diff --git a/.buckconfig b/.buckconfig
index a4c6d696ba66b7..963190d2b61a10 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -1,13 +1,13 @@
 
 [android]
-  target = android-26
+  target = android-27
 
 [download]
   max_number_of_retries = 3
 
 [maven_repositories]
   central = https://repo1.maven.org/maven2
-  google = https://maven.google.com
+  google = https://dl.google.com/dl/android/maven2/
 
 [alias]
   rntester = //RNTester/android/app:app
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 336b4dbf200818..7f94a6138c860f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,51 +28,42 @@ aliases:
 
   - &restore-cache-android-packages
     keys:
-      - v1-android-sdkmanager-packages-api-26-alpha-{{ checksum "scripts/.tests.env" }}
+      - v1-android-sdkmanager-packages-api-27-alpha-{{ checksum "scripts/.tests.env" }}
   - &save-cache-android-packages
     paths:
       - /opt/android/sdk
-    key: v1-android-sdkmanager-packages-api-26-alpha-{{ checksum "scripts/.tests.env" }}
+    key: v1-android-sdkmanager-packages-api-27-alpha-{{ checksum "scripts/.tests.env" }}
 
   - &restore-cache-gradle
     keys:
-      - v1-gradle-{{ arch }}-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum "ReactAndroid/build.gradle" }}
+      - v1-gradle-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum "ReactAndroid/build.gradle" }}
       # Fallback in case checksum fails
-      - v1-gradle-{{ arch }}-{{ .Branch }}-{{ checksum "build.gradle" }}-
-      - v1-gradle-{{ arch }}-{{ .Branch }}-
+      - v1-gradle-{{ .Branch }}-{{ checksum "build.gradle" }}-
+      - v1-gradle-{{ .Branch }}-
       # Fallback in case this is a first-time run on a fork
-      - v1-gradle-{{ arch }}-master-
+      - v1-gradle-master-
   - &save-cache-gradle
     paths:
       - ~/.gradle
-    key: v1-gradle-{{ arch }}-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum "ReactAndroid/build.gradle" }}
-
-  - &restore-cache-apt
-    keys:
-      - v1-apt-{{ .Branch }}-{{ checksum "scripts/circleci/apt-get-android-deps.sh" }}
-      # Fallback in case this is a first-time run on a fork
-      - v1-apt-master-{{ checksum "scripts/circleci/apt-get-android-deps.sh" }}
-  - &save-cache-apt
-    paths:
-      - ~/vendor/apt
-    key: v1-apt-{{ .Branch }}-{{ checksum "scripts/circleci/apt-get-android-deps.sh" }}
+    key: v1-gradle-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum "ReactAndroid/build.gradle" }}
 
   - &restore-cache-ndk
     keys:
-      - v3-android-ndk-{{ arch }}-r10e-{{ checksum "scripts/android-setup.sh" }}
+      - v3-android-ndk-r17c-{{ checksum "scripts/android-setup.sh" }}
   - &save-cache-ndk
     paths:
       - /opt/ndk
-    key: v3-android-ndk-{{ arch }}-r10e-{{ checksum "scripts/android-setup.sh" }}
+    key: v3-android-ndk-r17c-{{ checksum "scripts/android-setup.sh" }}
 
-  - &restore-cache-buck
+  - &restore-cache-downloads-buck
     keys:
-      - v3-buck-{{ arch }}-v2018.06.25.01
-  - &save-cache-buck
+      - v3-buck-v2018.07.23.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}}
+      - v3-buck-v2018.07.23.01-
+  - &save-cache-downloads-buck
     paths:
       - ~/buck
       - ~/okbuck
-    key: v3-buck-{{ arch }}-v2018.06.25.01
+    key: v3-buck-v2018.07.23.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}
 
   - &restore-cache-watchman
     keys:
@@ -82,16 +73,16 @@ aliases:
       - ~/watchman
     key: v1-watchman-{{ arch }}-v4.9.0
 
-  - &restore-cache-gradle-downloads
+  - &restore-cache-downloads-gradle
     keys:
-      - v1-gradle-{{ arch }}-{{ checksum "ReactAndroid/build.gradle" }}-{{ checksum "scripts/circleci/gradle_download_deps.sh" }}
-      - v1-gradle-{{ arch }}-
-  - &save-cache-gradle-downloads
+      - v1-gradle-{{ checksum "ReactAndroid/build.gradle" }}-{{ checksum "scripts/circleci/gradle_download_deps.sh" }}
+      - v1-gradle-
+  - &save-cache-downloads-gradle
     paths:
       - ~/.gradle
       - ReactAndroid/build/downloads
       - ReactAndroid/build/third-party-ndk
-    key: v1-gradle-{{ arch }}-{{ checksum "ReactAndroid/build.gradle" }}-{{ checksum "scripts/circleci/gradle_download_deps.sh" }}
+    key: v1-gradle-{{ checksum "ReactAndroid/build.gradle" }}-{{ checksum "scripts/circleci/gradle_download_deps.sh" }}
 
   # Branch Filtering
   - &filter-only-master-stable
@@ -137,15 +128,11 @@ aliases:
       echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
       sudo apt-get update && sudo apt-get install yarn
 
-  - &install-node-dependencies
-    |
-      npm install --no-package-lock --no-spin --no-progress
-
   - &install-buck
     name: Install BUCK
     command: |
       if [[ ! -e ~/buck ]]; then
-        git clone https://github.com/facebook/buck.git ~/buck --branch v2018.06.25.01 --depth=1
+        git clone https://github.com/facebook/buck.git ~/buck --branch v2018.07.23.01 --depth=1
       fi
       cd ~/buck && ant
       buck --version
@@ -156,13 +143,6 @@ aliases:
       mkdir -p ~/react-native/tooling/junit
       cp -R ~/okbuck/tooling/junit/* ~/react-native/tooling/junit/.
 
-
-  - &install-node
-    name: Install Node
-    command: |
-      curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
-      sudo apt-get install -y nodejs
-
   - &create-ndk-directory
     name: Create Android NDK Directory
     command: |
@@ -203,29 +183,32 @@ aliases:
   # eslint sometimes runs into trouble generating the reports
   - &run-lint-checks
     name: Lint code
-    command: |
-      if [ $((0 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
-        scripts/circleci/exec_swallow_error.sh yarn lint --format junit -o ~/react-native/reports/junit/eslint/results.xml
-      fi
+    command: scripts/circleci/exec_swallow_error.sh yarn lint --format junit -o ~/react-native/reports/junit/eslint/results.xml
 
-  - &run-flow-checks
-    name: Check for errors in code using Flow
-    command: |
-      if [ $((0 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
-        yarn flow check
-      fi
+  - &run-flow-checks-ios
+    name: Check for errors in code using Flow (iOS)
+    command: yarn flow-check-ios
+
+  - &run-flow-checks-android
+    name: Check for errors in code using Flow (Android)
+    command: yarn flow-check-android
 
   - &run-sanity-checks
     name: Sanity checks
     command: |
       ./scripts/circleci/check_license.sh
       ./scripts/circleci/check_cache.sh
+      ./scripts/circleci/validate_yarn_lockfile.sh
     when: always
 
-  - &gradle-download-deps
-    name: Download C++ Dependencies
+  - &download-dependencies-gradle
+    name: Download Dependencies Using Gradle
     command: ./scripts/circleci/gradle_download_deps.sh
 
+  - &download-dependencies-buck
+    name: Download Dependencies Using Buck
+    command: ./scripts/circleci/buck_fetch.sh
+
   - &build-android-app
     name: Build Android App
     command: |
@@ -266,6 +249,10 @@ aliases:
       fi
       source scripts/android-setup.sh && NO_BUCKD=1 retry3 timeout 300 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
 
+  - &build-android-rntester-app
+    name: Build Android RNTester App
+    command: ./gradlew RNTester:android:app:assembleRelease -Pjobs=$BUILD_THREADS
+
   - &collect-android-test-results
     name: Collect Test Results
     command: |
@@ -283,62 +270,54 @@ aliases:
       mkdir -p ~/react-native/reports/junit/
       mkdir -p ~/react-native/reports/outputs/
 
+  - &brew-install-watchman
+    name: Install Watchman
+    command: |
+      brew install watchman
+      touch .watchmanconfig
+
   - &boot-simulator-iphone
     name: Boot iPhone Simulator
-    command: |
-      if [ $((0 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
-        xcrun simctl boot "iPhone 5s" || true
-      fi
+    command: xcrun simctl boot "iPhone 5s" || true
 
   - &boot-simulator-appletv
     name: Boot Apple TV Simulator
-    command: |
-      if [ $((1 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
-        xcrun simctl boot "Apple TV" || true
-      fi
+    command: xcrun simctl boot "Apple TV" || true
 
   - &run-objc-ios-tests
     name: iOS Test Suite
-    command: |
-      if [ $((0 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
-        ./scripts/objc-test-ios.sh test
-      fi
+    command: ./scripts/objc-test-ios.sh test
 
   - &run-objc-tvos-tests
     name: tvOS Test Suite
+    command: ./scripts/objc-test-tvos.sh test
+
+  - &display-broken-tests-warning
+    name: Running broken tests (Ignore any failures past this point)
     command: |
-      if [ $((1 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
-        ./scripts/objc-test-tvos.sh test
-      fi
+      echo 'The following steps are known to be failing on master.'
+      echo 'They will no-op for most users.'
+      echo 'PRs that bring these back to green are appreciated.'
 
   - &run-podspec-tests
-    name: Test CocoaPods
-    command: |
-      if [ $((2 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
-        ./scripts/process-podspecs.sh
-      fi
+    name: Test CocoaPods (Disabled)
+    command: ./scripts/circleci/exec_author_check.sh ./scripts/process-podspecs.sh
 
   - &run-e2e-tests
-    name: End-to-End Test Suite
-    command: node ./scripts/run-ci-e2e-tests.js --android --ios --tvos --js --retries 3;
+    name: End-to-End Test Suite (Disabled)
+    command: ./scripts/circleci/exec_author_check.sh node ./scripts/run-ci-e2e-tests.js --android --ios --tvos --js --retries 3;
 
   - &run-objc-ios-e2e-tests
-    name: iOS End-to-End Test Suite
-    command: |
-      if [ $((0 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
-        node ./scripts/run-ci-e2e-tests.js --ios --retries 3;
-      fi
+    name: iOS End-to-End Test Suite (Disabled)
+    command: ./scripts/circleci/exec_author_check.sh node ./scripts/run-ci-e2e-tests.js --ios --retries 3;
 
   - &run-objc-tvos-e2e-tests
-    name: tvOS End-to-End Test Suite
-    command: |
-      if [ $((1 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
-        node ./scripts/run-ci-e2e-tests.js --tvos --js --retries 3;
-      fi
+    name: tvOS End-to-End Test Suite (Disabled)
+    command: ./scripts/circleci/exec_author_check.sh node ./scripts/run-ci-e2e-tests.js --tvos --js --retries 3;
 
   - &run-android-e2e-tests
-    name: Android End-to-End Test Suite
-    command: node ./scripts/run-ci-e2e-tests.js --android --retries 3;
+    name: Android End-to-End Test Suite (Disabled)
+    command: ./scripts/circleci/exec_author_check.sh node ./scripts/run-ci-e2e-tests.js --android --retries 3;
 
   - &run-js-e2e-tests
     name: JavaScript End-to-End Test Suite
@@ -359,14 +338,14 @@ js_defaults: &js_defaults
 android_defaults: &android_defaults
   <<: *defaults
   docker:
-    - image: circleci/android:api-26-node8-alpha
+    - image: circleci/android:api-27-node8-alpha
   resource_class: "large"
   environment:
     - TERM: "dumb"
     - ADB_INSTALL_TIMEOUT: 10
     - _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
     - GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"'
-    - ANDROID_NDK: '/opt/ndk/android-ndk-r10e'
+    - ANDROID_NDK: '/opt/ndk/android-ndk-r17c'
     - BUILD_THREADS: 2
 
 macos_defaults: &macos_defaults
@@ -403,7 +382,8 @@ jobs:
           at: ~/react-native
 
       - run: *run-lint-checks
-      - run: *run-flow-checks
+      - run: *run-flow-checks-ios
+      - run: *run-flow-checks-android
 
       - store_test_results:
           path: ~/react-native/reports/junit
@@ -422,108 +402,98 @@ jobs:
       - store_test_results:
           path: ~/react-native/reports/junit
 
+  # Run JavaScript tests on Node 10
+  test_node10:
+    <<: *defaults
+    docker:
+      - image: circleci/node:10
+    environment:
+      - PATH: "/opt/yarn/yarn-v1.5.1/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    steps:
+      - checkout
+      - run: *setup-artifacts
+      - run: *yarn
+      - run: *run-js-tests
+      - store_test_results:
+          path: ~/react-native/reports/junit
+
   # Runs unit tests on iOS and Apple TV devices
   test_objc:
     <<: *macos_defaults
-    parallelism: 3
     steps:
       - attach_workspace:
           at: ~/react-native
 
       - run: *boot-simulator-iphone
       - run: *boot-simulator-appletv
-      - run: brew install watchman
+      - run: *brew-install-watchman
 
       - run: *run-objc-ios-tests
       - run: *run-objc-tvos-tests
+
+      # TODO: Fix these failing tests.
+      - run: *display-broken-tests-warning
       - run: *run-podspec-tests
+      - run: *run-objc-ios-e2e-tests
+      - run: *run-objc-tvos-e2e-tests
 
       - store_test_results:
           path: ~/react-native/reports/junit
 
-  # Runs end to end tests
-  test_end_to_end:
-    <<: *macos_defaults
-    parallelism: 2
+  # Xcode 10: Runs unit tests on iOS and Apple TV devices
+  test_objc_xcode10:
+    <<: *defaults
+    macos:
+      xcode: "10.0.0"
     steps:
-      - attach_workspace:
-          at: ~/react-native
+      - checkout
+      - run: *setup-artifacts
+      - run: *yarn
 
       - run: *boot-simulator-iphone
       - run: *boot-simulator-appletv
+      - run: *brew-install-watchman
+
+      - run: *run-objc-ios-tests
+      - run: *run-objc-tvos-tests
+
+      # TODO: Fix these failing tests.
+      - run: *display-broken-tests-warning
+      - run: *run-podspec-tests
+      - run: *run-objc-ios-e2e-tests
+      - run: *run-objc-tvos-e2e-tests
+
+      - store_test_results:
+          path: ~/react-native/reports/junit
 
+  # Runs end to end tests (Detox)
+  test_detox_end_to_end:
+    <<: *macos_defaults
+    steps:
+      - attach_workspace:
+          at: ~/react-native
+      - run: xcrun simctl boot "iPhone 5s" || true
       - run:
           name: Configure Environment Variables
           command: |
             echo 'export PATH=/usr/local/opt/node@8/bin:$PATH' >> $BASH_ENV
             source $BASH_ENV
-
       - run:
           name: Install Node 8
           command: |
             brew install node@8
             brew link node@8
+            brew tap wix/brew
+            brew install applesimutils
             node -v
-
-      - run: *run-objc-ios-e2e-tests
-      # Disabled for now
-      # - run: *run-objc-tvos-e2e-tests
-
-      - store_test_results:
-          path: ~/react-native/reports/junit
-
-  # Publishes new version onto npm
-  publish_npm_package:
-    <<: *android_defaults
-    steps:
-      # Checkout code so that we can work with `git` in publish.js
-      - checkout
-
-      # Configure Android SDK and related dependencies
-      - run: *configure-android-path
-      - run: *install-android-build-dependencies
-
-      - restore-cache: *restore-cache-android-packages
-      - run: *install-android-packages
-      - save-cache: *save-cache-android-packages
-
-      # Install Android NDK
-      - run: *create-ndk-directory
-      - restore-cache: *restore-cache-ndk
-      - run: *install-ndk
-      - save-cache: *save-cache-ndk
-
-      # Fetch dependencies using BUCK
-      - restore-cache: *restore-cache-buck
-      - run: *install-buck
-      - save-cache: *save-cache-buck
-
-      - run: buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
-      - run: buck fetch ReactAndroid/src/main/java/com/facebook/react
-      - run: buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
-      - run: buck fetch ReactAndroid/src/test/...
-      - run: buck fetch ReactAndroid/src/androidTest/...
-
-      - restore-cache: *restore-cache-gradle-downloads
-      - run: *gradle-download-deps
-      - save-cache: *save-cache-gradle-downloads
-
-      - restore-cache: *restore-yarn-cache
       - run: *yarn
-      - save-cache: *save-yarn-cache
 
       - run:
-          name: Publish React Native Package
-          command: |
-            if [ -z "$CIRCLE_PULL_REQUEST" ]; then
-              echo "//registry.npmjs.org/:_authToken=${CIRCLE_NPM_TOKEN}" > ~/.npmrc
-              git config --global user.email "reactjs-bot@users.noreply.github.com"
-              git config --global user.name "npm Deployment Script"
-              echo "machine github.com login reactjs-bot password $GITHUB_TOKEN" > ~/.netrc
-              node ./scripts/publish-npm.js
-            else
-              echo "Skipping deploy."
-            fi
+          name: Build iOS app for simulator
+          command: yarn run build-ios-e2e
+      - run:
+          name: Run Detox Tests
+          command: yarn run test-ios-e2e
 
   # Set up an Android environment for downstream jobs
   test_android:
@@ -534,14 +504,14 @@ jobs:
 
       # Configure Android SDK and related dependencies
       - run: *configure-android-path
-      - restore-cache: *restore-cache-apt
+      # Android build deps install from the network faster than cache
       - run: *install-android-build-dependencies
-      - save-cache: *save-cache-apt
 
       - restore-cache: *restore-cache-android-packages
       - run: *install-android-packages
       - save-cache: *save-cache-android-packages
 
+      # Validate Android SDK installation and packages
       - run: *validate-android-sdk
 
       # Starting emulator in advance as it takes some time to boot.
@@ -556,22 +526,21 @@ jobs:
       - run: *install-ndk
       - save-cache: *save-cache-ndk
 
-      # Fetch dependencies using BUCK
-      - restore-cache: *restore-cache-buck
+      # Install Buck
+      - restore-cache: *restore-cache-downloads-buck
       - run: *install-buck
-      - save-cache: *save-cache-buck
+      - save-cache: *save-cache-downloads-buck
 
+      # Validate Android test environment (including Buck)
       - run: *validate-android-test-env
 
-      - run: buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
-      - run: buck fetch ReactAndroid/src/main/java/com/facebook/react
-      - run: buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
-      - run: buck fetch ReactAndroid/src/test/...
-      - run: buck fetch ReactAndroid/src/androidTest/...
+      # Download dependencies using Buck
+      - run: *download-dependencies-buck
 
-      - restore-cache: *restore-cache-gradle-downloads
-      - run: *gradle-download-deps
-      - save-cache: *save-cache-gradle-downloads
+      # Download dependencies using Gradle
+      - restore-cache: *restore-cache-downloads-gradle
+      - run: *download-dependencies-gradle
+      - save-cache: *save-cache-downloads-gradle
 
       # Build and compile
       - run: *build-android-app
@@ -586,16 +555,12 @@ jobs:
       # Test Suite
       - run: *run-android-unit-tests
       - run: *run-android-instrumentation-tests
-
-      # Build Android RNTester
-      - run:
-          name: Build Android RNTester
-          command: |
-            ./gradlew RNTester:android:app:assembleRelease -Pjobs=$BUILD_THREADS
+      - run: *build-android-rntester-app
 
       # Run Android end-to-end tests
-      # Disabled
-      # - run: *run-android-e2e-tests
+      # TODO: Fix these failing tests.
+      - run: *display-broken-tests-warning
+      - run: *run-android-e2e-tests
 
       # Collect Results
       - run: *collect-android-test-results
@@ -605,46 +570,111 @@ jobs:
   # Analyze pull request and raise any lint/flow issues.
   # Issues will be posted to the PR itself via GitHub bots.
   # This workflow should only fail if the bots fail to run.
+  # The public github tokens are publicly visible by design
   analyze_pr:
-    <<: *js_defaults
+    <<: *defaults
+    docker:
+      - image: circleci/node:10
+    environment:
+      - PATH: "/opt/yarn/yarn-v1.5.1/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+      - PUBLIC_PULLBOT_GITHUB_TOKEN_A: "a6edf8e8d40ce4e8b11a"
+      - PUBLIC_PULLBOT_GITHUB_TOKEN_B: "150e1341f4dd9c944d2a"
+      - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A: "78a72af35445ca3f8180"
+      - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B: "b1a98e0bbd56ff1ccba1"
+
     steps:
-      - attach_workspace:
-          at: ~/react-native
+      - checkout
+      - run: *setup-artifacts
 
       - restore-cache: *restore-cache-analysis
       - run: *yarn
+
       - run:
-          name: Install Additional Dependencies
+          name: Analyze Shell Scripts
           command: |
-            if [ -n "$CIRCLE_PR_NUMBER" ]; then
-              yarn add github@0.2.4
-              cd bots
-              yarn install --non-interactive --cache-folder ~/.cache/yarn
-            else
-              echo "Skipping dependency installation."
-            fi
-      - save-cache: *save-cache-analysis
+            echo -e "\\x1B[36mInstalling additional dependencies\\x1B[0m"
+            sudo apt-get install -y shellcheck
+            yarn add @octokit/rest@15.10.0
+            echo -e "\\x1B[36mAnalyzing shell scripts\\x1B[0m"; \
+            GITHUB_TOKEN="$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A""$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B" \
+            GITHUB_OWNER="$CIRCLE_PROJECT_USERNAME" \
+            GITHUB_REPO="$CIRCLE_PROJECT_REPONAME" \
+            GITHUB_PR_NUMBER="$CIRCLE_PR_NUMBER" \
+            ./scripts/circleci/analyze_scripts.sh
+          when: always
 
       - run:
-          name: Analyze Pull Request
+          name: Analyze Code
           command: |
-            # DANGER_GITHUB_API_TOKEN=React-Linter public_repo access token
-            if [ -n "$CIRCLE_PR_NUMBER" ]; then
-              cd bots && DANGER_GITHUB_API_TOKEN="80aa64c50f38a267e9ba""575d41d528f9c234edb8" yarn danger
-            else
-              echo "Skipping pull request analysis."
-            fi
+            echo -e "\\x1B[36mInstalling additional dependencies\\x1B[0m"; yarn add @octokit/rest@15.10.0
+            echo -e "\\x1B[36mAnalyzing code\\x1B[0m"; \
+            GITHUB_TOKEN="$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A""$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B" \
+            GITHUB_OWNER="$CIRCLE_PROJECT_USERNAME" \
+            GITHUB_REPO="$CIRCLE_PROJECT_REPONAME" \
+            GITHUB_PR_NUMBER="$CIRCLE_PR_NUMBER" \
+            ./scripts/circleci/analyze_code.sh
           when: always
+
       - run:
-          name: Analyze Code
+          name: Analyze Pull Request
           command: |
-            # GITHUB_TOKEN=eslint-bot public_repo access token
-            if [ -n "$CIRCLE_PR_NUMBER" ]; then
-              GITHUB_TOKEN="af6ef0d15709bc91d""06a6217a5a826a226fb57b7" CI_USER=$CIRCLE_PROJECT_USERNAME CI_REPO=$CIRCLE_PROJECT_REPONAME PULL_REQUEST_NUMBER=$CIRCLE_PR_NUMBER scripts/circleci/analyze_code.sh
-            else
-              echo "Skipping code analysis."
-            fi
+            echo -e "\\x1B[36mInstalling additional dependencies\\x1B[0m"
+            cd bots
+            yarn install --non-interactive --cache-folder ~/.cache/yarn
+            echo -e "\\x1B[36mAnalyzing pull request\\x1B[0m"; \
+            DANGER_GITHUB_API_TOKEN="$PUBLIC_PULLBOT_GITHUB_TOKEN_A""$PUBLIC_PULLBOT_GITHUB_TOKEN_B" \
+            yarn danger
           when: always
+      - save-cache: *save-cache-analysis
+
+  # Publishes new version onto npm
+  # Only works on stable branches when a properly tagged commit is pushed
+  publish_npm_package:
+    <<: *android_defaults
+    steps:
+      - checkout
+
+      - restore-cache: *restore-yarn-cache
+      - run: *yarn
+
+      # Configure Android SDK and related dependencies
+      - run: *configure-android-path
+      - run: *install-android-build-dependencies
+
+      - restore-cache: *restore-cache-android-packages
+      - run: *install-android-packages
+
+      # Install Android NDK
+      - run: *create-ndk-directory
+      - restore-cache: *restore-cache-ndk
+      - run: *install-ndk
+
+      # Fetch dependencies using Buck
+      - restore-cache: *restore-cache-downloads-buck
+      - run: *install-buck
+      - run: *download-dependencies-buck
+
+      # Fetch dependencies using Gradle
+      - restore-cache: *restore-cache-downloads-gradle
+      - run: *download-dependencies-gradle
+
+      - restore-cache: *restore-yarn-cache
+      - run: *yarn
+
+      - run:
+          name: Authenticate with npm
+          command: echo "//registry.npmjs.org/:_authToken=${CIRCLE_NPM_TOKEN}" > ~/.npmrc
+
+      - run:
+          name: Authenticate git user
+          command: |
+            git config --global user.email "react-native-bot@users.noreply.github.com"
+            git config --global user.name "npm Deployment Script"
+            echo "machine github.com login react-native-bot password $GITHUB_TOKEN" > ~/.netrc
+
+      - run:
+          name: Publish React Native Package
+          command: node ./scripts/publish-npm.js
 
 # Workflows enables us to run multiple jobs in parallel
 workflows:
@@ -680,35 +710,29 @@ workflows:
           requires:
             - checkout_code
 
-      # End-to-end tests
-      - test_end_to_end:
+      - test_detox_end_to_end:
           filters: *filter-ignore-gh-pages
           requires:
             - checkout_code
 
+      # Tooling Compatibility Checks
+      - test_objc_xcode10:
+          filters: *filter-ignore-gh-pages
+      - test_node10:
+          filters: *filter-ignore-gh-pages
+
       # Only runs on vX.X.X tags if all tests are green
       - publish_npm_package:
           filters:
+            # ignore any commit on any branch by default
             branches:
               ignore: /.*/
+            # only act on version tags
             tags:
               only: /v[0-9]+(\.[0-9]+)*(\-rc(\.[0-9]+)?)?/
-          requires:
-            - test_javascript
-            - test_objc
-            - test_android
-            - test_end_to_end
-            - analyze
-
-  # Only runs on PRs
-  analyze:
-    jobs:
-      # Checkout repo and run Yarn
-      - checkout_code:
-          filters: *filter-ignore-master-stable
 
-      # Run code checks
+      # Run code checks on PRs from forks
       - analyze_pr:
-          filters: *filter-ignore-master-stable
-          requires:
-            - checkout_code
+          filters:
+            branches:
+              only: /^pull\/.*$/
diff --git a/.editorconfig b/.editorconfig
index 4cde30709106fc..dadac3a2b6d50b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,3 +12,6 @@ indent_size = 2
 
 [*.gradle]
 indent_size = 4
+
+[BUCK]
+indent_size = 4
diff --git a/.eslintrc b/.eslintrc
index 395f7d8243492b..01842b1bcd0e5f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -52,7 +52,8 @@
     "setTimeout": false,
     "window": false,
     "XMLHttpRequest": false,
-    "pit": false
+    "pit": false,
+    "jasmine": true
   },
 
   "rules": {
@@ -143,7 +144,7 @@
     "no-undef": 2,                   // disallow use of undeclared variables unless mentioned in a /*global */ block
     "no-undefined": 0,               // disallow use of undefined variable (off by default)
     "no-undef-init": 1,              // disallow use of undefined when initializing variables
-    "no-unused-vars": [1, {"vars": "all", "args": "none"}], // disallow declaration of variables that are not used in the code
+    "no-unused-vars": [1, {"vars": "all", "args": "none", ignoreRestSiblings: true}], // disallow declaration of variables that are not used in the code
     "no-use-before-define": 0,       // disallow use of variables before they are defined
 
   // Node.js
diff --git a/.flowconfig b/.flowconfig
index 7ba7b7ccf41d93..1915005d9c20e2 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -40,6 +40,9 @@ flow-github/
 [options]
 emoji=true
 
+esproposal.optional_chaining=enable
+esproposal.nullish_coalescing=enable
+
 module.system=haste
 module.system.haste.use_name_reducers=true
 # keep the following in sync with server/haste/hasteImpl.js
@@ -53,10 +56,10 @@ module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
 module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
 module.system.haste.paths.blacklist=.*/__tests__/.*
 module.system.haste.paths.blacklist=.*/__mocks__/.*
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/Libraries/Animated/src/polyfills/.*
 module.system.haste.paths.whitelist=<PROJECT_ROOT>/Libraries/.*
 module.system.haste.paths.whitelist=<PROJECT_ROOT>/RNTester/.*
 module.system.haste.paths.whitelist=<PROJECT_ROOT>/IntegrationTests/.*
+module.system.haste.paths.blacklist=<PROJECT_ROOT>/Libraries/react-native/react-native-implementation.js
 module.system.haste.paths.blacklist=<PROJECT_ROOT>/Libraries/Animated/src/polyfills/.*
 
 munge_underscores=true
@@ -68,13 +71,14 @@ suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*[react_native_oss|react_native_fb][a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*[react_native_oss|react_native_fb][a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [lints]
 all=warn
+unnecessary-optional-chain=off
 
 # There is an ESLint rule for this
 unclear-type=off
@@ -97,4 +101,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.76.0
+^0.83.0
diff --git a/.flowconfig.android b/.flowconfig.android
new file mode 100644
index 00000000000000..2a37cfe29f58ee
--- /dev/null
+++ b/.flowconfig.android
@@ -0,0 +1,104 @@
+[ignore]
+; We fork some components by platform
+.*/*[.]ios.js
+
+; Ignore templates for 'react-native init'
+.*/local-cli/templates/.*
+
+; Ignore the Dangerfile
+<PROJECT_ROOT>/bots/dangerfile.js
+
+; Ignore "BUCK" generated dirs
+<PROJECT_ROOT>/\.buckd/
+
+; Ignore unexpected extra "@providesModule"
+.*/node_modules/.*/node_modules/fbjs/.*
+
+; Ignore duplicate module providers
+; For RN Apps installed via npm, "Libraries" folder is inside
+; "node_modules/react-native" but in the source repo it is in the root
+.*/Libraries/react-native/React.js
+
+; Ignore polyfills
+.*/Libraries/polyfills/.*
+
+; Ignore metro
+.*/node_modules/metro/.*
+
+; These should not be required directly
+; require from fbjs/lib instead: require('fbjs/lib/invariant')
+.*/node_modules/invariant/.*
+.*/node_modules/warning/.*
+
+[include]
+
+[libs]
+Libraries/react-native/react-native-interface.js
+flow/
+flow-github/
+
+[options]
+emoji=true
+
+esproposal.optional_chaining=enable
+esproposal.nullish_coalescing=enable
+
+module.system=haste
+module.system.haste.use_name_reducers=true
+# keep the following in sync with server/haste/hasteImpl.js
+# get basename
+module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
+# strip .js or .js.flow suffix
+module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
+# strip .android suffix
+module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
+module.system.haste.paths.blacklist=.*/__tests__/.*
+module.system.haste.paths.blacklist=.*/__mocks__/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/Libraries/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/RNTester/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/IntegrationTests/.*
+module.system.haste.paths.blacklist=<PROJECT_ROOT>/Libraries/react-native/react-native-implementation.js
+module.system.haste.paths.blacklist=<PROJECT_ROOT>/Libraries/Animated/src/polyfills/.*
+
+munge_underscores=true
+
+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\)$' -> 'RelativeImageStub'
+
+suppress_type=$FlowIssue
+suppress_type=$FlowFixMe
+suppress_type=$FlowFixMeProps
+suppress_type=$FlowFixMeState
+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_android\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_android\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
+suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
+
+[lints]
+all=warn
+unnecessary-optional-chain=off
+
+# There is an ESLint rule for this
+unclear-type=off
+
+sketchy-null=off
+sketchy-null-number=warn
+sketchy-null-mixed=warn
+
+# This is noisy for now. We *do* still want to warn on importing types
+# from untyped files, which is covered by untyped-type-import
+untyped-import=off
+
+[strict]
+deprecated-type
+nonstrict-import
+sketchy-null
+unclear-type
+unsafe-getters-setters
+untyped-import
+untyped-type-import
+
+[version]
+^0.83.0
diff --git a/.github/ISSUE_TEMPLATE/discussion.md b/.github/ISSUE_TEMPLATE/discussion.md
index a576b0de5c7539..b83e727da0a269 100644
--- a/.github/ISSUE_TEMPLATE/discussion.md
+++ b/.github/ISSUE_TEMPLATE/discussion.md
@@ -1,19 +1,18 @@
 ---
 name: 🗣 Start a Discussion
-about: Use https://discuss.reactjs.org/ to propose changes or discuss feature requests.
+about: Use https://github.com/react-native-community/discussions-and-proposals to propose changes or discuss feature requests.
 ---
 
-Please use https://discuss.reactjs.org/ to propose changes or discuss feature requests.
+Use https://github.com/react-native-community/discussions-and-proposals to propose changes or discuss feature requests. This helps us ensure bug reports and regressions are given the priority they require.
 
-If you feel strongly about starting a discussion as a GitHub Issue instead of using the discussion forum, you may follow this template.
-
-We kindly ask that issues of this type are kept to a minimum to ensure bug reports and regressions are given the priority they require.
-
-Maintainers may flag an issue for Stack Overflow or kindly ask you to move the discussion to https://discuss.reactjs.org at their own discretion.
+You may also use https://discuss.reactjs.org/ for discussions on topics that are not necessarily served by the Bug Report template.
 
 ---
 
 # For Discussion
 
-<!-- Describe your issue in detail. -->
+<!--
+  If you feel strongly about having your discussion in the main React Native repository, you may write your proposal here.
 
+  Please note that there is a high probability your issue will be closed by a maintainer, who may kindly ask you to move the discussion elsewhere.
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2ae837de23e7e3..d399a3f94c71cc 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,10 @@
-Thank you for sending the PR! We appreciate you spending the time to work on these changes. 
+Thank you for sending the PR! We appreciate you spending the time to work on these changes.
 Help us understand your motivation by explaining why you decided to make this change.
 
 If this PR fixes an issue, type "Fixes #issueNumber" to automatically close the issue when the PR is merged.
 
+_Pull requests that expand test coverage are more likely to get reviewed. Add a test case whenever possible!_
+
 Test Plan:
 ----------
 Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Bonus points for screenshots and videos!
diff --git a/.github/stale.yml b/.github/stale.yml
index 538514d6469695..4e334d27a425b0 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -2,7 +2,7 @@
 # Number of days of inactivity before an issue becomes stale
 daysUntilStale: 90
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 30
+daysUntilClose: 7
 # Issues with these labels will never be considered stale
 exemptLabels:
   - Good first issue
@@ -10,6 +10,7 @@ exemptLabels:
   - Core Team
   - "Help Wanted :octocat:"
   - ":warning:Regression"
+  - ":clock1:PR Pending"
 # Label to use when marking an issue as stale
 staleLabel: Stale 
 # Comment to post when marking an issue as stale. Set to `false` to disable
diff --git a/.gitignore b/.gitignore
index 7705dae8ffa43f..4fb4a25d15f722 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,10 +51,6 @@ node_modules
 *.log
 .nvm
 /bots/node_modules/
-
-# TODO: Check in yarn.lock in open source. Right now we need to keep it out
-# from the GitHub repo as importing it might conflict with internal workspaces
-yarn.lock
 package-lock.json
 
 # OS X
@@ -72,3 +68,4 @@ package-lock.json
 
 # ReactCommon subdir shouldn't have Xcode project
 /ReactCommon/**/*.xcodeproj
+RNTester/build
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 00000000000000..dba04c1e1786b2
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+8.11.3
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 062c7ca1df5c2d..0f7ad8bfc173ea 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,43 +1,5 @@
-# [Open Source Code of Conduct](https://code.facebook.com/codeofconduct)
+# Code of Conduct
 
-This code of conduct outlines our expectations for participants within the **Facebook Open Source** community, as well as steps to reporting unacceptable behavior. We are committed to providing a welcoming and inspiring community for all and expect our code of conduct to be honored. Anyone who violates this code of conduct may be banned from the community.
-
-Our open source community strives to:
-
-* **Be friendly and patient.**
-* **Be welcoming:** We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
-* **Be considerate:** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we’re a world-wide community, so you might not be communicating in someone else’s primary language.
-* **Be respectful:** Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one.
-* **Be careful in the words that you choose:** we are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren’t acceptable. This includes, but is not limited to:
-  * Violent threats or language directed against another person.
-  * Discriminatory jokes and language.
-  * Posting sexually explicit or violent material.
-  * Posting (or threatening to post) other people’s personally identifying information (“doxing”).
-  * Personal insults, especially those using racist or sexist terms.
-  * Unwelcome sexual attention.
-  * Advocating for, or encouraging, any of the above behavior.
-  * Repeated harassment of others. In general, if someone asks you to stop, then stop.
-* **When we disagree, try to understand why:** Disagreements, both social and technical, happen all the time. It is important that we resolve disagreements and differing views constructively.
-* **Remember that we’re different.** The strength of our community comes from its diversity, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.
-
-This code is not exhaustive or complete. It serves to distill our common understanding of a collaborative, shared environment, and goals. We expect it to be followed in spirit as much as in the letter.
-
-## Diversity Statement
-
-We encourage everyone to participate and are committed to building a community for all. Although we may not be able to satisfy everyone, we all agree that everyone is equal. Whenever a participant has made a mistake, we expect them to take responsibility for it. If someone has been harmed or offended, it is our responsibility to listen carefully and respectfully, and do our best to right the wrong.
-
-Although this list cannot be exhaustive, we explicitly honor diversity in age, gender, gender identity or expression, culture, ethnicity, language, national origin, political beliefs, profession, race, religion, sexual orientation, socioeconomic status, and technical ability. We will not tolerate discrimination based on any of the protected characteristics above, including participants with disabilities.
-
-## Reporting Issues
-
-If you experience or witness unacceptable behavior—or have any other concerns—please report it by contacting us via opensource@fb.com. All reports will be handled with discretion. In your report please include:
-
-* Your contact information.
-* Names (real, nicknames, or pseudonyms) of any individuals involved. If there are additional witnesses, please include them as well. Your account of what occurred, and if you believe the incident is ongoing. If there is a publicly available record (e.g. a mailing list archive or a public IRC logger), please include a link.
-* Any additional information that may be helpful.
-
-After filing a report, a representative will contact you personally. If the person who is harassing you is part of the response team, they will recuse themselves from handling your incident. A representative will then review the incident, follow up with any additional questions, and make a decision as to how to respond. We will respect confidentiality requests for the purpose of protecting victims of abuse.
-
-Anyone asked to stop unacceptable behavior is expected to comply immediately. If an individual engages in unacceptable behavior, the representative may take any action they deem appropriate, up to and including a permanent ban from our community without warning.
-
-_This Code Of Conduct follows the [template](http://todogroup.org/opencodeofconduct/) established by the [TODO Group](http://todogroup.org/)._
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to.
+Please read the [full text](https://code.fb.com/codeofconduct/)
+so that you can understand what actions will and will not be tolerated.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 25ba2d5c1e1d51..743a6db7f3cecc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,192 +1,41 @@
 # Contributing to React Native
 
-<!-- generated_contributing_start -->
-React Native is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody using Facebook's mobile apps. If you're interested in contributing to React Native, hopefully this document makes the process for contributing clear.
+We want to make contributing to this project as easy and transparent as possible. Read on to learn more about our development process and how to propose bug fixes and improvements. The [How to Contribute](https://facebook.github.io/react-native/docs/contributing.html) guide on the website goes into more detail for each of these areas.
 
-## [Code of Conduct](https://code.facebook.com/codeofconduct)
+## Our Development Process
 
-Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.facebook.com/codeofconduct) so that you can understand what actions will and will not be tolerated.
+Most changes from engineers at Facebook will sync to [GitHub](https://github.com/facebook/react-native) through a bridge with Facebook's internal source control. Changes from the community are handled through GitHub pull requests. Once a change made on GitHub is approved, it will first be imported into Facebook's internal source control. The change will eventually sync back to GitHub as a single commit once it has passed Facebook's internal tests.
 
-## Get involved
-
-There are many ways to contribute to React Native, and many of them do not involve writing any code. Here's a few ideas to get started:
-
-* Simply start using React Native. Go through the [Getting Started](https://facebook.github.io/react-native/docs/getting-started.html) guide. Does everything work as expected? If not, we're always looking for improvements. Let us know by [opening an issue](https://facebook.github.io/react-native/docs/contributing.html#reporting-new-issues).
-* Look through the [open issues](https://github.com/facebook/react-native/issues). Provide workarounds, ask for clarification, or suggest labels. Help [triage issues](https://facebook.github.io/react-native/docs/contributing.html#triaging-issues-and-pull-requests).
-* If you find an issue you would like to fix, [open a pull request](https://facebook.github.io/react-native/docs/contributing.html#your-first-pull-request). Issues tagged as [_Good first issue_](https://github.com/facebook/react-native/labels/Good%20first%20issue) are a good place to get started.
-* Read through the [React Native docs](https://facebook.github.io/react-native/docs/getting-started.html). If you find anything that is confusing or can be improved, you can make edits by clicking the "EDIT" button in the top-right corner of most docs.
-* Browse [Stack Overflow](https://stackoverflow.com/questions/tagged/react-native) and answer questions. This will help you get familiarized with common pitfalls or misunderstandings, which can be useful when contributing updates to the documentation.
-* Take a look at the [features requested](https://react-native.canny.io/feature-requests) by others in the community and consider opening a pull request if you see something you want to work on.
-
-Contributions are very welcome. If you think you need help planning your contribution, please hop into [#react-native](https://discord.gg/0ZcbPKXt5bZjGY5n) and let people know you're looking for a mentor.
-
-Core contributors to React Native meet monthly and post their meeting notes on the [React Native blog](https://facebook.github.io/react-native/blog). You can also find ad hoc discussions in the [React Native Core Contributors](https://www.facebook.com/groups/reactnativeoss/) Facebook group.
-
-### Triaging issues and pull requests
-
-One great way you can contribute to the project without writing any code is to help triage issues and pull requests as they come in.
-
-* Ask for more information if the issue does not provide all the details required by the template.
-* Suggest [labels](https://github.com/facebook/react-native/labels) that can help categorize issues.
-* Flag issues that are stale or that should be closed.
-* Ask for test plans and review code.
-
-You can learn more about handling issues in the [maintainer's guide](docs/maintainers.html#handling-issues).
-
-## Our development process
-
-Some of the core team will be working directly on [GitHub](https://github.com/facebook/react-native). These changes will be public from the beginning. Other changesets will come via a bridge with Facebook's internal source control. This is a necessity as it allows engineers at Facebook outside of the core team to move fast and contribute from an environment they are comfortable in.
-
-When a change made on GitHub is approved, it will first be imported into Facebook's internal source control. The change will eventually sync back to GitHub as a single commit once it has passed all internal tests.
-
-### Branch organization
-
-We will do our best to keep `master` in good shape, with tests passing at all times. But in order to move fast, we will make API changes that your application might not be compatible with. We will do our best to [communicate these changes](https://github.com/facebook/react-native/releases) and version appropriately so you can lock into a specific version if need be.
-
-To see what changes are coming and provide better feedback to React Native contributors, use the [latest release candidate](https://facebook.github.io/react-native/versions.html) when possible. By the time a release candidate is released, the changes it contains will have been shipped in production Facebook apps for over two weeks.
-
-## Bugs
-
-We use [GitHub Issues](https://github.com/facebook/react-native/issues) for our public bugs. If you would like to report a problem, take a look around and see if someone already opened an issue about it. If you a are certain this is a new, unreported bug, you can submit a [bug report](https://facebook.github.io/react-native/docs/contributing.html#reporting-new-issues).
-
-If you have questions about using React Native, the [Community page](https://facebook.github.io/react-native/help.html) list various resources that should help you get started.
-
-We also have a [place where you can request features or enhancements](https://react-native.canny.io/feature-requests). If you see anything you'd like to be implemented, vote it up and explain your use case.
-
-## Reporting new issues
-
-When [opening a new issue](https://github.com/facebook/react-native/issues/new), always make sure to fill out the [issue template](https://raw.githubusercontent.com/facebook/react-native/master/.github/ISSUE_TEMPLATE.md). **This step is very important!** Not doing so may result in your issue getting closed. Don't take this personally if this happens, and feel free to open a new issue once you've gathered all the information required by the template.
-
-* **One issue, one bug:** Please report a single bug per issue.
-* **Provide a Snack:** The best way to get attention on your issue is to provide a reduced test case. You can use [Snack](https://snack.expo.io/) to demonstrate the issue.
-* **Provide reproduction steps:** List all the steps necessary to reproduce the issue. Provide a Snack or upload a sample project to GitHub. The person reading your bug report should be able to follow these steps to reproduce your issue with minimal effort.
-* **Try out the latest version:** Verify that the issue can be reproduced locally by updating your project to use [React Native from `master`](https://facebook.github.io/react-native/versions.html). The bug may have already been fixed!
-
-We're not able to provide support through GitHub Issues. If you're looking for help with your code, consider asking on [Stack Overflow](https://stackoverflow.com/questions/tagged/react-native) or reaching out to the community through [other channels](https://facebook.github.io/react-native/support.html).
-
-### Security bugs
-
-Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe disclosure of security bugs. With that in mind, please do not file public issues; go through the process outlined on that page.
-
-## Pull requests
-
-### Your first pull request
-
-So you have decided to contribute code back to upstream by opening a pull request. You've invested a good chunk of time, and we appreciate it. We will do our best to work with you and get the PR looked at.
-
-Working on your first Pull Request? You can learn how from this free video series:
-
-[**How to Contribute to an Open Source Project on GitHub**](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github)
-
-We have a list of [beginner friendly issues](https://github.com/facebook/react-native/labels/Good%20first%20issue) to help you get your feet wet in the React Native codebase and familiar with our contribution process. This is a great place to get started.
-
-### Proposing a change
-
-If you would like to request a new feature or enhancement but are not yet thinking about opening a pull request, we have a [place to track feature requests](https://react-native.canny.io/feature-requests).
-
-If you intend to change the public API, or make any non-trivial changes to the implementation, we recommend [filing an issue](https://github.com/facebook/react-native/issues/new?title=%5BProposal%5D) that includes `[Proposal]` in the title. This lets us reach an agreement on your proposal before you put significant effort into it. These types of issues should be rare. If you have been contributing to the project long enough, you will probably already have access to the [React Native Core Contributors](https://www.facebook.com/groups/reactnativeoss/) Facebook Group, where this sort of discussion is usually held.
-
-If you're only fixing a bug, it's fine to submit a pull request right away but we still recommend to file an issue detailing what you're fixing. This is helpful in case we don't accept that specific fix but want to keep track of the issue.
-
-### Sending a pull request
-
-Small pull requests are much easier to review and more likely to get merged. Make sure the PR does only one thing, otherwise please split it.
+## Pull Requests
 
 Please make sure the following is done when submitting a pull request:
 
-1. Fork [the repository](https://github.com/facebook/react-native) and create your branch from `master`.
-2. Add the copyright notice to the top of any new files you've added.
-3. Describe your [**test plan**](https://facebook.github.io/react-native/docs/contributing.html#test-plan) in your pull request description. Make sure to [test your changes](https://facebook.github.io/react-native/docs/testing.html)!
-4. Make sure your code lints (`npm run lint`).
-5. If you haven't already, [sign the CLA](https://code.facebook.com/cla).
-
-All pull requests should be opened against the `master` branch. After opening your pull request, ensure [**all tests pass**](https://facebook.github.io/react-native/docs/contributing.html#contrinuous-integration-tests) on Circle CI. If a test fails and you believe it is unrelated to your change, leave a comment on the pull request explaining why.
-
-> **Note:** It is not necessary to keep clicking `Merge master to your branch` on the PR page. You would want to merge master if there are conflicts or tests are failing. The Facebook-GitHub-Bot ultimately squashes all commits to a single one before merging your PR.
-
-#### Test plan
-
-A good test plan has the exact commands you ran and their output, provides screenshots or videos if the pull request changes UI.
-
-* If you've added code that should be tested, add tests!
-* If you've changed APIs, update the documentation.
-
-See [What is a Test Plan?](https://medium.com/@martinkonicek/what-is-a-test-plan-8bfc840ec171#.y9lcuqqi9) to learn more.
-
-#### Continuous integration tests
-
-Make sure all **tests pass** on [Circle CI][circle]. PRs that break tests are unlikely to be merged. Learn more about [testing your changes here](https://facebook.github.io/react-native/docs/testing.html).
-
-[circle]: https://circleci.com/gh/facebook/react-native
+1. Fork the repo and create your branch from `master`.
+2. If you've added code that should be tested, add tests.
+3. If you've changed APIs, update the documentation.
+4. Ensure the test suite passes.
+5. Make sure your code lints.
+6. If you haven't already, complete the Contributor License Agreement ("CLA").
 
-#### Breaking changes
+## Contributor License Agreement ("CLA")
 
-When adding a new breaking change, follow this template in your pull request:
+In order to accept your pull request, we need you to submit a CLA. You only need to do this once to work on any of Facebook's open source projects.
 
-```
-### New breaking change here
+Complete your CLA here: <https://code.facebook.com/cla>
 
-* **Who does this affect**:
-* **How to migrate**:
-* **Why make this breaking change**:
-* **Severity (number of people affected x effort)**:
-```
+## Issues
 
-If your pull request is merged, a core contributor will update the [list of breaking changes](https://github.com/facebook/react-native/wiki/Breaking-Changes) which is then used to populate the release notes.
+We use GitHub issues to track public bugs. Please ensure your description is clear and has sufficient instructions to be able to reproduce the issue.
 
-#### Copyright Notice for files
+Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe disclosure of security bugs. In those cases, please go through the process outlined on that page and do not file a public issue.
 
-Copy and paste this to the top of your new file(s):
+## Coding Style
 
-```JS
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-```
+We use Prettier to format our JavaScript code. This saves you time and energy as you can let Prettier fix up any formatting issues automatically through its editor integrations, or by manually running `npm run prettier`. We also use a linter to catch styling issues that may exist in your code. You can check the status of your code styling by simply running `npm run lint`.
 
-#### Contributor License Agreement (CLA)
+However, there are still some styles that the linter cannot pick up, notably in Java or Objective-C code.
 
-In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another Facebook open source project, you're good to go. If you are submitting a pull request for the first time, the Facebook GitHub Bot will reply with a link to the CLA form. You may also [complete your CLA here](https://code.facebook.com/cla).
-
-### What happens next?
-
-The core team will be monitoring for pull requests. Read [what to expect from maintainers](https://facebook.github.io/react-native/docs/maintainers.html#handling-pull-requests) to understand what may happen after you open a pull request.
-
-## Style Guide
-
-Our linter will catch most styling issues that may exist in your code. You can check the status of your code styling by simply running `npm run lint`.
-
-However, there are still some styles that the linter cannot pick up.
-
-### Code Conventions
-
-#### General
-
-* **Most important: Look around.** Match the style you see used in the rest of the project. This includes formatting, naming things in code, naming things in documentation.
-* Add trailing commas,
-* 2 spaces for indentation (no tabs)
-* "Attractive"
-
-#### JavaScript
-
-* Use semicolons;
-* ES6 standards
-* Prefer `'` over `"`
-* Do not use the optional parameters of `setTimeout` and `setInterval`
-* 80 character line length
-
-#### JSX
-
-* Prefer `"` over `'` for string literal props
-* When wrapping opening tags over multiple lines, place one prop per line
-* `{}` of props should hug their values (no spaces)
-* Place the closing `>` of opening tags on the same line as the last prop
-* Place the closing `/>` of self-closing tags on their own line and left-align them with the opening `<`
-
-#### Objective-C
+**Objective-C:**
 
 * Space after `@property` declarations
 * Brackets on *every* `if`, on the *same* line
@@ -194,17 +43,13 @@ However, there are still some styles that the linter cannot pick up.
 * *Try* to keep it around 80 characters line length (sometimes it's just not possible...)
 * `*` operator goes with the variable name (e.g. `NSObject *variableName;`)
 
-#### Java
+**Java:**
 
 * If a method call spans multiple lines closing bracket is on the same line as the last argument.
 * If a method header doesn't fit on one line each argument goes on a separate line.
 * 100 character line length
 
-### Documentation
-
-* Do not wrap lines at 80 characters - configure your editor to soft-wrap when editing documentation.
-
 ## License
 
-By contributing to React Native, you agree that your contributions will be licensed under its MIT license.
-<!-- generated_contributing_end -->
+By contributing to React Native, you agree that your contributions will be licensed
+under the LICENSE file in the root directory of this source tree.
diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base
index 78cb4dc22ca478..433adf5470e122 100644
--- a/ContainerShip/Dockerfile.android-base
+++ b/ContainerShip/Dockerfile.android-base
@@ -18,10 +18,10 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
 
 # set default build arguments
 ARG SDK_VERSION=sdk-tools-linux-3859397.zip
-ARG ANDROID_BUILD_VERSION=26
-ARG ANDROID_TOOLS_VERSION=26.0.3
-ARG BUCK_VERSION=v2018.06.25.01
-ARG NDK_VERSION=10e
+ARG ANDROID_BUILD_VERSION=27
+ARG ANDROID_TOOLS_VERSION=27.0.3
+ARG BUCK_VERSION=v2018.07.23.01
+ARG NDK_VERSION=17c
 ARG NODE_VERSION=8.10.0
 ARG WATCHMAN_VERSION=4.9.0
 
diff --git a/ContainerShip/scripts/run-android-ci-instrumentation-tests.js b/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
index c16c7990ed317d..e538be7a6a9318 100644
--- a/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
+++ b/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ContainerShip/scripts/run-android-docker-instrumentation-tests.sh b/ContainerShip/scripts/run-android-docker-instrumentation-tests.sh
index ed7183dec9d5fc..e2c320d7e61afe 100644
--- a/ContainerShip/scripts/run-android-docker-instrumentation-tests.sh
+++ b/ContainerShip/scripts/run-android-docker-instrumentation-tests.sh
@@ -6,7 +6,7 @@ mount -o remount,exec /dev/shm
 AVD_UUID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
 
 # create virtual device
-echo no | android create avd -n $AVD_UUID -f -t android-19 --abi default/armeabi-v7a
+echo no | android create avd -n "$AVD_UUID" -f -t android-19 --abi default/armeabi-v7a
 
 # emulator setup
 emulator64-arm -avd $AVD_UUID -no-skin -no-audio -no-window -no-boot-anim &
@@ -28,8 +28,9 @@ watchman shutdown-server
 node local-cli/cli.js bundle --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
 
 # 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
 
 # run installed apk with tests
-node ./ContainerShip/scripts/run-android-ci-instrumentation-tests.js $*
+node ./ContainerShip/scripts/run-android-ci-instrumentation-tests.js "$*"
 exit $?
diff --git a/ContainerShip/scripts/run-android-docker-unit-tests.sh b/ContainerShip/scripts/run-android-docker-unit-tests.sh
index 5a58bb352e5421..1a422c25bf1b17 100644
--- a/ContainerShip/scripts/run-android-docker-unit-tests.sh
+++ b/ContainerShip/scripts/run-android-docker-unit-tests.sh
@@ -9,4 +9,4 @@ mount -o remount,exec /dev/shm
 set -x
 
 # run unit tests
-buck test ReactAndroid/src/test/... --config build.threads=$UNIT_TESTS_BUILD_THREADS
+buck test ReactAndroid/src/test/... --config build.threads="$UNIT_TESTS_BUILD_THREADS"
diff --git a/ContainerShip/scripts/run-ci-e2e-tests.sh b/ContainerShip/scripts/run-ci-e2e-tests.sh
index de2b97edb5bb7a..be916439735dfd 100755
--- a/ContainerShip/scripts/run-ci-e2e-tests.sh
+++ b/ContainerShip/scripts/run-ci-e2e-tests.sh
@@ -12,11 +12,12 @@ RUN_IOS=0
 RUN_JS=0
 
 RETRY_COUNT=${RETRY_COUNT:-2}
-AVD_UUID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
-
+AVD_UUID=$(< /dev/urandom tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
 ANDROID_NPM_DEPS="appium@1.5.1 mocha@2.4.5 wd@0.3.11 colors@1.0.3 pretty-data2@0.40.1"
-CLI_PACKAGE=$ROOT/react-native-cli/react-native-cli-*.tgz
-PACKAGE=$ROOT/react-native-*.tgz
+CLI_PACKAGE="$ROOT/react-native-cli/react-native-cli-*.tgz"
+PACKAGE="$ROOT/react-native-*.tgz"
+# Version of react-native-dummy to test against
+REACT_DUMMY_PLATFORM=react-native-dummy@0.1.0
 
 # solve issue with max user watches limit
 echo 65536 | tee -a /proc/sys/fs/inotify/max_user_watches
@@ -27,7 +28,7 @@ watchman shutdown-server
 # $2 -- command to run
 function retry() {
     local -r -i max_attempts="$1"; shift
-    local -r cmd="$@"
+    local -r cmd="$*"
     local -i attempt_num=1
 
     until $cmd; do
@@ -75,7 +76,7 @@ while :; do
 done
 
 function e2e_suite() {
-    cd $ROOT
+    cd "$ROOT"
 
     if [ $RUN_ANDROID -eq 0 ] && [ $RUN_IOS -eq 0 ] && [ $RUN_JS -eq 0 ]; then
       echo "No e2e tests specified!"
@@ -88,8 +89,8 @@ function e2e_suite() {
     # To make sure we actually installed the local version
     # of react-native, we will create a temp file inside the template
     # and check that it exists after `react-native init
-    IOS_MARKER=$(mktemp $ROOT/local-cli/templates/HelloWorld/ios/HelloWorld/XXXXXXXX)
-    ANDROID_MARKER=$(mktemp ${ROOT}/local-cli/templates/HelloWorld/android/XXXXXXXX)
+    IOS_MARKER="$(mktemp "$ROOT"/local-cli/templates/HelloWorld/ios/HelloWorld/XXXXXXXX)"
+    ANDROID_MARKER="$(mktemp "$ROOT"/local-cli/templates/HelloWorld/android/XXXXXXXX)"
 
     # install CLI
     cd react-native-cli
@@ -98,8 +99,8 @@ function e2e_suite() {
 
     # can skip cli install for non sudo mode
     if [ $RUN_CLI_INSTALL -ne 0 ]; then
-      npm install -g $CLI_PACKAGE
-      if [ $? -ne 0 ]; then
+      if ! npm install -g "$CLI_PACKAGE"
+      then
         echo "Could not install react-native-cli globally, please run in su mode"
         echo "Or with --skip-cli-install to skip this step"
         return 1
@@ -111,7 +112,7 @@ function e2e_suite() {
 
         # create virtual device
         if ! android list avd | grep "$AVD_UUID" > /dev/null; then
-            echo no | android create avd -n $AVD_UUID -f -t android-19 --abi default/armeabi-v7a
+            echo no | android create avd -n "$AVD_UUID" -f -t android-19 --abi default/armeabi-v7a
         fi
 
         # newline at end of adb devices call and first line is headers
@@ -124,9 +125,10 @@ function e2e_suite() {
         fi
 
         # emulator setup
-        emulator64-arm -avd $AVD_UUID -no-skin -no-audio -no-window -no-boot-anim &
+        emulator64-arm -avd "$AVD_UUID" -no-skin -no-audio -no-window -no-boot-anim &
 
         bootanim=""
+        # shellcheck disable=SC2076
         until [[ "$bootanim" =~ "stopped" ]]; do
             sleep 5
             bootanim=$(adb -e shell getprop init.svc.bootanim 2>&1)
@@ -135,23 +137,23 @@ function e2e_suite() {
 
         set -ex
 
-      ./gradlew :ReactAndroid:installArchives -Pjobs=1 -Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError"
-      if [ $? -ne 0 ]; then
+      if ! ./gradlew :ReactAndroid:installArchives -Pjobs=1 -Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError"
+      then
         echo "Failed to compile Android binaries"
         return 1
       fi
     fi
 
-    npm pack
-    if [ $? -ne 0 ]; then
+    if ! npm pack
+    then
       echo "Failed to pack react-native"
       return 1
     fi
 
-    cd $TEMP_DIR
+    cd "$TEMP_DIR"
 
-    retry $RETRY_COUNT react-native init EndToEndTest --version $PACKAGE --npm
-    if [ $? -ne 0 ]; then
+    if ! retry "$RETRY_COUNT" react-native init EndToEndTest --version "$PACKAGE" --npm
+    then
       echo "Failed to execute react-native init"
       echo "Most common reason is npm registry connectivity, try again"
       return 1
@@ -164,20 +166,21 @@ function e2e_suite() {
       echo "Running an Android e2e test"
       echo "Installing e2e framework"
 
-      retry $RETRY_COUNT npm install --save-dev $ANDROID_NPM_DEPS --silent >> /dev/null
-      if [ $? -ne 0 ]; then
+      if ! retry "$RETRY_COUNT" npm install --save-dev "$ANDROID_NPM_DEPS" --silent >> /dev/null
+      then
         echo "Failed to install appium"
         echo "Most common reason is npm registry connectivity, try again"
         return 1
       fi
 
-      cp $SCRIPTS/android-e2e-test.js android-e2e-test.js
+      cp "$SCRIPTS/android-e2e-test.js" android-e2e-test.js
 
-      cd android
+      (
+      cd android || exit
       echo "Downloading Maven deps"
       ./gradlew :app:copyDownloadableDepsToLibs
+      )
 
-      cd ..
       keytool -genkey -v -keystore android/keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"
 
       node ./node_modules/.bin/appium >> /dev/null &
@@ -188,9 +191,8 @@ function e2e_suite() {
       buck build android/app
 
       # hack to get node unhung (kill buckd)
-      kill -9 $(pgrep java)
-
-      if [ $? -ne 0 ]; then
+      if ! kill -9 "$(pgrep java)"
+      then
         echo "could not execute Buck build, is it installed and in PATH?"
         return 1
       fi
@@ -201,23 +203,23 @@ function e2e_suite() {
       sleep 15
 
       echo "Executing android e2e test"
-      retry $RETRY_COUNT node node_modules/.bin/_mocha android-e2e-test.js
-      if [ $? -ne 0 ]; then
+      if ! retry "$RETRY_COUNT" node node_modules/.bin/_mocha android-e2e-test.js
+      then
         echo "Failed to run Android e2e tests"
         echo "Most likely the code is broken"
         return 1
       fi
 
       # kill packager process
-      if kill -0 $SERVER_PID; then
+      if kill -0 "$SERVER_PID"; then
         echo "Killing packager $SERVER_PID"
-        kill -9 $SERVER_PID
+        kill -9 "$SERVER_PID"
       fi
 
       # kill appium process
-      if kill -0 $APPIUM_PID; then
+      if kill -0 "$APPIUM_PID"; then
         echo "Killing appium $APPIUM_PID"
-        kill -9 $APPIUM_PID
+        kill -9 "$APPIUM_PID"
       fi
 
     fi
@@ -230,24 +232,37 @@ function e2e_suite() {
     # js tests
     if [ $RUN_JS -ne 0 ]; then
       # Check the packager produces a bundle (doesn't throw an error)
-      react-native bundle --max-workers 1 --platform android --dev true --entry-file index.js --bundle-output android-bundle.js
-      if [ $? -ne 0 ]; then
+      if ! react-native bundle --max-workers 1 --platform android --dev true --entry-file index.js --bundle-output android-bundle.js
+      then
         echo "Could not build android bundle"
         return 1
       fi
 
-      react-native bundle --max-workers 1 --platform ios --dev true --entry-file index.js --bundle-output ios-bundle.js
-      if [ $? -ne 0 ]; then
+      if ! react-native bundle --max-workers 1 --platform ios --dev true --entry-file index.js --bundle-output ios-bundle.js
+      then
         echo "Could not build iOS bundle"
         return 1
       fi
+
+      if ! retry "$RETRY_COUNT" npm install --save "$REACT_DUMMY_PLATFORM" --silent >> /dev/null
+      then
+        echo "Failed to install react-native-dummy"
+        echo "Most common reason is npm registry connectivity, try again"
+        return 1
+      fi
+
+      if ! react-native bundle --max-workers 1 --platform dummy --dev true --entry-file index.js --bundle-output dummy-bundle.js
+      then
+        echo "Could not build dummy bundle"
+        return 1
+      fi
     fi
 
     # directory cleanup
-    rm $IOS_MARKER
-    rm $ANDROID_MARKER
+    rm "$IOS_MARKER"
+    rm "$ANDROID_MARKER"
 
     return 0
 }
 
-retry $RETRY_COUNT e2e_suite
+retry "$RETRY_COUNT" e2e_suite
diff --git a/ContainerShip/scripts/run-instrumentation-tests-via-adb-shell.sh b/ContainerShip/scripts/run-instrumentation-tests-via-adb-shell.sh
index 5a9a976a97da4e..72b011ca9c3c8b 100755
--- a/ContainerShip/scripts/run-instrumentation-tests-via-adb-shell.sh
+++ b/ContainerShip/scripts/run-instrumentation-tests-via-adb-shell.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+# shellcheck disable=SC1117
 # Python script to run instrumentation tests, copied from https://github.com/circleci/circle-dummy-android
 # Example: ./scripts/run-android-instrumentation-tests.sh com.facebook.react.tests com.facebook.react.tests.ReactPickerTestCase
 #
@@ -9,7 +9,7 @@ export PATH="$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$PATH"
 adb logcat -c
 
 # run tests and check output
-python - $1 $2 << END
+python - "$1" "$2" << END
 
 import re
 import subprocess as sp
@@ -24,7 +24,7 @@ test_class = None
 
 if len(sys.argv) > 2:
   test_class = sys.argv[2]
-  
+
 def update():
   # prevent CircleCI from killing the process for inactivity
   while not done:
@@ -38,10 +38,10 @@ t.start()
 def run():
   sp.Popen(['adb', 'wait-for-device']).communicate()
   if (test_class != None):
-    p = sp.Popen('adb shell am instrument -w -e class %s %s/android.support.test.runner.AndroidJUnitRunner' 
+    p = sp.Popen('adb shell am instrument -w -e class %s %s/android.support.test.runner.AndroidJUnitRunner'
       % (test_class, test_app), shell=True, stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE)
   else :
-    p = sp.Popen('adb shell am instrument -w %s/android.support.test.runner.AndroidJUnitRunner' 
+    p = sp.Popen('adb shell am instrument -w %s/android.support.test.runner.AndroidJUnitRunner'
       % (test_app), shell=True, stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE)
   return p.communicate()
 
diff --git a/DockerTests.md b/DockerTests.md
index f1714db87a0a05..429e312ceb31be 100644
--- a/DockerTests.md
+++ b/DockerTests.md
@@ -12,9 +12,9 @@ See <https://docs.docker.com/engine/installation/> for more information on how t
 
 We have added a number of default run scripts to the `package.json` file to simplify building and running your tests.
 
-`npm run test-android-setup` - Pulls down the base android docker image used for running the tests
+`npm run docker-setup-android` - Pulls down the base android docker image used for running the tests
 
-`npm run test-android-build` - Builds the docker image used to run the tests
+`npm run docker-build-android` - Builds the docker image used to run the tests
 
 `npm run test-android-run-unit` - Runs all the unit tests that have been built in the latest react/android docker image (note: you need to run test-android-build before executing this, if the image does not exist it will fail)
 
diff --git a/IntegrationTests/AccessibilityManagerTest.js b/IntegrationTests/AccessibilityManagerTest.js
index 41710be91e14c0..0a059d99c27c24 100644
--- a/IntegrationTests/AccessibilityManagerTest.js
+++ b/IntegrationTests/AccessibilityManagerTest.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/IntegrationTests/AppEventsTest.js b/IntegrationTests/AppEventsTest.js
index 90da0bd87c1ac2..e88e97909d35e9 100644
--- a/IntegrationTests/AppEventsTest.js
+++ b/IntegrationTests/AppEventsTest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/IntegrationTests/AsyncStorageTest.js b/IntegrationTests/AsyncStorageTest.js
index 150aa2aed511cf..da762ea01ced87 100644
--- a/IntegrationTests/AsyncStorageTest.js
+++ b/IntegrationTests/AsyncStorageTest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/IntegrationTests/ImageCachePolicyTest.js b/IntegrationTests/ImageCachePolicyTest.js
index 1dc5d5fb61a9b5..61909b6b0414e2 100644
--- a/IntegrationTests/ImageCachePolicyTest.js
+++ b/IntegrationTests/ImageCachePolicyTest.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/IntegrationTests/ImageSnapshotTest.js b/IntegrationTests/ImageSnapshotTest.js
index c20406c641ecb5..255db4090d9f71 100644
--- a/IntegrationTests/ImageSnapshotTest.js
+++ b/IntegrationTests/ImageSnapshotTest.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/IntegrationTests/IntegrationTestHarnessTest.js b/IntegrationTests/IntegrationTestHarnessTest.js
index 045d2e7e1eae1e..e1469dda1b418a 100644
--- a/IntegrationTests/IntegrationTestHarnessTest.js
+++ b/IntegrationTests/IntegrationTestHarnessTest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,28 +10,22 @@
 
 'use strict';
 
-/* $FlowFixMe(>=0.54.0 site=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. */
 const requestAnimationFrame = require('fbjs/lib/requestAnimationFrame');
 const React = require('react');
-const PropTypes = require('prop-types');
 const ReactNative = require('react-native');
 const {Text, View} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 
-class IntegrationTestHarnessTest extends React.Component<
-  {
-    shouldThrow?: boolean,
-    waitOneFrame?: boolean,
-  },
-  $FlowFixMeState,
-> {
-  static propTypes = {
-    shouldThrow: PropTypes.bool,
-    waitOneFrame: PropTypes.bool,
-  };
+type Props = $ReadOnly<{|
+  shouldThrow?: boolean,
+  waitOneFrame?: boolean,
+|}>;
+
+type State = {|
+  done: boolean,
+|};
 
+class IntegrationTestHarnessTest extends React.Component<Props, State> {
   state = {
     done: false,
   };
diff --git a/IntegrationTests/IntegrationTestsApp.js b/IntegrationTests/IntegrationTestsApp.js
index 421b4f6abe2b19..348d0867e73e97 100644
--- a/IntegrationTests/IntegrationTestsApp.js
+++ b/IntegrationTests/IntegrationTestsApp.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/IntegrationTests/LayoutEventsTest.js b/IntegrationTests/LayoutEventsTest.js
index 5d2676bc1550b3..b51544b94e7f29 100644
--- a/IntegrationTests/LayoutEventsTest.js
+++ b/IntegrationTests/LayoutEventsTest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,11 +11,12 @@
 'use strict';
 
 const React = require('react');
-const createReactClass = require('create-react-class');
 const ReactNative = require('react-native');
 const {Image, LayoutAnimation, StyleSheet, Text, View} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 
+import type {ViewStyleProp} from 'StyleSheet';
+
 const deepDiffer = require('deepDiffer');
 
 function debug(...args) {
@@ -23,14 +24,8 @@ function debug(...args) {
 }
 
 import type {Layout, LayoutEvent} from 'CoreEventTypes';
-type Style = {
-  margin?: number,
-  padding?: number,
-  borderColor?: string,
-  borderWidth?: number,
-  backgroundColor?: string,
-  width?: number,
-};
+
+type Props = $ReadOnly<{||}>;
 
 type State = {
   didAnimation: boolean,
@@ -38,44 +33,58 @@ type State = {
   imageLayout?: Layout,
   textLayout?: Layout,
   viewLayout?: Layout,
-  viewStyle?: Style,
-  containerStyle?: Style,
+  viewStyle?: ViewStyleProp,
+  containerStyle?: ViewStyleProp,
 };
 
-const LayoutEventsTest = createReactClass({
-  displayName: 'LayoutEventsTest',
-  getInitialState(): State {
-    return {
-      didAnimation: false,
-    };
-  },
-  animateViewLayout: function() {
+class LayoutEventsTest extends React.Component<Props, State> {
+  _view: ?React.ElementRef<typeof View>;
+  _img: ?React.ElementRef<typeof Image>;
+  _txt: ?React.ElementRef<typeof Text>;
+
+  state: State = {
+    didAnimation: false,
+  };
+
+  animateViewLayout() {
     debug('animateViewLayout invoked');
     LayoutAnimation.configureNext(LayoutAnimation.Presets.spring, () => {
       debug('animateViewLayout done');
       this.checkLayout(this.addWrapText);
     });
     this.setState({viewStyle: {margin: 60}});
-  },
-  addWrapText: function() {
+  }
+
+  addWrapText = () => {
     debug('addWrapText invoked');
     this.setState(
       {extraText: '  And a bunch more text to wrap around a few lines.'},
       () => this.checkLayout(this.changeContainer),
     );
-  },
-  changeContainer: function() {
+  };
+
+  changeContainer = () => {
     debug('changeContainer invoked');
     this.setState({containerStyle: {width: 280}}, () =>
       this.checkLayout(TestModule.markTestCompleted),
     );
-  },
-  checkLayout: function(next?: ?Function) {
-    if (!this.isMounted()) {
+  };
+
+  checkLayout = (next?: ?() => void) => {
+    const view = this._view;
+    const txt = this._txt;
+    const img = this._img;
+
+    if (view == null || txt == null || img == null) {
       return;
     }
-    this.refs.view.measure((x, y, width, height) => {
-      this.compare('view', {x, y, width, height}, this.state.viewLayout);
+
+    view.measure((x, y, width, height) => {
+      this.compare(
+        'view',
+        {x, y, width, height},
+        this.state.viewLayout || null,
+      );
       if (typeof next === 'function') {
         next();
       } else if (!this.state.didAnimation) {
@@ -84,14 +93,17 @@ const LayoutEventsTest = createReactClass({
         this.state.didAnimation = true;
       }
     });
-    this.refs.txt.measure((x, y, width, height) => {
+
+    txt.measure((x, y, width, height) => {
       this.compare('txt', {x, y, width, height}, this.state.textLayout);
     });
-    this.refs.img.measure((x, y, width, height) => {
+
+    img.measure((x, y, width, height) => {
       this.compare('img', {x, y, width, height}, this.state.imageLayout);
     });
-  },
-  compare: function(node: string, measured: any, onLayout: any): void {
+  };
+
+  compare(node: string, measured: Layout, onLayout?: ?Layout): void {
     if (deepDiffer(measured, onLayout)) {
       const data = {measured, onLayout};
       throw new Error(
@@ -100,34 +112,50 @@ const LayoutEventsTest = createReactClass({
           JSON.stringify(data, null, '  '),
       );
     }
-  },
-  onViewLayout: function(e: LayoutEvent) {
+  }
+
+  onViewLayout = (e: LayoutEvent) => {
     debug('received view layout event\n', e.nativeEvent);
     this.setState({viewLayout: e.nativeEvent.layout}, this.checkLayout);
-  },
-  onTextLayout: function(e: LayoutEvent) {
+  };
+
+  onTextLayout = (e: LayoutEvent) => {
     debug('received text layout event\n', e.nativeEvent);
     this.setState({textLayout: e.nativeEvent.layout}, this.checkLayout);
-  },
-  onImageLayout: function(e: LayoutEvent) {
+  };
+
+  onImageLayout = (e: LayoutEvent) => {
     debug('received image layout event\n', e.nativeEvent);
     this.setState({imageLayout: e.nativeEvent.layout}, this.checkLayout);
-  },
-  render: function() {
+  };
+
+  render() {
     const viewStyle = [styles.view, this.state.viewStyle];
     const textLayout = this.state.textLayout || {width: '?', height: '?'};
     const imageLayout = this.state.imageLayout || {x: '?', y: '?'};
     debug('viewLayout', this.state.viewLayout);
     return (
       <View style={[styles.container, this.state.containerStyle]}>
-        <View ref="view" onLayout={this.onViewLayout} style={viewStyle}>
+        <View
+          ref={ref => {
+            this._view = ref;
+          }}
+          onLayout={this.onViewLayout}
+          style={viewStyle}>
           <Image
-            ref="img"
+            ref={ref => {
+              this._img = ref;
+            }}
             onLayout={this.onImageLayout}
             style={styles.image}
             source={{uri: 'uie_thumb_big.png'}}
           />
-          <Text ref="txt" onLayout={this.onTextLayout} style={styles.text}>
+          <Text
+            ref={ref => {
+              this._txt = ref;
+            }}
+            onLayout={this.onTextLayout}
+            style={styles.text}>
             A simple piece of text.{this.state.extraText}
           </Text>
           <Text>
@@ -138,8 +166,8 @@ const LayoutEventsTest = createReactClass({
         </View>
       </View>
     );
-  },
-});
+  }
+}
 
 const styles = StyleSheet.create({
   container: {
@@ -165,6 +193,4 @@ const styles = StyleSheet.create({
   },
 });
 
-LayoutEventsTest.displayName = 'LayoutEventsTest';
-
 module.exports = LayoutEventsTest;
diff --git a/IntegrationTests/LoggingTestModule.js b/IntegrationTests/LoggingTestModule.js
index 905abee400828d..32a049f8866265 100644
--- a/IntegrationTests/LoggingTestModule.js
+++ b/IntegrationTests/LoggingTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/IntegrationTests/PromiseTest.js b/IntegrationTests/PromiseTest.js
index facf8b45cdc746..c36d3beb017b69 100644
--- a/IntegrationTests/PromiseTest.js
+++ b/IntegrationTests/PromiseTest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/IntegrationTests/PropertiesUpdateTest.js b/IntegrationTests/PropertiesUpdateTest.js
index 33d17da5e5c442..8c61685bf8848e 100644
--- a/IntegrationTests/PropertiesUpdateTest.js
+++ b/IntegrationTests/PropertiesUpdateTest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/IntegrationTests/RCTRootViewIntegrationTestApp.js b/IntegrationTests/RCTRootViewIntegrationTestApp.js
index 6afda59cd688c1..2466b6378586eb 100644
--- a/IntegrationTests/RCTRootViewIntegrationTestApp.js
+++ b/IntegrationTests/RCTRootViewIntegrationTestApp.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,8 +9,6 @@
 
 'use strict';
 
-require('regenerator-runtime/runtime');
-
 const React = require('react');
 const ReactNative = require('react-native');
 
diff --git a/IntegrationTests/ReactContentSizeUpdateTest.js b/IntegrationTests/ReactContentSizeUpdateTest.js
index be0b06b6abf56b..707abc6cb727e3 100644
--- a/IntegrationTests/ReactContentSizeUpdateTest.js
+++ b/IntegrationTests/ReactContentSizeUpdateTest.js
@@ -1,78 +1,89 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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 createReactClass = require('create-react-class');
 const ReactNative = require('react-native');
 const RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter');
-const Subscribable = require('Subscribable');
-const TimerMixin = require('react-timer-mixin');
 
 const {View} = ReactNative;
 
 const {TestModule} = ReactNative.NativeModules;
+import type EmitterSubscription from 'EmitterSubscription';
 
 const reactViewWidth = 101;
 const reactViewHeight = 102;
 const newReactViewWidth = 201;
 const newReactViewHeight = 202;
 
-const ReactContentSizeUpdateTest = createReactClass({
-  displayName: 'ReactContentSizeUpdateTest',
-  mixins: [Subscribable.Mixin, TimerMixin],
+type Props = {||};
 
-  UNSAFE_componentWillMount: function() {
-    this.addListenerOn(
-      RCTNativeAppEventEmitter,
+type State = {|
+  height: number,
+  width: number,
+|};
+
+class ReactContentSizeUpdateTest extends React.Component<Props, State> {
+  _timeoutID: ?TimeoutID = null;
+  _subscription: ?EmitterSubscription = null;
+
+  state = {
+    height: reactViewHeight,
+    width: reactViewWidth,
+  };
+
+  UNSAFE_componentWillMount() {
+    this._subscription = RCTNativeAppEventEmitter.addListener(
       'rootViewDidChangeIntrinsicSize',
       this.rootViewDidChangeIntrinsicSize,
     );
-  },
+  }
 
-  getInitialState: function() {
-    return {
-      height: reactViewHeight,
-      width: reactViewWidth,
-    };
-  },
+  componentDidMount() {
+    this._timeoutID = setTimeout(() => {
+      this.updateViewSize();
+    }, 1000);
+  }
+
+  componentWillUnmount() {
+    if (this._timeoutID != null) {
+      clearTimeout(this._timeoutID);
+    }
 
-  updateViewSize: function() {
+    if (this._subscription != null) {
+      this._subscription.remove();
+    }
+  }
+
+  updateViewSize() {
     this.setState({
       height: newReactViewHeight,
       width: newReactViewWidth,
     });
-  },
-
-  componentDidMount: function() {
-    this.setTimeout(() => {
-      this.updateViewSize();
-    }, 1000);
-  },
+  }
 
-  rootViewDidChangeIntrinsicSize: function(intrinsicSize) {
+  rootViewDidChangeIntrinsicSize = (intrinsicSize: State) => {
     if (
       intrinsicSize.height === newReactViewHeight &&
       intrinsicSize.width === newReactViewWidth
     ) {
       TestModule.markTestPassed(true);
     }
-  },
+  };
 
   render() {
     return (
       <View style={{height: this.state.height, width: this.state.width}} />
     );
-  },
-});
-
-ReactContentSizeUpdateTest.displayName = 'ReactContentSizeUpdateTest';
+  }
+}
 
 module.exports = ReactContentSizeUpdateTest;
diff --git a/IntegrationTests/SimpleSnapshotTest.js b/IntegrationTests/SimpleSnapshotTest.js
index 2857f3f41b492a..e8f530311b3794 100644
--- a/IntegrationTests/SimpleSnapshotTest.js
+++ b/IntegrationTests/SimpleSnapshotTest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/IntegrationTests/SizeFlexibilityUpdateTest.js b/IntegrationTests/SizeFlexibilityUpdateTest.js
index 0d0ebd4bfc20f3..42ce5bf5fb8173 100644
--- a/IntegrationTests/SizeFlexibilityUpdateTest.js
+++ b/IntegrationTests/SizeFlexibilityUpdateTest.js
@@ -1,46 +1,60 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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 createReactClass = require('create-react-class');
 const ReactNative = require('react-native');
 const RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter');
-const Subscribable = require('Subscribable');
 const {View} = ReactNative;
 
 const {TestModule} = ReactNative.NativeModules;
+import type EmitterSubscription from 'EmitterSubscription';
 
 const reactViewWidth = 111;
 const reactViewHeight = 222;
 
 let finalState = false;
 
-const SizeFlexibilityUpdateTest = createReactClass({
-  displayName: 'SizeFlexibilityUpdateTest',
-  mixins: [Subscribable.Mixin],
+type Props = $ReadOnly<{|
+  width: boolean,
+  height: boolean,
+  both: boolean,
+  none: boolean,
+|}>;
 
-  UNSAFE_componentWillMount: function() {
-    this.addListenerOn(
-      RCTNativeAppEventEmitter,
+class SizeFlexibilityUpdateTest extends React.Component<Props> {
+  _subscription: ?EmitterSubscription = null;
+
+  UNSAFE_componentWillMount() {
+    this._subscription = RCTNativeAppEventEmitter.addListener(
       'rootViewDidChangeIntrinsicSize',
       this.rootViewDidChangeIntrinsicSize,
     );
-  },
+  }
+
+  componentWillUnmount() {
+    if (this._subscription != null) {
+      this._subscription.remove();
+    }
+  }
 
-  markPassed: function() {
+  markPassed = () => {
     TestModule.markTestPassed(true);
     finalState = true;
-  },
+  };
 
-  rootViewDidChangeIntrinsicSize: function(intrinsicSize) {
+  rootViewDidChangeIntrinsicSize = (intrinsicSize: {
+    width: number,
+    height: number,
+  }) => {
     if (finalState) {
       // If a test reaches its final state, it is not expected to do anything more
       TestModule.markTestPassed(false);
@@ -83,13 +97,11 @@ const SizeFlexibilityUpdateTest = createReactClass({
         return;
       }
     }
-  },
+  };
 
   render() {
     return <View style={{height: reactViewHeight, width: reactViewWidth}} />;
-  },
-});
-
-SizeFlexibilityUpdateTest.displayName = 'SizeFlexibilityUpdateTest';
+  }
+}
 
 module.exports = SizeFlexibilityUpdateTest;
diff --git a/IntegrationTests/SyncMethodTest.js b/IntegrationTests/SyncMethodTest.js
index 6efef977d81194..d618ced4761585 100644
--- a/IntegrationTests/SyncMethodTest.js
+++ b/IntegrationTests/SyncMethodTest.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/IntegrationTests/TimersTest.js b/IntegrationTests/TimersTest.js
index 15d42c4c852a1c..c7eefb915333c3 100644
--- a/IntegrationTests/TimersTest.js
+++ b/IntegrationTests/TimersTest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,75 +11,136 @@
 'use strict';
 
 const React = require('react');
-const createReactClass = require('create-react-class');
 const ReactNative = require('react-native');
-/* $FlowFixMe(>=0.54.0 site=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. */
-const TimerMixin = require('react-timer-mixin');
-
 const {StyleSheet, Text, View} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 
-const TimersTest = createReactClass({
-  displayName: 'TimersTest',
-  mixins: [TimerMixin],
+type Props = $ReadOnly<{||}>;
 
-  _nextTest: () => {},
-  _interval: -1,
+type State = {|
+  count: number,
+  done: boolean,
+|};
 
-  getInitialState() {
-    return {
-      count: 0,
-      done: false,
-    };
-  },
+type ImmediateID = Object;
+
+class TimersTest extends React.Component<Props, State> {
+  _nextTest = () => {};
+  _interval: ?IntervalID = null;
+
+  _timeoutIDs: Set<TimeoutID> = new Set();
+  _intervalIDs: Set<IntervalID> = new Set();
+  _immediateIDs: Set<ImmediateID> = new Set();
+  _animationFrameIDs: Set<AnimationFrameID> = new Set();
+
+  state = {
+    count: 0,
+    done: false,
+  };
+
+  setTimeout(fn: () => void, time: number): TimeoutID {
+    const id = setTimeout(() => {
+      this._timeoutIDs.delete(id);
+      fn();
+    }, time);
+
+    this._timeoutIDs.add(id);
+
+    return id;
+  }
+
+  clearTimeout(id: TimeoutID) {
+    this._timeoutIDs.delete(id);
+    clearTimeout(id);
+  }
+
+  setInterval(fn: () => void, time: number): IntervalID {
+    const id = setInterval(() => {
+      fn();
+    }, time);
+
+    this._intervalIDs.add(id);
+
+    return id;
+  }
+
+  clearInterval(id: IntervalID) {
+    this._intervalIDs.delete(id);
+    clearInterval(id);
+  }
+
+  setImmediate(fn: () => void): ImmediateID {
+    const id = setImmediate(() => {
+      this._immediateIDs.delete(id);
+      fn();
+    });
+
+    this._immediateIDs.add(id);
+
+    return id;
+  }
+
+  requestAnimationFrame(fn: () => void): AnimationFrameID {
+    const id = requestAnimationFrame(() => {
+      this._animationFrameIDs.delete(id);
+      fn();
+    });
+
+    this._animationFrameIDs.add(id);
+
+    return id;
+  }
+
+  cancelAnimationFrame(id: AnimationFrameID): void {
+    this._animationFrameIDs.delete(id);
+    cancelAnimationFrame(id);
+  }
 
   componentDidMount() {
     this.setTimeout(this.testSetTimeout0, 1000);
-  },
+  }
 
   testSetTimeout0() {
     this.setTimeout(this.testSetTimeout1, 0);
-  },
+  }
 
   testSetTimeout1() {
     this.setTimeout(this.testSetTimeout50, 1);
-  },
+  }
 
   testSetTimeout50() {
     this.setTimeout(this.testRequestAnimationFrame, 50);
-  },
+  }
 
   testRequestAnimationFrame() {
     this.requestAnimationFrame(this.testSetInterval0);
-  },
+  }
 
   testSetInterval0() {
     this._nextTest = this.testSetInterval20;
     this._interval = this.setInterval(this._incrementInterval, 0);
-  },
+  }
 
   testSetInterval20() {
     this._nextTest = this.testSetImmediate;
     this._interval = this.setInterval(this._incrementInterval, 20);
-  },
+  }
 
   testSetImmediate() {
     this.setImmediate(this.testClearTimeout0);
-  },
+  }
 
   testClearTimeout0() {
     const timeout = this.setTimeout(() => this._fail('testClearTimeout0'), 0);
     this.clearTimeout(timeout);
     this.testClearTimeout30();
-  },
+  }
 
   testClearTimeout30() {
     const timeout = this.setTimeout(() => this._fail('testClearTimeout30'), 30);
     this.clearTimeout(timeout);
     this.setTimeout(this.testClearMulti, 50);
-  },
+  }
 
   testClearMulti() {
     const fails = [];
@@ -96,7 +157,7 @@ const TimersTest = createReactClass({
     this.setTimeout(() => this.clearTimeout(delayClear), 20);
 
     this.setTimeout(this.testOrdering, 50);
-  },
+  }
 
   testOrdering() {
     // Clear timers are set first because it's more likely to uncover bugs.
@@ -131,42 +192,73 @@ const TimersTest = createReactClass({
       25,
     );
     this.setTimeout(this.done, 50);
-  },
+  }
 
   done() {
     this.setState({done: true}, () => {
       TestModule.markTestCompleted();
     });
-  },
+  }
+
+  componentWillUnmount() {
+    for (const timeoutID of this._timeoutIDs) {
+      clearTimeout(timeoutID);
+    }
+
+    for (const intervalID of this._intervalIDs) {
+      clearInterval(intervalID);
+    }
+
+    for (const requestAnimationFrameID of this._animationFrameIDs) {
+      cancelAnimationFrame(requestAnimationFrameID);
+    }
+
+    for (const immediateID of this._immediateIDs) {
+      clearImmediate(immediateID);
+    }
+
+    this._timeoutIDs = new Set();
+    this._intervalIDs = new Set();
+    this._animationFrameIDs = new Set();
+    this._immediateIDs = new Set();
+
+    if (this._interval != null) {
+      clearInterval(this._interval);
+      this._interval = null;
+    }
+  }
 
   render() {
     return (
       <View style={styles.container}>
         <Text>
-          {this.constructor.displayName + ': \n'}
+          {this.constructor.name + ': \n'}
           Intervals: {this.state.count + '\n'}
           {this.state.done ? 'Done' : 'Testing...'}
         </Text>
       </View>
     );
-  },
+  }
 
   _incrementInterval() {
     if (this.state.count > 3) {
       throw new Error('interval incremented past end.');
     }
     if (this.state.count === 3) {
-      this.clearInterval(this._interval);
+      if (this._interval != null) {
+        this.clearInterval(this._interval);
+        this._interval = null;
+      }
       this.setState({count: 0}, this._nextTest);
       return;
     }
     this.setState({count: this.state.count + 1});
-  },
+  }
 
   _fail(caller: string): void {
     throw new Error('_fail called by ' + caller);
-  },
-});
+  }
+}
 
 const styles = StyleSheet.create({
   container: {
@@ -175,6 +267,4 @@ const styles = StyleSheet.create({
   },
 });
 
-TimersTest.displayName = 'TimersTest';
-
 module.exports = TimersTest;
diff --git a/IntegrationTests/WebSocketTest.js b/IntegrationTests/WebSocketTest.js
index f2478cbcb68539..d1ccb68cc74a01 100644
--- a/IntegrationTests/WebSocketTest.js
+++ b/IntegrationTests/WebSocketTest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/IntegrationTests/WebViewTest.js b/IntegrationTests/WebViewTest.js
index 74dbeddec6b5ce..269b9d24bdee81 100644
--- a/IntegrationTests/WebViewTest.js
+++ b/IntegrationTests/WebViewTest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/IntegrationTests/launchWebSocketServer.command b/IntegrationTests/launchWebSocketServer.command
index a6531c5f8d78b2..1ce2cf5317c010 100755
--- a/IntegrationTests/launchWebSocketServer.command
+++ b/IntegrationTests/launchWebSocketServer.command
@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-# Copyright (c) 2015-present, Facebook, Inc.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
@@ -9,7 +9,7 @@
 echo -en "\033]0;Web Socket Test Server\a"
 clear
 
-THIS_DIR=$(dirname "$0")
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 pushd "$THIS_DIR"
 ./websocket_integration_test_server.js
 popd
diff --git a/IntegrationTests/websocket_integration_test_server.js b/IntegrationTests/websocket_integration_test_server.js
index 50a6568710a2b8..67b358d70b09dd 100755
--- a/IntegrationTests/websocket_integration_test_server.js
+++ b/IntegrationTests/websocket_integration_test_server.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/LICENSE b/LICENSE
index 9e051010d82dc6..b96dcb0480a0b0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2015-present, Facebook, Inc.
+Copyright (c) Facebook, Inc. and its affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Libraries/ART/ARTCGFloatArray.h b/Libraries/ART/ARTCGFloatArray.h
index 72286a50527e84..a607904e0be1ed 100644
--- a/Libraries/ART/ARTCGFloatArray.h
+++ b/Libraries/ART/ARTCGFloatArray.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTContainer.h b/Libraries/ART/ARTContainer.h
index 532145825bd74b..5439d9fb1d2176 100644
--- a/Libraries/ART/ARTContainer.h
+++ b/Libraries/ART/ARTContainer.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTGroup.h b/Libraries/ART/ARTGroup.h
index d9dcb48c87b180..31edddde7b664f 100644
--- a/Libraries/ART/ARTGroup.h
+++ b/Libraries/ART/ARTGroup.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTGroup.m b/Libraries/ART/ARTGroup.m
index 1bc70725c030e8..56699114f4a3f2 100644
--- a/Libraries/ART/ARTGroup.m
+++ b/Libraries/ART/ARTGroup.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTNode.h b/Libraries/ART/ARTNode.h
index 8b66c205ef2440..9f381115a7646e 100644
--- a/Libraries/ART/ARTNode.h
+++ b/Libraries/ART/ARTNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTNode.m b/Libraries/ART/ARTNode.m
index b27b014b9e7d0e..ae1a152a7d7626 100644
--- a/Libraries/ART/ARTNode.m
+++ b/Libraries/ART/ARTNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTRenderable.h b/Libraries/ART/ARTRenderable.h
index e5735a1fbd81ef..077d47ec2c6c32 100644
--- a/Libraries/ART/ARTRenderable.h
+++ b/Libraries/ART/ARTRenderable.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTRenderable.m b/Libraries/ART/ARTRenderable.m
index d7a3115586f3dd..88349f8296e7b0 100644
--- a/Libraries/ART/ARTRenderable.m
+++ b/Libraries/ART/ARTRenderable.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTSerializablePath.js b/Libraries/ART/ARTSerializablePath.js
index 9c2d98e033fcc3..aafb74c45d065c 100644
--- a/Libraries/ART/ARTSerializablePath.js
+++ b/Libraries/ART/ARTSerializablePath.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTShape.h b/Libraries/ART/ARTShape.h
index ce685c564b06be..1a1fd429a8bf1a 100644
--- a/Libraries/ART/ARTShape.h
+++ b/Libraries/ART/ARTShape.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTShape.m b/Libraries/ART/ARTShape.m
index 935c8894994a2b..8a1a7d6979f3e9 100644
--- a/Libraries/ART/ARTShape.m
+++ b/Libraries/ART/ARTShape.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTSurfaceView.h b/Libraries/ART/ARTSurfaceView.h
index cb42928cedbe12..34016b9ea7f8ef 100644
--- a/Libraries/ART/ARTSurfaceView.h
+++ b/Libraries/ART/ARTSurfaceView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTSurfaceView.m b/Libraries/ART/ARTSurfaceView.m
index c8f46069038603..7e033690d1dc99 100644
--- a/Libraries/ART/ARTSurfaceView.m
+++ b/Libraries/ART/ARTSurfaceView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTText.h b/Libraries/ART/ARTText.h
index cdf8393a137629..1431fc5e181c5e 100644
--- a/Libraries/ART/ARTText.h
+++ b/Libraries/ART/ARTText.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTText.m b/Libraries/ART/ARTText.m
index 0953c850dc293e..5bcebdf5559942 100644
--- a/Libraries/ART/ARTText.m
+++ b/Libraries/ART/ARTText.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ARTTextFrame.h b/Libraries/ART/ARTTextFrame.h
index 8ad06e0a01baed..1c02d3e04260b0 100644
--- a/Libraries/ART/ARTTextFrame.h
+++ b/Libraries/ART/ARTTextFrame.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/Brushes/ARTBrush.h b/Libraries/ART/Brushes/ARTBrush.h
index 95709e65f19bc9..f6e39e861f737c 100644
--- a/Libraries/ART/Brushes/ARTBrush.h
+++ b/Libraries/ART/Brushes/ARTBrush.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/Brushes/ARTBrush.m b/Libraries/ART/Brushes/ARTBrush.m
index 4ade2c221143f7..969ad5d7edb363 100644
--- a/Libraries/ART/Brushes/ARTBrush.m
+++ b/Libraries/ART/Brushes/ARTBrush.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/Brushes/ARTLinearGradient.h b/Libraries/ART/Brushes/ARTLinearGradient.h
index 8e6abbc5fbbfde..d289b192a51b1e 100644
--- a/Libraries/ART/Brushes/ARTLinearGradient.h
+++ b/Libraries/ART/Brushes/ARTLinearGradient.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/Brushes/ARTLinearGradient.m b/Libraries/ART/Brushes/ARTLinearGradient.m
index 1415a6ffcbc80f..20bd1af6233b4e 100644
--- a/Libraries/ART/Brushes/ARTLinearGradient.m
+++ b/Libraries/ART/Brushes/ARTLinearGradient.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/Brushes/ARTPattern.h b/Libraries/ART/Brushes/ARTPattern.h
index ce1767cc9b0bc8..11fa9354de29d0 100644
--- a/Libraries/ART/Brushes/ARTPattern.h
+++ b/Libraries/ART/Brushes/ARTPattern.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/Brushes/ARTPattern.m b/Libraries/ART/Brushes/ARTPattern.m
index 5c43586452d198..70e0bd25f367b7 100644
--- a/Libraries/ART/Brushes/ARTPattern.m
+++ b/Libraries/ART/Brushes/ARTPattern.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/Brushes/ARTRadialGradient.h b/Libraries/ART/Brushes/ARTRadialGradient.h
index d7895f8b74d084..98bec026385014 100644
--- a/Libraries/ART/Brushes/ARTRadialGradient.h
+++ b/Libraries/ART/Brushes/ARTRadialGradient.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/Brushes/ARTRadialGradient.m b/Libraries/ART/Brushes/ARTRadialGradient.m
index 19db9cb97b567a..c36f6ce57fc1fc 100644
--- a/Libraries/ART/Brushes/ARTRadialGradient.m
+++ b/Libraries/ART/Brushes/ARTRadialGradient.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/Brushes/ARTSolidColor.h b/Libraries/ART/Brushes/ARTSolidColor.h
index a16c2b915c72f8..9880cfd61675ff 100644
--- a/Libraries/ART/Brushes/ARTSolidColor.h
+++ b/Libraries/ART/Brushes/ARTSolidColor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/Brushes/ARTSolidColor.m b/Libraries/ART/Brushes/ARTSolidColor.m
index 096c4e043ed429..2ef02d43d98592 100644
--- a/Libraries/ART/Brushes/ARTSolidColor.m
+++ b/Libraries/ART/Brushes/ARTSolidColor.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/RCTConvert+ART.h b/Libraries/ART/RCTConvert+ART.h
index 1deb3c600176ab..ffc1deafe4e6e7 100644
--- a/Libraries/ART/RCTConvert+ART.h
+++ b/Libraries/ART/RCTConvert+ART.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/RCTConvert+ART.m b/Libraries/ART/RCTConvert+ART.m
index ea22d5426f18f9..3312e319436369 100644
--- a/Libraries/ART/RCTConvert+ART.m
+++ b/Libraries/ART/RCTConvert+ART.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ReactNativeART.js b/Libraries/ART/ReactNativeART.js
index cf56028b102cab..12af4f0b2edc08 100644
--- a/Libraries/ART/ReactNativeART.js
+++ b/Libraries/ART/ReactNativeART.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,7 +11,6 @@
 
 const Color = require('art/core/color');
 const Path = require('ARTSerializablePath');
-const Platform = require('Platform');
 const Transform = require('art/core/transform');
 
 const React = require('React');
@@ -154,11 +153,8 @@ class Surface extends React.Component {
     const height = extractNumber(this.props.height, 0);
     const width = extractNumber(this.props.width, 0);
 
-    // WORKAROUND: Android bug in which canvas does not reflect size changes.
-    const key = Platform.OS === 'android' ? height + ',' + width : null;
-
     return (
-      <NativeSurfaceView key={key} style={[this.props.style, {height, width}]}>
+      <NativeSurfaceView style={[this.props.style, {height, width}]}>
         {this.props.children}
       </NativeSurfaceView>
     );
diff --git a/Libraries/ART/ViewManagers/ARTGroupManager.h b/Libraries/ART/ViewManagers/ARTGroupManager.h
index a35e09481be639..f518cf0efbdbb3 100644
--- a/Libraries/ART/ViewManagers/ARTGroupManager.h
+++ b/Libraries/ART/ViewManagers/ARTGroupManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ViewManagers/ARTGroupManager.m b/Libraries/ART/ViewManagers/ARTGroupManager.m
index 2de0d0e5688739..9fb45d71bbdf4d 100644
--- a/Libraries/ART/ViewManagers/ARTGroupManager.m
+++ b/Libraries/ART/ViewManagers/ARTGroupManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ViewManagers/ARTNodeManager.h b/Libraries/ART/ViewManagers/ARTNodeManager.h
index 3a8f99e7abdc7a..84ef8fb01cf3d4 100644
--- a/Libraries/ART/ViewManagers/ARTNodeManager.h
+++ b/Libraries/ART/ViewManagers/ARTNodeManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ViewManagers/ARTNodeManager.m b/Libraries/ART/ViewManagers/ARTNodeManager.m
index 8e568ce6d8efd4..62680975ba1033 100644
--- a/Libraries/ART/ViewManagers/ARTNodeManager.m
+++ b/Libraries/ART/ViewManagers/ARTNodeManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ViewManagers/ARTRenderableManager.h b/Libraries/ART/ViewManagers/ARTRenderableManager.h
index 1e4b554f0f79f7..781ed32f8f574d 100644
--- a/Libraries/ART/ViewManagers/ARTRenderableManager.h
+++ b/Libraries/ART/ViewManagers/ARTRenderableManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ViewManagers/ARTRenderableManager.m b/Libraries/ART/ViewManagers/ARTRenderableManager.m
index a30841b50c1046..ad0264965391e5 100644
--- a/Libraries/ART/ViewManagers/ARTRenderableManager.m
+++ b/Libraries/ART/ViewManagers/ARTRenderableManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ViewManagers/ARTShapeManager.h b/Libraries/ART/ViewManagers/ARTShapeManager.h
index 2f31b23a0eab10..cc514b159ee192 100644
--- a/Libraries/ART/ViewManagers/ARTShapeManager.h
+++ b/Libraries/ART/ViewManagers/ARTShapeManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ViewManagers/ARTShapeManager.m b/Libraries/ART/ViewManagers/ARTShapeManager.m
index 57b603ca1a16b6..cb056e5d268877 100644
--- a/Libraries/ART/ViewManagers/ARTShapeManager.m
+++ b/Libraries/ART/ViewManagers/ARTShapeManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
index 5915536bd6f917..36d5949a90ab4d 100644
--- a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
+++ b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m
index 54052a331d4585..1a03897937e860 100644
--- a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m
+++ b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ViewManagers/ARTTextManager.h b/Libraries/ART/ViewManagers/ARTTextManager.h
index c7d5304da3a3eb..343e669af7553c 100644
--- a/Libraries/ART/ViewManagers/ARTTextManager.h
+++ b/Libraries/ART/ViewManagers/ARTTextManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ART/ViewManagers/ARTTextManager.m b/Libraries/ART/ViewManagers/ARTTextManager.m
index ac6688c3d925b9..35c53811fd9509 100644
--- a/Libraries/ART/ViewManagers/ARTTextManager.m
+++ b/Libraries/ART/ViewManagers/ARTTextManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ActionSheetIOS/ActionSheetIOS.js b/Libraries/ActionSheetIOS/ActionSheetIOS.js
index b135a23e5fc998..ea2e01f9dd9b8a 100644
--- a/Libraries/ActionSheetIOS/ActionSheetIOS.js
+++ b/Libraries/ActionSheetIOS/ActionSheetIOS.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.h b/Libraries/ActionSheetIOS/RCTActionSheetManager.h
index b9a5b2df7329a1..53184041393cd4 100644
--- a/Libraries/ActionSheetIOS/RCTActionSheetManager.h
+++ b/Libraries/ActionSheetIOS/RCTActionSheetManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.m b/Libraries/ActionSheetIOS/RCTActionSheetManager.m
index cd5d5719ff769c..af1e202c962409 100644
--- a/Libraries/ActionSheetIOS/RCTActionSheetManager.m
+++ b/Libraries/ActionSheetIOS/RCTActionSheetManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
index a424f5026d5a8c..ceab6763680b8e 100644
--- a/Libraries/Alert/Alert.js
+++ b/Libraries/Alert/Alert.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Alert/AlertIOS.js b/Libraries/Alert/AlertIOS.js
index 1998865b2d597c..b7e1a0d73b7b59 100644
--- a/Libraries/Alert/AlertIOS.js
+++ b/Libraries/Alert/AlertIOS.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Alert/RCTAlertManager.android.js b/Libraries/Alert/RCTAlertManager.android.js
index 2e510add8ddaca..b16298f01ff3f2 100644
--- a/Libraries/Alert/RCTAlertManager.android.js
+++ b/Libraries/Alert/RCTAlertManager.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Alert/RCTAlertManager.ios.js b/Libraries/Alert/RCTAlertManager.ios.js
index 529bb5da0e55f2..a300de65521d97 100644
--- a/Libraries/Alert/RCTAlertManager.ios.js
+++ b/Libraries/Alert/RCTAlertManager.ios.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Animated/release/.gitignore b/Libraries/Animated/release/.gitignore
new file mode 100644
index 00000000000000..4c422f3bc92283
--- /dev/null
+++ b/Libraries/Animated/release/.gitignore
@@ -0,0 +1,3 @@
+/lib/
+/dist/
+/node_modules/
diff --git a/Libraries/Animated/release/gulpfile.js b/Libraries/Animated/release/gulpfile.js
index b5599e9365fef3..291f3236303d87 100644
--- a/Libraries/Animated/release/gulpfile.js
+++ b/Libraries/Animated/release/gulpfile.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/release/package.json b/Libraries/Animated/release/package.json
index 49f6a2081ffd14..4873f784a5ffad 100644
--- a/Libraries/Animated/release/package.json
+++ b/Libraries/Animated/release/package.json
@@ -10,7 +10,7 @@
   "license": "MIT",
   "main": "Animated.js",
   "dependencies": {
-    "fbjs": "0.8.17"
+    "fbjs": "^1.0.0"
   },
   "scripts": {
     "build": "gulp"
diff --git a/Libraries/Animated/src/Animated.js b/Libraries/Animated/src/Animated.js
index 8678b21f14b889..f04de4a7aff3f1 100644
--- a/Libraries/Animated/src/Animated.js
+++ b/Libraries/Animated/src/Animated.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,15 +11,25 @@
 'use strict';
 
 const AnimatedImplementation = require('AnimatedImplementation');
-const Image = require('Image');
-const ScrollView = require('ScrollView');
-const Text = require('Text');
-const View = require('View');
 
 module.exports = {
+  get FlatList() {
+    return require('AnimatedFlatList');
+  },
+  get Image() {
+    return require('AnimatedImage');
+  },
+  get ScrollView() {
+    return require('AnimatedScrollView');
+  },
+  get SectionList() {
+    return require('AnimatedSectionList');
+  },
+  get Text() {
+    return require('AnimatedText');
+  },
+  get View() {
+    return require('AnimatedView');
+  },
   ...AnimatedImplementation,
-  View: AnimatedImplementation.createAnimatedComponent(View),
-  Text: AnimatedImplementation.createAnimatedComponent(Text),
-  Image: AnimatedImplementation.createAnimatedComponent(Image),
-  ScrollView: AnimatedImplementation.createAnimatedComponent(ScrollView),
 };
diff --git a/Libraries/Animated/src/AnimatedEvent.js b/Libraries/Animated/src/AnimatedEvent.js
index 084632737c661d..c4d1b88290e5cb 100644
--- a/Libraries/Animated/src/AnimatedEvent.js
+++ b/Libraries/Animated/src/AnimatedEvent.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js
index 2c1ce431d10686..57e34ce6e9eee3 100644
--- a/Libraries/Animated/src/AnimatedImplementation.js
+++ b/Libraries/Animated/src/AnimatedImplementation.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/AnimatedWeb.js b/Libraries/Animated/src/AnimatedWeb.js
index e80023d73687a4..cf105d4af58a6c 100644
--- a/Libraries/Animated/src/AnimatedWeb.js
+++ b/Libraries/Animated/src/AnimatedWeb.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Animated/src/Easing.js b/Libraries/Animated/src/Easing.js
index 94fb865882c040..8f38322a873df1 100644
--- a/Libraries/Animated/src/Easing.js
+++ b/Libraries/Animated/src/Easing.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/NativeAnimatedHelper.js b/Libraries/Animated/src/NativeAnimatedHelper.js
index 3142ea24c084d1..f60a2de0c3b4c4 100644
--- a/Libraries/Animated/src/NativeAnimatedHelper.js
+++ b/Libraries/Animated/src/NativeAnimatedHelper.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -153,6 +153,7 @@ const STYLES_WHITELIST = {
   borderTopLeftRadius: true,
   borderTopRightRadius: true,
   borderTopStartRadius: true,
+  elevation: true,
   /* ios styles */
   shadowOpacity: true,
   shadowRadius: true,
diff --git a/Libraries/Animated/src/SpringConfig.js b/Libraries/Animated/src/SpringConfig.js
index 456af9c40ec1ae..e226a3173a1902 100644
--- a/Libraries/Animated/src/SpringConfig.js
+++ b/Libraries/Animated/src/SpringConfig.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/__tests__/Animated-test.js b/Libraries/Animated/src/__tests__/Animated-test.js
index 6c5ef66b14a170..930d8a020f2bff 100644
--- a/Libraries/Animated/src/__tests__/Animated-test.js
+++ b/Libraries/Animated/src/__tests__/Animated-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -134,7 +134,9 @@ describe('Animated tests', () => {
       expect(callback).toBeCalled();
     });
 
-    it('send toValue when an underdamped spring stops', () => {
+    // This test is flaky and we are asking open source to fix it
+    // https://github.com/facebook/react-native/issues/21517
+    it.skip('send toValue when an underdamped spring stops', () => {
       const anim = new Animated.Value(0);
       const listener = jest.fn();
       anim.addListener(listener);
diff --git a/Libraries/Animated/src/__tests__/AnimatedNative-test.js b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
index d3ff6665cbc81f..fb6257f15d8183 100644
--- a/Libraries/Animated/src/__tests__/AnimatedNative-test.js
+++ b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -19,6 +19,8 @@ jest
   .setMock('View', ClassComponentMock)
   .setMock('Image', ClassComponentMock)
   .setMock('ScrollView', ClassComponentMock)
+  .setMock('FlatList', ClassComponentMock)
+  .setMock('SectionList', ClassComponentMock)
   .setMock('React', {Component: class {}})
   .setMock('NativeModules', {
     NativeAnimatedModule: {},
diff --git a/Libraries/Animated/src/__tests__/Easing-test.js b/Libraries/Animated/src/__tests__/Easing-test.js
index 0284f3f0b697ef..1cb6152538fec2 100644
--- a/Libraries/Animated/src/__tests__/Easing-test.js
+++ b/Libraries/Animated/src/__tests__/Easing-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/__tests__/Interpolation-test.js b/Libraries/Animated/src/__tests__/Interpolation-test.js
index 5515f09bacd0bc..6b77584b00d8ab 100644
--- a/Libraries/Animated/src/__tests__/Interpolation-test.js
+++ b/Libraries/Animated/src/__tests__/Interpolation-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/animations/Animation.js b/Libraries/Animated/src/animations/Animation.js
index b4e38016dba557..b34ac9555a1eca 100644
--- a/Libraries/Animated/src/animations/Animation.js
+++ b/Libraries/Animated/src/animations/Animation.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/animations/DecayAnimation.js b/Libraries/Animated/src/animations/DecayAnimation.js
index a6fe05bb3f6343..0e09b6144d30e1 100644
--- a/Libraries/Animated/src/animations/DecayAnimation.js
+++ b/Libraries/Animated/src/animations/DecayAnimation.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/animations/SpringAnimation.js b/Libraries/Animated/src/animations/SpringAnimation.js
index a0f38d3b024e5c..a44c181eb25dfe 100644
--- a/Libraries/Animated/src/animations/SpringAnimation.js
+++ b/Libraries/Animated/src/animations/SpringAnimation.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/animations/TimingAnimation.js b/Libraries/Animated/src/animations/TimingAnimation.js
index 694a52c0a39f7b..61ad74e9e1f5f0 100644
--- a/Libraries/Animated/src/animations/TimingAnimation.js
+++ b/Libraries/Animated/src/animations/TimingAnimation.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/components/AnimatedFlatList.js b/Libraries/Animated/src/components/AnimatedFlatList.js
new file mode 100644
index 00000000000000..af69ff3674769e
--- /dev/null
+++ b/Libraries/Animated/src/components/AnimatedFlatList.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 FlatList = require('FlatList');
+
+const createAnimatedComponent = require('createAnimatedComponent');
+
+module.exports = createAnimatedComponent(FlatList);
diff --git a/Libraries/Animated/src/components/AnimatedImage.js b/Libraries/Animated/src/components/AnimatedImage.js
new file mode 100644
index 00000000000000..e7d0bc4429513a
--- /dev/null
+++ b/Libraries/Animated/src/components/AnimatedImage.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 Image = require('Image');
+
+const createAnimatedComponent = require('createAnimatedComponent');
+
+module.exports = createAnimatedComponent(Image);
diff --git a/Libraries/Animated/src/components/AnimatedScrollView.js b/Libraries/Animated/src/components/AnimatedScrollView.js
new file mode 100644
index 00000000000000..195f17b7005ad7
--- /dev/null
+++ b/Libraries/Animated/src/components/AnimatedScrollView.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 ScrollView = require('ScrollView');
+
+const createAnimatedComponent = require('createAnimatedComponent');
+
+module.exports = createAnimatedComponent(ScrollView);
diff --git a/Libraries/Animated/src/components/AnimatedSectionList.js b/Libraries/Animated/src/components/AnimatedSectionList.js
new file mode 100644
index 00000000000000..482e203abac637
--- /dev/null
+++ b/Libraries/Animated/src/components/AnimatedSectionList.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 SectionList = require('SectionList');
+
+const createAnimatedComponent = require('createAnimatedComponent');
+
+module.exports = createAnimatedComponent(SectionList);
diff --git a/Libraries/Animated/src/components/AnimatedText.js b/Libraries/Animated/src/components/AnimatedText.js
new file mode 100644
index 00000000000000..870ba144b10207
--- /dev/null
+++ b/Libraries/Animated/src/components/AnimatedText.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 Text = require('Text');
+
+const createAnimatedComponent = require('createAnimatedComponent');
+
+module.exports = createAnimatedComponent(Text);
diff --git a/Libraries/Animated/src/components/AnimatedView.js b/Libraries/Animated/src/components/AnimatedView.js
new file mode 100644
index 00000000000000..396760d999485f
--- /dev/null
+++ b/Libraries/Animated/src/components/AnimatedView.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 View = require('View');
+
+const createAnimatedComponent = require('createAnimatedComponent');
+
+module.exports = createAnimatedComponent(View);
diff --git a/Libraries/Animated/src/createAnimatedComponent.js b/Libraries/Animated/src/createAnimatedComponent.js
index a4177d65be0e40..d705d6eebaa8be 100644
--- a/Libraries/Animated/src/createAnimatedComponent.js
+++ b/Libraries/Animated/src/createAnimatedComponent.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,7 +12,7 @@
 const {AnimatedEvent} = require('./AnimatedEvent');
 const AnimatedProps = require('./nodes/AnimatedProps');
 const React = require('React');
-const ViewStylePropTypes = require('ViewStylePropTypes');
+const DeprecatedViewStylePropTypes = require('DeprecatedViewStylePropTypes');
 
 const invariant = require('fbjs/lib/invariant');
 
@@ -184,7 +184,7 @@ function createAnimatedComponent(Component: any): any {
         return;
       }
 
-      for (const key in ViewStylePropTypes) {
+      for (const key in DeprecatedViewStylePropTypes) {
         if (!propTypes[key] && props[key] !== undefined) {
           console.warn(
             'You are setting the style `{ ' +
diff --git a/Libraries/Animated/src/nodes/AnimatedAddition.js b/Libraries/Animated/src/nodes/AnimatedAddition.js
index 60713da500213c..f3d6b55167f404 100644
--- a/Libraries/Animated/src/nodes/AnimatedAddition.js
+++ b/Libraries/Animated/src/nodes/AnimatedAddition.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedDiffClamp.js b/Libraries/Animated/src/nodes/AnimatedDiffClamp.js
index 4219eccfb377ff..3b657ef75ee23f 100644
--- a/Libraries/Animated/src/nodes/AnimatedDiffClamp.js
+++ b/Libraries/Animated/src/nodes/AnimatedDiffClamp.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedDivision.js b/Libraries/Animated/src/nodes/AnimatedDivision.js
index 3498d322211f64..9efb4214dfa41f 100644
--- a/Libraries/Animated/src/nodes/AnimatedDivision.js
+++ b/Libraries/Animated/src/nodes/AnimatedDivision.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedInterpolation.js b/Libraries/Animated/src/nodes/AnimatedInterpolation.js
index 8ee7cbba8a7fc0..d314e078063ec3 100644
--- a/Libraries/Animated/src/nodes/AnimatedInterpolation.js
+++ b/Libraries/Animated/src/nodes/AnimatedInterpolation.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedModulo.js b/Libraries/Animated/src/nodes/AnimatedModulo.js
index a3968566e9a2c4..a0cad545101ccb 100644
--- a/Libraries/Animated/src/nodes/AnimatedModulo.js
+++ b/Libraries/Animated/src/nodes/AnimatedModulo.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedMultiplication.js b/Libraries/Animated/src/nodes/AnimatedMultiplication.js
index 889f530c76baee..b031ba613dc805 100644
--- a/Libraries/Animated/src/nodes/AnimatedMultiplication.js
+++ b/Libraries/Animated/src/nodes/AnimatedMultiplication.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedNode.js b/Libraries/Animated/src/nodes/AnimatedNode.js
index 34e010a62f8c45..94532087d201eb 100644
--- a/Libraries/Animated/src/nodes/AnimatedNode.js
+++ b/Libraries/Animated/src/nodes/AnimatedNode.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedProps.js b/Libraries/Animated/src/nodes/AnimatedProps.js
index 75c9c25487135a..92c5012075fc85 100644
--- a/Libraries/Animated/src/nodes/AnimatedProps.js
+++ b/Libraries/Animated/src/nodes/AnimatedProps.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedStyle.js b/Libraries/Animated/src/nodes/AnimatedStyle.js
index 990b960a336805..e1f3d332a2280f 100644
--- a/Libraries/Animated/src/nodes/AnimatedStyle.js
+++ b/Libraries/Animated/src/nodes/AnimatedStyle.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -95,13 +95,13 @@ class AnimatedStyle extends AnimatedWithChildren {
   }
 
   __makeNative() {
-    super.__makeNative();
     for (const key in this._style) {
       const value = this._style[key];
       if (value instanceof AnimatedNode) {
         value.__makeNative();
       }
     }
+    super.__makeNative();
   }
 
   __getNativeConfig(): Object {
diff --git a/Libraries/Animated/src/nodes/AnimatedSubtraction.js b/Libraries/Animated/src/nodes/AnimatedSubtraction.js
index 3fe8bbb6920703..c79860a4095074 100644
--- a/Libraries/Animated/src/nodes/AnimatedSubtraction.js
+++ b/Libraries/Animated/src/nodes/AnimatedSubtraction.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedTracking.js b/Libraries/Animated/src/nodes/AnimatedTracking.js
index 699da167c7b2c7..284d5b39af7a0b 100644
--- a/Libraries/Animated/src/nodes/AnimatedTracking.js
+++ b/Libraries/Animated/src/nodes/AnimatedTracking.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedTransform.js b/Libraries/Animated/src/nodes/AnimatedTransform.js
index 1706923394ec96..703fa51ceb4e1b 100644
--- a/Libraries/Animated/src/nodes/AnimatedTransform.js
+++ b/Libraries/Animated/src/nodes/AnimatedTransform.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -22,7 +22,6 @@ class AnimatedTransform extends AnimatedWithChildren {
   }
 
   __makeNative() {
-    super.__makeNative();
     this._transforms.forEach(transform => {
       for (const key in transform) {
         const value = transform[key];
@@ -31,6 +30,7 @@ class AnimatedTransform extends AnimatedWithChildren {
         }
       }
     });
+    super.__makeNative();
   }
 
   __getValue(): $ReadOnlyArray<Object> {
diff --git a/Libraries/Animated/src/nodes/AnimatedValue.js b/Libraries/Animated/src/nodes/AnimatedValue.js
index a3fb3a325b838e..7c4fe9817f98dd 100644
--- a/Libraries/Animated/src/nodes/AnimatedValue.js
+++ b/Libraries/Animated/src/nodes/AnimatedValue.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedValueXY.js b/Libraries/Animated/src/nodes/AnimatedValueXY.js
index 3de5bbaf9d3a04..a8168c591039ad 100644
--- a/Libraries/Animated/src/nodes/AnimatedValueXY.js
+++ b/Libraries/Animated/src/nodes/AnimatedValueXY.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/nodes/AnimatedWithChildren.js b/Libraries/Animated/src/nodes/AnimatedWithChildren.js
index 9cd5fb49e14070..3940c4ae206082 100644
--- a/Libraries/Animated/src/nodes/AnimatedWithChildren.js
+++ b/Libraries/Animated/src/nodes/AnimatedWithChildren.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 'use strict';
diff --git a/Libraries/Animated/src/polyfills/InteractionManager.js b/Libraries/Animated/src/polyfills/InteractionManager.js
index 5e82aaaa544cdb..c2247c762a3da0 100644
--- a/Libraries/Animated/src/polyfills/InteractionManager.js
+++ b/Libraries/Animated/src/polyfills/InteractionManager.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/polyfills/Set.js b/Libraries/Animated/src/polyfills/Set.js
index c88278bda1cb38..39205b8f9f9920 100644
--- a/Libraries/Animated/src/polyfills/Set.js
+++ b/Libraries/Animated/src/polyfills/Set.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Animated/src/polyfills/flattenStyle.js b/Libraries/Animated/src/polyfills/flattenStyle.js
index 21907b235f97f5..b50057af28435f 100644
--- a/Libraries/Animated/src/polyfills/flattenStyle.js
+++ b/Libraries/Animated/src/polyfills/flattenStyle.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/AppState/AppState.js b/Libraries/AppState/AppState.js
index 554689f11ad680..8918225ec92365 100644
--- a/Libraries/AppState/AppState.js
+++ b/Libraries/AppState/AppState.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/BatchedBridge/BatchedBridge.js b/Libraries/BatchedBridge/BatchedBridge.js
index 0b1aae766493e6..663b0051457e24 100644
--- a/Libraries/BatchedBridge/BatchedBridge.js
+++ b/Libraries/BatchedBridge/BatchedBridge.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/BatchedBridge/MessageQueue.js b/Libraries/BatchedBridge/MessageQueue.js
index c9b750df9efdc8..a7f1f5a3a5aacd 100644
--- a/Libraries/BatchedBridge/MessageQueue.js
+++ b/Libraries/BatchedBridge/MessageQueue.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -60,7 +60,7 @@ class MessageQueue {
     this._failureCallbacks = {};
     this._callID = 0;
     this._lastFlush = 0;
-    this._eventLoopStartTime = new Date().getTime();
+    this._eventLoopStartTime = Date.now();
     this._immediatesCallback = null;
 
     if (__DEV__) {
@@ -141,7 +141,7 @@ class MessageQueue {
   }
 
   getEventLoopRunningTime() {
-    return new Date().getTime() - this._eventLoopStartTime;
+    return Date.now() - this._eventLoopStartTime;
   }
 
   registerCallableModule(name: string, module: Object) {
@@ -213,11 +213,13 @@ class MessageQueue {
           t === 'undefined' ||
           t === 'null' ||
           t === 'boolean' ||
-          t === 'number' ||
           t === 'string'
         ) {
           return true;
         }
+        if (t === 'number') {
+          return isFinite(val);
+        }
         if (t === 'function' || t !== 'object') {
           return false;
         }
@@ -232,10 +234,25 @@ class MessageQueue {
         return true;
       };
 
+      // Replacement allows normally non-JSON-convertible values to be
+      // seen.  There is ambiguity with string values, but in context,
+      // it should at least be a strong hint.
+      const replacer = (key, val) => {
+        const t = typeof val;
+        if (t === 'function') {
+          return '<<Function ' + val.name + '>>';
+        } else if (t === 'number' && !isFinite(val)) {
+          return '<<' + val.toString() + '>>';
+        } else {
+          return val;
+        }
+      };
+
+      // Note that JSON.stringify
       invariant(
         isValidArgument(params),
         '%s is not usable as a native method argument',
-        params,
+        JSON.stringify(params, replacer),
       );
 
       // The params object should not be mutated after being queued
@@ -243,7 +260,7 @@ class MessageQueue {
     }
     this._queue[PARAMS].push(params);
 
-    const now = new Date().getTime();
+    const now = Date.now();
     if (
       global.nativeFlushQueueImmediate &&
       now - this._lastFlush >= MIN_TIME_BETWEEN_FLUSHES_MS
@@ -323,7 +340,7 @@ class MessageQueue {
   }
 
   __callFunction(module: string, method: string, args: any[]): any {
-    this._lastFlush = new Date().getTime();
+    this._lastFlush = Date.now();
     this._eventLoopStartTime = this._lastFlush;
     if (__DEV__ || this.__spy) {
       Systrace.beginEvent(`${module}.${method}(${stringifySafe(args)})`);
@@ -352,7 +369,7 @@ class MessageQueue {
   }
 
   __invokeCallback(cbID: number, args: any[]) {
-    this._lastFlush = new Date().getTime();
+    this._lastFlush = Date.now();
     this._eventLoopStartTime = this._lastFlush;
 
     // The rightmost bit of cbID indicates fail (0) or success (1), the other bits are the callID shifted left.
diff --git a/Libraries/BatchedBridge/NativeModules.js b/Libraries/BatchedBridge/NativeModules.js
index 61dd5bff1e61df..203cce932e0bae 100644
--- a/Libraries/BatchedBridge/NativeModules.js
+++ b/Libraries/BatchedBridge/NativeModules.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js b/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js
index 3f9ae5f0a4855c..bb50f5d2fa7b50 100644
--- a/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js
+++ b/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js b/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js
index 05168a6b570094..37425cd7652706 100644
--- a/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js
+++ b/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
index 555a9e2053be33..77cd6948124487 100644
--- a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
+++ b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/BatchedBridge/__tests__/NativeModules-test.js b/Libraries/BatchedBridge/__tests__/NativeModules-test.js
index 9702146b719090..821c3261a4169a 100644
--- a/Libraries/BatchedBridge/__tests__/NativeModules-test.js
+++ b/Libraries/BatchedBridge/__tests__/NativeModules-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,12 +10,7 @@
 
 'use strict';
 
-jest
-  .enableAutomock()
-  .unmock('BatchedBridge')
-  .unmock('defineLazyObjectProperty')
-  .unmock('MessageQueue')
-  .unmock('NativeModules');
+jest.unmock('NativeModules');
 
 let BatchedBridge;
 let NativeModules;
diff --git a/Libraries/Blob/Blob.js b/Libraries/Blob/Blob.js
index 0e36b07f7f4e5a..c7e013dfa0b530 100644
--- a/Libraries/Blob/Blob.js
+++ b/Libraries/Blob/Blob.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/BlobManager.js b/Libraries/Blob/BlobManager.js
index b08082e35e1580..460980bb5b21ef 100644
--- a/Libraries/Blob/BlobManager.js
+++ b/Libraries/Blob/BlobManager.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 
diff --git a/Libraries/Blob/BlobRegistry.js b/Libraries/Blob/BlobRegistry.js
index 445fe6bb855835..cfd0475a53ea07 100644
--- a/Libraries/Blob/BlobRegistry.js
+++ b/Libraries/Blob/BlobRegistry.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/BlobTypes.js b/Libraries/Blob/BlobTypes.js
index 2e5be53e19615f..de105d2a6904d3 100644
--- a/Libraries/Blob/BlobTypes.js
+++ b/Libraries/Blob/BlobTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/File.js b/Libraries/Blob/File.js
index 2f57183cdb3f19..fcad0d0bc1415c 100644
--- a/Libraries/Blob/File.js
+++ b/Libraries/Blob/File.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/FileReader.js b/Libraries/Blob/FileReader.js
index 309e4577a455f8..b9181ed9aaa34b 100644
--- a/Libraries/Blob/FileReader.js
+++ b/Libraries/Blob/FileReader.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/RCTBlobManager.h b/Libraries/Blob/RCTBlobManager.h
index 24b589ef987ae5..1d5750799e3d29 100755
--- a/Libraries/Blob/RCTBlobManager.h
+++ b/Libraries/Blob/RCTBlobManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm
index 7c0cbb8673f064..99084d9aba3b53 100755
--- a/Libraries/Blob/RCTBlobManager.mm
+++ b/Libraries/Blob/RCTBlobManager.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/RCTFileReaderModule.h b/Libraries/Blob/RCTFileReaderModule.h
index 72d224b0d968cb..89c018381bcd32 100644
--- a/Libraries/Blob/RCTFileReaderModule.h
+++ b/Libraries/Blob/RCTFileReaderModule.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/RCTFileReaderModule.m b/Libraries/Blob/RCTFileReaderModule.m
index 5059e0b84180ee..26b33f63e471a9 100644
--- a/Libraries/Blob/RCTFileReaderModule.m
+++ b/Libraries/Blob/RCTFileReaderModule.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/URL.js b/Libraries/Blob/URL.js
index de73affac2af1b..36dbe0ffa02b50 100644
--- a/Libraries/Blob/URL.js
+++ b/Libraries/Blob/URL.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Blob/__mocks__/BlobModule.js b/Libraries/Blob/__mocks__/BlobModule.js
index e904d2929dd74b..3a1cb8eda6174b 100644
--- a/Libraries/Blob/__mocks__/BlobModule.js
+++ b/Libraries/Blob/__mocks__/BlobModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/__mocks__/FileReaderModule.js b/Libraries/Blob/__mocks__/FileReaderModule.js
index 0f35aa89ace07e..da687eca470b1d 100644
--- a/Libraries/Blob/__mocks__/FileReaderModule.js
+++ b/Libraries/Blob/__mocks__/FileReaderModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/__tests__/Blob-test.js b/Libraries/Blob/__tests__/Blob-test.js
index 47bf5fee7c1361..7600c0c967825c 100644
--- a/Libraries/Blob/__tests__/Blob-test.js
+++ b/Libraries/Blob/__tests__/Blob-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/__tests__/BlobManager-test.js b/Libraries/Blob/__tests__/BlobManager-test.js
index c141d42f16334c..73ad2a9de1103f 100644
--- a/Libraries/Blob/__tests__/BlobManager-test.js
+++ b/Libraries/Blob/__tests__/BlobManager-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/__tests__/File-test.js b/Libraries/Blob/__tests__/File-test.js
index c10f90c18766ae..11b25116809a5d 100644
--- a/Libraries/Blob/__tests__/File-test.js
+++ b/Libraries/Blob/__tests__/File-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Blob/__tests__/FileReader-test.js b/Libraries/Blob/__tests__/FileReader-test.js
index b2237550bf7184..a375c3ef374710 100644
--- a/Libraries/Blob/__tests__/FileReader-test.js
+++ b/Libraries/Blob/__tests__/FileReader-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/BugReporting/BugReporting.js b/Libraries/BugReporting/BugReporting.js
index 6c63b6a1eebf98..9e0adabfe3f19f 100644
--- a/Libraries/BugReporting/BugReporting.js
+++ b/Libraries/BugReporting/BugReporting.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/BugReporting/dumpReactTree.js b/Libraries/BugReporting/dumpReactTree.js
index ead8f4bdd76c32..2ef17ecf034784 100644
--- a/Libraries/BugReporting/dumpReactTree.js
+++ b/Libraries/BugReporting/dumpReactTree.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/BugReporting/getReactData.js b/Libraries/BugReporting/getReactData.js
index b4d1c4a32fd557..cc9bc55f0cc394 100644
--- a/Libraries/BugReporting/getReactData.js
+++ b/Libraries/BugReporting/getReactData.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/CameraRoll/CameraRoll.js b/Libraries/CameraRoll/CameraRoll.js
index f2a4f65aa80933..ad8db27937aa46 100644
--- a/Libraries/CameraRoll/CameraRoll.js
+++ b/Libraries/CameraRoll/CameraRoll.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,7 +13,7 @@ const PropTypes = require('prop-types');
 const {checkPropTypes} = PropTypes;
 const RCTCameraRollManager = require('NativeModules').CameraRollManager;
 
-const createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
+const deprecatedCreateStrictShapeTypeChecker = require('deprecatedCreateStrictShapeTypeChecker');
 const invariant = require('fbjs/lib/invariant');
 
 const GROUP_TYPES_OPTIONS = {
@@ -32,10 +32,12 @@ const ASSET_TYPE_OPTIONS = {
   Photos: 'Photos',
 };
 
-type GetPhotosParams = {
+export type GroupTypes = $Keys<typeof GROUP_TYPES_OPTIONS>;
+
+export type GetPhotosParams = {
   first: number,
   after?: string,
-  groupTypes?: $Keys<typeof GROUP_TYPES_OPTIONS>,
+  groupTypes?: GroupTypes,
   groupName?: string,
   assetType?: $Keys<typeof ASSET_TYPE_OPTIONS>,
   mimeTypes?: Array<string>,
@@ -44,7 +46,7 @@ type GetPhotosParams = {
 /**
  * Shape of the param arg for the `getPhotos` function.
  */
-const getPhotosParamChecker = createStrictShapeTypeChecker({
+const getPhotosParamChecker = deprecatedCreateStrictShapeTypeChecker({
   /**
    * The number of photos wanted in reverse order of the photo application
    * (i.e. most recent first for SavedPhotos).
@@ -79,48 +81,51 @@ const getPhotosParamChecker = createStrictShapeTypeChecker({
   mimeTypes: PropTypes.arrayOf(PropTypes.string),
 });
 
-type GetPhotosReturn = Promise<{
-  edges: Array<{
-    node: {
-      type: string,
-      group_name: string,
-      image: {
-        uri: string,
-        height: number,
-        width: number,
-        isStored?: boolean,
-        playableDuration: number,
-      },
-      timestamp: number,
-      location?: {
-        latitude?: number,
-        longitude?: number,
-        altitude?: number,
-        heading?: number,
-        speed?: number,
-      },
+export type PhotoIdentifier = {
+  node: {
+    type: string,
+    group_name: string,
+    image: {
+      filename: string,
+      uri: string,
+      height: number,
+      width: number,
+      isStored?: boolean,
+      playableDuration: number,
+    },
+    timestamp: number,
+    location?: {
+      latitude?: number,
+      longitude?: number,
+      altitude?: number,
+      heading?: number,
+      speed?: number,
     },
-  }>,
+  },
+};
+
+export type PhotoIdentifiersPage = {
+  edges: Array<PhotoIdentifier>,
   page_info: {
     has_next_page: boolean,
     start_cursor?: string,
     end_cursor?: string,
   },
-}>;
+};
 
 /**
  * Shape of the return value of the `getPhotos` function.
  */
-const getPhotosReturnChecker = createStrictShapeTypeChecker({
+const getPhotosReturnChecker = deprecatedCreateStrictShapeTypeChecker({
   edges: PropTypes.arrayOf(
     /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses an
      * error found when Flow v0.66 was deployed. To see the error delete this
      * comment and run Flow. */
-    createStrictShapeTypeChecker({
-      node: createStrictShapeTypeChecker({
+    deprecatedCreateStrictShapeTypeChecker({
+      node: deprecatedCreateStrictShapeTypeChecker({
         type: PropTypes.string.isRequired,
         group_name: PropTypes.string.isRequired,
-        image: createStrictShapeTypeChecker({
+        image: deprecatedCreateStrictShapeTypeChecker({
           uri: PropTypes.string.isRequired,
           height: PropTypes.number.isRequired,
           width: PropTypes.number.isRequired,
@@ -128,7 +133,7 @@ const getPhotosReturnChecker = createStrictShapeTypeChecker({
           playableDuration: PropTypes.number.isRequired,
         }).isRequired,
         timestamp: PropTypes.number.isRequired,
-        location: createStrictShapeTypeChecker({
+        location: deprecatedCreateStrictShapeTypeChecker({
           latitude: PropTypes.number,
           longitude: PropTypes.number,
           altitude: PropTypes.number,
@@ -138,7 +143,7 @@ const getPhotosReturnChecker = createStrictShapeTypeChecker({
       }).isRequired,
     }),
   ).isRequired,
-  page_info: createStrictShapeTypeChecker({
+  page_info: deprecatedCreateStrictShapeTypeChecker({
     has_next_page: PropTypes.bool.isRequired,
     start_cursor: PropTypes.string,
     end_cursor: PropTypes.string,
@@ -151,8 +156,8 @@ const getPhotosReturnChecker = createStrictShapeTypeChecker({
  * See https://facebook.github.io/react-native/docs/cameraroll.html
  */
 class CameraRoll {
-  static GroupTypesOptions: Object = GROUP_TYPES_OPTIONS;
-  static AssetTypeOptions: Object = ASSET_TYPE_OPTIONS;
+  static GroupTypesOptions = GROUP_TYPES_OPTIONS;
+  static AssetTypeOptions = ASSET_TYPE_OPTIONS;
 
   /**
    * `CameraRoll.saveImageWithTag()` is deprecated. Use `CameraRoll.saveToCameraRoll()` instead.
@@ -204,7 +209,7 @@ class CameraRoll {
    *
    * See https://facebook.github.io/react-native/docs/cameraroll.html#getphotos
    */
-  static getPhotos(params: GetPhotosParams): GetPhotosReturn {
+  static getPhotos(params: GetPhotosParams): Promise<PhotoIdentifiersPage> {
     if (__DEV__) {
       checkPropTypes(
         {params: getPhotosParamChecker},
diff --git a/Libraries/CameraRoll/ImagePickerIOS.js b/Libraries/CameraRoll/ImagePickerIOS.js
index 785f4b57cb6b56..9c783339835f88 100644
--- a/Libraries/CameraRoll/ImagePickerIOS.js
+++ b/Libraries/CameraRoll/ImagePickerIOS.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h
index 8189bb56e4ea8c..7ccba500f59f0b 100644
--- a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h
+++ b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m
index 9721b392b80f78..663598ceaea0b7 100644
--- a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m
+++ b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/CameraRoll/RCTCameraRollManager.h b/Libraries/CameraRoll/RCTCameraRollManager.h
index b8b2c7d2ad63c7..3341c539b0e9dc 100644
--- a/Libraries/CameraRoll/RCTCameraRollManager.h
+++ b/Libraries/CameraRoll/RCTCameraRollManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/CameraRoll/RCTCameraRollManager.m b/Libraries/CameraRoll/RCTCameraRollManager.m
index e6e397392bd159..96e117c16a3783 100644
--- a/Libraries/CameraRoll/RCTCameraRollManager.m
+++ b/Libraries/CameraRoll/RCTCameraRollManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/CameraRoll/RCTImagePickerManager.h b/Libraries/CameraRoll/RCTImagePickerManager.h
index 825e7721a46c01..5f489191c3ffc2 100644
--- a/Libraries/CameraRoll/RCTImagePickerManager.h
+++ b/Libraries/CameraRoll/RCTImagePickerManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/CameraRoll/RCTImagePickerManager.m b/Libraries/CameraRoll/RCTImagePickerManager.m
index 4da2a6490b9504..96932c473f3446 100644
--- a/Libraries/CameraRoll/RCTImagePickerManager.m
+++ b/Libraries/CameraRoll/RCTImagePickerManager.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -123,7 +123,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker
   // WARNING: Using ImageStoreManager may cause a memory leak because the
   // image isn't automatically removed from store once we're done using it.
   [_bridge.imageStoreManager storeImage:originalImage withBlock:^(NSString *tempImageTag) {
-    [self _dismissPicker:picker args:tempImageTag ? @[tempImageTag, height, width] : nil];
+    [self _dismissPicker:picker args:tempImageTag ? @[tempImageTag, RCTNullIfNil(height), RCTNullIfNil(width)] : nil];
   }];
 }
 
diff --git a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h
index 0a45f184dab73c..d3b8dc646b3c6b 100644
--- a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h
+++ b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m
index ac27231adc9e9a..e6c191e93b5099 100644
--- a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m
+++ b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Color/normalizeColor.js b/Libraries/Color/normalizeColor.js
index edede79ee6e267..811b5535f8de5f 100755
--- a/Libraries/Color/normalizeColor.js
+++ b/Libraries/Color/normalizeColor.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
index dfa09b53a466aa..6cd0193eb42eca 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,6 +12,7 @@
 
 const NativeModules = require('NativeModules');
 const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
+const UIManager = require('UIManager');
 
 const RCTAccessibilityInfo = NativeModules.AccessibilityInfo;
 
@@ -34,6 +35,8 @@ const _subscriptions = new Map();
  */
 
 const AccessibilityInfo = {
+  /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+   * when making Flow check .android.js files. */
   fetch: function(): Promise {
     return new Promise((resolve, reject) => {
       RCTAccessibilityInfo.isTouchExplorationEnabled(function(resp) {
@@ -66,6 +69,18 @@ const AccessibilityInfo = {
     listener.remove();
     _subscriptions.delete(handler);
   },
+
+  /**
+   * Set accessibility focus to a react component.
+   *
+   * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#setaccessibilityfocus
+   */
+  setAccessibilityFocus: function(reactTag: number): void {
+    UIManager.sendAccessibilityEvent(
+      reactTag,
+      UIManager.AccessibilityEventTypes.typeViewFocused,
+    );
+  },
 };
 
 module.exports = AccessibilityInfo;
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
index 8f2b0aa78dc064..5a1d64e9595e83 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -93,8 +93,6 @@ const AccessibilityInfo = {
   /**
    * Set accessibility focus to a react component.
    *
-   * @platform ios
-   *
    * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#setaccessibilityfocus
    */
   setAccessibilityFocus: function(reactTag: number): void {
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
index abe6a75af9478e..62df9c5783ded2 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -103,6 +103,8 @@ const ActivityIndicator = (
         styles.container,
         style,
       )}>
+      {/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+        * found when making Flow check .android.js files. */}
       <RCTActivityIndicator {...nativeProps} />
     </View>
   );
diff --git a/Libraries/Components/AppleTV/TVEventHandler.js b/Libraries/Components/AppleTV/TVEventHandler.js
index 567776b5d9bfa9..9b584de6bec581 100644
--- a/Libraries/Components/AppleTV/TVEventHandler.js
+++ b/Libraries/Components/AppleTV/TVEventHandler.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/AppleTV/TVViewPropTypes.js b/Libraries/Components/AppleTV/TVViewPropTypes.js
index 5bda1f618c5440..ce3651d5f490da 100644
--- a/Libraries/Components/AppleTV/TVViewPropTypes.js
+++ b/Libraries/Components/AppleTV/TVViewPropTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,76 +9,85 @@
  */
 
 'use strict';
-const PropTypes = require('prop-types');
+
+type TVParallaxPropertiesType = $ReadOnly<{|
+  /**
+   * If true, parallax effects are enabled.  Defaults to true.
+   */
+  enabled: boolean,
+
+  /**
+   * Defaults to 2.0.
+   */
+  shiftDistanceX: number,
+
+  /**
+   * Defaults to 2.0.
+   */
+  shiftDistanceY: number,
+
+  /**
+   * Defaults to 0.05.
+   */
+  tiltAngle: number,
+
+  /**
+   * Defaults to 1.0
+   */
+  magnification: number,
+|}>;
 
 /**
  * Additional View properties for Apple TV
  */
-const TVViewPropTypes = {
+export type TVViewProps = $ReadOnly<{|
   /**
-   * When set to true, this view will be focusable
-   * and navigable using the TV remote.
+   * *(Apple TV only)* When set to true, this view will be focusable
+   * and navigable using the Apple TV remote.
+   *
+   * @platform ios
    */
-  isTVSelectable: PropTypes.bool,
+  isTVSelectable?: boolean,
 
   /**
-   * May be set to true to force the TV focus engine to move focus to this view.
+   * *(Apple TV only)* May be set to true to force the Apple TV focus engine to move focus to this view.
+   *
+   * @platform ios
    */
-  hasTVPreferredFocus: PropTypes.bool,
+  hasTVPreferredFocus?: boolean,
 
   /**
    * *(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 ios
    */
-  tvParallaxProperties: PropTypes.object,
+  tvParallaxProperties?: TVParallaxPropertiesType,
 
   /**
    * *(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: PropTypes.number,
+  tvParallaxShiftDistanceX?: number,
 
   /**
    * *(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: PropTypes.number,
+  tvParallaxShiftDistanceY?: number,
 
   /**
    * *(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: PropTypes.number,
+  tvParallaxTiltAngle?: number,
 
   /**
    * *(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: PropTypes.number,
-};
-
-export type TVViewProps = $ReadOnly<{|
-  isTVSelectable?: boolean,
-  hasTVPreferredFocus?: boolean,
-  tvParallaxProperties?: Object,
-  tvParallaxShiftDistanceX?: number,
-  tvParallaxShiftDistanceY?: number,
-  tvParallaxTiltAngle?: number,
   tvParallaxMagnification?: number,
 |}>;
-
-module.exports = TVViewPropTypes;
diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js
index 22c376467ea9bc..93ee79035915f6 100644
--- a/Libraries/Components/Button.js
+++ b/Libraries/Components/Button.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,10 +10,8 @@
 
 'use strict';
 
-const ColorPropType = require('ColorPropType');
 const Platform = require('Platform');
 const React = require('React');
-const PropTypes = require('prop-types');
 const StyleSheet = require('StyleSheet');
 const Text = require('Text');
 const TouchableNativeFeedback = require('TouchableNativeFeedback');
@@ -22,6 +20,45 @@ const View = require('View');
 
 const invariant = require('fbjs/lib/invariant');
 
+import type {PressEvent} from 'CoreEventTypes';
+
+type ButtonProps = $ReadOnly<{|
+  /**
+   * Text to display inside the button
+   */
+  title: string,
+
+  /**
+   * Handler to be called when the user taps the button
+   */
+  onPress: (event?: PressEvent) => mixed,
+
+  /**
+   * Color of the text (iOS), or background color of the button (Android)
+   */
+  color?: ?string,
+
+  /**
+   * TV preferred focus (see documentation for the View component).
+   */
+  hasTVPreferredFocus?: ?boolean,
+
+  /**
+   * Text to display for blindness accessibility features
+   */
+  accessibilityLabel?: ?string,
+
+  /**
+   * If true, disable all interactions for this component.
+   */
+  disabled?: ?boolean,
+
+  /**
+   * Used to locate this view in end-to-end tests.
+   */
+  testID?: ?string,
+|}>;
+
 /**
  * A basic button component that should render nicely on any platform. Supports
  * a minimal level of customization.
@@ -50,46 +87,7 @@ const invariant = require('fbjs/lib/invariant');
  *
  */
 
-class Button extends React.Component<{
-  title: string,
-  onPress: () => any,
-  color?: ?string,
-  hasTVPreferredFocus?: ?boolean,
-  accessibilityLabel?: ?string,
-  disabled?: ?boolean,
-  testID?: ?string,
-}> {
-  static propTypes = {
-    /**
-     * Text to display inside the button
-     */
-    title: PropTypes.string.isRequired,
-    /**
-     * Text to display for blindness accessibility features
-     */
-    accessibilityLabel: PropTypes.string,
-    /**
-     * Color of the text (iOS), or background color of the button (Android)
-     */
-    color: ColorPropType,
-    /**
-     * If true, disable all interactions for this component.
-     */
-    disabled: PropTypes.bool,
-    /**
-     * TV preferred focus (see documentation for the View component).
-     */
-    hasTVPreferredFocus: PropTypes.bool,
-    /**
-     * Handler to be called when the user taps the button
-     */
-    onPress: PropTypes.func.isRequired,
-    /**
-     * Used to locate this view in end-to-end tests.
-     */
-    testID: PropTypes.string,
-  };
-
+class Button extends React.Component<ButtonProps> {
   render() {
     const {
       accessibilityLabel,
@@ -109,11 +107,11 @@ class Button extends React.Component<{
         buttonStyles.push({backgroundColor: color});
       }
     }
-    const accessibilityTraits = ['button'];
+    const accessibilityStates = [];
     if (disabled) {
       buttonStyles.push(styles.buttonDisabled);
       textStyles.push(styles.textDisabled);
-      accessibilityTraits.push('disabled');
+      accessibilityStates.push('disabled');
     }
     invariant(
       typeof title === 'string',
@@ -125,9 +123,9 @@ class Button extends React.Component<{
       Platform.OS === 'android' ? TouchableNativeFeedback : TouchableOpacity;
     return (
       <Touchable
-        accessibilityComponentType="button"
         accessibilityLabel={accessibilityLabel}
-        accessibilityTraits={accessibilityTraits}
+        accessibilityRole="button"
+        accessibilityStates={accessibilityStates}
         hasTVPreferredFocus={hasTVPreferredFocus}
         testID={testID}
         disabled={disabled}
@@ -152,21 +150,21 @@ const styles = StyleSheet.create({
       borderRadius: 2,
     },
   }),
-  text: Platform.select({
-    ios: {
-      // iOS blue from https://developer.apple.com/ios/human-interface-guidelines/visual-design/color/
-      color: '#007AFF',
-      textAlign: 'center',
-      padding: 8,
-      fontSize: 18,
-    },
-    android: {
-      color: 'white',
-      textAlign: 'center',
-      padding: 8,
-      fontWeight: '500',
-    },
-  }),
+  text: {
+    textAlign: 'center',
+    padding: 8,
+    ...Platform.select({
+      ios: {
+        // iOS blue from https://developer.apple.com/ios/human-interface-guidelines/visual-design/color/
+        color: '#007AFF',
+        fontSize: 18,
+      },
+      android: {
+        color: 'white',
+        fontWeight: '500',
+      },
+    }),
+  },
   buttonDisabled: Platform.select({
     ios: {},
     android: {
diff --git a/Libraries/Components/CheckBox/CheckBox.android.js b/Libraries/Components/CheckBox/CheckBox.android.js
index 0c7f13decd8c13..3b0973b8ff994d 100644
--- a/Libraries/Components/CheckBox/CheckBox.android.js
+++ b/Libraries/Components/CheckBox/CheckBox.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,11 +9,11 @@
  */
 'use strict';
 
+const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const PropTypes = require('prop-types');
 const React = require('React');
 const StyleSheet = require('StyleSheet');
-const ViewPropTypes = require('ViewPropTypes');
 
 const createReactClass = require('create-react-class');
 const requireNativeComponent = require('requireNativeComponent');
@@ -83,7 +83,7 @@ type DefaultProps = {
 let CheckBox = createReactClass({
   displayName: 'CheckBox',
   propTypes: {
-    ...ViewPropTypes,
+    ...DeprecatedViewPropTypes,
     /**
      * The value of the checkbox.  If true the checkbox will be turned on.
      * Default value is false.
@@ -131,7 +131,11 @@ let CheckBox = createReactClass({
     let props = {...this.props};
     props.onStartShouldSetResponder = () => true;
     props.onResponderTerminationRequest = () => false;
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     props.enabled = !this.props.disabled;
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     props.on = this.props.value;
     props.style = [styles.rctCheckBox, this.props.style];
 
diff --git a/Libraries/Components/CheckBox/CheckBox.ios.js b/Libraries/Components/CheckBox/CheckBox.ios.js
index 5fda2cd5ec2bce..8bc431d610e066 100644
--- a/Libraries/Components/CheckBox/CheckBox.ios.js
+++ b/Libraries/Components/CheckBox/CheckBox.ios.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 'use strict';
diff --git a/Libraries/Components/Clipboard/Clipboard.js b/Libraries/Components/Clipboard/Clipboard.js
index 706bc0fba8c9b7..d9eddb6cd0548e 100644
--- a/Libraries/Components/Clipboard/Clipboard.js
+++ b/Libraries/Components/Clipboard/Clipboard.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.android.js b/Libraries/Components/DatePicker/DatePickerIOS.android.js
index 585be6e297673d..c532f212d6080b 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.android.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
index 1202364665fc94..8df54ec3169b93 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
index bd91263a8f9b49..734a59abf72cf4 100644
--- a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
+++ b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js
index a158f035c303d3..bb6442b5262c79 100644
--- a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js
+++ b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
index d4b3fa9f7f63d0..b58385ef941911 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,19 +9,20 @@
 
 'use strict';
 
-const ColorPropType = require('ColorPropType');
+const DeprecatedColorPropType = require('DeprecatedColorPropType');
+const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const Platform = require('Platform');
-const React = require('React');
 const PropTypes = require('prop-types');
+const React = require('React');
 const ReactNative = require('ReactNative');
 const StatusBar = require('StatusBar');
 const StyleSheet = require('StyleSheet');
 const UIManager = require('UIManager');
 const View = require('View');
-const ViewPropTypes = require('ViewPropTypes');
 
-const DrawerConsts = UIManager.AndroidDrawerLayout.Constants;
+const DrawerConsts = UIManager.getViewManagerConfig('AndroidDrawerLayout')
+  .Constants;
 
 const createReactClass = require('create-react-class');
 const dismissKeyboard = require('dismissKeyboard');
@@ -70,7 +71,7 @@ const DrawerLayoutAndroid = createReactClass({
   },
 
   propTypes: {
-    ...ViewPropTypes,
+    ...DeprecatedViewPropTypes,
     /**
      * Determines whether the keyboard gets dismissed in response to a drag.
      *   - 'none' (the default), drags do not dismiss the keyboard.
@@ -91,7 +92,7 @@ const DrawerLayoutAndroid = createReactClass({
      * );
      * ```
      */
-    drawerBackgroundColor: ColorPropType,
+    drawerBackgroundColor: DeprecatedColorPropType,
     /**
      * Specifies the side of the screen from which the drawer will slide in.
      */
@@ -146,7 +147,7 @@ const DrawerLayoutAndroid = createReactClass({
      * status bar to allow it to open over the status bar. It will only have an
      * effect on API 21+.
      */
-    statusBarBackgroundColor: ColorPropType,
+    statusBarBackgroundColor: DeprecatedColorPropType,
   },
 
   mixins: [NativeMethodsMixin],
@@ -254,7 +255,7 @@ const DrawerLayoutAndroid = createReactClass({
   openDrawer: function() {
     UIManager.dispatchViewManagerCommand(
       this._getDrawerLayoutHandle(),
-      UIManager.AndroidDrawerLayout.Commands.openDrawer,
+      UIManager.getViewManagerConfig('AndroidDrawerLayout').Commands.openDrawer,
       null,
     );
   },
@@ -265,7 +266,8 @@ const DrawerLayoutAndroid = createReactClass({
   closeDrawer: function() {
     UIManager.dispatchViewManagerCommand(
       this._getDrawerLayoutHandle(),
-      UIManager.AndroidDrawerLayout.Commands.closeDrawer,
+      UIManager.getViewManagerConfig('AndroidDrawerLayout').Commands
+        .closeDrawer,
       null,
     );
   },
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js
index 260d559929796f..7a00b6636cf664 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Keyboard/Keyboard.js b/Libraries/Components/Keyboard/Keyboard.js
index feeb4a4ec2ce70..a2389fe9198c5a 100644
--- a/Libraries/Components/Keyboard/Keyboard.js
+++ b/Libraries/Components/Keyboard/Keyboard.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
index 4973fd4a0a3805..46e5c2e889e883 100644
--- a/Libraries/Components/Keyboard/KeyboardAvoidingView.js
+++ b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.android.js b/Libraries/Components/MaskedView/MaskedViewIOS.android.js
index 49d44e1541dcd5..95d93f156b29cd 100644
--- a/Libraries/Components/MaskedView/MaskedViewIOS.android.js
+++ b/Libraries/Components/MaskedView/MaskedViewIOS.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
index c65822a64b2d30..ce860ac2eeab40 100644
--- a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
+++ b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,27 +8,26 @@
  * @flow
  */
 
-const PropTypes = require('prop-types');
 const React = require('React');
 const StyleSheet = require('StyleSheet');
 const View = require('View');
-const ViewPropTypes = require('ViewPropTypes');
+
 const requireNativeComponent = require('requireNativeComponent');
 
 import type {ViewProps} from 'ViewPropTypes';
 
 const RCTMaskedView = requireNativeComponent('RCTMaskedView');
 
-type Props = {
+type Props = $ReadOnly<{|
   ...ViewProps,
 
-  children: any,
+  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.
@@ -67,11 +66,6 @@ type Props = {
  *
  */
 class MaskedViewIOS extends React.Component<Props> {
-  static propTypes = {
-    ...ViewPropTypes,
-    maskElement: PropTypes.element.isRequired,
-  };
-
   _hasWarnedInvalidRenderMask = false;
 
   render() {
diff --git a/Libraries/Components/Navigation/NavigatorIOS.android.js b/Libraries/Components/Navigation/NavigatorIOS.android.js
deleted file mode 100644
index 260d559929796f..00000000000000
--- a/Libraries/Components/Navigation/NavigatorIOS.android.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 = require('UnimplementedView');
diff --git a/Libraries/Components/Navigation/NavigatorIOS.ios.js b/Libraries/Components/Navigation/NavigatorIOS.ios.js
deleted file mode 100644
index 8f28d79147fe77..00000000000000
--- a/Libraries/Components/Navigation/NavigatorIOS.ios.js
+++ /dev/null
@@ -1,932 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 EventEmitter = require('EventEmitter');
-const Image = require('Image');
-const RCTNavigatorManager = require('NativeModules').NavigatorManager;
-const React = require('React');
-const PropTypes = require('prop-types');
-const ReactNative = require('ReactNative');
-const StaticContainer = require('StaticContainer.react');
-const StyleSheet = require('StyleSheet');
-const TVEventHandler = require('TVEventHandler');
-const View = require('View');
-const ViewPropTypes = require('ViewPropTypes');
-
-const createReactClass = require('create-react-class');
-const invariant = require('fbjs/lib/invariant');
-const requireNativeComponent = require('requireNativeComponent');
-
-/* $FlowFixMe(>=0.54.0 site=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. */
-const keyMirror = require('fbjs/lib/keyMirror');
-
-const TRANSITIONER_REF = 'transitionerRef';
-
-let __uid = 0;
-function getuid() {
-  return __uid++;
-}
-
-class NavigatorTransitionerIOS extends React.Component<$FlowFixMeProps> {
-  requestSchedulingNavigation(cb) {
-    RCTNavigatorManager.requestSchedulingJavaScriptNavigation(
-      ReactNative.findNodeHandle(this),
-      cb,
-    );
-  }
-
-  render() {
-    return <RCTNavigator {...this.props} />;
-  }
-}
-
-const SystemIconLabels = {
-  done: true,
-  cancel: true,
-  edit: true,
-  save: true,
-  add: true,
-  compose: true,
-  reply: true,
-  action: true,
-  organize: true,
-  bookmarks: true,
-  search: true,
-  refresh: true,
-  stop: true,
-  camera: true,
-  trash: true,
-  play: true,
-  pause: true,
-  rewind: true,
-  'fast-forward': true,
-  undo: true,
-  redo: true,
-  'page-curl': true,
-};
-const SystemIcons = keyMirror(SystemIconLabels);
-
-type SystemButtonType = $Enum<typeof SystemIconLabels>;
-
-type Route = {
-  component: Function,
-  title: string,
-  titleImage?: Object,
-  passProps?: Object,
-  backButtonTitle?: string,
-  backButtonIcon?: Object,
-  leftButtonTitle?: string,
-  leftButtonIcon?: Object,
-  leftButtonSystemIcon?: SystemButtonType,
-  onLeftButtonPress?: Function,
-  rightButtonTitle?: string,
-  rightButtonIcon?: Object,
-  rightButtonSystemIcon?: SystemButtonType,
-  onRightButtonPress?: Function,
-  wrapperStyle?: any,
-};
-
-type State = {
-  idStack: Array<number>,
-  routeStack: Array<Route>,
-  requestedTopOfStack: number,
-  observedTopOfStack: number,
-  progress: number,
-  fromIndex: number,
-  toIndex: number,
-  makingNavigatorRequest: boolean,
-  updatingAllIndicesAtOrBeyond: ?number,
-};
-
-type Event = Object;
-
-/**
- * Think of `<NavigatorIOS>` as simply a component that renders an
- * `RCTNavigator`, and moves the `RCTNavigator`'s `requestedTopOfStack` pointer
- * forward and backward. The `RCTNavigator` interprets changes in
- * `requestedTopOfStack` to be pushes and pops of children that are rendered.
- * `<NavigatorIOS>` always ensures that whenever the `requestedTopOfStack`
- * pointer is moved, that we've also rendered enough children so that the
- * `RCTNavigator` can carry out the push/pop with those children.
- * `<NavigatorIOS>` also removes children that will no longer be needed
- * (after the pop of a child has been fully completed/animated out).
- */
-
-/**
- * `NavigatorIOS` is a wrapper around
- * [`UINavigationController`](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UINavigationController_Class/),
- * enabling you to implement a navigation stack. It works exactly the same as it
- * would on a native app using `UINavigationController`, providing the same
- * animations and behavior from UIKit.
- *
- * As the name implies, it is only available on iOS. Take a look at
- * [`React Navigation`](https://reactnavigation.org/) for a cross-platform
- * solution in JavaScript, or check out either of these components for native
- * solutions: [native-navigation](http://airbnb.io/native-navigation/),
- * [react-native-navigation](https://github.com/wix/react-native-navigation).
- *
- * To set up the navigator, provide the `initialRoute` prop with a route
- * object. A route object is used to describe each scene that your app
- * navigates to. `initialRoute` represents the first route in your navigator.
- *
- * ```
- * import PropTypes from 'prop-types';
- * import React, { Component } from 'react';
- * import { NavigatorIOS, Text } from 'react-native';
- *
- * export default class NavigatorIOSApp extends Component {
- *   render() {
- *     return (
- *       <NavigatorIOS
- *         initialRoute={{
- *           component: MyScene,
- *           title: 'My Initial Scene',
- *         }}
- *         style={{flex: 1}}
- *       />
- *     );
- *   }
- * }
- *
- * class MyScene extends Component {
- *   static propTypes = {
- *     title: PropTypes.string.isRequired,
- *     navigator: PropTypes.object.isRequired,
- *   }
- *
- *   _onForward = () => {
- *     this.props.navigator.push({
- *       title: 'Scene ' + nextIndex,
- *     });
- *   }
- *
- *   render() {
- *     return (
- *       <View>
- *         <Text>Current Scene: { this.props.title }</Text>
- *         <TouchableHighlight onPress={this._onForward}>
- *           <Text>Tap me to load the next scene</Text>
- *         </TouchableHighlight>
- *       </View>
- *     )
- *   }
- * }
- * ```
- *
- * In this code, the navigator renders the component specified in initialRoute,
- * which in this case is `MyScene`. This component will receive a `route` prop
- * and a `navigator` prop representing the navigator. The navigator's navigation
- * bar will render the title for the current scene, "My Initial Scene".
- *
- * You can optionally pass in a `passProps` property to your `initialRoute`.
- * `NavigatorIOS` passes this in as props to the rendered component:
- *
- * ```
- * initialRoute={{
- *   component: MyScene,
- *   title: 'My Initial Scene',
- *   passProps: { myProp: 'foo' }
- * }}
- * ```
- *
- * You can then access the props passed in via `{this.props.myProp}`.
- *
- * #### Handling Navigation
- *
- * To trigger navigation functionality such as pushing or popping a view, you
- * have access to a `navigator` object. The object is passed in as a prop to any
- * component that is rendered by `NavigatorIOS`. You can then call the
- * relevant methods to perform the navigation action you need:
- *
- * ```
- * class MyView extends Component {
- *   _handleBackPress() {
- *     this.props.navigator.pop();
- *   }
- *
- *   _handleNextPress(nextRoute) {
- *     this.props.navigator.push(nextRoute);
- *   }
- *
- *   render() {
- *     const nextRoute = {
- *       component: MyView,
- *       title: 'Bar That',
- *       passProps: { myProp: 'bar' }
- *     };
- *     return(
- *       <TouchableHighlight onPress={() => this._handleNextPress(nextRoute)}>
- *         <Text style={{marginTop: 200, alignSelf: 'center'}}>
- *           See you on the other nav {this.props.myProp}!
- *         </Text>
- *       </TouchableHighlight>
- *     );
- *   }
- * }
- * ```
- *
- * You can also trigger navigator functionality from the `NavigatorIOS`
- * component:
- *
- * ```
- * class NavvyIOS extends Component {
- *   _handleNavigationRequest() {
- *     this.refs.nav.push({
- *       component: MyView,
- *       title: 'Genius',
- *       passProps: { myProp: 'genius' },
- *     });
- *   }
- *
- *   render() {
- *     return (
- *       <NavigatorIOS
- *         ref='nav'
- *         initialRoute={{
- *           component: MyView,
- *           title: 'Foo This',
- *           passProps: { myProp: 'foo' },
- *           rightButtonTitle: 'Add',
- *           onRightButtonPress: () => this._handleNavigationRequest(),
- *         }}
- *         style={{flex: 1}}
- *       />
- *     );
- *   }
- * }
- * ```
- *
- * The code above adds a `_handleNavigationRequest` private method that is
- * invoked from the `NavigatorIOS` component when the right navigation bar item
- * is pressed. To get access to the navigator functionality, a reference to it
- * is saved in the `ref` prop and later referenced to push a new scene into the
- * navigation stack.
- *
- * #### Navigation Bar Configuration
- *
- * Props passed to `NavigatorIOS` will set the default configuration
- * for the navigation bar. Props passed as properties to a route object will set
- * the configuration for that route's navigation bar, overriding any props
- * passed to the `NavigatorIOS` component.
- *
- * ```
- * _handleNavigationRequest() {
- *   this.refs.nav.push({
- *     //...
- *     passProps: { myProp: 'genius' },
- *     barTintColor: '#996699',
- *   });
- * }
- *
- * render() {
- *   return (
- *     <NavigatorIOS
- *       //...
- *       style={{flex: 1}}
- *       barTintColor='#ffffcc'
- *     />
- *   );
- * }
- * ```
- *
- * In the example above the navigation bar color is changed when the new route
- * is pushed.
- *
- */
-const NavigatorIOS = createReactClass({
-  displayName: 'NavigatorIOS',
-
-  propTypes: {
-    /**
-     * NavigatorIOS uses `route` objects to identify child views, their props,
-     * and navigation bar configuration. Navigation operations such as push
-     * operations expect routes to look like this the `initialRoute`.
-     */
-    initialRoute: PropTypes.shape({
-      /**
-       * The React Class to render for this route
-       */
-      component: PropTypes.func.isRequired,
-
-      /**
-       * The title displayed in the navigation bar and the back button for this
-       * route.
-       */
-      title: PropTypes.string.isRequired,
-
-      /**
-       * If set, a title image will appear instead of the text title.
-       */
-      titleImage: Image.propTypes.source,
-
-      /**
-       * Use this to specify additional props to pass to the rendered
-       * component. `NavigatorIOS` will automatically pass in `route` and
-       * `navigator` props to the component.
-       */
-      passProps: PropTypes.object,
-
-      /**
-       * If set, the left navigation button image will be displayed using this
-       * source. Note that this doesn't apply to the header of the current
-       * view, but to those views that are subsequently pushed.
-       */
-      backButtonIcon: Image.propTypes.source,
-
-      /**
-       * If set, the left navigation button text will be set to this. Note that
-       * this doesn't apply to the left button of the current view, but to
-       * those views that are subsequently pushed
-       */
-      backButtonTitle: PropTypes.string,
-
-      /**
-       * If set, the left navigation button image will be displayed using
-       * this source.
-       */
-      leftButtonIcon: Image.propTypes.source,
-
-      /**
-       * If set, the left navigation button will display this text.
-       */
-      leftButtonTitle: PropTypes.string,
-
-      /**
-       * If set, the left header button will appear with this system icon
-       *
-       * Supported icons are `done`, `cancel`, `edit`, `save`, `add`,
-       * `compose`, `reply`, `action`, `organize`, `bookmarks`, `search`,
-       * `refresh`, `stop`, `camera`, `trash`, `play`, `pause`, `rewind`,
-       * `fast-forward`, `undo`, `redo`, and `page-curl`
-       */
-      leftButtonSystemIcon: PropTypes.oneOf(Object.keys(SystemIcons)),
-
-      /**
-       * This function will be invoked when the left navigation bar item is
-       * pressed.
-       */
-      onLeftButtonPress: PropTypes.func,
-
-      /**
-       * If set, the right navigation button image will be displayed using
-       * this source.
-       */
-      rightButtonIcon: Image.propTypes.source,
-
-      /**
-       * If set, the right navigation button will display this text.
-       */
-      rightButtonTitle: PropTypes.string,
-
-      /**
-       * If set, the right header button will appear with this system icon
-       *
-       * See leftButtonSystemIcon for supported icons
-       */
-      rightButtonSystemIcon: PropTypes.oneOf(Object.keys(SystemIcons)),
-
-      /**
-       * This function will be invoked when the right navigation bar item is
-       * pressed.
-       */
-      onRightButtonPress: PropTypes.func,
-
-      /**
-       * Styles for the navigation item containing the component.
-       */
-      wrapperStyle: ViewPropTypes.style,
-
-      /**
-       * Boolean value that indicates whether the navigation bar is hidden.
-       */
-      navigationBarHidden: PropTypes.bool,
-
-      /**
-       * Boolean value that indicates whether to hide the 1px hairline
-       * shadow.
-       */
-      shadowHidden: PropTypes.bool,
-
-      /**
-       * The color used for the buttons in the navigation bar.
-       */
-      tintColor: PropTypes.string,
-
-      /**
-       * The background color of the navigation bar.
-       */
-      barTintColor: PropTypes.string,
-
-      /**
-       * The style of the navigation bar. Supported values are 'default', 'black'.
-       * Use 'black' instead of setting `barTintColor` to black. This produces
-       * a navigation bar with the native iOS style with higher translucency.
-       */
-      barStyle: PropTypes.oneOf(['default', 'black']),
-
-      /**
-       * The text color of the navigation bar title.
-       */
-      titleTextColor: PropTypes.string,
-
-      /**
-       * Boolean value that indicates whether the navigation bar is
-       * translucent.
-       */
-      translucent: PropTypes.bool,
-    }).isRequired,
-
-    /**
-     * Boolean value that indicates whether the navigation bar is hidden
-     * by default.
-     */
-    navigationBarHidden: PropTypes.bool,
-
-    /**
-     * Boolean value that indicates whether to hide the 1px hairline shadow
-     * by default.
-     */
-    shadowHidden: PropTypes.bool,
-
-    /**
-     * The default wrapper style for components in the navigator.
-     * A common use case is to set the `backgroundColor` for every scene.
-     */
-    itemWrapperStyle: ViewPropTypes.style,
-
-    /**
-     * The default color used for the buttons in the navigation bar.
-     */
-    tintColor: PropTypes.string,
-
-    /**
-     * The default background color of the navigation bar.
-     */
-    barTintColor: PropTypes.string,
-
-    /**
-     * The style of the navigation bar. Supported values are 'default', 'black'.
-     * Use 'black' instead of setting `barTintColor` to black. This produces
-     * a navigation bar with the native iOS style with higher translucency.
-     */
-    barStyle: PropTypes.oneOf(['default', 'black']),
-
-    /**
-     * The default text color of the navigation bar title.
-     */
-    titleTextColor: PropTypes.string,
-
-    /**
-     * Boolean value that indicates whether the navigation bar is
-     * translucent by default
-     */
-    translucent: PropTypes.bool,
-
-    /**
-     * Boolean value that indicates whether the interactive pop gesture is
-     * enabled. This is useful for enabling/disabling the back swipe navigation
-     * gesture.
-     *
-     * If this prop is not provided, the default behavior is for the back swipe
-     * gesture to be enabled when the navigation bar is shown and disabled when
-     * the navigation bar is hidden. Once you've provided the
-     * `interactivePopGestureEnabled` prop, you can never restore the default
-     * behavior.
-     */
-    interactivePopGestureEnabled: PropTypes.bool,
-  },
-
-  navigator: (undefined: ?Object),
-
-  UNSAFE_componentWillMount: function() {
-    // Precompute a pack of callbacks that's frequently generated and passed to
-    // instances.
-    this.navigator = {
-      push: this.push,
-      pop: this.pop,
-      popN: this.popN,
-      replace: this.replace,
-      replaceAtIndex: this.replaceAtIndex,
-      replacePrevious: this.replacePrevious,
-      replacePreviousAndPop: this.replacePreviousAndPop,
-      resetTo: this.resetTo,
-      popToRoute: this.popToRoute,
-      popToTop: this.popToTop,
-    };
-  },
-
-  componentDidMount: function() {
-    this._enableTVEventHandler();
-  },
-
-  componentWillUnmount: function() {
-    this._disableTVEventHandler();
-  },
-
-  getDefaultProps: function(): Object {
-    return {
-      translucent: true,
-    };
-  },
-
-  getInitialState: function(): State {
-    return {
-      idStack: [getuid()],
-      routeStack: [this.props.initialRoute],
-      // The navigation index that we wish to push/pop to.
-      requestedTopOfStack: 0,
-      // The last index that native has sent confirmation of completed push/pop
-      // for. At this point, we can discard any views that are beyond the
-      // `requestedTopOfStack`. A value of `null` means we have not received
-      // any confirmation, ever. We may receive an `observedTopOfStack` without
-      // ever requesting it - native can instigate pops of its own with the
-      // backswipe gesture.
-      observedTopOfStack: 0,
-      progress: 1,
-      fromIndex: 0,
-      toIndex: 0,
-      // Whether or not we are making a navigator request to push/pop. (Used
-      // for performance optimization).
-      makingNavigatorRequest: false,
-      // Whether or not we are updating children of navigator and if so (not
-      // `null`) which index marks the beginning of all updates. Used for
-      // performance optimization.
-      updatingAllIndicesAtOrBeyond: 0,
-    };
-  },
-
-  _toFocusOnNavigationComplete: (undefined: any),
-
-  _handleFocusRequest: function(item: any) {
-    if (this.state.makingNavigatorRequest) {
-      this._toFocusOnNavigationComplete = item;
-    } else {
-      this._getFocusEmitter().emit('focus', item);
-    }
-  },
-
-  _focusEmitter: (undefined: ?EventEmitter),
-
-  _getFocusEmitter: function(): EventEmitter {
-    // Flow not yet tracking assignments to instance fields.
-    let focusEmitter = this._focusEmitter;
-    if (!focusEmitter) {
-      focusEmitter = new EventEmitter();
-      this._focusEmitter = focusEmitter;
-    }
-    return focusEmitter;
-  },
-
-  getChildContext: function(): {
-    onFocusRequested: Function,
-    focusEmitter: EventEmitter,
-  } {
-    return {
-      onFocusRequested: this._handleFocusRequest,
-      focusEmitter: this._getFocusEmitter(),
-    };
-  },
-
-  childContextTypes: {
-    onFocusRequested: PropTypes.func,
-    focusEmitter: PropTypes.instanceOf(EventEmitter),
-  },
-
-  _tryLockNavigator: function(cb: () => void) {
-    this.refs[TRANSITIONER_REF].requestSchedulingNavigation(
-      acquiredLock => acquiredLock && cb(),
-    );
-  },
-
-  _handleNavigatorStackChanged: function(e: Event) {
-    const newObservedTopOfStack = e.nativeEvent.stackLength - 1;
-
-    invariant(
-      newObservedTopOfStack <= this.state.requestedTopOfStack,
-      'No navigator item should be pushed without JS knowing about it %s %s',
-      newObservedTopOfStack,
-      this.state.requestedTopOfStack,
-    );
-    const wasWaitingForConfirmation =
-      this.state.requestedTopOfStack !== this.state.observedTopOfStack;
-    if (wasWaitingForConfirmation) {
-      invariant(
-        newObservedTopOfStack === this.state.requestedTopOfStack,
-        'If waiting for observedTopOfStack to reach requestedTopOfStack, ' +
-          'the only valid observedTopOfStack should be requestedTopOfStack.',
-      );
-    }
-    // Mark the most recent observation regardless of if we can lock the
-    // navigator. `observedTopOfStack` merely represents what we've observed
-    // and this first `setState` is only executed to update debugging
-    // overlays/navigation bar.
-    // Also reset progress, toIndex, and fromIndex as they might not end
-    // in the correct states for a two possible reasons:
-    // Progress isn't always 0 or 1 at the end, the system rounds
-    // If the Navigator is offscreen these values won't be updated
-    // TOOD: Revisit this decision when no longer relying on native navigator.
-    const nextState = {
-      observedTopOfStack: newObservedTopOfStack,
-      makingNavigatorRequest: false,
-      updatingAllIndicesAtOrBeyond: null,
-      progress: 1,
-      toIndex: newObservedTopOfStack,
-      fromIndex: newObservedTopOfStack,
-    };
-    this.setState(nextState, this._eliminateUnneededChildren);
-  },
-
-  _eliminateUnneededChildren: function() {
-    // Updating the indices that we're deleting and that's all. (Truth: Nothing
-    // even uses the indices in this case, but let's make this describe the
-    // truth anyways).
-    const updatingAllIndicesAtOrBeyond =
-      this.state.routeStack.length > this.state.observedTopOfStack + 1
-        ? this.state.observedTopOfStack + 1
-        : null;
-    this.setState({
-      idStack: this.state.idStack.slice(0, this.state.observedTopOfStack + 1),
-      routeStack: this.state.routeStack.slice(
-        0,
-        this.state.observedTopOfStack + 1,
-      ),
-      // Now we rerequest the top of stack that we observed.
-      requestedTopOfStack: this.state.observedTopOfStack,
-      makingNavigatorRequest: true,
-      updatingAllIndicesAtOrBeyond: updatingAllIndicesAtOrBeyond,
-    });
-  },
-
-  /**
-   * Navigate forward to a new route.
-   * @param route The new route to navigate to.
-   */
-  push: function(route: Route) {
-    invariant(!!route, 'Must supply route to push');
-    // Make sure all previous requests are caught up first. Otherwise reject.
-    if (this.state.requestedTopOfStack === this.state.observedTopOfStack) {
-      this._tryLockNavigator(() => {
-        const nextStack = this.state.routeStack.concat([route]);
-        const nextIDStack = this.state.idStack.concat([getuid()]);
-        this.setState({
-          // We have to make sure that we've also supplied enough views to
-          // satisfy our request to adjust the `requestedTopOfStack`.
-          idStack: nextIDStack,
-          routeStack: nextStack,
-          requestedTopOfStack: nextStack.length - 1,
-          makingNavigatorRequest: true,
-          updatingAllIndicesAtOrBeyond: nextStack.length - 1,
-        });
-      });
-    }
-  },
-
-  /**
-   * Go back N scenes at once. When N=1, behavior matches `pop()`.
-   * @param n The number of scenes to pop.
-   */
-  popN: function(n: number) {
-    if (n === 0) {
-      return;
-    }
-    // Make sure all previous requests are caught up first. Otherwise reject.
-    if (this.state.requestedTopOfStack === this.state.observedTopOfStack) {
-      if (this.state.requestedTopOfStack > 0) {
-        this._tryLockNavigator(() => {
-          const newRequestedTopOfStack = this.state.requestedTopOfStack - n;
-          invariant(newRequestedTopOfStack >= 0, 'Cannot pop below 0');
-          this.setState({
-            requestedTopOfStack: newRequestedTopOfStack,
-            makingNavigatorRequest: true,
-            updatingAllIndicesAtOrBeyond: this.state.requestedTopOfStack - n,
-          });
-        });
-      }
-    }
-  },
-
-  /**
-   * Pop back to the previous scene.
-   */
-  pop: function() {
-    this.popN(1);
-  },
-
-  /**
-   * Replace a route in the navigation stack.
-   *
-   * @param route The new route that will replace the specified one.
-   * @param index The route into the stack that should be replaced.
-   *    If it is negative, it counts from the back of the stack.
-   */
-  replaceAtIndex: function(route: Route, index: number) {
-    invariant(!!route, 'Must supply route to replace');
-    if (index < 0) {
-      index += this.state.routeStack.length;
-    }
-
-    if (this.state.routeStack.length <= index) {
-      return;
-    }
-
-    // I don't believe we need to lock for a replace since there's no
-    // navigation actually happening
-    const nextIDStack = this.state.idStack.slice();
-    const nextRouteStack = this.state.routeStack.slice();
-    nextIDStack[index] = getuid();
-    nextRouteStack[index] = route;
-
-    this.setState({
-      idStack: nextIDStack,
-      routeStack: nextRouteStack,
-      makingNavigatorRequest: false,
-      updatingAllIndicesAtOrBeyond: index,
-    });
-  },
-
-  /**
-   * Replace the route for the current scene and immediately
-   * load the view for the new route.
-   * @param route The new route to navigate to.
-   */
-  replace: function(route: Route) {
-    this.replaceAtIndex(route, -1);
-  },
-
-  /**
-   * Replace the route/view for the previous scene.
-   * @param route The new route to will replace the previous scene.
-   */
-  replacePrevious: function(route: Route) {
-    this.replaceAtIndex(route, -2);
-  },
-
-  /**
-   * Go back to the topmost item in the navigation stack.
-   */
-  popToTop: function() {
-    this.popToRoute(this.state.routeStack[0]);
-  },
-
-  /**
-   * Go back to the item for a particular route object.
-   * @param route The new route to navigate to.
-   */
-  popToRoute: function(route: Route) {
-    const indexOfRoute = this.state.routeStack.indexOf(route);
-    invariant(
-      indexOfRoute !== -1,
-      "Calling pop to route for a route that doesn't exist!",
-    );
-    const numToPop = this.state.routeStack.length - indexOfRoute - 1;
-    this.popN(numToPop);
-  },
-
-  /**
-   * Replaces the previous route/view and transitions back to it.
-   * @param route The new route that replaces the previous scene.
-   */
-  replacePreviousAndPop: function(route: Route) {
-    // Make sure all previous requests are caught up first. Otherwise reject.
-    if (this.state.requestedTopOfStack !== this.state.observedTopOfStack) {
-      return;
-    }
-    if (this.state.routeStack.length < 2) {
-      return;
-    }
-    this._tryLockNavigator(() => {
-      this.replacePrevious(route);
-      this.setState({
-        requestedTopOfStack: this.state.requestedTopOfStack - 1,
-        makingNavigatorRequest: true,
-      });
-    });
-  },
-
-  /**
-   * Replaces the top item and pop to it.
-   * @param route The new route that will replace the topmost item.
-   */
-  resetTo: function(route: Route) {
-    invariant(!!route, 'Must supply route to push');
-    // Make sure all previous requests are caught up first. Otherwise reject.
-    if (this.state.requestedTopOfStack !== this.state.observedTopOfStack) {
-      return;
-    }
-    this.replaceAtIndex(route, 0);
-    this.popToRoute(route);
-  },
-
-  _handleNavigationComplete: function(e: Event) {
-    // Don't propagate to other NavigatorIOS instances this is nested in:
-    e.stopPropagation();
-
-    if (this._toFocusOnNavigationComplete) {
-      this._getFocusEmitter().emit('focus', this._toFocusOnNavigationComplete);
-      this._toFocusOnNavigationComplete = null;
-    }
-    this._handleNavigatorStackChanged(e);
-  },
-
-  _routeToStackItem: function(routeArg: Route, i: number) {
-    const {component, wrapperStyle, passProps, ...route} = routeArg;
-    const {itemWrapperStyle, ...props} = this.props;
-    const shouldUpdateChild =
-      this.state.updatingAllIndicesAtOrBeyond != null &&
-      this.state.updatingAllIndicesAtOrBeyond >= i;
-    const Component = component;
-    return (
-      <StaticContainer key={'nav' + i} shouldUpdate={shouldUpdateChild}>
-        <RCTNavigatorItem
-          {...props}
-          {...route}
-          style={[styles.stackItem, itemWrapperStyle, wrapperStyle]}>
-          <Component navigator={this.navigator} route={route} {...passProps} />
-        </RCTNavigatorItem>
-      </StaticContainer>
-    );
-  },
-
-  _renderNavigationStackItems: function() {
-    const shouldRecurseToNavigator =
-      this.state.makingNavigatorRequest ||
-      this.state.updatingAllIndicesAtOrBeyond !== null;
-    // If not recursing update to navigator at all, may as well avoid
-    // computation of navigator children.
-    const items = shouldRecurseToNavigator
-      ? this.state.routeStack.map(this._routeToStackItem)
-      : null;
-    return (
-      <StaticContainer shouldUpdate={shouldRecurseToNavigator}>
-        <NavigatorTransitionerIOS
-          ref={TRANSITIONER_REF}
-          style={styles.transitioner}
-          // $FlowFixMe(>=0.41.0)
-          vertical={this.props.vertical}
-          requestedTopOfStack={this.state.requestedTopOfStack}
-          onNavigationComplete={this._handleNavigationComplete}
-          interactivePopGestureEnabled={
-            this.props.interactivePopGestureEnabled
-          }>
-          {items}
-        </NavigatorTransitionerIOS>
-      </StaticContainer>
-    );
-  },
-
-  _tvEventHandler: (undefined: ?TVEventHandler),
-
-  _enableTVEventHandler: function() {
-    this._tvEventHandler = new TVEventHandler();
-    this._tvEventHandler.enable(this, function(cmp, evt) {
-      if (evt && evt.eventType === 'menu') {
-        cmp.pop();
-      }
-    });
-  },
-
-  _disableTVEventHandler: function() {
-    if (this._tvEventHandler) {
-      this._tvEventHandler.disable();
-      delete this._tvEventHandler;
-    }
-  },
-
-  render: function() {
-    return (
-      // $FlowFixMe(>=0.41.0)
-      <View style={this.props.style}>{this._renderNavigationStackItems()}</View>
-    );
-  },
-});
-
-const styles = StyleSheet.create({
-  stackItem: {
-    backgroundColor: 'white',
-    overflow: 'hidden',
-    position: 'absolute',
-    top: 0,
-    left: 0,
-    right: 0,
-    bottom: 0,
-  },
-  transitioner: {
-    flex: 1,
-  },
-});
-
-const RCTNavigator = requireNativeComponent('RCTNavigator');
-const RCTNavigatorItem = requireNativeComponent('RCTNavItem');
-
-module.exports = NavigatorIOS;
diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js
index 1e3e96579e21cb..88a70a59f6d05f 100644
--- a/Libraries/Components/Picker/Picker.js
+++ b/Libraries/Components/Picker/Picker.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,64 +10,103 @@
 
 'use strict';
 
-const ColorPropType = require('ColorPropType');
-const PickerIOS = require('PickerIOS');
 const PickerAndroid = require('PickerAndroid');
+const PickerIOS = require('PickerIOS');
 const Platform = require('Platform');
 const React = require('React');
-const PropTypes = require('prop-types');
-const StyleSheetPropType = require('StyleSheetPropType');
-const TextStylePropTypes = require('TextStylePropTypes');
 const UnimplementedView = require('UnimplementedView');
-const ViewPropTypes = require('ViewPropTypes');
-const ViewStylePropTypes = require('ViewStylePropTypes');
-
-const itemStylePropType = StyleSheetPropType(TextStylePropTypes);
 
-const pickerStyleType = StyleSheetPropType({
-  ...ViewStylePropTypes,
-  color: ColorPropType,
-});
+import type {TextStyleProp} from 'StyleSheet';
+import type {ColorValue} from 'StyleSheetTypes';
 
 const MODE_DIALOG = 'dialog';
 const MODE_DROPDOWN = 'dropdown';
 
-/**
- * Individual selectable item in a Picker.
- */
-class PickerItem extends React.Component<{
+type PickerItemProps = $ReadOnly<{|
+  /**
+   * Text to display for this item.
+   */
   label: string,
+
+  /**
+   * The value to be passed to picker's `onValueChange` callback when
+   * this item is selected. Can be a string or an integer.
+   */
   value?: any,
-  color?: ColorPropType,
+
+  /**
+   * Color of this item's text.
+   * @platform android
+   */
+  color?: ColorValue,
+
+  /**
+   * Used to locate the item in end-to-end tests.
+   */
   testID?: string,
-}> {
-  static propTypes = {
-    /**
-     * Text to display for this item.
-     */
-    label: PropTypes.string.isRequired,
-    /**
-     * The value to be passed to picker's `onValueChange` callback when
-     * this item is selected. Can be a string or an integer.
-     */
-    value: PropTypes.any,
-    /**
-     * Color of this item's text.
-     * @platform android
-     */
-    color: ColorPropType,
-    /**
-     * Used to locate the item in end-to-end tests.
-     */
-    testID: PropTypes.string,
-  };
+|}>;
 
+/**
+ * Individual selectable item in a Picker.
+ */
+class PickerItem extends React.Component<PickerItemProps> {
   render() {
     // The items are not rendered directly
     throw null;
   }
 }
 
+type PickerProps = $ReadOnly<{|
+  children?: React.Node,
+  style?: ?TextStyleProp,
+
+  /**
+   * Value matching value of one of the items. Can be a string or an integer.
+   */
+  selectedValue?: any,
+
+  /**
+   * Callback for when an item is selected. This is called with the following parameters:
+   *   - `itemValue`: the `value` prop of the item that was selected
+   *   - `itemPosition`: the index of the selected item in this picker
+   */
+  onValueChange?: ?(newValue: any, newIndex: number) => mixed,
+
+  /**
+   * If set to false, the picker will be disabled, i.e. the user will not be able to make a
+   * selection.
+   * @platform android
+   */
+  enabled?: ?boolean,
+
+  /**
+   * On Android, specifies how to display the selection items when the user taps on the picker:
+   *
+   *   - 'dialog': Show a modal dialog. This is the default.
+   *   - 'dropdown': Shows a dropdown anchored to the picker view
+   *
+   * @platform android
+   */
+  mode?: ?('dialog' | 'dropdown'),
+
+  /**
+   * Style to apply to each of the item labels.
+   * @platform ios
+   */
+  itemStyle?: ?TextStyleProp,
+
+  /**
+   * Prompt string for this picker, used on Android in dialog mode as the title of the dialog.
+   * @platform android
+   */
+  prompt?: ?string,
+
+  /**
+   * Used to locate this view in end-to-end tests.
+   */
+  testID?: ?string,
+|}>;
+
 /**
  * Renders the native picker component on iOS and Android. Example:
  *
@@ -78,16 +117,7 @@ class PickerItem extends React.Component<{
  *       <Picker.Item label="JavaScript" value="js" />
  *     </Picker>
  */
-class Picker extends React.Component<{
-  style?: $FlowFixMe,
-  selectedValue?: any,
-  onValueChange?: Function,
-  enabled?: boolean,
-  mode?: 'dialog' | 'dropdown',
-  itemStyle?: $FlowFixMe,
-  prompt?: string,
-  testID?: string,
-}> {
+class Picker extends React.Component<PickerProps> {
   /**
    * On Android, display the options in a dialog.
    */
@@ -104,58 +134,15 @@ class Picker extends React.Component<{
     mode: MODE_DIALOG,
   };
 
-  // $FlowFixMe(>=0.41.0)
-  static propTypes = {
-    ...ViewPropTypes,
-    style: pickerStyleType,
-    /**
-     * Value matching value of one of the items. Can be a string or an integer.
-     */
-    selectedValue: PropTypes.any,
-    /**
-     * Callback for when an item is selected. This is called with the following parameters:
-     *   - `itemValue`: the `value` prop of the item that was selected
-     *   - `itemPosition`: the index of the selected item in this picker
-     */
-    onValueChange: PropTypes.func,
-    /**
-     * If set to false, the picker will be disabled, i.e. the user will not be able to make a
-     * selection.
-     * @platform android
-     */
-    enabled: PropTypes.bool,
-    /**
-     * On Android, specifies how to display the selection items when the user taps on the picker:
-     *
-     *   - 'dialog': Show a modal dialog. This is the default.
-     *   - 'dropdown': Shows a dropdown anchored to the picker view
-     *
-     * @platform android
-     */
-    mode: PropTypes.oneOf(['dialog', 'dropdown']),
-    /**
-     * Style to apply to each of the item labels.
-     * @platform ios
-     */
-    itemStyle: itemStylePropType,
-    /**
-     * Prompt string for this picker, used on Android in dialog mode as the title of the dialog.
-     * @platform android
-     */
-    prompt: PropTypes.string,
-    /**
-     * Used to locate this view in end-to-end tests.
-     */
-    testID: PropTypes.string,
-  };
-
   render() {
     if (Platform.OS === 'ios') {
-      // $FlowFixMe found when converting React.createClass to ES6
+      /* $FlowFixMe(>=0.81.0 site=react_native_ios_fb) This suppression was
+       * added when renaming suppression sites. */
       return <PickerIOS {...this.props}>{this.props.children}</PickerIOS>;
     } else if (Platform.OS === 'android') {
       return (
-        // $FlowFixMe found when converting React.createClass to ES6
+        /* $FlowFixMe(>=0.81.0 site=react_native_android_fb) This suppression
+         * was added when renaming suppression sites. */
         <PickerAndroid {...this.props}>{this.props.children}</PickerAndroid>
       );
     } else {
diff --git a/Libraries/Components/Picker/PickerAndroid.android.js b/Libraries/Components/Picker/PickerAndroid.android.js
index 1f80aa3928d05c..2fb010506853e0 100644
--- a/Libraries/Components/Picker/PickerAndroid.android.js
+++ b/Libraries/Components/Picker/PickerAndroid.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,13 +10,8 @@
 
 'use strict';
 
-const ColorPropType = require('ColorPropType');
 const React = require('React');
-const ReactPropTypes = require('prop-types');
 const StyleSheet = require('StyleSheet');
-const StyleSheetPropType = require('StyleSheetPropType');
-const ViewPropTypes = require('ViewPropTypes');
-const ViewStylePropTypes = require('ViewStylePropTypes');
 
 const processColor = require('processColor');
 const requireNativeComponent = require('requireNativeComponent');
@@ -27,39 +22,32 @@ const DialogPicker = requireNativeComponent('AndroidDialogPicker');
 const REF_PICKER = 'picker';
 const MODE_DROPDOWN = 'dropdown';
 
-const pickerStyleType = StyleSheetPropType({
-  ...ViewStylePropTypes,
-  color: ColorPropType,
-});
-
-type Event = Object;
+import type {SyntheticEvent} from 'CoreEventTypes';
+import type {TextStyleProp} from 'StyleSheet';
+
+type PickerAndroidChangeEvent = SyntheticEvent<
+  $ReadOnly<{|
+    position: number,
+  |}>,
+>;
+
+type PickerAndroidProps = $ReadOnly<{|
+  children?: React.Node,
+  style?: ?TextStyleProp,
+  selectedValue?: any,
+  enabled?: ?boolean,
+  mode?: ?('dialog' | 'dropdown'),
+  onValueChange?: ?(newValue: any, newIndex: number) => mixed,
+  prompt?: ?string,
+  testID?: string,
+|}>;
 
 /**
  * Not exposed as a public API - use <Picker> instead.
  */
-class PickerAndroid extends React.Component<
-  {
-    style?: $FlowFixMe,
-    selectedValue?: any,
-    enabled?: boolean,
-    mode?: 'dialog' | 'dropdown',
-    onValueChange?: Function,
-    prompt?: string,
-    testID?: string,
-  },
-  *,
-> {
-  static propTypes = {
-    ...ViewPropTypes,
-    style: pickerStyleType,
-    selectedValue: ReactPropTypes.any,
-    enabled: ReactPropTypes.bool,
-    mode: ReactPropTypes.oneOf(['dialog', 'dropdown']),
-    onValueChange: ReactPropTypes.func,
-    prompt: ReactPropTypes.string,
-    testID: ReactPropTypes.string,
-  };
-
+class PickerAndroid extends React.Component<PickerAndroidProps, *> {
+  /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+   * when making Flow check .android.js files. */
   constructor(props, context) {
     super(props, context);
     const state = this._stateFromProps(props);
@@ -70,6 +58,8 @@ class PickerAndroid extends React.Component<
     };
   }
 
+  /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+   * when making Flow check .android.js files. */
   UNSAFE_componentWillReceiveProps(nextProps) {
     this.setState(this._stateFromProps(nextProps));
   }
@@ -86,6 +76,8 @@ class PickerAndroid extends React.Component<
         label: child.props.label,
       };
       if (child.props.color) {
+        /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+         * found when making Flow check .android.js files. */
         childProps.color = processColor(child.props.color);
       }
       return childProps;
@@ -106,28 +98,36 @@ class PickerAndroid extends React.Component<
       selected: this.state.initialSelectedIndex,
       testID: this.props.testID,
       style: [styles.pickerAndroid, this.props.style],
+      /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+       * when making Flow check .android.js files. */
       accessibilityLabel: this.props.accessibilityLabel,
     };
 
     return <Picker ref={REF_PICKER} {...nativeProps} />;
   }
 
-  _onChange = (event: Event) => {
+  _onChange = (event: PickerAndroidChangeEvent) => {
     if (this.props.onValueChange) {
       const position = event.nativeEvent.position;
       if (position >= 0) {
         const children = React.Children.toArray(this.props.children);
         const value = children[position].props.value;
+        /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+         * found when making Flow check .android.js files. */
         this.props.onValueChange(value, position);
       } else {
         this.props.onValueChange(null, position);
       }
     }
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     this._lastNativePosition = event.nativeEvent.position;
     this.forceUpdate();
   };
 
   componentDidMount() {
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     this._lastNativePosition = this.state.initialSelectedIndex;
   }
 
@@ -140,11 +140,15 @@ class PickerAndroid extends React.Component<
     // truth, not the native component.
     if (
       this.refs[REF_PICKER] &&
+      /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+       * when making Flow check .android.js files. */
       this.state.selectedIndex !== this._lastNativePosition
     ) {
       this.refs[REF_PICKER].setNativeProps({
         selected: this.state.selectedIndex,
       });
+      /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+       * when making Flow check .android.js files. */
       this._lastNativePosition = this.state.selectedIndex;
     }
   }
diff --git a/Libraries/Components/Picker/PickerAndroid.ios.js b/Libraries/Components/Picker/PickerAndroid.ios.js
index 260d559929796f..7a00b6636cf664 100644
--- a/Libraries/Components/Picker/PickerAndroid.ios.js
+++ b/Libraries/Components/Picker/PickerAndroid.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Picker/PickerIOS.android.js b/Libraries/Components/Picker/PickerIOS.android.js
index 36acfe18342b6f..006c5b4d1ae82f 100644
--- a/Libraries/Components/Picker/PickerIOS.android.js
+++ b/Libraries/Components/Picker/PickerIOS.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Picker/PickerIOS.ios.js b/Libraries/Components/Picker/PickerIOS.ios.js
index 62ebe53e89a3ea..fa2fabc09404e2 100644
--- a/Libraries/Components/Picker/PickerIOS.ios.js
+++ b/Libraries/Components/Picker/PickerIOS.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
index f343e2e5452044..a6f64f011ef074 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js
index 260d559929796f..7a00b6636cf664 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
index 8caa73db33e494..1b5a1436e4f1ba 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
index ea92fccb980583..7b0bff3a248f8a 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,82 +10,70 @@
 
 'use strict';
 
-const Image = require('Image');
-const NativeMethodsMixin = require('NativeMethodsMixin');
 const React = require('React');
-const ReactNative = require('ReactNative');
-const PropTypes = require('prop-types');
 const StyleSheet = require('StyleSheet');
-const ViewPropTypes = require('ViewPropTypes');
 
 const createReactClass = require('create-react-class');
 const requireNativeComponent = require('requireNativeComponent');
 
+import type {NativeComponent} from 'ReactNative';
 import type {ImageSource} from 'ImageSource';
 import type {ColorValue} from 'StyleSheetTypes';
 import type {ViewProps} from 'ViewPropTypes';
 
-const RCTProgressView = requireNativeComponent('RCTProgressView');
-
 type Props = $ReadOnly<{|
   ...ViewProps,
+
+  /**
+   * The progress bar style.
+   */
   progressViewStyle?: ?('default' | 'bar'),
+
+  /**
+   * The progress value (between 0 and 1).
+   */
   progress?: ?number,
+
+  /**
+   * The tint color of the progress bar itself.
+   */
   progressTintColor?: ?ColorValue,
-  trackTintColor?: ?string,
+
+  /**
+   * The tint color of the progress bar track.
+   */
+  trackTintColor?: ?ColorValue,
+
+  /**
+   * A stretchable image to display as the progress bar.
+   */
   progressImage?: ?ImageSource,
+
+  /**
+   * A stretchable image to display behind the progress bar.
+   */
   trackImage?: ?ImageSource,
 |}>;
 
+type NativeProgressViewIOS = Class<NativeComponent<Props>>;
+
+const RCTProgressView = ((requireNativeComponent(
+  'RCTProgressView',
+): any): NativeProgressViewIOS);
+
 /**
  * Use `ProgressViewIOS` to render a UIProgressView on iOS.
  */
-const ProgressViewIOS = createReactClass({
-  displayName: 'ProgressViewIOS',
-  mixins: [NativeMethodsMixin],
-
-  propTypes: {
-    ...ViewPropTypes,
-    /**
-     * The progress bar style.
-     */
-    progressViewStyle: PropTypes.oneOf(['default', 'bar']),
-
-    /**
-     * The progress value (between 0 and 1).
-     */
-    progress: PropTypes.number,
-
-    /**
-     * The tint color of the progress bar itself.
-     */
-    progressTintColor: PropTypes.string,
-
-    /**
-     * The tint color of the progress bar track.
-     */
-    trackTintColor: PropTypes.string,
-
-    /**
-     * A stretchable image to display as the progress bar.
-     */
-    progressImage: Image.propTypes.source,
-
-    /**
-     * A stretchable image to display behind the progress bar.
-     */
-    trackImage: Image.propTypes.source,
-  },
-
-  render: function() {
-    return (
-      <RCTProgressView
-        {...this.props}
-        style={[styles.progressView, this.props.style]}
-      />
-    );
-  },
-});
+const ProgressViewIOS = (
+  props: Props,
+  forwardedRef?: ?React.Ref<typeof RCTProgressView>,
+) => (
+  <RCTProgressView
+    {...props}
+    style={[styles.progressView, props.style]}
+    ref={forwardedRef}
+  />
+);
 
 const styles = StyleSheet.create({
   progressView: {
@@ -93,6 +81,7 @@ const styles = StyleSheet.create({
   },
 });
 
-module.exports = ((ProgressViewIOS: any): Class<
-  ReactNative.NativeComponent<Props>,
->);
+// $FlowFixMe - TODO T29156721 `React.forwardRef` is not defined in Flow, yet.
+const ProgressViewIOSWithRef = React.forwardRef(ProgressViewIOS);
+
+module.exports = (ProgressViewIOSWithRef: NativeProgressViewIOS);
diff --git a/Libraries/Components/RefreshControl/RefreshControl.js b/Libraries/Components/RefreshControl/RefreshControl.js
index 9b287cc4a180b9..0f3f4c857557df 100644
--- a/Libraries/Components/RefreshControl/RefreshControl.js
+++ b/Libraries/Components/RefreshControl/RefreshControl.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -15,21 +15,22 @@ const React = require('React');
 const {NativeComponent} = require('ReactNative');
 
 const requireNativeComponent = require('requireNativeComponent');
-const nullthrows = require('fbjs/lib/nullthrows');
+const nullthrows = require('nullthrows');
 
 import type {ColorValue} from 'StyleSheetTypes';
 import type {ViewProps} from 'ViewPropTypes';
 
 if (Platform.OS === 'android') {
-  const AndroidSwipeRefreshLayout = require('UIManager')
-    .AndroidSwipeRefreshLayout;
+  const AndroidSwipeRefreshLayout = require('UIManager').getViewManagerConfig(
+    'AndroidSwipeRefreshLayout',
+  );
   var RefreshLayoutConsts = AndroidSwipeRefreshLayout
     ? AndroidSwipeRefreshLayout.Constants
     : {SIZE: {}};
 } else {
   var RefreshLayoutConsts = {SIZE: {}};
 }
-type NativeRefreshControlType = Class<NativeComponent<Props>>;
+type NativeRefreshControlType = Class<NativeComponent<RefreshControlProps>>;
 
 const NativeRefreshControl: NativeRefreshControlType =
   Platform.OS === 'ios'
@@ -77,7 +78,7 @@ type AndroidProps = $ReadOnly<{|
   progressViewOffset?: ?number,
 |}>;
 
-type Props = $ReadOnly<{|
+export type RefreshControlProps = $ReadOnly<{|
   ...ViewProps,
   ...IOSProps,
   ...AndroidProps,
@@ -138,7 +139,7 @@ type Props = $ReadOnly<{|
  * __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.
  */
-class RefreshControl extends React.Component<Props> {
+class RefreshControl extends React.Component<RefreshControlProps> {
   static SIZE = RefreshLayoutConsts.SIZE;
 
   _nativeRef: ?React.ElementRef<NativeRefreshControlType> = null;
@@ -148,7 +149,7 @@ class RefreshControl extends React.Component<Props> {
     this._lastNativeRefreshing = this.props.refreshing;
   }
 
-  componentDidUpdate(prevProps: Props) {
+  componentDidUpdate(prevProps: RefreshControlProps) {
     // RefreshControl is a controlled component so if the native refreshing
     // value doesn't match the current js refreshing prop update it to
     // the js value.
diff --git a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
index bc03b7afa87878..daa576350aa120 100644
--- a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
+++ b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.ios.js b/Libraries/Components/SafeAreaView/SafeAreaView.ios.js
deleted file mode 100644
index 5fb0406b8d5125..00000000000000
--- a/Libraries/Components/SafeAreaView/SafeAreaView.ios.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 ViewPropTypes = require('ViewPropTypes');
-const requireNativeComponent = require('requireNativeComponent');
-
-import type {ViewProps} from 'ViewPropTypes';
-
-const RCTSafeAreaView = requireNativeComponent('RCTSafeAreaView');
-
-type Props = ViewProps & {
-  children: any,
-};
-
-/**
- * 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).
- */
-class SafeAreaView extends React.Component<Props> {
-  static propTypes = {
-    ...ViewPropTypes,
-  };
-
-  render() {
-    return <RCTSafeAreaView {...this.props} />;
-  }
-}
-
-module.exports = SafeAreaView;
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.js b/Libraries/Components/SafeAreaView/SafeAreaView.js
new file mode 100644
index 00000000000000..6f4ecf3ac867b4
--- /dev/null
+++ b/Libraries/Components/SafeAreaView/SafeAreaView.js
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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
+ */
+
+const Platform = require('Platform');
+const React = require('React');
+const View = require('View');
+const requireNativeComponent = require('requireNativeComponent');
+
+import type {ViewProps} from 'ViewPropTypes';
+
+type Props = $ReadOnly<{|
+  ...ViewProps,
+  emulateUnlessSupported?: boolean,
+|}>;
+
+let exported;
+
+/**
+ * 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).
+ */
+if (Platform.OS === 'android') {
+  exported = class SafeAreaView extends React.Component<Props> {
+    render(): React.Node {
+      const {emulateUnlessSupported, ...props} = this.props;
+      return <View {...props} />;
+    }
+  };
+} else {
+  const RCTSafeAreaView = requireNativeComponent('RCTSafeAreaView');
+  exported = class SafeAreaView extends React.Component<Props> {
+    render(): React.Node {
+      return <RCTSafeAreaView emulateUnlessSupported={true} {...this.props} />;
+    }
+  };
+}
+
+module.exports = exported;
diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js
index 548efba80da48c..42079dec32abfa 100644
--- a/Libraries/Components/ScrollResponder.js
+++ b/Libraries/Components/ScrollResponder.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,17 +14,18 @@ const Dimensions = require('Dimensions');
 const FrameRateLogger = require('FrameRateLogger');
 const Keyboard = require('Keyboard');
 const ReactNative = require('ReactNative');
-const Subscribable = require('Subscribable');
 const TextInputState = require('TextInputState');
 const UIManager = require('UIManager');
 
 const invariant = require('fbjs/lib/invariant');
-const nullthrows = require('fbjs/lib/nullthrows');
+const nullthrows = require('nullthrows');
 const performanceNow = require('fbjs/lib/performanceNow');
 const warning = require('fbjs/lib/warning');
 
 const {ScrollViewManager} = require('NativeModules');
 
+import type EmitterSubscription from 'EmitterSubscription';
+
 /**
  * Mixin that can be integrated in order to handle scrolling that plays well
  * with `ResponderEventPlugin`. Integrate with your platform specific scroll
@@ -115,7 +116,10 @@ type State = {
 type Event = Object;
 
 const ScrollResponderMixin = {
-  mixins: [Subscribable.Mixin],
+  _subscriptionKeyboardWillShow: (null: ?EmitterSubscription),
+  _subscriptionKeyboardWillHide: (null: ?EmitterSubscription),
+  _subscriptionKeyboardDidShow: (null: ?EmitterSubscription),
+  _subscriptionKeyboardDidHide: (null: ?EmitterSubscription),
   scrollResponderMixinGetInitialState: function(): State {
     return {
       isTouching: false,
@@ -436,7 +440,7 @@ const ScrollResponderMixin = {
     }
     UIManager.dispatchViewManagerCommand(
       nullthrows(this.scrollResponderGetScrollableNode()),
-      UIManager.RCTScrollView.Commands.scrollTo,
+      UIManager.getViewManagerConfig('RCTScrollView').Commands.scrollTo,
       [x || 0, y || 0, animated !== false],
     );
   },
@@ -454,7 +458,7 @@ const ScrollResponderMixin = {
     const animated = (options && options.animated) !== false;
     UIManager.dispatchViewManagerCommand(
       this.scrollResponderGetScrollableNode(),
-      UIManager.RCTScrollView.Commands.scrollToEnd,
+      UIManager.getViewManagerConfig('RCTScrollView').Commands.scrollToEnd,
       [animated],
     );
   },
@@ -513,7 +517,8 @@ const ScrollResponderMixin = {
   scrollResponderFlashScrollIndicators: function() {
     UIManager.dispatchViewManagerCommand(
       this.scrollResponderGetScrollableNode(),
-      UIManager.RCTScrollView.Commands.flashScrollIndicators,
+      UIManager.getViewManagerConfig('RCTScrollView').Commands
+        .flashScrollIndicators,
       [],
     );
   },
@@ -601,28 +606,39 @@ const ScrollResponderMixin = {
 
     this.keyboardWillOpenTo = null;
     this.additionalScrollOffset = 0;
-    this.addListenerOn(
-      Keyboard,
+    this._subscriptionKeyboardWillShow = Keyboard.addListener(
       'keyboardWillShow',
       this.scrollResponderKeyboardWillShow,
     );
-    this.addListenerOn(
-      Keyboard,
+    this._subscriptionKeyboardWillHide = Keyboard.addListener(
       'keyboardWillHide',
       this.scrollResponderKeyboardWillHide,
     );
-    this.addListenerOn(
-      Keyboard,
+    this._subscriptionKeyboardDidShow = Keyboard.addListener(
       'keyboardDidShow',
       this.scrollResponderKeyboardDidShow,
     );
-    this.addListenerOn(
-      Keyboard,
+    this._subscriptionKeyboardDidHide = Keyboard.addListener(
       'keyboardDidHide',
       this.scrollResponderKeyboardDidHide,
     );
   },
 
+  componentWillUnmount: function() {
+    if (this._subscriptionKeyboardWillShow != null) {
+      this._subscriptionKeyboardWillShow.remove();
+    }
+    if (this._subscriptionKeyboardWillHide != null) {
+      this._subscriptionKeyboardWillHide.remove();
+    }
+    if (this._subscriptionKeyboardDidShow != null) {
+      this._subscriptionKeyboardDidShow.remove();
+    }
+    if (this._subscriptionKeyboardDidHide != null) {
+      this._subscriptionKeyboardDidHide.remove();
+    }
+  },
+
   /**
    * 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
diff --git a/Libraries/Components/ScrollView/InternalScrollViewType.js b/Libraries/Components/ScrollView/InternalScrollViewType.js
index 471e25d9a5dab9..a13db7dee6a65b 100644
--- a/Libraries/Components/ScrollView/InternalScrollViewType.js
+++ b/Libraries/Components/ScrollView/InternalScrollViewType.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index 9f0688e87489f3..a8b46291190083 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -125,19 +125,6 @@ type IOSProps = $ReadOnly<{|
    * @platform ios
    */
   centerContent?: ?boolean,
-  /**
-   * 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 (the default)
-   *   - `'fast'`: 0.99
-   *
-   * @platform ios
-   */
-  decelerationRate?: ?('fast' | 'normal' | number),
   /**
    * The style of the scroll indicators.
    *
@@ -230,6 +217,11 @@ type IOSProps = $ReadOnly<{|
    * @platform ios
    */
   scrollsToTop?: ?boolean,
+  /**
+   * Fires when the scroll view scrolls to top after the status bar has been tapped
+   * @platform ios
+   */
+  onScrollToTop?: ?Function,
   /**
    * When true, shows a horizontal scroll indicator.
    * The default value is true.
@@ -353,6 +345,17 @@ export type Props = $ReadOnly<{|
    * ```
    */
   contentContainerStyle?: ?ViewStyleProp,
+  /**
+   * 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),
   /**
    * When true, the scroll view's children are arranged horizontally in a row
    * instead of vertically in a column. The default value is false.
@@ -462,12 +465,36 @@ export type Props = $ReadOnly<{|
    * 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. Typically used in
-   * combination with `snapToAlignment` and `decelerationRate="fast"` on ios.
-   * Overrides less configurable `pagingEnabled` prop.
+   * combination with `snapToAlignment` and `decelerationRate="fast"`.
    *
-   * Supported for horizontal scrollview on android.
+   * Overrides less configurable `pagingEnabled` prop.
    */
   snapToInterval?: ?number,
+  /**
+   * 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?: ?$ReadOnlyArray<number>,
+  /**
+   * Use in conjuction 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,
+  /**
+   * Use in conjuction 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,
   /**
    * Experimental: When true, offscreen child views (whose `overflow` value is
    * `hidden`) are removed from their native backing superview when offscreen.
@@ -483,7 +510,6 @@ export type Props = $ReadOnly<{|
    * See [RefreshControl](docs/refreshcontrol.html).
    */
   refreshControl?: ?React.Element<any>,
-  style?: ?ViewStyleProp,
   children?: React.Node,
 |}>;
 
@@ -773,10 +799,6 @@ const ScrollView = createReactClass({
     } else {
       ScrollViewClass = RCTScrollView;
       ScrollContentContainerViewClass = RCTScrollContentView;
-      warning(
-        this.props.snapToInterval == null || !this.props.pagingEnabled,
-        'snapToInterval is currently ignored when pagingEnabled is true.',
-      );
     }
 
     invariant(
@@ -920,6 +942,23 @@ const ScrollView = createReactClass({
           ? true
           : false,
       DEPRECATED_sendUpdatedChildFrames,
+      // default to true
+      snapToStart: this.props.snapToStart !== false,
+      // default to true
+      snapToEnd: this.props.snapToEnd !== false,
+      // pagingEnabled is overridden by snapToInterval / snapToOffsets
+      pagingEnabled: Platform.select({
+        // on iOS, pagingEnabled must be set to false to have snapToInterval / snapToOffsets work
+        ios:
+          this.props.pagingEnabled &&
+          this.props.snapToInterval == null &&
+          this.props.snapToOffsets == null,
+        // on Android, pagingEnabled must be set to true to have snapToInterval / snapToOffsets work
+        android:
+          this.props.pagingEnabled ||
+          this.props.snapToInterval != null ||
+          this.props.snapToOffsets != null,
+      }),
     };
 
     const {decelerationRate} = this.props;
diff --git a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
index e17467b264cd98..5ad409c783e96f 100644
--- a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
+++ b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
index 46f691382d2f6e..17e55550f35aea 100644
--- a/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
+++ b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/ScrollView/processDecelerationRate.js b/Libraries/Components/ScrollView/processDecelerationRate.js
index 18b903ffa3831c..a685381715d835 100644
--- a/Libraries/Components/ScrollView/processDecelerationRate.js
+++ b/Libraries/Components/ScrollView/processDecelerationRate.js
@@ -1,19 +1,30 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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';
 
-function processDecelerationRate(decelerationRate) {
+const Platform = require('Platform');
+
+function processDecelerationRate(
+  decelerationRate: number | 'normal' | 'fast',
+): number {
   if (decelerationRate === 'normal') {
-    decelerationRate = 0.998;
+    return Platform.select({
+      ios: 0.998,
+      android: 0.985,
+    });
   } else if (decelerationRate === 'fast') {
-    decelerationRate = 0.99;
+    return Platform.select({
+      ios: 0.99,
+      android: 0.9,
+    });
   }
   return decelerationRate;
 }
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
index 7a988960ceca96..581e77cf6ff8d4 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
index b4635f13f8e4d5..e8e6d3d57ab65c 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,12 +10,12 @@
 
 'use strict';
 
+const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
 const NativeMethodsMixin = require('NativeMethodsMixin');
+const PropTypes = require('prop-types');
 const React = require('React');
 const ReactNative = require('ReactNative');
-const PropTypes = require('prop-types');
 const StyleSheet = require('StyleSheet');
-const ViewPropTypes = require('ViewPropTypes');
 
 const createReactClass = require('create-react-class');
 const requireNativeComponent = require('requireNativeComponent');
@@ -69,7 +69,7 @@ const SegmentedControlIOS = createReactClass({
   mixins: [NativeMethodsMixin],
 
   propTypes: {
-    ...ViewPropTypes,
+    ...DeprecatedViewPropTypes,
     /**
      * The labels for the control's segment buttons, in order.
      */
diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js
index 7f18a2d3b35ef0..fdde5f17ea6eec 100644
--- a/Libraries/Components/Slider/Slider.js
+++ b/Libraries/Components/Slider/Slider.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -66,7 +66,7 @@ type Props = $ReadOnly<{|
 
   /**
    * Used to style and layout the `Slider`.  See `StyleSheet.js` and
-   * `ViewStylePropTypes.js` for more info.
+   * `DeprecatedViewStylePropTypes.js` for more info.
    */
   style?: ?ViewStyleProp,
 
diff --git a/Libraries/Components/StaticContainer.react.js b/Libraries/Components/StaticContainer.react.js
index ffba809a46ab72..dc852849c1d61f 100644
--- a/Libraries/Components/StaticContainer.react.js
+++ b/Libraries/Components/StaticContainer.react.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/StaticRenderer.js b/Libraries/Components/StaticRenderer.js
index 4f8cfbd0989fa8..f4d630d6a98ab0 100644
--- a/Libraries/Components/StaticRenderer.js
+++ b/Libraries/Components/StaticRenderer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,18 +12,20 @@
 
 const React = require('React');
 
-const PropTypes = require('prop-types');
-
-class StaticRenderer extends React.Component<{
+type Props = $ReadOnly<{|
+  /**
+   * Indicates whether the render function needs to be called again
+   */
   shouldUpdate: boolean,
-  render: Function,
-}> {
-  static propTypes = {
-    shouldUpdate: PropTypes.bool.isRequired,
-    render: PropTypes.func.isRequired,
-  };
+  /**
+   * () => renderable
+   * A function that returns a renderable component
+   */
+  render: () => React.Node,
+|}>;
 
-  shouldComponentUpdate(nextProps: {shouldUpdate: boolean}): boolean {
+class StaticRenderer extends React.Component<Props> {
+  shouldComponentUpdate(nextProps: Props): boolean {
     return nextProps.shouldUpdate;
   }
 
diff --git a/Libraries/Components/StatusBar/StatusBar.js b/Libraries/Components/StatusBar/StatusBar.js
index 97db49fdd10283..52e6a764d2ca74 100644
--- a/Libraries/Components/StatusBar/StatusBar.js
+++ b/Libraries/Components/StatusBar/StatusBar.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,8 +11,6 @@
 'use strict';
 
 const React = require('React');
-const PropTypes = require('prop-types');
-const ColorPropType = require('ColorPropType');
 const Platform = require('Platform');
 
 const processColor = require('processColor');
@@ -55,9 +53,55 @@ export type StatusBarAnimation = $Enum<{
   slide: string,
 }>;
 
-type DefaultProps = {
-  animated: boolean,
-};
+type AndroidProps = $ReadOnly<{|
+  /**
+   * The background color of the status bar.
+   * @platform android
+   */
+  backgroundColor?: ?string,
+  /**
+   * 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,
+|}>;
+
+type IOSProps = $ReadOnly<{|
+  /**
+   * If the network activity indicator should be visible.
+   *
+   * @platform ios
+   */
+  networkActivityIndicatorVisible?: ?boolean,
+  /**
+   * The transition effect when showing and hiding the status bar using the `hidden`
+   * prop. Defaults to 'fade'.
+   *
+   * @platform ios
+   */
+  showHideTransition?: ?('fade' | 'slide'),
+|}>;
+
+type Props = $ReadOnly<{|
+  ...AndroidProps,
+  ...IOSProps,
+  /**
+   * If the status bar is hidden.
+   */
+  hidden?: ?boolean,
+  /**
+   * If the transition between status bar property changes should be animated.
+   * Supported for backgroundColor, barStyle and hidden.
+   */
+  animated?: ?boolean,
+  /**
+   * Sets the color of the status bar text.
+   */
+  barStyle?: ?('default' | 'light-content' | 'dark-content'),
+|}>;
 
 /**
  * Merges the prop stack with the default values.
@@ -148,15 +192,7 @@ function createStackEntry(props: any): any {
  *
  * `currentHeight` (Android only) The height of the status bar.
  */
-class StatusBar extends React.Component<{
-  hidden?: boolean,
-  animated?: boolean,
-  backgroundColor?: string,
-  translucent?: boolean,
-  barStyle?: 'default' | 'light-content' | 'dark-content',
-  networkActivityIndicatorVisible?: boolean,
-  showHideTransition?: 'fade' | 'slide',
-}> {
+class StatusBar extends React.Component<Props> {
   static _propsStack = [];
 
   static _defaultProps = createStackEntry({
@@ -261,48 +297,6 @@ class StatusBar extends React.Component<{
     StatusBarManager.setTranslucent(translucent);
   }
 
-  static propTypes = {
-    /**
-     * If the status bar is hidden.
-     */
-    hidden: PropTypes.bool,
-    /**
-     * If the transition between status bar property changes should be animated.
-     * Supported for backgroundColor, barStyle and hidden.
-     */
-    animated: PropTypes.bool,
-    /**
-     * The background color of the status bar.
-     * @platform android
-     */
-    backgroundColor: ColorPropType,
-    /**
-     * 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: PropTypes.bool,
-    /**
-     * Sets the color of the status bar text.
-     */
-    barStyle: PropTypes.oneOf(['default', 'light-content', 'dark-content']),
-    /**
-     * If the network activity indicator should be visible.
-     *
-     * @platform ios
-     */
-    networkActivityIndicatorVisible: PropTypes.bool,
-    /**
-     * The transition effect when showing and hiding the status bar using the `hidden`
-     * prop. Defaults to 'fade'.
-     *
-     * @platform ios
-     */
-    showHideTransition: PropTypes.oneOf(['fade', 'slide']),
-  };
-
   static defaultProps = {
     animated: false,
     showHideTransition: 'fade',
diff --git a/Libraries/Components/StatusBar/StatusBarIOS.android.js b/Libraries/Components/StatusBar/StatusBarIOS.android.js
index 96f77d7868fbff..4e9f97309b29b0 100644
--- a/Libraries/Components/StatusBar/StatusBarIOS.android.js
+++ b/Libraries/Components/StatusBar/StatusBarIOS.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,4 +12,6 @@
 
 const NativeEventEmitter = require('NativeEventEmitter');
 
+/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found when
+ * making Flow check .android.js files. */
 module.exports = new NativeEventEmitter('StatusBarManager');
diff --git a/Libraries/Components/StatusBar/StatusBarIOS.ios.js b/Libraries/Components/StatusBar/StatusBarIOS.ios.js
index 529e01b308fd88..ea558eafa9ba94 100644
--- a/Libraries/Components/StatusBar/StatusBarIOS.ios.js
+++ b/Libraries/Components/StatusBar/StatusBarIOS.ios.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Components/Subscribable.js b/Libraries/Components/Subscribable.js
deleted file mode 100644
index a56d42ed864c8d..00000000000000
--- a/Libraries/Components/Subscribable.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 EventEmitter from 'EventEmitter';
-
-/**
- * Subscribable provides a mixin for safely subscribing a component to an
- * eventEmitter
- *
- * This will be replaced with the observe interface that will be coming soon to
- * React Core
- */
-
-const Subscribable = {};
-
-Subscribable.Mixin = {
-  UNSAFE_componentWillMount: function() {
-    this._subscribableSubscriptions = [];
-  },
-
-  componentWillUnmount: function() {
-    // This null check is a fix for a broken version of uglify-es. Should be deleted eventually
-    // https://github.com/facebook/react-native/issues/17348
-    this._subscribableSubscriptions &&
-      this._subscribableSubscriptions.forEach(subscription =>
-        subscription.remove(),
-      );
-    this._subscribableSubscriptions = null;
-  },
-
-  /**
-   * 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} eventEmitter emitter to subscribe to.
-   * @param {string} eventType Type of event to listen to.
-   * @param {function} listener Function to invoke when event occurs.
-   * @param {object} context Object to use as listener context.
-   */
-  addListenerOn: function(
-    eventEmitter: EventEmitter,
-    eventType: string,
-    listener: Function,
-    context: Object,
-  ) {
-    this._subscribableSubscriptions.push(
-      eventEmitter.addListener(eventType, listener, context),
-    );
-  },
-};
-
-module.exports = Subscribable;
diff --git a/Libraries/Components/Switch/Switch.js b/Libraries/Components/Switch/Switch.js
index 39ccd9a1de16e2..80fe6306d7228c 100644
--- a/Libraries/Components/Switch/Switch.js
+++ b/Libraries/Components/Switch/Switch.js
@@ -1,163 +1,207 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @format
  */
 
 'use strict';
 
+const SwitchNativeComponent = require('SwitchNativeComponent');
 const Platform = require('Platform');
 const React = require('React');
-const ReactNative = require('ReactNative');
 const StyleSheet = require('StyleSheet');
 
-const nullthrows = require('fbjs/lib/nullthrows');
-const requireNativeComponent = require('requireNativeComponent');
-
+import type {SwitchChangeEvent} from 'CoreEventTypes';
 import type {ColorValue} from 'StyleSheetTypes';
 import type {ViewProps} from 'ViewPropTypes';
+import type {NativeAndroidProps, NativeIOSProps} from 'SwitchNativeComponent';
 
-type Props = $ReadOnly<{|
+export type Props = $ReadOnly<{|
   ...ViewProps,
-  /**
-   * The value of the switch.  If true the switch will be turned on.
-   * Default value is false.
-   */
-  value?: ?boolean,
 
   /**
-   * If true the user won't be able to toggle the switch.
-   * Default value is false.
+   * Whether the switch is disabled. Defaults to false.
    */
   disabled?: ?boolean,
 
   /**
-   * Switch change handler.
-   *
-   * Invoked with the event when the value changes. For getting the value
-   * the switch was changed to use onValueChange instead.
+   * Boolean value of the switch. Defaults to false.
    */
-  onChange?: ?Function,
+  value?: ?boolean,
 
   /**
-   * Invoked with the new value when the value changes.
+   * Custom color for the switch thumb.
    */
-  onValueChange?: ?Function,
+  thumbColor?: ?ColorValue,
 
   /**
-   * Used to locate this view in end-to-end tests.
+   * Custom colors for the switch track.
+   *
+   * NOTE: On iOS when the switch value is false, the track shrinks into the
+   * border. If you want to change the color of the background exposed by the
+   * shrunken track, use `ios_backgroundColor`.
    */
-  testID?: ?string,
+  trackColor?: ?$ReadOnly<{|
+    false?: ?ColorValue,
+    true?: ?ColorValue,
+  |}>,
 
   /**
-   * Border color on iOS and background color on Android when the switch is turned off.
+   * On iOS, custom color for the background. This background color can be seen
+   * either when the switch value is false or when the switch is disabled (and
+   * the switch is translucent).
    */
-  tintColor?: ?ColorValue,
+  ios_backgroundColor?: ?ColorValue,
 
   /**
-   * Background color when the switch is turned on.
+   * Called when the user tries to change the value of the switch.
+   *
+   * Receives the change event as an argument. If you want to only receive the
+   * new value, use `onValueChange` instead.
    */
-  onTintColor?: ?ColorValue,
+  onChange?: ?(event: SwitchChangeEvent) => Promise<void> | void,
 
   /**
-   * Color of the foreground switch grip.
+   * Called when the user tries to change the value of the switch.
+   *
+   * Receives the new value as an argument. If you want to instead receive an
+   * event, use `onChange`.
    */
-  thumbTintColor?: ?ColorValue,
+  onValueChange?: ?(value: boolean) => Promise<void> | void,
 |}>;
 
-type NativeSwitchType = Class<
-  ReactNative.NativeComponent<
-    $ReadOnly<{|
-      ...Props,
-      enabled?: ?boolean,
-      on?: ?boolean,
-      trackTintColor?: ?ColorValue,
-    |}>,
-  >,
->;
-
-const RCTSwitch: NativeSwitchType =
-  Platform.OS === 'android'
-    ? (requireNativeComponent('AndroidSwitch'): any)
-    : (requireNativeComponent('RCTSwitch'): any);
-
 /**
- * Renders a boolean input.
+ * A visual toggle between two mutually exclusive states.
  *
  * 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.
- *
- * @keyword checkbox
- * @keyword toggle
+ * 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.
  */
 class Switch extends React.Component<Props> {
-  static defaultProps = {
-    value: false,
-    disabled: false,
-  };
-
-  _rctSwitch: ?React.ElementRef<NativeSwitchType> = null;
-
-  _onChange = (event: Object) => {
-    if (Platform.OS === 'android') {
-      nullthrows(this._rctSwitch).setNativeProps({on: this.props.value});
-    } else {
-      nullthrows(this._rctSwitch).setNativeProps({value: this.props.value});
-    }
-
-    this.props.onChange && this.props.onChange(event);
-    this.props.onValueChange &&
-      this.props.onValueChange(event.nativeEvent.value);
-  };
+  _nativeSwitchRef: ?React.ElementRef<typeof SwitchNativeComponent>;
 
   render() {
-    const props = {
-      ...this.props,
-      onStartShouldSetResponder: () => true,
-      onResponderTerminationRequest: () => false,
-    };
+    const {
+      disabled,
+      ios_backgroundColor,
+      onChange,
+      onValueChange,
+      style,
+      thumbColor,
+      trackColor,
+      value,
+      ...props
+    } = this.props;
+
+    // Support deprecated color props.
+    let _thumbColor = thumbColor;
+    let _trackColorForFalse = trackColor?.false;
+    let _trackColorForTrue = trackColor?.true;
+
+    // TODO: Remove support for these props after a couple releases.
+    const {thumbTintColor, tintColor, onTintColor} = (props: $FlowFixMe);
+    if (thumbTintColor != null) {
+      _thumbColor = thumbTintColor;
+      if (__DEV__) {
+        console.warn(
+          'Switch: `thumbTintColor` is deprecated, use `thumbColor` instead.',
+        );
+      }
+    }
+    if (tintColor != null) {
+      _trackColorForFalse = tintColor;
+      if (__DEV__) {
+        console.warn(
+          'Switch: `tintColor` is deprecated, use `trackColor` instead.',
+        );
+      }
+    }
+    if (onTintColor != null) {
+      _trackColorForTrue = onTintColor;
+      if (__DEV__) {
+        console.warn(
+          'Switch: `onTintColor` is deprecated, use `trackColor` instead.',
+        );
+      }
+    }
 
     const platformProps =
       Platform.OS === 'android'
-        ? {
-            enabled: !this.props.disabled,
-            on: this.props.value,
-            style: this.props.style,
-            trackTintColor: this.props.value
-              ? this.props.onTintColor
-              : this.props.tintColor,
-          }
-        : {
+        ? ({
+            enabled: disabled !== true,
+            on: value === true,
+            style,
+            thumbTintColor: _thumbColor,
+            trackTintColor:
+              value === true ? _trackColorForTrue : _trackColorForFalse,
+          }: NativeAndroidProps)
+        : ({
+            disabled,
+            onTintColor: _trackColorForTrue,
             style: StyleSheet.compose(
-              styles.rctSwitchIOS,
-              this.props.style,
+              {height: 31, width: 51},
+              StyleSheet.compose(
+                style,
+                ios_backgroundColor == null
+                  ? null
+                  : {
+                      backgroundColor: ios_backgroundColor,
+                      borderRadius: 16,
+                    },
+              ),
             ),
-          };
+            thumbTintColor: _thumbColor,
+            tintColor: _trackColorForFalse,
+            value: value === true,
+          }: NativeIOSProps);
 
     return (
-      <RCTSwitch
+      <SwitchNativeComponent
         {...props}
         {...platformProps}
-        ref={ref => {
-          this._rctSwitch = ref;
-        }}
-        onChange={this._onChange}
+        onChange={this._handleChange}
+        onResponderTerminationRequest={returnsFalse}
+        onStartShouldSetResponder={returnsTrue}
+        ref={this._handleSwitchNativeComponentRef}
       />
     );
   }
+
+  _handleChange = (event: SwitchChangeEvent) => {
+    if (this._nativeSwitchRef == null) {
+      return;
+    }
+
+    // Force value of native switch in order to control it.
+    const value = this.props.value === true;
+    if (Platform.OS === 'android') {
+      this._nativeSwitchRef.setNativeProps({on: value});
+    } else {
+      this._nativeSwitchRef.setNativeProps({value});
+    }
+
+    if (this.props.onChange != null) {
+      this.props.onChange(event);
+    }
+
+    if (this.props.onValueChange != null) {
+      this.props.onValueChange(event.nativeEvent.value);
+    }
+  };
+
+  _handleSwitchNativeComponentRef = (
+    ref: ?React.ElementRef<typeof SwitchNativeComponent>,
+  ) => {
+    this._nativeSwitchRef = ref;
+  };
 }
 
-const styles = StyleSheet.create({
-  rctSwitchIOS: {
-    height: 31,
-    width: 51,
-  },
-});
+const returnsFalse = () => false;
+const returnsTrue = () => true;
 
 module.exports = Switch;
diff --git a/Libraries/Components/Switch/SwitchNativeComponent.js b/Libraries/Components/Switch/SwitchNativeComponent.js
new file mode 100644
index 00000000000000..4b43fc3e96cea1
--- /dev/null
+++ b/Libraries/Components/Switch/SwitchNativeComponent.js
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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';
+
+const Platform = require('Platform');
+const ReactNative = require('ReactNative');
+
+const requireNativeComponent = require('requireNativeComponent');
+
+import type {SwitchChangeEvent} from 'CoreEventTypes';
+import type {ViewProps} from 'ViewPropTypes';
+
+// @see ReactSwitchManager.java
+export type NativeAndroidProps = $ReadOnly<{|
+  ...ViewProps,
+  enabled?: ?boolean,
+  on?: ?boolean,
+  onChange?: ?(event: SwitchChangeEvent) => mixed,
+  thumbTintColor?: ?string,
+  trackTintColor?: ?string,
+|}>;
+
+// @see RCTSwitchManager.m
+export type NativeIOSProps = $ReadOnly<{|
+  ...ViewProps,
+  disabled?: ?boolean,
+  onChange?: ?(event: SwitchChangeEvent) => mixed,
+  onTintColor?: ?string,
+  thumbTintColor?: ?string,
+  tintColor?: ?string,
+  value?: ?boolean,
+|}>;
+
+type SwitchNativeComponentType = Class<
+  ReactNative.NativeComponent<
+    $ReadOnly<{|
+      ...NativeAndroidProps,
+      ...NativeIOSProps,
+    |}>,
+  >,
+>;
+
+const SwitchNativeComponent: SwitchNativeComponentType =
+  Platform.OS === 'android'
+    ? (requireNativeComponent('AndroidSwitch'): any)
+    : (requireNativeComponent('RCTSwitch'): any);
+
+module.exports = SwitchNativeComponent;
diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.android.js b/Libraries/Components/TabBarIOS/TabBarIOS.android.js
index e8e376f8a9eb7e..58da238b4b7019 100644
--- a/Libraries/Components/TabBarIOS/TabBarIOS.android.js
+++ b/Libraries/Components/TabBarIOS/TabBarIOS.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
index 6cbe213f7fc36d..7b19a1487081e3 100644
--- a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,77 +10,67 @@
 
 'use strict';
 
-const ColorPropType = require('ColorPropType');
 const React = require('React');
-const PropTypes = require('prop-types');
 const StyleSheet = require('StyleSheet');
 const TabBarItemIOS = require('TabBarItemIOS');
-const ViewPropTypes = require('ViewPropTypes');
 
 const requireNativeComponent = require('requireNativeComponent');
 
-import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 import type {ViewProps} from 'ViewPropTypes';
+import type {ColorValue} from 'StyleSheetTypes';
 
 const RCTTabBar = requireNativeComponent('RCTTabBar');
 
 type Props = $ReadOnly<{|
   ...ViewProps,
-  style?: DangerouslyImpreciseStyleProp,
-  unselectedTintColor?: string,
-  tintColor?: string,
-  unselectedItemTintColor?: string,
-  barTintColor?: string,
-  barStyle?: 'default' | 'black',
-  translucent?: boolean,
-  itemPositioning?: 'fill' | 'center' | 'auto',
-  children: React.Node,
+
+  /**
+   * Color of text on unselected tabs
+   */
+  unselectedTintColor?: ColorValue,
+
+  /**
+   * Color of the currently selected tab icon
+   */
+  tintColor?: ColorValue,
+
+  /**
+   * Color of unselected tab icons. Available since iOS 10.
+   */
+  unselectedItemTintColor?: ColorValue,
+
+  /**
+   * Background color of the tab bar
+   */
+  barTintColor?: ColorValue,
+
+  /**
+   * The style of the tab bar. Supported values are 'default', 'black'.
+   * Use 'black' instead of setting `barTintColor` to black. This produces
+   * a tab bar with the native iOS style with higher translucency.
+   */
+  barStyle?: ?('default' | 'black'),
+
+  /**
+   * A Boolean value that indicates whether the tab bar is translucent
+   */
+  translucent?: ?boolean,
+
+  /**
+   * Specifies tab bar item positioning. Available values are:
+   * - fill - distributes items across the entire width of the tab bar
+   * - center - centers item in the available tab bar space
+   * - auto (default) - distributes items dynamically according to the
+   * user interface idiom. In a horizontally compact environment (e.g. iPhone 5)
+   * this value defaults to `fill`, in a horizontally regular one (e.g. iPad)
+   * it defaults to center.
+   */
+  itemPositioning?: ?('fill' | 'center' | 'auto'),
 |}>;
 
 class TabBarIOS extends React.Component<Props> {
   static Item = TabBarItemIOS;
 
-  static propTypes = {
-    ...ViewPropTypes,
-    style: ViewPropTypes.style,
-    /**
-     * Color of text on unselected tabs
-     */
-    unselectedTintColor: ColorPropType,
-    /**
-     * Color of the currently selected tab icon
-     */
-    tintColor: ColorPropType,
-    /**
-     * Color of unselected tab icons. Available since iOS 10.
-     */
-    unselectedItemTintColor: ColorPropType,
-    /**
-     * Background color of the tab bar
-     */
-    barTintColor: ColorPropType,
-    /**
-     * The style of the tab bar. Supported values are 'default', 'black'.
-     * Use 'black' instead of setting `barTintColor` to black. This produces
-     * a tab bar with the native iOS style with higher translucency.
-     */
-    barStyle: PropTypes.oneOf(['default', 'black']),
-    /**
-     * A Boolean value that indicates whether the tab bar is translucent
-     */
-    translucent: PropTypes.bool,
-    /**
-     * Specifies tab bar item positioning. Available values are:
-     * - fill - distributes items across the entire width of the tab bar
-     * - center - centers item in the available tab bar space
-     * - auto (default) - distributes items dynamically according to the
-     * user interface idiom. In a horizontally compact environment (e.g. iPhone 5)
-     * this value defaults to `fill`, in a horizontally regular one (e.g. iPad)
-     * it defaults to center.
-     */
-    itemPositioning: PropTypes.oneOf(['fill', 'center', 'auto']),
-  };
-
   render() {
     return (
       <RCTTabBar
diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
index 37dc72f4d41faf..fa72c66a682521 100644
--- a/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
+++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
index b8825977a8cac6..430934f24034e0 100644
--- a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,90 +10,101 @@
 
 'use strict';
 
-const ColorPropType = require('ColorPropType');
 const Image = require('Image');
 const React = require('React');
-const PropTypes = require('prop-types');
 const StaticContainer = require('StaticContainer.react');
 const StyleSheet = require('StyleSheet');
 const View = require('View');
 
-const ViewPropTypes = require('ViewPropTypes');
-
 const requireNativeComponent = require('requireNativeComponent');
 
-class TabBarItemIOS extends React.Component {
-  static propTypes = {
-    ...ViewPropTypes,
-    /**
-     * Little red bubble that sits at the top right of the icon.
-     */
-    badge: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    /**
-     * Background color for the badge. Available since iOS 10.
-     */
-    badgeColor: ColorPropType,
-    /**
-     * Items comes with a few predefined system icons. Note that if you are
-     * using them, the title and selectedIcon will be overridden with the
-     * system ones.
-     */
-    systemIcon: PropTypes.oneOf([
-      'bookmarks',
-      'contacts',
-      'downloads',
-      'favorites',
-      'featured',
-      'history',
-      'more',
-      'most-recent',
-      'most-viewed',
-      'recents',
-      'search',
-      'top-rated',
-    ]),
-    /**
-     * A custom icon for the tab. It is ignored when a system icon is defined.
-     */
-    icon: Image.propTypes.source,
-    /**
-     * A custom icon when the tab is selected. It is ignored when a system
-     * icon is defined. If left empty, the icon will be tinted in blue.
-     */
-    selectedIcon: Image.propTypes.source,
-    /**
-     * Callback when this tab is being selected, you should change the state of your
-     * component to set selected={true}.
-     */
-    onPress: PropTypes.func,
-    /**
-     * If set to true it renders the image as original,
-     * it defaults to being displayed as a template
-     */
-    renderAsOriginal: PropTypes.bool,
-    /**
-     * It specifies whether the children are visible or not. If you see a
-     * blank content, you probably forgot to add a selected one.
-     */
-    selected: PropTypes.bool,
-    /**
-     * React style object.
-     */
-    style: ViewPropTypes.style,
-    /**
-     * Text that appears under the icon. It is ignored when a system icon
-     * is defined.
-     */
-    title: PropTypes.string,
-    /**
-     *(Apple TV only)* When set to true, this view will be focusable
-     * and navigable using the Apple TV remote.
-     *
-     * @platform ios
-     */
-    isTVSelectable: PropTypes.bool,
-  };
+import type {ViewProps} from 'ViewPropTypes';
+import type {ColorValue} from 'StyleSheetTypes';
+import type {SyntheticEvent} from 'CoreEventTypes';
+import type {ImageSource} from 'ImageSource';
+
+type Props = $ReadOnly<{|
+  ...ViewProps,
+
+  /**
+   * Little red bubble that sits at the top right of the icon.
+   */
+  badge?: ?(string | number),
+
+  /**
+   * Background color for the badge. Available since iOS 10.
+   */
+  badgeColor?: ColorValue,
+
+  /**
+   * Items comes with a few predefined system icons. Note that if you are
+   * using them, the title and selectedIcon will be overridden with the
+   * system ones.
+   */
+  systemIcon?: ?(
+    | 'bookmarks'
+    | 'contacts'
+    | 'downloads'
+    | 'favorites'
+    | 'featured'
+    | 'history'
+    | 'more'
+    | 'most-recent'
+    | 'most-viewed'
+    | 'recents'
+    | 'search'
+    | 'top-rated'
+  ),
+
+  /**
+   * A custom icon for the tab. It is ignored when a system icon is defined.
+   */
+  icon?: ?ImageSource,
+
+  /**
+   * A custom icon when the tab is selected. It is ignored when a system
+   * icon is defined. If left empty, the icon will be tinted in blue.
+   */
+  selectedIcon?: ?ImageSource,
+
+  /**
+   * Callback when this tab is being selected, you should change the state of your
+   * component to set selected={true}.
+   */
+  onPress?: ?(event: SyntheticEvent<null>) => mixed,
+
+  /**
+   * If set to true it renders the image as original,
+   * it defaults to being displayed as a template
+   */
+  renderAsOriginal?: ?boolean,
+
+  /**
+   * It specifies whether the children are visible or not. If you see a
+   * blank content, you probably forgot to add a selected one.
+   */
+  selected?: ?boolean,
+
+  /**
+   * Text that appears under the icon. It is ignored when a system icon
+   * is defined.
+   */
+  title?: ?string,
+
+  /**
+   * *(Apple TV only)* When set to true, this view will be focusable
+   * and navigable using the Apple TV remote.
+   *
+   * @platform ios
+   */
+  isTVSelectable?: ?boolean,
+|}>;
+
+type State = {|
+  hasBeenSelected: boolean,
+|};
 
+class TabBarItemIOS extends React.Component<Props, State> {
   state = {
     hasBeenSelected: false,
   };
@@ -104,7 +115,7 @@ class TabBarItemIOS extends React.Component {
     }
   }
 
-  UNSAFE_componentWillReceiveProps(nextProps: {selected?: boolean}) {
+  UNSAFE_componentWillReceiveProps(nextProps: Props) {
     if (this.state.hasBeenSelected || nextProps.selected) {
       this.setState({hasBeenSelected: true});
     }
diff --git a/Libraries/Components/TextInput/InputAccessoryView.js b/Libraries/Components/TextInput/InputAccessoryView.js
index 731476bc7138b7..2e7f906096c3b0 100644
--- a/Libraries/Components/TextInput/InputAccessoryView.js
+++ b/Libraries/Components/TextInput/InputAccessoryView.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,15 +9,17 @@
  */
 'use strict';
 
-const ColorPropType = require('ColorPropType');
+const DeprecatedColorPropType = require('DeprecatedColorPropType');
+const Platform = require('Platform');
 const React = require('React');
 const StyleSheet = require('StyleSheet');
-const ViewPropTypes = require('ViewPropTypes');
 
 const requireNativeComponent = require('requireNativeComponent');
 
 const RCTInputAccessoryView = requireNativeComponent('RCTInputAccessoryView');
 
+import type {ViewStyleProp} from 'StyleSheet';
+
 /**
  * Note: iOS only
  *
@@ -76,20 +78,22 @@ const RCTInputAccessoryView = requireNativeComponent('RCTInputAccessoryView');
  * For an example, look at InputAccessoryViewExample.js in RNTester.
  */
 
-type Props = {
+type Props = $ReadOnly<{|
   +children: React.Node,
   /**
    * An ID which is used to associate this `InputAccessoryView` to
    * specified TextInput(s).
    */
-  nativeID?: string,
-  style?: ViewPropTypes.style,
-  backgroundColor?: ColorPropType,
-};
+  nativeID?: ?string,
+  style?: ?ViewStyleProp,
+  backgroundColor?: ?DeprecatedColorPropType,
+|}>;
 
 class InputAccessoryView extends React.Component<Props> {
   render(): React.Node {
-    console.warn('<InputAccessoryView> is not supported on Android yet.');
+    if (Platform.OS !== 'ios') {
+      console.warn('<InputAccessoryView> is only supported on iOS.');
+    }
 
     if (React.Children.count(this.props.children) === 0) {
       return null;
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index ef8d6a81f12383..cd71083cc08ebf 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,31 +9,30 @@
  */
 'use strict';
 
-const ColorPropType = require('ColorPropType');
+const DeprecatedColorPropType = require('DeprecatedColorPropType');
+const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
 const DocumentSelectionState = require('DocumentSelectionState');
 const EventEmitter = require('EventEmitter');
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const Platform = require('Platform');
-const React = require('React');
-const createReactClass = require('create-react-class');
 const PropTypes = require('prop-types');
+const React = require('React');
 const ReactNative = require('ReactNative');
 const StyleSheet = require('StyleSheet');
 const Text = require('Text');
 const TextAncestor = require('TextAncestor');
 const TextInputState = require('TextInputState');
-const TimerMixin = require('react-timer-mixin');
 const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 const UIManager = require('UIManager');
-const ViewPropTypes = require('ViewPropTypes');
 
+const createReactClass = require('create-react-class');
 const emptyFunction = require('fbjs/lib/emptyFunction');
 const invariant = require('fbjs/lib/invariant');
 const requireNativeComponent = require('requireNativeComponent');
 const warning = require('fbjs/lib/warning');
 
+import type {TextStyleProp, ViewStyleProp} from 'StyleSheet';
 import type {ColorValue} from 'StyleSheetTypes';
-import type {TextStyleProp} from 'StyleSheet';
 import type {ViewProps} from 'ViewPropTypes';
 
 let AndroidTextInput;
@@ -155,7 +154,10 @@ type IOSProps = $ReadOnly<{|
     | 'telephoneNumber'
     | 'username'
     | 'password'
+    | 'newPassword'
+    | 'oneTimeCode'
   ),
+  scrollEnabled?: ?boolean,
 |}>;
 
 type AndroidProps = $ReadOnly<{|
@@ -169,13 +171,14 @@ type AndroidProps = $ReadOnly<{|
 |}>;
 
 type Props = $ReadOnly<{|
-  ...ViewProps,
+  ...$Diff<ViewProps, $ReadOnly<{|style: ?ViewStyleProp|}>>,
   ...IOSProps,
   ...AndroidProps,
   autoCapitalize?: ?AutoCapitalize,
   autoCorrect?: ?boolean,
   autoFocus?: ?boolean,
   allowFontScaling?: ?boolean,
+  maxFontSizeMultiplier?: ?number,
   editable?: ?boolean,
   keyboardType?: ?KeyboardType,
   returnKeyType?: ?ReturnKeyType,
@@ -326,22 +329,12 @@ const TextInput = createReactClass({
   statics: {
     State: {
       currentlyFocusedField: TextInputState.currentlyFocusedField,
-      focusTextInput: (textFieldID: ?number) => {
-        console.warn(
-          '`focusTextInput` is deprecated, use the `focus` method of the `TextInput` ref instead.',
-        );
-        TextInputState.focusTextInput(textFieldID);
-      },
-      blurTextInput: (textFieldID: ?number) => {
-        console.warn(
-          '`blurTextInput` is deprecated, use `Keyboard.dismiss` or the `blur` method of the `TextInput` ref.',
-        );
-        TextInputState.blurTextInput(textFieldID);
-      },
+      focusTextInput: TextInputState.focusTextInput,
+      blurTextInput: TextInputState.blurTextInput,
     },
   },
   propTypes: {
-    ...ViewPropTypes,
+    ...DeprecatedViewPropTypes,
     /**
      * Can tell `TextInput` to automatically capitalize certain characters.
      *
@@ -376,6 +369,14 @@ const TextInput = createReactClass({
      * default is `true`.
      */
     allowFontScaling: PropTypes.bool,
+    /**
+     * 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: PropTypes.number,
     /**
      * If `false`, text is not editable. The default value is `true`.
      */
@@ -590,7 +591,13 @@ const TextInput = createReactClass({
     /**
      * The text color of the placeholder string.
      */
-    placeholderTextColor: ColorPropType,
+    placeholderTextColor: DeprecatedColorPropType,
+    /**
+     * If `false`, scrolling of the text view will be disabled.
+     * The default value is `true`. Does only work with 'multiline={true}'.
+     * @platform ios
+     */
+    scrollEnabled: PropTypes.bool,
     /**
      * 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}'.
@@ -599,7 +606,7 @@ const TextInput = createReactClass({
     /**
      * The highlight and cursor color of the text input.
      */
-    selectionColor: ColorPropType,
+    selectionColor: DeprecatedColorPropType,
     /**
      * An instance of `DocumentSelectionState`, this is some state that is responsible for
      * maintaining selection information for a document.
@@ -690,7 +697,7 @@ const TextInput = createReactClass({
      * The color of the `TextInput` underline.
      * @platform android
      */
-    underlineColorAndroid: ColorPropType,
+    underlineColorAndroid: DeprecatedColorPropType,
 
     /**
      * If defined, the provided image resource will be rendered on the left.
@@ -781,6 +788,8 @@ const TextInput = createReactClass({
       'telephoneNumber',
       'username',
       'password',
+      'newPassword',
+      'oneTimeCode',
     ]),
   },
   getDefaultProps(): Object {
@@ -793,7 +802,7 @@ const TextInput = createReactClass({
    * `NativeMethodsMixin` will look for this when invoking `setNativeProps`. We
    * make `this` look like an actual native component class.
    */
-  mixins: [NativeMethodsMixin, TimerMixin],
+  mixins: [NativeMethodsMixin],
 
   /**
    * Returns `true` if the input is currently focused; `false` otherwise.
@@ -809,6 +818,7 @@ const TextInput = createReactClass({
   _focusSubscription: (undefined: ?Function),
   _lastNativeText: (undefined: ?string),
   _lastNativeSelection: (undefined: ?Selection),
+  _rafId: (null: ?AnimationFrameID),
 
   componentDidMount: function() {
     this._lastNativeText = this.props.value;
@@ -823,7 +833,7 @@ const TextInput = createReactClass({
         'focus',
         el => {
           if (this === el) {
-            this.requestAnimationFrame(this.focus);
+            this._rafId = requestAnimationFrame(this.focus);
           } else if (this.isFocused()) {
             this.blur();
           }
@@ -834,7 +844,7 @@ const TextInput = createReactClass({
       }
     } else {
       if (this.props.autoFocus) {
-        this.requestAnimationFrame(this.focus);
+        this._rafId = requestAnimationFrame(this.focus);
       }
     }
   },
@@ -848,6 +858,9 @@ const TextInput = createReactClass({
     if (tag != null) {
       TextInputState.unregisterInput(tag);
     }
+    if (this._rafId != null) {
+      cancelAnimationFrame(this._rafId);
+    }
   },
 
   contextTypes: {
@@ -865,7 +878,7 @@ const TextInput = createReactClass({
   render: function() {
     let textInput;
     if (Platform.OS === 'ios') {
-      textInput = UIManager.RCTVirtualText
+      textInput = UIManager.getViewManagerConfig('RCTVirtualText')
         ? this._renderIOS()
         : this._renderIOSLegacy();
     } else if (Platform.OS === 'android') {
@@ -936,7 +949,10 @@ const TextInput = createReactClass({
       );
       if (childCount >= 1) {
         children = (
-          <Text style={props.style} allowFontScaling={props.allowFontScaling}>
+          <Text
+            style={props.style}
+            allowFontScaling={props.allowFontScaling}
+            maxFontSizeMultiplier={props.maxFontSizeMultiplier}>
             {children}
           </Text>
         );
@@ -971,7 +987,8 @@ const TextInput = createReactClass({
         rejectResponderTermination={true}
         accessible={props.accessible}
         accessibilityLabel={props.accessibilityLabel}
-        accessibilityTraits={props.accessibilityTraits}
+        accessibilityRole={props.accessibilityRole}
+        accessibilityStates={props.accessibilityStates}
         nativeID={this.props.nativeID}
         testID={props.testID}>
         {textContainer}
@@ -1022,7 +1039,8 @@ const TextInput = createReactClass({
         rejectResponderTermination={true}
         accessible={props.accessible}
         accessibilityLabel={props.accessibilityLabel}
-        accessibilityTraits={props.accessibilityTraits}
+        accessibilityRole={props.accessibilityRole}
+        accessibilityStates={props.accessibilityStates}
         nativeID={this.props.nativeID}
         testID={props.testID}>
         {textContainer}
@@ -1033,10 +1051,9 @@ const TextInput = createReactClass({
   _renderAndroid: function() {
     const props = Object.assign({}, this.props);
     props.style = [this.props.style];
-    props.autoCapitalize =
-      UIManager.AndroidTextInput.Constants.AutoCapitalizationType[
-        props.autoCapitalize || 'sentences'
-      ];
+    props.autoCapitalize = UIManager.getViewManagerConfig(
+      'AndroidTextInput',
+    ).Constants.AutoCapitalizationType[props.autoCapitalize || 'sentences'];
     /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
      * suppresses an error when upgrading Flow's support for React. To see the
      * error delete this comment and run Flow. */
@@ -1082,7 +1099,8 @@ const TextInput = createReactClass({
         onPress={this._onPress}
         accessible={this.props.accessible}
         accessibilityLabel={this.props.accessibilityLabel}
-        accessibilityComponentType={this.props.accessibilityComponentType}
+        accessibilityRole={this.props.accessibilityRole}
+        accessibilityStates={this.props.accessibilityStates}
         nativeID={this.props.nativeID}
         testID={this.props.testID}>
         {textContainer}
diff --git a/Libraries/Components/TextInput/TextInputState.js b/Libraries/Components/TextInput/TextInputState.js
index 95cd24fbe8d2dc..19acafe2642855 100644
--- a/Libraries/Components/TextInput/TextInputState.js
+++ b/Libraries/Components/TextInput/TextInputState.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,7 @@
  * should be funneled through here
  *
  * @format
- * @flow
+ * @flow strict-local
  */
 
 'use strict';
@@ -18,73 +18,76 @@
 const Platform = require('Platform');
 const UIManager = require('UIManager');
 
+let currentlyFocusedID: ?number = null;
 const inputs = new Set();
 
-const TextInputState = {
-  /**
-   * Internal state
-   */
-  _currentlyFocusedID: (null: ?number),
-
-  /**
-   * Returns the ID of the currently focused text field, if one exists
-   * If no text field is focused it returns null
-   */
-  currentlyFocusedField: function(): ?number {
-    return this._currentlyFocusedID;
-  },
+/**
+ * Returns the ID of the currently focused text field, if one exists
+ * If no text field is focused it returns null
+ */
+function currentlyFocusedField(): ?number {
+  return currentlyFocusedID;
+}
 
-  /**
-   * @param {number} TextInputID id of the text field to focus
-   * Focuses the specified text field
-   * noop if the text field was already focused
-   */
-  focusTextInput: function(textFieldID: ?number) {
-    if (this._currentlyFocusedID !== textFieldID && textFieldID !== null) {
-      this._currentlyFocusedID = textFieldID;
-      if (Platform.OS === 'ios') {
-        UIManager.focus(textFieldID);
-      } else if (Platform.OS === 'android') {
-        UIManager.dispatchViewManagerCommand(
-          textFieldID,
-          UIManager.AndroidTextInput.Commands.focusTextInput,
-          null,
-        );
-      }
+/**
+ * @param {number} TextInputID id of the text field to focus
+ * Focuses the specified text field
+ * noop if the text field was already focused
+ */
+function focusTextInput(textFieldID: ?number) {
+  if (currentlyFocusedID !== textFieldID && textFieldID !== null) {
+    currentlyFocusedID = textFieldID;
+    if (Platform.OS === 'ios') {
+      UIManager.focus(textFieldID);
+    } else if (Platform.OS === 'android') {
+      UIManager.dispatchViewManagerCommand(
+        textFieldID,
+        UIManager.getViewManagerConfig('AndroidTextInput').Commands
+          .focusTextInput,
+        null,
+      );
     }
-  },
+  }
+}
 
-  /**
-   * @param {number} textFieldID id of the text field to unfocus
-   * Unfocuses the specified text field
-   * noop if it wasn't focused
-   */
-  blurTextInput: function(textFieldID: ?number) {
-    if (this._currentlyFocusedID === textFieldID && textFieldID !== null) {
-      this._currentlyFocusedID = null;
-      if (Platform.OS === 'ios') {
-        UIManager.blur(textFieldID);
-      } else if (Platform.OS === 'android') {
-        UIManager.dispatchViewManagerCommand(
-          textFieldID,
-          UIManager.AndroidTextInput.Commands.blurTextInput,
-          null,
-        );
-      }
+/**
+ * @param {number} textFieldID id of the text field to unfocus
+ * Unfocuses the specified text field
+ * noop if it wasn't focused
+ */
+function blurTextInput(textFieldID: ?number) {
+  if (currentlyFocusedID === textFieldID && textFieldID !== null) {
+    currentlyFocusedID = null;
+    if (Platform.OS === 'ios') {
+      UIManager.blur(textFieldID);
+    } else if (Platform.OS === 'android') {
+      UIManager.dispatchViewManagerCommand(
+        textFieldID,
+        UIManager.getViewManagerConfig('AndroidTextInput').Commands
+          .blurTextInput,
+        null,
+      );
     }
-  },
+  }
+}
 
-  registerInput: function(textFieldID: number) {
-    inputs.add(textFieldID);
-  },
+function registerInput(textFieldID: number) {
+  inputs.add(textFieldID);
+}
 
-  unregisterInput: function(textFieldID: number) {
-    inputs.delete(textFieldID);
-  },
+function unregisterInput(textFieldID: number) {
+  inputs.delete(textFieldID);
+}
 
-  isTextInput: function(textFieldID: number) {
-    return inputs.has(textFieldID);
-  },
-};
+function isTextInput(textFieldID: number) {
+  return inputs.has(textFieldID);
+}
 
-module.exports = TextInputState;
+module.exports = {
+  currentlyFocusedField,
+  focusTextInput,
+  blurTextInput,
+  registerInput,
+  unregisterInput,
+  isTextInput,
+};
diff --git a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js
index 6cdd964cc8cea2..bdb29421f89d0e 100644
--- a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js
+++ b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js
index 6a0ecfa656313c..59ec50eb27260c 100644
--- a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js
+++ b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.android.js b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
index c661adf503565d..832887453c3fc0 100644
--- a/Libraries/Components/ToastAndroid/ToastAndroid.android.js
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.ios.js b/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
index adb6032ef6731b..ed5fcf02f40116 100644
--- a/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
index 44bcfc03d8046e..23d9f22b8b45a0 100644
--- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
+++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,13 +9,13 @@
 
 'use strict';
 
+const DeprecatedColorPropType = require('DeprecatedColorPropType');
+const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
 const Image = require('Image');
 const NativeMethodsMixin = require('NativeMethodsMixin');
-const React = require('React');
 const PropTypes = require('prop-types');
+const React = require('React');
 const UIManager = require('UIManager');
-const ViewPropTypes = require('ViewPropTypes');
-const ColorPropType = require('ColorPropType');
 
 const createReactClass = require('create-react-class');
 const requireNativeComponent = require('requireNativeComponent');
@@ -68,7 +68,7 @@ const ToolbarAndroid = createReactClass({
   mixins: [NativeMethodsMixin],
 
   propTypes: {
-    ...ViewPropTypes,
+    ...DeprecatedViewPropTypes,
     /**
      * Sets possible actions on the toolbar as part of the action menu. These are displayed as icons
      * or text on the right side of the widget. If they don't fit they are placed in an 'overflow'
@@ -118,7 +118,7 @@ const ToolbarAndroid = createReactClass({
     /**
      * Sets the toolbar subtitle color.
      */
-    subtitleColor: ColorPropType,
+    subtitleColor: DeprecatedColorPropType,
     /**
      * Sets the toolbar title.
      */
@@ -126,7 +126,7 @@ const ToolbarAndroid = createReactClass({
     /**
      * Sets the toolbar title color.
      */
-    titleColor: ColorPropType,
+    titleColor: DeprecatedColorPropType,
     /**
      * Sets the content inset for the toolbar starting edge.
      *
@@ -185,8 +185,9 @@ const ToolbarAndroid = createReactClass({
           action.icon = resolveAssetSource(action.icon);
         }
         if (action.show) {
-          action.show =
-            UIManager.ToolbarAndroid.Constants.ShowAsAction[action.show];
+          action.show = UIManager.getViewManagerConfig(
+            'ToolbarAndroid',
+          ).Constants.ShowAsAction[action.show];
         }
         nativeActions.push(action);
       }
diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js
index 260d559929796f..7a00b6636cf664 100644
--- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js
+++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Touchable/BoundingDimensions.js b/Libraries/Components/Touchable/BoundingDimensions.js
index 755da5ab8937aa..28622a5b2da7f1 100644
--- a/Libraries/Components/Touchable/BoundingDimensions.js
+++ b/Libraries/Components/Touchable/BoundingDimensions.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Touchable/PooledClass.js b/Libraries/Components/Touchable/PooledClass.js
index a6934facae7049..0d6168a3fa51cf 100644
--- a/Libraries/Components/Touchable/PooledClass.js
+++ b/Libraries/Components/Touchable/PooledClass.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Touchable/Position.js b/Libraries/Components/Touchable/Position.js
index 19899d74c49820..bc6a45cc6c6a1f 100644
--- a/Libraries/Components/Touchable/Position.js
+++ b/Libraries/Components/Touchable/Position.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js
index 3f1874c8aac4a4..8fc27be8882e63 100644
--- a/Libraries/Components/Touchable/Touchable.js
+++ b/Libraries/Components/Touchable/Touchable.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js
index c899748b44fd1c..c1e3a731fec294 100644
--- a/Libraries/Components/Touchable/TouchableBounce.js
+++ b/Libraries/Components/Touchable/TouchableBounce.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,18 +10,19 @@
 'use strict';
 
 const Animated = require('Animated');
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
+const DeprecatedEdgeInsetsPropType = require('DeprecatedEdgeInsetsPropType');
 const NativeMethodsMixin = require('NativeMethodsMixin');
-const React = require('React');
-const createReactClass = require('create-react-class');
 const PropTypes = require('prop-types');
+const React = require('React');
 const Touchable = require('Touchable');
 const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
-const ViewPropTypes = require('ViewPropTypes');
+
+const createReactClass = require('create-react-class');
 
 import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
-import type {Props as TouchableWithoutFeedbackProps} from 'TouchableWithoutFeedback';
 import type {ViewStyleProp} from 'StyleSheet';
+import type {Props as TouchableWithoutFeedbackProps} from 'TouchableWithoutFeedback';
 
 type Event = Object;
 
@@ -69,14 +70,14 @@ const TouchableBounce = ((createReactClass({
      * 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: EdgeInsetsPropType,
+    pressRetentionOffset: DeprecatedEdgeInsetsPropType,
     releaseVelocity: PropTypes.number.isRequired,
     releaseBounciness: PropTypes.number.isRequired,
     /**
      * Style to apply to the container/underlay. Most commonly used to make sure
      * rounded corners match the wrapped component.
      */
-    style: ViewPropTypes.style,
+    style: DeprecatedViewPropTypes.style,
   },
 
   getDefaultProps: function() {
@@ -160,8 +161,9 @@ const TouchableBounce = ((createReactClass({
         style={[{transform: [{scale: this.state.scale}]}, this.props.style]}
         accessible={this.props.accessible !== false}
         accessibilityLabel={this.props.accessibilityLabel}
-        accessibilityComponentType={this.props.accessibilityComponentType}
-        accessibilityTraits={this.props.accessibilityTraits}
+        accessibilityHint={this.props.accessibilityHint}
+        accessibilityRole={this.props.accessibilityRole}
+        accessibilityStates={this.props.accessibilityStates}
         nativeID={this.props.nativeID}
         testID={this.props.testID}
         hitSlop={this.props.hitSlop}
diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
index 5a681c099125ac..f4e81f37485e10 100644
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,25 +9,25 @@
  */
 'use strict';
 
-const ColorPropType = require('ColorPropType');
+const DeprecatedColorPropType = require('DeprecatedColorPropType');
+const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
 const NativeMethodsMixin = require('NativeMethodsMixin');
-const PropTypes = require('prop-types');
 const Platform = require('Platform');
+const PropTypes = require('prop-types');
 const React = require('React');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 const StyleSheet = require('StyleSheet');
 const Touchable = require('Touchable');
 const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 const View = require('View');
-const ViewPropTypes = require('ViewPropTypes');
 
 const createReactClass = require('create-react-class');
 const ensurePositiveDelayProps = require('ensurePositiveDelayProps');
 
 import type {PressEvent} from 'CoreEventTypes';
-import type {Props as TouchableWithoutFeedbackProps} from 'TouchableWithoutFeedback';
 import type {ViewStyleProp} from 'StyleSheet';
 import type {ColorValue} from 'StyleSheetTypes';
+import type {Props as TouchableWithoutFeedbackProps} from 'TouchableWithoutFeedback';
 
 const DEFAULT_PROPS = {
   activeOpacity: 0.85,
@@ -164,12 +164,12 @@ const TouchableHighlight = ((createReactClass({
      * The color of the underlay that will show through when the touch is
      * active.
      */
-    underlayColor: ColorPropType,
+    underlayColor: DeprecatedColorPropType,
     /**
      * Style to apply to the container/underlay. Most commonly used to make sure
      * rounded corners match the wrapped component.
      */
-    style: ViewPropTypes.style,
+    style: DeprecatedViewPropTypes.style,
     /**
      * Called immediately after the underlay is shown
      */
@@ -348,8 +348,9 @@ const TouchableHighlight = ((createReactClass({
       <View
         accessible={this.props.accessible !== false}
         accessibilityLabel={this.props.accessibilityLabel}
-        accessibilityComponentType={this.props.accessibilityComponentType}
-        accessibilityTraits={this.props.accessibilityTraits}
+        accessibilityHint={this.props.accessibilityHint}
+        accessibilityRole={this.props.accessibilityRole}
+        accessibilityStates={this.props.accessibilityStates}
         style={StyleSheet.compose(
           this.props.style,
           this.state.extraUnderlayStyle,
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
index f727d5d8a2b6be..77e54347928bb1 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -16,6 +16,7 @@ const ReactNative = require('ReactNative');
 const Touchable = require('Touchable');
 const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 const UIManager = require('UIManager');
+const View = require('View');
 
 const createReactClass = require('create-react-class');
 const ensurePositiveDelayProps = require('ensurePositiveDelayProps');
@@ -222,7 +223,7 @@ const TouchableNativeFeedback = createReactClass({
   _dispatchHotspotUpdate: function(destX, destY) {
     UIManager.dispatchViewManagerCommand(
       ReactNative.findNodeHandle(this),
-      UIManager.RCTView.Commands.hotspotUpdate,
+      UIManager.getViewManagerConfig('RCTView').Commands.hotspotUpdate,
       [destX || 0, destY || 0],
     );
   },
@@ -230,7 +231,7 @@ const TouchableNativeFeedback = createReactClass({
   _dispatchPressedStateChange: function(pressed) {
     UIManager.dispatchViewManagerCommand(
       ReactNative.findNodeHandle(this),
-      UIManager.RCTView.Commands.setPressed,
+      UIManager.getViewManagerConfig('RCTView').Commands.setPressed,
       [pressed],
     );
   },
@@ -238,7 +239,7 @@ const TouchableNativeFeedback = createReactClass({
   render: function() {
     const child = React.Children.only(this.props.children);
     let children = child.props.children;
-    if (Touchable.TOUCH_TARGET_DEBUG && child.type.displayName === 'View') {
+    if (Touchable.TOUCH_TARGET_DEBUG && child.type === View) {
       if (!Array.isArray(children)) {
         children = [children];
       }
@@ -269,8 +270,8 @@ const TouchableNativeFeedback = createReactClass({
       [drawableProp]: this.props.background,
       accessible: this.props.accessible !== false,
       accessibilityLabel: this.props.accessibilityLabel,
-      accessibilityComponentType: this.props.accessibilityComponentType,
-      accessibilityTraits: this.props.accessibilityTraits,
+      accessibilityRole: this.props.accessibilityRole,
+      accessibilityStates: this.props.accessibilityStates,
       children,
       testID: this.props.testID,
       onLayout: this.props.onLayout,
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
index b0770047bbeef8..e32f30deda1124 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index f860337e0d653b..9d153a586a52d6 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -15,7 +15,6 @@ const Easing = require('Easing');
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const React = require('React');
 const PropTypes = require('prop-types');
-const TimerMixin = require('react-timer-mixin');
 const Touchable = require('Touchable');
 const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 
@@ -132,7 +131,7 @@ type Props = $ReadOnly<{|
  */
 const TouchableOpacity = ((createReactClass({
   displayName: 'TouchableOpacity',
-  mixins: [TimerMixin, Touchable.Mixin, NativeMethodsMixin],
+  mixins: [Touchable.Mixin, NativeMethodsMixin],
 
   propTypes: {
     ...TouchableWithoutFeedback.propTypes,
@@ -256,8 +255,9 @@ const TouchableOpacity = ((createReactClass({
       <Animated.View
         accessible={this.props.accessible !== false}
         accessibilityLabel={this.props.accessibilityLabel}
-        accessibilityComponentType={this.props.accessibilityComponentType}
-        accessibilityTraits={this.props.accessibilityTraits}
+        accessibilityHint={this.props.accessibilityHint}
+        accessibilityRole={this.props.accessibilityRole}
+        accessibilityStates={this.props.accessibilityStates}
         style={[this.props.style, {opacity: this.state.anim}]}
         nativeID={this.props.nativeID}
         testID={this.props.testID}
diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
index 9228d271a90f8d..50e98e504667f6 100755
--- a/Libraries/Components/Touchable/TouchableWithoutFeedback.js
+++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,26 +10,29 @@
 
 'use strict';
 
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const DeprecatedEdgeInsetsPropType = require('DeprecatedEdgeInsetsPropType');
 const React = require('React');
 const PropTypes = require('prop-types');
-const TimerMixin = require('react-timer-mixin');
 const Touchable = require('Touchable');
+const View = require('View');
 
 const createReactClass = require('create-react-class');
 const ensurePositiveDelayProps = require('ensurePositiveDelayProps');
-const warning = require('fbjs/lib/warning');
 
 const {
-  AccessibilityComponentTypes,
-  AccessibilityTraits,
-} = require('ViewAccessibility');
+  DeprecatedAccessibilityComponentTypes,
+  DeprecatedAccessibilityRoles,
+  DeprecatedAccessibilityStates,
+  DeprecatedAccessibilityTraits,
+} = require('DeprecatedViewAccessibility');
 
 import type {PressEvent} from 'CoreEventTypes';
 import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
 import type {
   AccessibilityComponentType,
-  AccessibilityTraits as AccessibilityTraitsFlow,
+  AccessibilityRole,
+  AccessibilityStates,
+  AccessibilityTraits,
 } from 'ViewAccessibility';
 
 const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
@@ -43,7 +46,11 @@ export type Props = $ReadOnly<{|
     | string
     | Array<any>
     | any,
-  accessibilityTraits?: ?AccessibilityTraitsFlow,
+  accessibilityHint?: ?Stringish,
+  accessibilityIgnoresInvertColors?: ?boolean,
+  accessibilityRole?: ?AccessibilityRole,
+  accessibilityStates?: ?AccessibilityStates,
+  accessibilityTraits?: ?AccessibilityTraits,
   children?: ?React.Node,
   delayLongPress?: ?number,
   delayPressIn?: ?number,
@@ -51,6 +58,8 @@ export type Props = $ReadOnly<{|
   disabled?: ?boolean,
   hitSlop?: ?EdgeInsetsProp,
   nativeID?: ?string,
+  onBlur?: ?Function,
+  onFocus?: ?Function,
   onLayout?: ?Function,
   onLongPress?: ?Function,
   onPress?: ?Function,
@@ -70,15 +79,22 @@ export type Props = $ReadOnly<{|
  */
 const TouchableWithoutFeedback = ((createReactClass({
   displayName: 'TouchableWithoutFeedback',
-  mixins: [TimerMixin, Touchable.Mixin],
+  mixins: [Touchable.Mixin],
 
   propTypes: {
     accessible: PropTypes.bool,
     accessibilityLabel: PropTypes.node,
-    accessibilityComponentType: PropTypes.oneOf(AccessibilityComponentTypes),
+    accessibilityHint: PropTypes.string,
+    accessibilityComponentType: PropTypes.oneOf(
+      DeprecatedAccessibilityComponentTypes,
+    ),
+    accessibilityRole: PropTypes.oneOf(DeprecatedAccessibilityRoles),
+    accessibilityStates: PropTypes.arrayOf(
+      PropTypes.oneOf(DeprecatedAccessibilityStates),
+    ),
     accessibilityTraits: PropTypes.oneOfType([
-      PropTypes.oneOf(AccessibilityTraits),
-      PropTypes.arrayOf(PropTypes.oneOf(AccessibilityTraits)),
+      PropTypes.oneOf(DeprecatedAccessibilityTraits),
+      PropTypes.arrayOf(PropTypes.oneOf(DeprecatedAccessibilityTraits)),
     ]),
     /**
      * When `accessible` is true (which is the default) this may be called when
@@ -141,7 +157,7 @@ const TouchableWithoutFeedback = ((createReactClass({
      * 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: EdgeInsetsPropType,
+    pressRetentionOffset: DeprecatedEdgeInsetsPropType,
     /**
      * This defines how far your touch can start away from the button. This is
      * added to `pressRetentionOffset` when moving off of the button.
@@ -150,7 +166,7 @@ const TouchableWithoutFeedback = ((createReactClass({
      * of sibling views always takes precedence if a touch hits two overlapping
      * views.
      */
-    hitSlop: EdgeInsetsPropType,
+    hitSlop: DeprecatedEdgeInsetsPropType,
   },
 
   getInitialState: function() {
@@ -213,32 +229,19 @@ const TouchableWithoutFeedback = ((createReactClass({
     // $FlowFixMe(>=0.41.0)
     const child = React.Children.only(this.props.children);
     let children = child.props.children;
-    warning(
-      !child.type || child.type.displayName !== 'Text',
-      'TouchableWithoutFeedback does not work well with Text children. Wrap children in a View instead. See ' +
-        ((child._owner && child._owner.getName && child._owner.getName()) ||
-          '<unknown>'),
-    );
-    if (
-      Touchable.TOUCH_TARGET_DEBUG &&
-      child.type &&
-      child.type.displayName === 'View'
-    ) {
+    if (Touchable.TOUCH_TARGET_DEBUG && child.type === View) {
       children = React.Children.toArray(children);
       children.push(
         Touchable.renderDebugView({color: 'red', hitSlop: this.props.hitSlop}),
       );
     }
-    const style =
-      Touchable.TOUCH_TARGET_DEBUG &&
-      child.type &&
-      child.type.displayName === 'Text'
-        ? [child.props.style, {color: 'red'}]
-        : child.props.style;
     return (React: any).cloneElement(child, {
       accessible: this.props.accessible !== false,
       accessibilityLabel: this.props.accessibilityLabel,
+      accessibilityHint: this.props.accessibilityHint,
       accessibilityComponentType: this.props.accessibilityComponentType,
+      accessibilityRole: this.props.accessibilityRole,
+      accessibilityStates: this.props.accessibilityStates,
       accessibilityTraits: this.props.accessibilityTraits,
       nativeID: this.props.nativeID,
       testID: this.props.testID,
@@ -251,7 +254,6 @@ const TouchableWithoutFeedback = ((createReactClass({
       onResponderMove: this.touchableHandleResponderMove,
       onResponderRelease: this.touchableHandleResponderRelease,
       onResponderTerminate: this.touchableHandleResponderTerminate,
-      style,
       children,
     });
   },
diff --git a/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js b/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js
index f152b68bba74a4..234c178afddd94 100644
--- a/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js
+++ b/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
index f40cc0b7ad1be9..8f299d8a360103 100644
--- a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
+++ b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Touchable/ensureComponentIsNative.js b/Libraries/Components/Touchable/ensureComponentIsNative.js
index 5ce5a39d9baaf0..911a8ffbb67bcb 100644
--- a/Libraries/Components/Touchable/ensureComponentIsNative.js
+++ b/Libraries/Components/Touchable/ensureComponentIsNative.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/Touchable/ensurePositiveDelayProps.js b/Libraries/Components/Touchable/ensurePositiveDelayProps.js
index 01c001ad4b6a7e..f4f23aec035641 100644
--- a/Libraries/Components/Touchable/ensurePositiveDelayProps.js
+++ b/Libraries/Components/Touchable/ensurePositiveDelayProps.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/UnimplementedViews/UnimplementedView.js b/Libraries/Components/UnimplementedViews/UnimplementedView.js
index 7be6f1ac77f759..30e64eb83d01fd 100644
--- a/Libraries/Components/UnimplementedViews/UnimplementedView.js
+++ b/Libraries/Components/UnimplementedViews/UnimplementedView.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 'use strict';
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.android.js b/Libraries/Components/View/PlatformViewPropTypes.android.js
similarity index 56%
rename from Libraries/Components/SafeAreaView/SafeAreaView.android.js
rename to Libraries/Components/View/PlatformViewPropTypes.android.js
index a581258a57832f..f96fe3a62d8149 100644
--- a/Libraries/Components/SafeAreaView/SafeAreaView.android.js
+++ b/Libraries/Components/View/PlatformViewPropTypes.android.js
@@ -1,13 +1,14 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @providesModule PlatformViewPropTypes
  * @format
  * @flow
  */
 
 'use strict';
 
-module.exports = require('View');
+export type PlatformViewPropTypes = {};
diff --git a/Libraries/Components/View/PlatformViewPropTypes.ios.js b/Libraries/Components/View/PlatformViewPropTypes.ios.js
new file mode 100644
index 00000000000000..fc842750601026
--- /dev/null
+++ b/Libraries/Components/View/PlatformViewPropTypes.ios.js
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule PlatformViewPropTypes
+ * @format
+ * @flow
+ */
+
+'use strict';
+
+import type {TVViewProps} from 'TVViewPropTypes';
+
+export type PlatformViewPropTypes = TVViewProps;
diff --git a/Libraries/Components/View/PlatformViewPropTypes.js b/Libraries/Components/View/PlatformViewPropTypes.js
deleted file mode 100644
index 4c6105893cc6eb..00000000000000
--- a/Libraries/Components/View/PlatformViewPropTypes.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 Platform = require('Platform');
-
-let TVViewPropTypes = {};
-// We need to always include TVViewPropTypes on Android
-// as unlike on iOS we can't detect TV devices at build time
-// and hence make view manager export a different list of native properties.
-if (Platform.isTV || Platform.OS === 'android') {
-  TVViewPropTypes = require('TVViewPropTypes');
-}
-
-module.exports = TVViewPropTypes;
diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js
index 7a75dda8b7f41b..240e6a4f0a4e4a 100644
--- a/Libraries/Components/View/ReactNativeStyleAttributes.js
+++ b/Libraries/Components/View/ReactNativeStyleAttributes.js
@@ -1,32 +1,32 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
+ * @format strict-local
  * @flow
  */
 
 'use strict';
 
-const ImageStylePropTypes = require('ImageStylePropTypes');
+const DeprecatedImageStylePropTypes = require('DeprecatedImageStylePropTypes');
 const TextStylePropTypes = require('TextStylePropTypes');
-const ViewStylePropTypes = require('ViewStylePropTypes');
+const DeprecatedViewStylePropTypes = require('DeprecatedViewStylePropTypes');
 
-/* $FlowFixMe(>=0.54.0 site=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. */
-const keyMirror = require('fbjs/lib/keyMirror');
 const processColor = require('processColor');
 const processTransform = require('processTransform');
 const sizesDiffer = require('sizesDiffer');
 
-const ReactNativeStyleAttributes = {
-  ...keyMirror(ViewStylePropTypes),
-  ...keyMirror(TextStylePropTypes),
-  ...keyMirror(ImageStylePropTypes),
-};
+const ReactNativeStyleAttributes = {};
+
+for (const attributeName of Object.keys({
+  ...DeprecatedViewStylePropTypes,
+  ...TextStylePropTypes,
+  ...DeprecatedImageStylePropTypes,
+})) {
+  ReactNativeStyleAttributes[attributeName] = true;
+}
 
 ReactNativeStyleAttributes.transform = {process: processTransform};
 ReactNativeStyleAttributes.shadowOffset = {diff: sizesDiffer};
diff --git a/Libraries/Components/View/ReactNativeViewAttributes.js b/Libraries/Components/View/ReactNativeViewAttributes.js
index bc4ca6b3d229fc..5b4ab1c6c2c5fa 100644
--- a/Libraries/Components/View/ReactNativeViewAttributes.js
+++ b/Libraries/Components/View/ReactNativeViewAttributes.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
- * @flow strict
  */
 
 'use strict';
@@ -21,7 +21,10 @@ ReactNativeViewAttributes.UIView = {
   accessibilityLabel: true,
   accessibilityComponentType: true,
   accessibilityLiveRegion: true,
+  accessibilityRole: true,
+  accessibilityStates: true,
   accessibilityTraits: true,
+  accessibilityHint: true,
   importantForAccessibility: true,
   nativeID: true,
   testID: true,
diff --git a/Libraries/Components/View/ShadowPropTypesIOS.js b/Libraries/Components/View/ShadowPropTypesIOS.js
deleted file mode 100644
index 2dfc021735ad9e..00000000000000
--- a/Libraries/Components/View/ShadowPropTypesIOS.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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';
-
-const ColorPropType = require('ColorPropType');
-const ReactPropTypes = require('prop-types');
-
-/**
- * These props can be used to dynamically generate shadows on views, images, text, etc.
- *
- * Because they are dynamically generated, they may cause performance regressions. Static
- * shadow image asset may be a better way to go for optimal performance.
- *
- * These properties are iOS only - for similar functionality on Android, use the [`elevation`
- * property](docs/viewstyleproptypes.html#elevation).
- */
-const ShadowPropTypesIOS = {
-  /**
-   * Sets the drop shadow color
-   * @platform ios
-   */
-  shadowColor: ColorPropType,
-  /**
-   * Sets the drop shadow offset
-   * @platform ios
-   */
-  shadowOffset: ReactPropTypes.shape({
-    width: ReactPropTypes.number,
-    height: ReactPropTypes.number,
-  }),
-  /**
-   * Sets the drop shadow opacity (multiplied by the color's alpha component)
-   * @platform ios
-   */
-  shadowOpacity: ReactPropTypes.number,
-  /**
-   * Sets the drop shadow blur radius
-   * @platform ios
-   */
-  shadowRadius: ReactPropTypes.number,
-};
-
-module.exports = ShadowPropTypesIOS;
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index 2cfa05a8c118b2..46e55feb8be3f8 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -1,22 +1,21 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
 
 const React = require('React');
 const TextAncestor = require('TextAncestor');
+const ViewNativeComponent = require('ViewNativeComponent');
 
 const invariant = require('fbjs/lib/invariant');
-const requireNativeComponent = require('requireNativeComponent');
 
-import type {NativeComponent} from 'ReactNative';
 import type {ViewProps} from 'ViewPropTypes';
 
 export type Props = ViewProps;
@@ -28,27 +27,29 @@ export type Props = ViewProps;
  *
  * @see http://facebook.github.io/react-native/docs/view.html
  */
-const RCTView = requireNativeComponent('RCTView');
 
-let ViewToExport = RCTView;
+let ViewToExport = ViewNativeComponent;
 if (__DEV__) {
-  const View = (props: Props, forwardedRef: ?React.Ref<'RCTView'>) => {
-    return (
-      <TextAncestor.Consumer>
-        {hasTextAncestor => {
-          invariant(
-            !hasTextAncestor,
-            'Nesting of <View> within <Text> is not currently supported.',
-          );
-          return <RCTView {...props} ref={forwardedRef} />;
-        }}
-      </TextAncestor.Consumer>
-    );
-  };
-  // $FlowFixMe - TODO T29156721 `React.forwardRef` is not defined in Flow, yet.
-  ViewToExport = React.forwardRef(View);
+  if (!global.__RCTProfileIsProfiling) {
+    const View = (
+      props: Props,
+      forwardedRef: React.Ref<typeof ViewNativeComponent>,
+    ) => {
+      return (
+        <TextAncestor.Consumer>
+          {hasTextAncestor => {
+            invariant(
+              !hasTextAncestor,
+              'Nesting of <View> within <Text> is not currently supported.',
+            );
+            return <ViewNativeComponent {...props} ref={forwardedRef} />;
+          }}
+        </TextAncestor.Consumer>
+      );
+    };
+    // $FlowFixMe - TODO T29156721 `React.forwardRef` is not defined in Flow, yet.
+    ViewToExport = React.forwardRef(View);
+  }
 }
 
-module.exports = ((ViewToExport: $FlowFixMe): Class<
-  NativeComponent<ViewProps>,
->);
+module.exports = ((ViewToExport: $FlowFixMe): typeof ViewNativeComponent);
diff --git a/Libraries/Components/View/ViewAccessibility.js b/Libraries/Components/View/ViewAccessibility.js
index 17ed43140e46c6..ed7eb4d68e50b8 100644
--- a/Libraries/Components/View/ViewAccessibility.js
+++ b/Libraries/Components/View/ViewAccessibility.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -39,44 +39,19 @@ export type AccessibilityComponentType =
   | 'radiobutton_checked'
   | 'radiobutton_unchecked';
 
+// This must be kept in sync with the AccessibilityRolesMask in RCTViewManager.m
 export type AccessibilityRole =
   | 'none'
   | 'button'
+  | 'link'
+  | 'search'
   | 'image'
   | 'keyboardkey'
-  | 'text';
+  | 'text'
+  | 'adjustable'
+  | 'imagebutton'
+  | 'header'
+  | 'summary';
 
-module.exports = {
-  AccessibilityTraits: [
-    'none',
-    'button',
-    'link',
-    'header',
-    'search',
-    'image',
-    'selected',
-    'plays',
-    'key',
-    'text',
-    'summary',
-    'disabled',
-    'frequentUpdates',
-    'startsMedia',
-    'adjustable',
-    'allowsDirectInteraction',
-    'pageTurn',
-  ],
-  AccessibilityComponentTypes: [
-    'none',
-    'button',
-    'radiobutton_checked',
-    'radiobutton_unchecked',
-  ],
-  AccessibilityRoles: [
-    'none',
-    'button',
-    'image',
-    'keyboardkey',
-    'text',
-  ],
-};
+// This must be kept in sync with the AccessibilityStatesMask in RCTViewManager.m
+export type AccessibilityStates = $ReadOnlyArray<'disabled' | 'selected'>;
diff --git a/Libraries/Components/View/ViewNativeComponent.js b/Libraries/Components/View/ViewNativeComponent.js
new file mode 100644
index 00000000000000..432040ad3c3a4c
--- /dev/null
+++ b/Libraries/Components/View/ViewNativeComponent.js
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 ReactNative = require('ReactNative');
+
+const requireNativeComponent = require('requireNativeComponent');
+
+import type {ViewProps} from 'ViewPropTypes';
+
+type ViewNativeComponentType = Class<ReactNative.NativeComponent<ViewProps>>;
+
+const NativeViewComponent = requireNativeComponent('RCTView');
+
+module.exports = ((NativeViewComponent: any): ViewNativeComponentType);
diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
index 73a39cf255fcbf..d2907278c34d08 100644
--- a/Libraries/Components/View/ViewPropTypes.js
+++ b/Libraries/Components/View/ViewPropTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,221 +10,50 @@
 
 'use strict';
 
-const React = require('React');
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
-const PlatformViewPropTypes = require('PlatformViewPropTypes');
-const PropTypes = require('prop-types');
-const StyleSheetPropType = require('StyleSheetPropType');
-const ViewStylePropTypes = require('ViewStylePropTypes');
-
-const {
-  AccessibilityComponentTypes,
-  AccessibilityTraits,
-  AccessibilityRoles,
-} = require('ViewAccessibility');
-
+import type {Layout, LayoutEvent} from 'CoreEventTypes';
+import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
+import type React from 'React';
+import type {ViewStyleProp} from 'StyleSheet';
+import type {TVViewProps} from 'TVViewPropTypes';
 import type {
   AccessibilityComponentType,
   AccessibilityTrait,
   AccessibilityRole,
+  AccessibilityStates,
 } from 'ViewAccessibility';
-import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
-import type {TVViewProps} from 'TVViewPropTypes';
-import type {Layout, LayoutEvent} from 'CoreEventTypes';
-
-const stylePropType = StyleSheetPropType(ViewStylePropTypes);
 
 export type ViewLayout = Layout;
 export type ViewLayoutEvent = LayoutEvent;
 
 type DirectEventProps = $ReadOnly<{|
-  onAccessibilityAction?: Function,
-  onAccessibilityTap?: Function,
-  onLayout?: ?(event: LayoutEvent) => void,
-  onMagicTap?: Function,
-|}>;
-
-type TouchEventProps = $ReadOnly<{|
-  onTouchCancel?: ?Function,
-  onTouchCancelCapture?: ?Function,
-  onTouchEnd?: ?Function,
-  onTouchEndCapture?: ?Function,
-  onTouchMove?: ?Function,
-  onTouchMoveCapture?: ?Function,
-  onTouchStart?: ?Function,
-  onTouchStartCapture?: ?Function,
-|}>;
-
-type GestureResponderEventProps = $ReadOnly<{|
-  onMoveShouldSetResponder?: ?Function,
-  onMoveShouldSetResponderCapture?: ?Function,
-  onResponderGrant?: ?Function,
-  onResponderMove?: ?Function,
-  onResponderReject?: ?Function,
-  onResponderRelease?: ?Function,
-  onResponderStart?: ?Function,
-  onResponderTerminate?: ?Function,
-  onResponderTerminationRequest?: ?Function,
-  onStartShouldSetResponder?: ?Function,
-  onStartShouldSetResponderCapture?: ?Function,
-|}>;
-
-export type ViewProps = $ReadOnly<{|
-  ...DirectEventProps,
-  ...GestureResponderEventProps,
-  ...TouchEventProps,
-
-  // There's no easy way to create a different type if (Platform.isTV):
-  // so we must include TVViewProps
-  ...TVViewProps,
-
-  accessible?: boolean,
-  accessibilityLabel?:
-    | null
-    | React$PropType$Primitive<any>
-    | string
-    | Array<any>
-    | any,
-  accessibilityActions?: Array<string>,
-  accessibilityComponentType?: AccessibilityComponentType,
-  accessibilityLiveRegion?: 'none' | 'polite' | 'assertive',
-  importantForAccessibility?: 'auto' | 'yes' | 'no' | 'no-hide-descendants',
-  accessibilityIgnoresInvertColors?: boolean,
-  accessibilityTraits?: AccessibilityTrait | Array<AccessibilityTrait>,
-  accessibilityRole?: AccessibilityRole,
-  accessibilityViewIsModal?: boolean,
-  accessibilityElementsHidden?: boolean,
-  children?: ?React.Node,
-  testID?: ?string,
-  nativeID?: string,
-  hitSlop?: ?EdgeInsetsProp,
-  pointerEvents?: null | 'box-none' | 'none' | 'box-only' | 'auto',
-  style?: stylePropType,
-  removeClippedSubviews?: boolean,
-  renderToHardwareTextureAndroid?: boolean,
-  shouldRasterizeIOS?: boolean,
-  collapsable?: boolean,
-  needsOffscreenAlphaCompositing?: boolean,
-|}>;
-
-module.exports = {
-  /**
-   * When `true`, indicates that the view is an accessibility element.
-   * By default, all the touchable elements are accessible.
-   *
-   * See http://facebook.github.io/react-native/docs/view.html#accessible
-   */
-  accessible: PropTypes.bool,
-
-  /**
-   * 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.
-   *
-   * See http://facebook.github.io/react-native/docs/view.html#accessibilitylabel
-   */
-  accessibilityLabel: PropTypes.node,
-
-  /**
-   * Provides an array of custom actions available for accessibility.
-   *
-   * @platform ios
-   */
-  accessibilityActions: PropTypes.arrayOf(PropTypes.string),
-
   /**
-   * Indicates to accessibility services to treat UI component like a
-   * native one. Works for Android only.
-   *
-   * @platform android
-   *
-   * See http://facebook.github.io/react-native/docs/view.html#accessibilitycomponenttype
-   */
-  accessibilityComponentType: PropTypes.oneOf(AccessibilityComponentTypes),
-
-  /**
-   * Indicates to accessibility services to treat UI component like a
-   * native one. Merging accessibilityComponentType and accessibilityTraits.
-   */
-  accessibilityRole: PropTypes.oneOf(AccessibilityRoles),
-
-  /**
-   * Indicates to accessibility services whether the user should be notified
-   * when this view changes. Works for Android API >= 19 only.
-   *
-   * @platform android
-   *
-   * See http://facebook.github.io/react-native/docs/view.html#accessibilityliveregion
-   */
-  accessibilityLiveRegion: PropTypes.oneOf(['none', 'polite', 'assertive']),
-
-  /**
-   * 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.
-   *
-   * @platform android
-   *
-   * See http://facebook.github.io/react-native/docs/view.html#importantforaccessibility
-   */
-  importantForAccessibility: PropTypes.oneOf([
-    'auto',
-    'yes',
-    'no',
-    'no-hide-descendants',
-  ]),
-
-  /**
-   * Provides additional traits to screen reader. By default no traits are
-   * provided unless specified otherwise in element.
-   *
-   * You can provide one trait or an array of many traits.
+   * When `accessible` is true, the system will try to invoke this function
+   * when the user performs an accessibility custom action.
    *
    * @platform ios
-   *
-   * See http://facebook.github.io/react-native/docs/view.html#accessibilitytraits
    */
-  accessibilityTraits: PropTypes.oneOfType([
-    PropTypes.oneOf(AccessibilityTraits),
-    PropTypes.arrayOf(PropTypes.oneOf(AccessibilityTraits)),
-  ]),
+  onAccessibilityAction?: ?Function,
 
   /**
-   * A value indicating whether VoiceOver should ignore the elements
-   * within views that are siblings of the receiver.
-   * Default is `false`.
-   *
-   * @platform ios
+   * When `accessible` is true, the system will try to invoke this function
+   * when the user performs accessibility tap gesture.
    *
-   * See http://facebook.github.io/react-native/docs/view.html#accessibilityviewismodal
+   * See http://facebook.github.io/react-native/docs/view.html#onaccessibilitytap
    */
-  accessibilityViewIsModal: PropTypes.bool,
+  onAccessibilityTap?: ?Function,
 
   /**
-   * A value indicating whether the accessibility elements contained within
-   * this accessibility element are hidden.
-   *
-   * @platform ios
+   * Invoked on mount and layout changes with:
    *
-   * See http://facebook.github.io/react-native/docs/view.html#accessibilityElementsHidden
-   */
-  accessibilityElementsHidden: PropTypes.bool,
-
-  /**
-   * When `accessible` is true, the system will try to invoke this function
-   * when the user performs an accessibility custom action.
+   * `{nativeEvent: { layout: {x, y, width, height}}}`
    *
-   * @platform ios
-   */
-  onAccessibilityAction: PropTypes.func,
-
-  /**
-   * When `accessible` is true, the system will try to invoke this function
-   * when the user performs accessibility tap gesture.
+   * This event is fired immediately once the layout has been calculated, but
+   * the new layout may not yet be reflected on the screen at the time the
+   * event is received, especially if a layout animation is in progress.
    *
-   * See http://facebook.github.io/react-native/docs/view.html#onaccessibilitytap
+   * See http://facebook.github.io/react-native/docs/view.html#onlayout
    */
-  onAccessibilityTap: PropTypes.func,
+  onLayout?: ?(event: LayoutEvent) => mixed,
 
   /**
    * When `accessible` is `true`, the system will invoke this function when the
@@ -232,31 +61,47 @@ module.exports = {
    *
    * See http://facebook.github.io/react-native/docs/view.html#onmagictap
    */
-  onMagicTap: PropTypes.func,
+  onMagicTap?: ?Function,
+|}>;
 
+type TouchEventProps = $ReadOnly<{|
+  onTouchCancel?: ?Function,
+  onTouchCancelCapture?: ?Function,
+  onTouchEnd?: ?Function,
+  onTouchEndCapture?: ?Function,
+  onTouchMove?: ?Function,
+  onTouchMoveCapture?: ?Function,
+  onTouchStart?: ?Function,
+  onTouchStartCapture?: ?Function,
+|}>;
+
+/**
+ * For most touch interactions, you'll simply want to wrap your component in
+ * `TouchableHighlight` or `TouchableOpacity`. Check out `Touchable.js`,
+ * `ScrollResponder.js` and `ResponderEventPlugin.js` for more discussion.
+ */
+type GestureResponderEventProps = $ReadOnly<{|
   /**
-   * Used to locate this view in end-to-end tests.
+   * Does this view want to "claim" touch responsiveness? This is called for
+   * every touch move on the `View` when it is not the responder.
    *
-   * > This disables the 'layout-only view removal' optimization for this view!
+   * `View.props.onMoveShouldSetResponder: (event) => [true | false]`, where
+   * `event` is a synthetic touch event as described above.
    *
-   * See http://facebook.github.io/react-native/docs/view.html#testid
+   * See http://facebook.github.io/react-native/docs/view.html#onmoveshouldsetresponder
    */
-  testID: PropTypes.string,
+  onMoveShouldSetResponder?: ?Function,
 
   /**
-   * Used to locate this view from native classes.
+   * If a parent `View` wants to prevent a child `View` from becoming responder
+   * on a move, it should have this handler which returns `true`.
    *
-   * > This disables the 'layout-only view removal' optimization for this view!
+   * `View.props.onMoveShouldSetResponderCapture: (event) => [true | false]`,
+   * where `event` is a synthetic touch event as described above.
    *
-   * See http://facebook.github.io/react-native/docs/view.html#nativeid
-   */
-  nativeID: PropTypes.string,
-
-  /**
-   * For most touch interactions, you'll simply want to wrap your component in
-   * `TouchableHighlight` or `TouchableOpacity`. Check out `Touchable.js`,
-   * `ScrollResponder.js` and `ResponderEventPlugin.js` for more discussion.
+   * See http://facebook.github.io/react-native/docs/view.html#onMoveShouldsetrespondercapture
    */
+  onMoveShouldSetResponderCapture?: ?Function,
 
   /**
    * The View is now responding for touch events. This is the time to highlight
@@ -267,7 +112,7 @@ module.exports = {
    *
    * See http://facebook.github.io/react-native/docs/view.html#onrespondergrant
    */
-  onResponderGrant: PropTypes.func,
+  onResponderGrant?: ?Function,
 
   /**
    * The user is moving their finger.
@@ -277,7 +122,7 @@ module.exports = {
    *
    * See http://facebook.github.io/react-native/docs/view.html#onrespondermove
    */
-  onResponderMove: PropTypes.func,
+  onResponderMove?: ?Function,
 
   /**
    * Another responder is already active and will not release it to that `View`
@@ -288,7 +133,7 @@ module.exports = {
    *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderreject
    */
-  onResponderReject: PropTypes.func,
+  onResponderReject?: ?Function,
 
   /**
    * Fired at the end of the touch.
@@ -298,7 +143,10 @@ module.exports = {
    *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderrelease
    */
-  onResponderRelease: PropTypes.func,
+  onResponderRelease?: ?Function,
+
+  onResponderStart?: ?Function,
+  onResponderEnd?: ?Function,
 
   /**
    * The responder has been taken from the `View`. Might be taken by other
@@ -311,7 +159,7 @@ module.exports = {
    *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderterminate
    */
-  onResponderTerminate: PropTypes.func,
+  onResponderTerminate?: ?Function,
 
   /**
    * Some other `View` wants to become responder and is asking this `View` to
@@ -322,7 +170,7 @@ module.exports = {
    *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderterminationrequest
    */
-  onResponderTerminationRequest: PropTypes.func,
+  onResponderTerminationRequest?: ?Function,
 
   /**
    * Does this view want to become responder on the start of a touch?
@@ -332,7 +180,7 @@ module.exports = {
    *
    * See http://facebook.github.io/react-native/docs/view.html#onstartshouldsetresponder
    */
-  onStartShouldSetResponder: PropTypes.func,
+  onStartShouldSetResponder?: ?Function,
 
   /**
    * If a parent `View` wants to prevent a child `View` from becoming responder
@@ -343,89 +191,127 @@ module.exports = {
    *
    * See http://facebook.github.io/react-native/docs/view.html#onstartshouldsetrespondercapture
    */
-  onStartShouldSetResponderCapture: PropTypes.func,
+  onStartShouldSetResponderCapture?: ?Function,
+|}>;
+
+type AndroidViewProps = $ReadOnly<{|
+  nativeBackgroundAndroid?: ?Object,
+  nativeForegroundAndroid?: ?Object,
 
   /**
-   * Does this view want to "claim" touch responsiveness? This is called for
-   * every touch move on the `View` when it is not the responder.
+   * Whether this `View` should render itself (and all of its children) into a
+   * single hardware texture on the GPU.
    *
-   * `View.props.onMoveShouldSetResponder: (event) => [true | false]`, where
-   * `event` is a synthetic touch event as described above.
+   * @platform android
    *
-   * See http://facebook.github.io/react-native/docs/view.html#onmoveshouldsetresponder
+   * See http://facebook.github.io/react-native/docs/view.html#rendertohardwaretextureandroid
    */
-  onMoveShouldSetResponder: PropTypes.func,
+  renderToHardwareTextureAndroid?: ?boolean,
 
   /**
-   * If a parent `View` wants to prevent a child `View` from becoming responder
-   * on a move, it should have this handler which returns `true`.
+   * 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.
    *
-   * `View.props.onMoveShouldSetResponderCapture: (event) => [true | false]`,
-   * where `event` is a synthetic touch event as described above.
+   * @platform android
    *
-   * See http://facebook.github.io/react-native/docs/view.html#onMoveShouldsetrespondercapture
+   * See http://facebook.github.io/react-native/docs/view.html#collapsable
    */
-  onMoveShouldSetResponderCapture: PropTypes.func,
+  collapsable?: ?boolean,
 
   /**
-   * 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.
+   * Whether this `View` needs to rendered offscreen and composited with an
+   * alpha in order to preserve 100% correct colors and blending behavior.
    *
-   * > 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.
+   * @platform android
    *
-   * See http://facebook.github.io/react-native/docs/view.html#hitslop
+   * See http://facebook.github.io/react-native/docs/view.html#needsoffscreenalphacompositing
    */
-  hitSlop: EdgeInsetsPropType,
+  needsOffscreenAlphaCompositing?: ?boolean,
 
   /**
-   * Invoked on mount and layout changes with:
+   * Indicates to accessibility services to treat UI component like a
+   * native one. Works for Android only.
    *
-   * `{nativeEvent: { layout: {x, y, width, height}}}`
+   * @platform android
    *
-   * This event is fired immediately once the layout has been calculated, but
-   * the new layout may not yet be reflected on the screen at the time the
-   * event is received, especially if a layout animation is in progress.
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilitycomponenttype
+   */
+  accessibilityComponentType?: ?AccessibilityComponentType,
+
+  /**
+   * Indicates to accessibility services whether the user should be notified
+   * when this view changes. Works for Android API >= 19 only.
    *
-   * See http://facebook.github.io/react-native/docs/view.html#onlayout
+   * @platform android
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilityliveregion
    */
-  onLayout: PropTypes.func,
+  accessibilityLiveRegion?: ?('none' | 'polite' | 'assertive'),
 
   /**
-   * Controls whether the `View` can be the target of touch events.
+   * 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://facebook.github.io/react-native/docs/view.html#pointerevents
+   * @platform android
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#importantforaccessibility
    */
-  pointerEvents: PropTypes.oneOf(['box-none', 'none', 'box-only', 'auto']),
+  importantForAccessibility?: ?('auto' | 'yes' | 'no' | 'no-hide-descendants'),
+|}>;
 
+type IOSViewProps = $ReadOnly<{|
   /**
-   * See http://facebook.github.io/react-native/docs/style.html
+   * Provides an array of custom actions available for accessibility.
+   *
+   * @platform ios
    */
-  style: stylePropType,
+  accessibilityActions?: ?$ReadOnlyArray<string>,
 
   /**
-   * 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).
+   * Prevents view from being inverted if set to true and color inversion is turned on.
    *
-   * See http://facebook.github.io/react-native/docs/view.html#removeclippedsubviews
+   * @platform ios
    */
-  removeClippedSubviews: PropTypes.bool,
+  accessibilityIgnoresInvertColors?: ?boolean,
 
   /**
-   * Whether this `View` should render itself (and all of its children) into a
-   * single hardware texture on the GPU.
+   * Provides additional traits to screen reader. By default no traits are
+   * provided unless specified otherwise in element.
    *
-   * @platform android
+   * You can provide one trait or an array of many traits.
    *
-   * See http://facebook.github.io/react-native/docs/view.html#rendertohardwaretextureandroid
+   * @platform ios
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilitytraits
    */
-  renderToHardwareTextureAndroid: PropTypes.bool,
+  accessibilityTraits?: ?(
+    | AccessibilityTrait
+    | $ReadOnlyArray<AccessibilityTrait>
+  ),
+
+  /**
+   * A value indicating whether VoiceOver should ignore the elements
+   * within views that are siblings of the receiver.
+   * Default is `false`.
+   *
+   * @platform ios
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilityviewismodal
+   */
+  accessibilityViewIsModal?: ?boolean,
+
+  /**
+   * A value indicating whether the accessibility elements contained within
+   * this accessibility element are hidden.
+   *
+   * @platform ios
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilityElementsHidden
+   */
+  accessibilityElementsHidden?: ?boolean,
 
   /**
    * Whether this `View` should be rendered as a bitmap before compositing.
@@ -434,32 +320,107 @@ module.exports = {
    *
    * See http://facebook.github.io/react-native/docs/view.html#shouldrasterizeios
    */
-  shouldRasterizeIOS: PropTypes.bool,
+  shouldRasterizeIOS?: ?boolean,
+|}>;
+
+export type ViewProps = $ReadOnly<{|
+  ...DirectEventProps,
+  ...GestureResponderEventProps,
+  ...TouchEventProps,
+  ...AndroidViewProps,
+  ...IOSViewProps,
+
+  // There's no easy way to create a different type if (Platform.isTV):
+  // so we must include TVViewProps
+  ...TVViewProps,
+
+  children?: React.Node,
+  style?: ?ViewStyleProp,
 
   /**
-   * 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.
+   * When `true`, indicates that the view is an accessibility element.
+   * By default, all the touchable elements are accessible.
    *
-   * @platform android
+   * See http://facebook.github.io/react-native/docs/view.html#accessible
+   */
+  accessible?: ?boolean,
+
+  /**
+   * 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.
    *
-   * See http://facebook.github.io/react-native/docs/view.html#collapsable
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilitylabel
    */
-  collapsable: PropTypes.bool,
+  accessibilityLabel?: ?Stringish,
 
   /**
-   * Whether this `View` needs to rendered offscreen and composited with an
-   * alpha in order to preserve 100% correct colors and blending behavior.
+   * 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.
    *
-   * @platform android
    *
-   * See http://facebook.github.io/react-native/docs/view.html#needsoffscreenalphacompositing
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilityHint
+   */
+  accessibilityHint?: ?Stringish,
+
+  /**
+   * Indicates to accessibility services to treat UI component like a specific role.
+   */
+  accessibilityRole?: ?AccessibilityRole,
+
+  /**
+   * Indicates to accessibility services that UI Component is in a specific State.
+   */
+  accessibilityStates?: ?AccessibilityStates,
+
+  /**
+   * Used to locate this view in end-to-end tests.
+   *
+   * > This disables the 'layout-only view removal' optimization for this view!
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#testid
+   */
+  testID?: ?string,
+
+  /**
+   * Used to locate this view from native classes.
+   *
+   * > This disables the 'layout-only view removal' optimization for this view!
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#nativeid
+   */
+  nativeID?: ?string,
+
+  /**
+   * 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.
+   *
+   * > 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.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#hitslop
    */
-  needsOffscreenAlphaCompositing: PropTypes.bool,
+  hitSlop?: ?EdgeInsetsProp,
 
   /**
-   * Any additional platform-specific view prop types, or prop type overrides.
+   * Controls whether the `View` can be the target of touch events.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#pointerevents
    */
-  ...PlatformViewPropTypes,
-};
+  pointerEvents?: ?('auto' | 'box-none' | 'box-only' | 'none'),
+
+  /**
+   * 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).
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#removeclippedsubviews
+   */
+  removeClippedSubviews?: ?boolean,
+|}>;
diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
index 2ccdd31b56365d..3b98308b026589 100644
--- a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
+++ b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,16 +11,16 @@
 'use strict';
 
 const React = require('React');
-const PropTypes = require('prop-types');
 const ReactNative = require('ReactNative');
 const UIManager = require('UIManager');
-const ViewPropTypes = require('ViewPropTypes');
 
 const dismissKeyboard = require('dismissKeyboard');
 const requireNativeComponent = require('requireNativeComponent');
 
 const NativeAndroidViewPager = requireNativeComponent('AndroidViewPager');
 
+import type {ViewStyleProp} from 'StyleSheet';
+
 const VIEWPAGER_REF = 'viewPager';
 
 type Event = Object;
@@ -31,6 +31,73 @@ export type ViewPagerScrollState = $Enum<{
   settling: string,
 }>;
 
+type Props = $ReadOnly<{|
+  /**
+   * Index of initial page that should be selected. Use `setPage` method to
+   * update the page, and `onPageSelected` to monitor page changes
+   */
+  initialPage?: ?number,
+
+  /**
+   * Executed when transitioning between pages (ether because of animation for
+   * the requested page change or when user is swiping/dragging between pages)
+   * The `event.nativeEvent` object for this callback will carry following data:
+   *  - position - index of first page from the left that is currently visible
+   *  - offset - value from range [0,1) describing stage between page transitions.
+   *    Value x means that (1 - x) fraction of the page at "position" index is
+   *    visible, and x fraction of the next page is visible.
+   */
+  onPageScroll?: ?Function,
+
+  /**
+   * Function called when the page scrolling state has changed.
+   * The page scrolling state can be in 3 states:
+   * - idle, meaning there is no interaction with the page scroller happening at the time
+   * - dragging, meaning there is currently an interaction with the page scroller
+   * - settling, meaning that there was an interaction with the page scroller, and the
+   *   page scroller is now finishing it's closing or opening animation
+   */
+  onPageScrollStateChanged?: ?Function,
+
+  /**
+   * This callback will be called once ViewPager finish navigating to selected page
+   * (when user swipes between pages). The `event.nativeEvent` object passed to this
+   * callback will have following fields:
+   *  - position - index of page that has been selected
+   */
+  onPageSelected?: ?Function,
+
+  /**
+   * Blank space to show between pages. This is only visible while scrolling, pages are still
+   * edge-to-edge.
+   */
+  pageMargin?: ?number,
+
+  /**
+   * Whether enable showing peekFraction or not. If this is true, the preview of
+   * last and next page will show in current screen. Defaults to false.
+   */
+
+  peekEnabled?: ?boolean,
+
+  /**
+   * 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'),
+
+  /**
+   * When false, the content does not scroll.
+   * The default value is true.
+   */
+  scrollEnabled?: ?boolean,
+
+  children?: React.Node,
+
+  style?: ?ViewStyleProp,
+|}>;
+
 /**
  * Container that allows to flip left and right between child views. Each
  * child view of the `ViewPagerAndroid` will be treated as a separate page
@@ -72,92 +139,22 @@ export type ViewPagerScrollState = $Enum<{
  * }
  * ```
  */
-class ViewPagerAndroid extends React.Component<{
-  initialPage?: number,
-  onPageScroll?: Function,
-  onPageScrollStateChanged?: Function,
-  onPageSelected?: Function,
-  pageMargin?: number,
-  peekEnabled?: boolean,
-  keyboardDismissMode?: 'none' | 'on-drag',
-  scrollEnabled?: boolean,
-}> {
-  static propTypes = {
-    ...ViewPropTypes,
-    /**
-     * Index of initial page that should be selected. Use `setPage` method to
-     * update the page, and `onPageSelected` to monitor page changes
-     */
-    initialPage: PropTypes.number,
-
-    /**
-     * Executed when transitioning between pages (ether because of animation for
-     * the requested page change or when user is swiping/dragging between pages)
-     * The `event.nativeEvent` object for this callback will carry following data:
-     *  - position - index of first page from the left that is currently visible
-     *  - offset - value from range [0,1) describing stage between page transitions.
-     *    Value x means that (1 - x) fraction of the page at "position" index is
-     *    visible, and x fraction of the next page is visible.
-     */
-    onPageScroll: PropTypes.func,
-
-    /**
-     * Function called when the page scrolling state has changed.
-     * The page scrolling state can be in 3 states:
-     * - idle, meaning there is no interaction with the page scroller happening at the time
-     * - dragging, meaning there is currently an interaction with the page scroller
-     * - settling, meaning that there was an interaction with the page scroller, and the
-     *   page scroller is now finishing it's closing or opening animation
-     */
-    onPageScrollStateChanged: PropTypes.func,
-
-    /**
-     * This callback will be called once ViewPager finish navigating to selected page
-     * (when user swipes between pages). The `event.nativeEvent` object passed to this
-     * callback will have following fields:
-     *  - position - index of page that has been selected
-     */
-    onPageSelected: PropTypes.func,
-
-    /**
-     * Blank space to show between pages. This is only visible while scrolling, pages are still
-     * edge-to-edge.
-     */
-    pageMargin: PropTypes.number,
-
-    /**
-     * 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: PropTypes.oneOf([
-      'none', // default
-      'on-drag',
-    ]),
-
-    /**
-     * When false, the content does not scroll.
-     * The default value is true.
-     */
-    scrollEnabled: PropTypes.bool,
-
-    /**
-     * Whether enable showing peekFraction or not. If this is true, the preview of
-     * last and next page will show in current screen. Defaults to false.
-     */
-    peekEnabled: PropTypes.bool,
-  };
 
+class ViewPagerAndroid extends React.Component<Props> {
   componentDidMount() {
     if (this.props.initialPage != null) {
       this.setPageWithoutAnimation(this.props.initialPage);
     }
   }
 
+  /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+   * when making Flow check .android.js files. */
   getInnerViewNode = (): ReactComponent => {
     return this.refs[VIEWPAGER_REF].getInnerViewNode();
   };
 
+  /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+   * when making Flow check .android.js files. */
   _childrenWithOverridenStyle = (): Array => {
     // Override styles so that each page will fill the parent. Native component
     // will handle positioning of elements, so it's not important to offset
@@ -225,7 +222,7 @@ class ViewPagerAndroid extends React.Component<{
   setPage = (selectedPage: number) => {
     UIManager.dispatchViewManagerCommand(
       ReactNative.findNodeHandle(this),
-      UIManager.AndroidViewPager.Commands.setPage,
+      UIManager.getViewManagerConfig('AndroidViewPager').Commands.setPage,
       [selectedPage],
     );
   };
@@ -237,7 +234,8 @@ class ViewPagerAndroid extends React.Component<{
   setPageWithoutAnimation = (selectedPage: number) => {
     UIManager.dispatchViewManagerCommand(
       ReactNative.findNodeHandle(this),
-      UIManager.AndroidViewPager.Commands.setPageWithoutAnimation,
+      UIManager.getViewManagerConfig('AndroidViewPager').Commands
+        .setPageWithoutAnimation,
       [selectedPage],
     );
   };
diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js b/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js
index 260d559929796f..7a00b6636cf664 100644
--- a/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js
+++ b/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/WebView/WebView.android.js b/Libraries/Components/WebView/WebView.android.js
index 4d4b65fb11fdc8..83991432b57c83 100644
--- a/Libraries/Components/WebView/WebView.android.js
+++ b/Libraries/Components/WebView/WebView.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,15 +9,15 @@
 
 'use strict';
 
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
 const ActivityIndicator = require('ActivityIndicator');
-const React = require('React');
+const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
+const DeprecatedEdgeInsetsPropType = require('DeprecatedEdgeInsetsPropType');
 const PropTypes = require('prop-types');
+const React = require('React');
 const ReactNative = require('ReactNative');
 const StyleSheet = require('StyleSheet');
 const UIManager = require('UIManager');
 const View = require('View');
-const ViewPropTypes = require('ViewPropTypes');
 const WebViewShared = require('WebViewShared');
 
 const deprecatedPropType = require('deprecatedPropType');
@@ -44,7 +44,7 @@ const defaultRenderLoading = () => (
  */
 class WebView extends React.Component {
   static propTypes = {
-    ...ViewPropTypes,
+    ...DeprecatedViewPropTypes,
     renderError: PropTypes.func,
     renderLoading: PropTypes.func,
     onLoad: PropTypes.func,
@@ -52,12 +52,12 @@ class WebView extends React.Component {
     onLoadStart: PropTypes.func,
     onError: PropTypes.func,
     automaticallyAdjustContentInsets: PropTypes.bool,
-    contentInset: EdgeInsetsPropType,
+    contentInset: DeprecatedEdgeInsetsPropType,
     onNavigationStateChange: PropTypes.func,
     onMessage: PropTypes.func,
     onContentSizeChange: PropTypes.func,
     startInLoadingState: PropTypes.bool, // force WebView to show loadingView on first load
-    style: ViewPropTypes.style,
+    style: DeprecatedViewPropTypes.style,
 
     html: deprecatedPropType(
       PropTypes.string,
@@ -109,6 +109,12 @@ class WebView extends React.Component {
       PropTypes.number,
     ]),
 
+    /**
+     * If true, use WKWebView instead of UIWebView.
+     * @platform ios
+     */
+    useWebKit: PropTypes.bool,
+
     /**
      * Used on Android only, JS is enabled by default for WebView on iOS
      * @platform android
@@ -144,6 +150,12 @@ class WebView extends React.Component {
      */
     scalesPageToFit: PropTypes.bool,
 
+    /**
+     * Sets whether the webview allow access to file system.
+     * @platform android
+     */
+    allowFileAccess: PropTypes.bool,
+
     /**
      * Sets the user-agent for this WebView. The user-agent can also be set in native using
      * WebViewConfig. This prop will overwrite that config.
@@ -311,6 +323,7 @@ class WebView extends React.Component {
         style={webViewStyles}
         source={resolveAssetSource(source)}
         scalesPageToFit={this.props.scalesPageToFit}
+        allowFileAccess={this.props.allowFileAccess}
         injectedJavaScript={this.props.injectedJavaScript}
         userAgent={this.props.userAgent}
         javaScriptEnabled={this.props.javaScriptEnabled}
@@ -353,7 +366,7 @@ class WebView extends React.Component {
   goForward = () => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.goForward,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.goForward,
       null,
     );
   };
@@ -361,7 +374,7 @@ class WebView extends React.Component {
   goBack = () => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.goBack,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.goBack,
       null,
     );
   };
@@ -372,7 +385,7 @@ class WebView extends React.Component {
     });
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.reload,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.reload,
       null,
     );
   };
@@ -380,7 +393,7 @@ class WebView extends React.Component {
   stopLoading = () => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.stopLoading,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.stopLoading,
       null,
     );
   };
@@ -388,7 +401,7 @@ class WebView extends React.Component {
   postMessage = data => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.postMessage,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.postMessage,
       [String(data)],
     );
   };
@@ -402,7 +415,7 @@ class WebView extends React.Component {
   injectJavaScript = data => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.injectJavaScript,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.injectJavaScript,
       [data],
     );
   };
diff --git a/Libraries/Components/WebView/WebView.ios.js b/Libraries/Components/WebView/WebView.ios.js
index 56290df97bcf94..f6c9295baba802 100644
--- a/Libraries/Components/WebView/WebView.ios.js
+++ b/Libraries/Components/WebView/WebView.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,7 +11,8 @@
 'use strict';
 
 const ActivityIndicator = require('ActivityIndicator');
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
+const DeprecatedEdgeInsetsPropType = require('DeprecatedEdgeInsetsPropType');
 const Linking = require('Linking');
 const PropTypes = require('prop-types');
 const React = require('React');
@@ -21,7 +22,6 @@ const StyleSheet = require('StyleSheet');
 const Text = require('Text');
 const UIManager = require('UIManager');
 const View = require('View');
-const ViewPropTypes = require('ViewPropTypes');
 const WebViewShared = require('WebViewShared');
 
 const deprecatedPropType = require('deprecatedPropType');
@@ -32,6 +32,7 @@ const requireNativeComponent = require('requireNativeComponent');
 const resolveAssetSource = require('resolveAssetSource');
 
 const RCTWebViewManager = require('NativeModules').WebViewManager;
+const RCTWKWebViewManager = require('NativeModules').WKWebViewManager;
 
 const BGWASH = 'rgba(255,255,255,0.8)';
 const RCT_WEBVIEW_REF = 'webview';
@@ -66,6 +67,9 @@ const DataDetectorTypes = [
   'link',
   'address',
   'calendarEvent',
+  'trackingNumber',
+  'flightNumber',
+  'lookupSuggestion',
   'none',
   'all',
 ];
@@ -110,7 +114,7 @@ class WebView extends React.Component {
   static JSNavigationScheme = JSNavigationScheme;
   static NavigationType = NavigationType;
   static propTypes = {
-    ...ViewPropTypes,
+    ...DeprecatedViewPropTypes,
 
     html: deprecatedPropType(
       PropTypes.string,
@@ -162,6 +166,12 @@ class WebView extends React.Component {
       PropTypes.number,
     ]),
 
+    /**
+     * If true, use WKWebView instead of UIWebView.
+     * @platform ios
+     */
+    useWebKit: PropTypes.bool,
+
     /**
      * Function that returns a view to show if there's an error.
      */
@@ -224,7 +234,7 @@ class WebView extends React.Component {
      * the scroll view. Defaults to {top: 0, left: 0, bottom: 0, right: 0}.
      * @platform ios
      */
-    contentInset: EdgeInsetsPropType,
+    contentInset: DeprecatedEdgeInsetsPropType,
     /**
      * Function that is invoked when the `WebView` loading starts or ends.
      */
@@ -247,7 +257,7 @@ class WebView extends React.Component {
     /**
      * The style to apply to the `WebView`.
      */
-    style: ViewPropTypes.style,
+    style: DeprecatedViewPropTypes.style,
 
     /**
      * Determines the types of data converted to clickable URLs in the web view's content.
@@ -264,6 +274,11 @@ class WebView extends React.Component {
      * - `'none'`
      * - `'all'`
      *
+     * With the new WebKit implementation, we have three new values:
+     * - `'trackingNumber'`,
+     * - `'flightNumber'`,
+     * - `'lookupSuggestion'`,
+     *
      * @platform ios
      */
     dataDetectorTypes: PropTypes.oneOfType([
@@ -309,6 +324,8 @@ class WebView extends React.Component {
      * Boolean that controls whether the web content is scaled to fit
      * the view and enables the user to change the scale. The default value
      * is `true`.
+     *
+     * On iOS, when `useWebKit=true`, this prop will not work.
      */
     scalesPageToFit: PropTypes.bool,
 
@@ -388,7 +405,6 @@ class WebView extends React.Component {
 
   static defaultProps = {
     originWhitelist: WebViewShared.defaultOriginWhitelist,
-    scalesPageToFit: true,
   };
 
   state = {
@@ -401,11 +417,28 @@ class WebView extends React.Component {
     if (this.props.startInLoadingState) {
       this.setState({viewState: WebViewState.LOADING});
     }
+
+    if (
+      this.props.useWebKit === true &&
+      this.props.scalesPageToFit !== undefined
+    ) {
+      console.warn(
+        'The scalesPageToFit property is not supported when useWebKit = true',
+      );
+    }
   }
 
   render() {
     let otherView = null;
 
+    let scalesPageToFit;
+
+    if (this.props.useWebKit) {
+      ({scalesPageToFit} = this.props);
+    } else {
+      ({scalesPageToFit = true} = this.props);
+    }
+
     if (this.state.viewState === WebViewState.LOADING) {
       otherView = (this.props.renderLoading || defaultRenderLoading)();
     } else if (this.state.viewState === WebViewState.ERROR) {
@@ -433,11 +466,18 @@ class WebView extends React.Component {
 
     const nativeConfig = this.props.nativeConfig || {};
 
-    const viewManager = nativeConfig.viewManager || RCTWebViewManager;
+    let viewManager = nativeConfig.viewManager;
 
-    const compiledWhitelist = (this.props.originWhitelist || []).map(
-      WebViewShared.originWhitelistToRegex,
-    );
+    if (this.props.useWebKit) {
+      viewManager = viewManager || RCTWKWebViewManager;
+    } else {
+      viewManager = viewManager || RCTWebViewManager;
+    }
+
+    const compiledWhitelist = [
+      'about:blank',
+      ...(this.props.originWhitelist || []),
+    ].map(WebViewShared.originWhitelistToRegex);
     const onShouldStartLoadWithRequest = (event: Event) => {
       let shouldStart = true;
       const {url} = event.nativeEvent;
@@ -473,7 +513,13 @@ class WebView extends React.Component {
 
     const messagingEnabled = typeof this.props.onMessage === 'function';
 
-    const NativeWebView = nativeConfig.component || RCTWebView;
+    let NativeWebView = nativeConfig.component;
+
+    if (this.props.useWebKit) {
+      NativeWebView = NativeWebView || RCTWKWebView;
+    } else {
+      NativeWebView = NativeWebView || RCTWebView;
+    }
 
     const webView = (
       <NativeWebView
@@ -495,7 +541,7 @@ class WebView extends React.Component {
         messagingEnabled={messagingEnabled}
         onMessage={this._onMessage}
         onShouldStartLoadWithRequest={onShouldStartLoadWithRequest}
-        scalesPageToFit={this.props.scalesPageToFit}
+        scalesPageToFit={scalesPageToFit}
         allowsInlineMediaPlayback={this.props.allowsInlineMediaPlayback}
         mediaPlaybackRequiresUserAction={
           this.props.mediaPlaybackRequiresUserAction
@@ -513,13 +559,21 @@ class WebView extends React.Component {
     );
   }
 
+  _getCommands() {
+    if (!this.props.useWebKit) {
+      return UIManager.getViewManagerConfig('RCTWebView').Commands;
+    }
+
+    return UIManager.getViewManagerConfig('RCTWKWebView').Commands;
+  }
+
   /**
    * Go forward one page in the web view's history.
    */
   goForward = () => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.goForward,
+      this._getCommands().goForward,
       null,
     );
   };
@@ -530,7 +584,7 @@ class WebView extends React.Component {
   goBack = () => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.goBack,
+      this._getCommands().goBack,
       null,
     );
   };
@@ -542,7 +596,7 @@ class WebView extends React.Component {
     this.setState({viewState: WebViewState.LOADING});
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.reload,
+      this._getCommands().reload,
       null,
     );
   };
@@ -553,7 +607,7 @@ class WebView extends React.Component {
   stopLoading = () => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.stopLoading,
+      this._getCommands().stopLoading,
       null,
     );
   };
@@ -571,7 +625,7 @@ class WebView extends React.Component {
   postMessage = data => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.postMessage,
+      this._getCommands().postMessage,
       [String(data)],
     );
   };
@@ -585,7 +639,7 @@ class WebView extends React.Component {
   injectJavaScript = data => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.injectJavaScript,
+      this._getCommands().injectJavaScript,
       [data],
     );
   };
@@ -640,9 +694,42 @@ class WebView extends React.Component {
     const {onMessage} = this.props;
     onMessage && onMessage(event);
   };
+
+  componentDidUpdate(prevProps) {
+    if (!(prevProps.useWebKit && this.props.useWebKit)) {
+      return;
+    }
+
+    this._showRedboxOnPropChanges(prevProps, 'allowsInlineMediaPlayback');
+    this._showRedboxOnPropChanges(prevProps, 'mediaPlaybackRequiresUserAction');
+    this._showRedboxOnPropChanges(prevProps, 'dataDetectorTypes');
+
+    if (this.props.scalesPageToFit !== undefined) {
+      console.warn(
+        'The scalesPageToFit property is not supported when useWebKit = true',
+      );
+    }
+  }
+
+  _showRedboxOnPropChanges(prevProps, propName: string) {
+    if (this.props[propName] !== prevProps[propName]) {
+      console.error(
+        `Changes to property ${propName} do nothing after the initial render.`,
+      );
+    }
+  }
 }
 
-const RCTWebView = requireNativeComponent('RCTWebView');
+const RCTWebView = requireNativeComponent(
+  'RCTWebView',
+  WebView,
+  WebView.extraNativeComponentConfig,
+);
+const RCTWKWebView = requireNativeComponent(
+  'RCTWKWebView',
+  WebView,
+  WebView.extraNativeComponentConfig,
+);
 
 const styles = StyleSheet.create({
   container: {
diff --git a/Libraries/Components/WebView/WebViewShared.js b/Libraries/Components/WebView/WebViewShared.js
index 5a3006e845b0cc..af2f7e9a80baaa 100644
--- a/Libraries/Components/WebView/WebViewShared.js
+++ b/Libraries/Components/WebView/WebViewShared.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Components/WebView/__tests__/WebViewShared-test.js b/Libraries/Components/WebView/__tests__/WebViewShared-test.js
index b7456638fedb71..2a6dee2e2758de 100644
--- a/Libraries/Components/WebView/__tests__/WebViewShared-test.js
+++ b/Libraries/Components/WebView/__tests__/WebViewShared-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js b/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
index 79d677e217e71c..14aafede381848 100644
--- a/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
+++ b/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Core/Devtools/getDevServer.js b/Libraries/Core/Devtools/getDevServer.js
index adcc28c2d067e1..3eae2fbc404baf 100644
--- a/Libraries/Core/Devtools/getDevServer.js
+++ b/Libraries/Core/Devtools/getDevServer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Core/Devtools/openFileInEditor.js b/Libraries/Core/Devtools/openFileInEditor.js
index c085883920aeda..00074b91eefedf 100644
--- a/Libraries/Core/Devtools/openFileInEditor.js
+++ b/Libraries/Core/Devtools/openFileInEditor.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Core/Devtools/parseErrorStack.js b/Libraries/Core/Devtools/parseErrorStack.js
index ec85260d7eaa35..ff308d1dd243cf 100644
--- a/Libraries/Core/Devtools/parseErrorStack.js
+++ b/Libraries/Core/Devtools/parseErrorStack.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -19,6 +19,7 @@ export type StackFrame = {
 
 export type ExtendedError = Error & {
   framesToPop?: number,
+  jsEngine?: string,
 };
 
 function parseErrorStack(e: ExtendedError): Array<StackFrame> {
diff --git a/Libraries/Core/Devtools/setupDevtools.js b/Libraries/Core/Devtools/setupDevtools.js
index ddca7d04003025..232301629e021b 100644
--- a/Libraries/Core/Devtools/setupDevtools.js
+++ b/Libraries/Core/Devtools/setupDevtools.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Core/Devtools/symbolicateStackTrace.js b/Libraries/Core/Devtools/symbolicateStackTrace.js
index b5d7d4e9754ff0..93d643cdb3380d 100644
--- a/Libraries/Core/Devtools/symbolicateStackTrace.js
+++ b/Libraries/Core/Devtools/symbolicateStackTrace.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Core/ExceptionsManager.js b/Libraries/Core/ExceptionsManager.js
index bc32f5d0d23890..08fe06f72b6c47 100644
--- a/Libraries/Core/ExceptionsManager.js
+++ b/Libraries/Core/ExceptionsManager.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -22,18 +22,16 @@ function reportException(e: ExtendedError, isFatal: boolean) {
     const parseErrorStack = require('parseErrorStack');
     const stack = parseErrorStack(e);
     const currentExceptionID = ++exceptionID;
+    const message =
+      e.jsEngine == null ? e.message : `${e.message}, js engine: ${e.jsEngine}`;
     if (isFatal) {
       ExceptionsManager.reportFatalException(
-        e.message,
+        message,
         stack,
         currentExceptionID,
       );
     } else {
-      ExceptionsManager.reportSoftException(
-        e.message,
-        stack,
-        currentExceptionID,
-      );
+      ExceptionsManager.reportSoftException(message, stack, currentExceptionID);
     }
     if (__DEV__) {
       const symbolicateStackTrace = require('symbolicateStackTrace');
diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js
index 119deb92b2b0bc..c55163981c8e4b 100644
--- a/Libraries/Core/InitializeCore.js
+++ b/Libraries/Core/InitializeCore.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -91,9 +91,6 @@ polyfillGlobal('regeneratorRuntime', () => {
   // The require just sets up the global, so make sure when we first
   // invoke it the global does not exist
   delete global.regeneratorRuntime;
-  /* $FlowFixMe(>=0.54.0 site=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. */
   require('regenerator-runtime/runtime');
   return global.regeneratorRuntime;
 });
@@ -214,9 +211,6 @@ if (__DEV__) {
 
     // Set up inspector
     const JSInspector = require('JSInspector');
-    /* $FlowFixMe(>=0.56.0 site=react_native_fb,react_native_oss) This comment
-     * suppresses an error found when Flow v0.56 was deployed. To see the error
-     * delete this comment and run Flow. */
     JSInspector.registerAgent(require('NetworkAgent'));
   }
 }
diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index 320b26ac84db6b..1fcb2e9eb61be9 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Core/ReactNativeVersionCheck.js b/Libraries/Core/ReactNativeVersionCheck.js
index 8a937c769d9979..578b205645a487 100644
--- a/Libraries/Core/ReactNativeVersionCheck.js
+++ b/Libraries/Core/ReactNativeVersionCheck.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 'use strict';
diff --git a/Libraries/Core/Timers/JSTimers.js b/Libraries/Core/Timers/JSTimers.js
index 7cffb4e3d06d82..36a56fd8cf97cd 100644
--- a/Libraries/Core/Timers/JSTimers.js
+++ b/Libraries/Core/Timers/JSTimers.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -290,6 +290,9 @@ const JSTimers = {
    * @param {function} func Callback to be invoked before the end of the
    * current JavaScript execution loop.
    */
+  /* $FlowFixMe(>=0.79.1 site=react_native_fb) This comment suppresses an
+   * error found when Flow v0.79 was deployed. To see the error delete this
+   * comment and run Flow. */
   setImmediate: function(func: Function, ...args: any) {
     const id = _allocateCallback(
       () => func.apply(undefined, args),
@@ -302,6 +305,9 @@ const JSTimers = {
   /**
    * @param {function} func Callback to be invoked every frame.
    */
+  /* $FlowFixMe(>=0.79.1 site=react_native_fb) This comment suppresses an
+   * error found when Flow v0.79 was deployed. To see the error delete this
+   * comment and run Flow. */
   requestAnimationFrame: function(func: Function) {
     const id = _allocateCallback(func, 'requestAnimationFrame');
     Timing.createTimer(id, 1, Date.now(), /* recurring */ false);
@@ -313,6 +319,9 @@ const JSTimers = {
    * with time remaining in frame.
    * @param {?object} options
    */
+  /* $FlowFixMe(>=0.79.1 site=react_native_fb) This comment suppresses an
+   * error found when Flow v0.79 was deployed. To see the error delete this
+   * comment and run Flow. */
   requestIdleCallback: function(func: Function, options: ?Object) {
     if (requestIdleCallbacks.length === 0) {
       Timing.setSendIdleEvents(true);
diff --git a/Libraries/Core/__mocks__/ErrorUtils.js b/Libraries/Core/__mocks__/ErrorUtils.js
index 2719c138c4549d..8505e23dc562fc 100644
--- a/Libraries/Core/__mocks__/ErrorUtils.js
+++ b/Libraries/Core/__mocks__/ErrorUtils.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js b/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
index e5c8cefddf15bb..6f4da360362e9f 100644
--- a/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
+++ b/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/StyleSheet/ColorPropType.js b/Libraries/DeprecatedPropTypes/DeprecatedColorPropType.js
similarity index 96%
rename from Libraries/StyleSheet/ColorPropType.js
rename to Libraries/DeprecatedPropTypes/DeprecatedColorPropType.js
index 93474c47ae234e..84d3b225a45f33 100644
--- a/Libraries/StyleSheet/ColorPropType.js
+++ b/Libraries/DeprecatedPropTypes/DeprecatedColorPropType.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedEdgeInsetsPropType.js b/Libraries/DeprecatedPropTypes/DeprecatedEdgeInsetsPropType.js
new file mode 100644
index 00000000000000..67a016fffc8d24
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedEdgeInsetsPropType.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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';
+
+const PropTypes = require('prop-types');
+
+const DeprecatedEdgeInsetsPropType = PropTypes.shape({
+  top: PropTypes.number,
+  left: PropTypes.number,
+  bottom: PropTypes.number,
+  right: PropTypes.number,
+});
+
+module.exports = DeprecatedEdgeInsetsPropType;
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedImagePropType.js b/Libraries/DeprecatedPropTypes/DeprecatedImagePropType.js
new file mode 100644
index 00000000000000..6b8c16b579d23e
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedImagePropType.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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';
+
+const DeprecatedEdgeInsetsPropType = require('DeprecatedEdgeInsetsPropType');
+const DeprecatedImageSourcePropType = require('DeprecatedImageSourcePropType');
+const DeprecatedImageStylePropTypes = require('DeprecatedImageStylePropTypes');
+const DeprecatedStyleSheetPropType = require('DeprecatedStyleSheetPropType');
+const PropTypes = require('prop-types');
+
+module.exports = {
+  style: DeprecatedStyleSheetPropType(DeprecatedImageStylePropTypes),
+  source: DeprecatedImageSourcePropType,
+  defaultSource: PropTypes.oneOfType([
+    PropTypes.shape({
+      uri: PropTypes.string,
+      width: PropTypes.number,
+      height: PropTypes.number,
+      scale: PropTypes.number,
+    }),
+    PropTypes.number,
+  ]),
+
+  accessible: PropTypes.bool,
+
+  accessibilityLabel: PropTypes.node,
+
+  blurRadius: PropTypes.number,
+
+  capInsets: DeprecatedEdgeInsetsPropType,
+
+  resizeMethod: PropTypes.oneOf(['auto', 'resize', 'scale']),
+
+  resizeMode: PropTypes.oneOf([
+    'cover',
+    'contain',
+    'stretch',
+    'repeat',
+    'center',
+  ]),
+
+  testID: PropTypes.string,
+
+  onLayout: PropTypes.func,
+
+  onLoadStart: PropTypes.func,
+
+  onProgress: PropTypes.func,
+
+  onError: PropTypes.func,
+
+  onPartialLoad: PropTypes.func,
+
+  onLoad: PropTypes.func,
+
+  onLoadEnd: PropTypes.func,
+};
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedImageSourcePropType.js b/Libraries/DeprecatedPropTypes/DeprecatedImageSourcePropType.js
new file mode 100644
index 00000000000000..0670023ae73ba2
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedImageSourcePropType.js
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @no-flow
+ * @format
+ */
+'use strict';
+
+const PropTypes = require('prop-types');
+
+const ImageURISourcePropType = PropTypes.shape({
+  uri: PropTypes.string,
+  bundle: PropTypes.string,
+  method: PropTypes.string,
+  headers: PropTypes.objectOf(PropTypes.string),
+  body: PropTypes.string,
+  cache: PropTypes.oneOf([
+    'default',
+    'reload',
+    'force-cache',
+    'only-if-cached',
+  ]),
+  width: PropTypes.number,
+  height: PropTypes.number,
+  scale: PropTypes.number,
+});
+
+const ImageSourcePropType = PropTypes.oneOfType([
+  ImageURISourcePropType,
+  // Opaque type returned by require('./image.jpg')
+  PropTypes.number,
+  // Multiple sources
+  PropTypes.arrayOf(ImageURISourcePropType),
+]);
+
+module.exports = ImageSourcePropType;
diff --git a/Libraries/Image/ImageStylePropTypes.js b/Libraries/DeprecatedPropTypes/DeprecatedImageStylePropTypes.js
similarity index 69%
rename from Libraries/Image/ImageStylePropTypes.js
rename to Libraries/DeprecatedPropTypes/DeprecatedImageStylePropTypes.js
index 54e500994227db..3fbed21da30fe0 100644
--- a/Libraries/Image/ImageStylePropTypes.js
+++ b/Libraries/DeprecatedPropTypes/DeprecatedImageStylePropTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,21 +9,26 @@
  */
 'use strict';
 
-const ColorPropType = require('ColorPropType');
-const ImageResizeMode = require('ImageResizeMode');
-const LayoutPropTypes = require('LayoutPropTypes');
+const DeprecatedColorPropType = require('DeprecatedColorPropType');
+const DeprecatedLayoutPropTypes = require('DeprecatedLayoutPropTypes');
 const ReactPropTypes = require('prop-types');
-const ShadowPropTypesIOS = require('ShadowPropTypesIOS');
-const TransformPropTypes = require('TransformPropTypes');
+const DeprecatedShadowPropTypesIOS = require('DeprecatedShadowPropTypesIOS');
+const DeprecatedTransformPropTypes = require('DeprecatedTransformPropTypes');
 
 const ImageStylePropTypes = {
-  ...LayoutPropTypes,
-  ...ShadowPropTypesIOS,
-  ...TransformPropTypes,
-  resizeMode: ReactPropTypes.oneOf(Object.keys(ImageResizeMode)),
+  ...DeprecatedLayoutPropTypes,
+  ...DeprecatedShadowPropTypesIOS,
+  ...DeprecatedTransformPropTypes,
+  resizeMode: ReactPropTypes.oneOf([
+    'center',
+    'contain',
+    'cover',
+    'repeat',
+    'stretch',
+  ]),
   backfaceVisibility: ReactPropTypes.oneOf(['visible', 'hidden']),
-  backgroundColor: ColorPropType,
-  borderColor: ColorPropType,
+  backgroundColor: DeprecatedColorPropType,
+  borderColor: DeprecatedColorPropType,
   borderWidth: ReactPropTypes.number,
   borderRadius: ReactPropTypes.number,
   overflow: ReactPropTypes.oneOf(['visible', 'hidden']),
@@ -31,7 +36,7 @@ const ImageStylePropTypes = {
   /**
    * Changes the color of all the non-transparent pixels to the tintColor.
    */
-  tintColor: ColorPropType,
+  tintColor: DeprecatedColorPropType,
   opacity: ReactPropTypes.number,
   /**
    * When the image has rounded corners, specifying an overlayColor will
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedLayoutPropTypes.js b/Libraries/DeprecatedPropTypes/DeprecatedLayoutPropTypes.js
new file mode 100644
index 00000000000000..0ebccaa8d07083
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedLayoutPropTypes.js
@@ -0,0 +1,190 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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';
+
+const ReactPropTypes = require('prop-types');
+
+const LayoutPropTypes = {
+  display: ReactPropTypes.oneOf(['none', 'flex']),
+  width: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  height: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  start: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  end: ReactPropTypes.oneOfType([ReactPropTypes.number, ReactPropTypes.string]),
+  top: ReactPropTypes.oneOfType([ReactPropTypes.number, ReactPropTypes.string]),
+  left: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  right: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  bottom: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  minWidth: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  maxWidth: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  minHeight: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  maxHeight: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  margin: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  marginVertical: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  marginHorizontal: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  marginTop: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  marginBottom: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  marginLeft: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  marginRight: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  marginStart: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  marginEnd: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  padding: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  paddingVertical: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  paddingHorizontal: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  paddingTop: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  paddingBottom: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  paddingLeft: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  paddingRight: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  paddingStart: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  paddingEnd: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  borderWidth: ReactPropTypes.number,
+  borderTopWidth: ReactPropTypes.number,
+  borderStartWidth: ReactPropTypes.number,
+  borderEndWidth: ReactPropTypes.number,
+  borderRightWidth: ReactPropTypes.number,
+  borderBottomWidth: ReactPropTypes.number,
+  borderLeftWidth: ReactPropTypes.number,
+  position: ReactPropTypes.oneOf(['absolute', 'relative']),
+  flexDirection: ReactPropTypes.oneOf([
+    'row',
+    'row-reverse',
+    'column',
+    'column-reverse',
+  ]),
+  flexWrap: ReactPropTypes.oneOf(['wrap', 'nowrap', 'wrap-reverse']),
+  justifyContent: ReactPropTypes.oneOf([
+    'flex-start',
+    'flex-end',
+    'center',
+    'space-between',
+    'space-around',
+    'space-evenly',
+  ]),
+  alignItems: ReactPropTypes.oneOf([
+    'flex-start',
+    'flex-end',
+    'center',
+    'stretch',
+    'baseline',
+  ]),
+  alignSelf: ReactPropTypes.oneOf([
+    'auto',
+    'flex-start',
+    'flex-end',
+    'center',
+    'stretch',
+    'baseline',
+  ]),
+  alignContent: ReactPropTypes.oneOf([
+    'flex-start',
+    'flex-end',
+    'center',
+    'stretch',
+    'space-between',
+    'space-around',
+  ]),
+  overflow: ReactPropTypes.oneOf(['visible', 'hidden', 'scroll']),
+  flex: ReactPropTypes.number,
+  flexGrow: ReactPropTypes.number,
+  flexShrink: ReactPropTypes.number,
+  flexBasis: ReactPropTypes.oneOfType([
+    ReactPropTypes.number,
+    ReactPropTypes.string,
+  ]),
+  aspectRatio: ReactPropTypes.number,
+  zIndex: ReactPropTypes.number,
+  direction: ReactPropTypes.oneOf(['inherit', 'ltr', 'rtl']),
+};
+
+module.exports = LayoutPropTypes;
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedPointPropType.js b/Libraries/DeprecatedPropTypes/DeprecatedPointPropType.js
new file mode 100644
index 00000000000000..9ae8c8f9872d5c
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedPointPropType.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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';
+
+const PropTypes = require('prop-types');
+
+const PointPropType = PropTypes.shape({
+  x: PropTypes.number,
+  y: PropTypes.number,
+});
+
+module.exports = PointPropType;
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedShadowPropTypesIOS.js b/Libraries/DeprecatedPropTypes/DeprecatedShadowPropTypesIOS.js
new file mode 100644
index 00000000000000..889b5624938736
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedShadowPropTypesIOS.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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';
+
+const DeprecatedColorPropType = require('DeprecatedColorPropType');
+const ReactPropTypes = require('prop-types');
+
+const DeprecatedShadowPropTypesIOS = {
+  shadowColor: DeprecatedColorPropType,
+  shadowOffset: ReactPropTypes.shape({
+    width: ReactPropTypes.number,
+    height: ReactPropTypes.number,
+  }),
+  shadowOpacity: ReactPropTypes.number,
+  shadowRadius: ReactPropTypes.number,
+};
+
+module.exports = DeprecatedShadowPropTypesIOS;
diff --git a/Libraries/StyleSheet/StyleSheetPropType.js b/Libraries/DeprecatedPropTypes/DeprecatedStyleSheetPropType.js
similarity index 65%
rename from Libraries/StyleSheet/StyleSheetPropType.js
rename to Libraries/DeprecatedPropTypes/DeprecatedStyleSheetPropType.js
index 964c91b5d4d33f..9cad5470ad7374 100644
--- a/Libraries/StyleSheet/StyleSheetPropType.js
+++ b/Libraries/DeprecatedPropTypes/DeprecatedStyleSheetPropType.js
@@ -1,22 +1,22 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
 
-const createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
+const deprecatedCreateStrictShapeTypeChecker = require('deprecatedCreateStrictShapeTypeChecker');
 const flattenStyle = require('flattenStyle');
 
-function StyleSheetPropType(shape: {
+function DeprecatedStyleSheetPropType(shape: {
   [key: string]: ReactPropsCheckType,
 }): ReactPropsCheckType {
-  const shapePropType = createStrictShapeTypeChecker(shape);
+  const shapePropType = deprecatedCreateStrictShapeTypeChecker(shape);
   return function(props, propName, componentName, location?, ...rest) {
     let newProps = props;
     if (props[propName]) {
@@ -28,4 +28,4 @@ function StyleSheetPropType(shape: {
   };
 }
 
-module.exports = StyleSheetPropType;
+module.exports = DeprecatedStyleSheetPropType;
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedTVViewPropTypes.js b/Libraries/DeprecatedPropTypes/DeprecatedTVViewPropTypes.js
new file mode 100644
index 00000000000000..90af60cc27da35
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedTVViewPropTypes.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 PropTypes = require('prop-types');
+
+const DeprecatedTVViewPropTypes = {
+  isTVSelectable: PropTypes.bool,
+  hasTVPreferredFocus: PropTypes.bool,
+  tvParallaxProperties: PropTypes.object,
+  tvParallaxShiftDistanceX: PropTypes.number,
+  tvParallaxShiftDistanceY: PropTypes.number,
+  tvParallaxTiltAngle: PropTypes.number,
+  tvParallaxMagnification: PropTypes.number,
+};
+
+module.exports = DeprecatedTVViewPropTypes;
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedTextPropTypes.js b/Libraries/DeprecatedPropTypes/DeprecatedTextPropTypes.js
new file mode 100644
index 00000000000000..1723bb56cb6cdd
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedTextPropTypes.js
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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';
+
+const DeprecatedColorPropType = require('DeprecatedColorPropType');
+const DeprecatedEdgeInsetsPropType = require('DeprecatedEdgeInsetsPropType');
+const DeprecatedStyleSheetPropType = require('DeprecatedStyleSheetPropType');
+const PropTypes = require('prop-types');
+const TextStylePropTypes = require('TextStylePropTypes');
+
+const stylePropType = DeprecatedStyleSheetPropType(TextStylePropTypes);
+
+module.exports = {
+  ellipsizeMode: PropTypes.oneOf(['head', 'middle', 'tail', 'clip']),
+  numberOfLines: PropTypes.number,
+  textBreakStrategy: PropTypes.oneOf(['simple', 'highQuality', 'balanced']),
+  onLayout: PropTypes.func,
+  onPress: PropTypes.func,
+  onLongPress: PropTypes.func,
+  pressRetentionOffset: DeprecatedEdgeInsetsPropType,
+  selectable: PropTypes.bool,
+  selectionColor: DeprecatedColorPropType,
+  suppressHighlighting: PropTypes.bool,
+  style: stylePropType,
+  testID: PropTypes.string,
+  nativeID: PropTypes.string,
+  allowFontScaling: PropTypes.bool,
+  maxFontSizeMultiplier: PropTypes.number,
+  accessible: PropTypes.bool,
+  adjustsFontSizeToFit: PropTypes.bool,
+  minimumFontScale: PropTypes.number,
+  disabled: PropTypes.bool,
+};
diff --git a/Libraries/StyleSheet/TransformPropTypes.js b/Libraries/DeprecatedPropTypes/DeprecatedTransformPropTypes.js
similarity index 70%
rename from Libraries/StyleSheet/TransformPropTypes.js
rename to Libraries/DeprecatedPropTypes/DeprecatedTransformPropTypes.js
index 105df3f073b9ad..a463dcc1cd15db 100644
--- a/Libraries/StyleSheet/TransformPropTypes.js
+++ b/Libraries/DeprecatedPropTypes/DeprecatedTransformPropTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -40,23 +40,7 @@ const DecomposedMatrixPropType = function(
   }
 };
 
-const TransformPropTypes = {
-  /**
-   * `transform` accepts an array of transformation objects. Each object specifies
-   * the property that will be transformed as the key, and the value to use in the
-   * transformation. Objects should not be combined. Use a single key/value pair
-   * per object.
-   *
-   * The rotate transformations require a string so that the transform may be
-   * expressed in degrees (deg) or radians (rad). For example:
-   *
-   * `transform([{ rotateX: '45deg' }, { rotateZ: '0.785398rad' }])`
-   *
-   * The skew transformations require a string so that the transform may be
-   * expressed in degrees (deg). For example:
-   *
-   * `transform([{ skewX: '45deg' }])`
-   */
+const DeprecatedTransformPropTypes = {
   transform: ReactPropTypes.arrayOf(
     ReactPropTypes.oneOfType([
       ReactPropTypes.shape({perspective: ReactPropTypes.number}),
@@ -73,17 +57,8 @@ const TransformPropTypes = {
       ReactPropTypes.shape({skewY: ReactPropTypes.string}),
     ]),
   ),
-
-  /**
-   * Deprecated. Use the transform prop instead.
-   */
   transformMatrix: TransformMatrixPropType,
-  /**
-   * Deprecated. Use the transform prop instead.
-   */
   decomposedMatrix: DecomposedMatrixPropType,
-
-  /* Deprecated transform props used on Android only */
   scaleX: deprecatedPropType(
     ReactPropTypes.number,
     'Use the transform prop instead.',
@@ -106,4 +81,4 @@ const TransformPropTypes = {
   ),
 };
 
-module.exports = TransformPropTypes;
+module.exports = DeprecatedTransformPropTypes;
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedViewAccessibility.js b/Libraries/DeprecatedPropTypes/DeprecatedViewAccessibility.js
new file mode 100644
index 00000000000000..890dd49f0f8672
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedViewAccessibility.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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';
+
+module.exports = {
+  DeprecatedAccessibilityTraits: [
+    'none',
+    'button',
+    'link',
+    'header',
+    'search',
+    'image',
+    'selected',
+    'plays',
+    'key',
+    'text',
+    'summary',
+    'disabled',
+    'frequentUpdates',
+    'startsMedia',
+    'adjustable',
+    'allowsDirectInteraction',
+    'pageTurn',
+  ],
+  DeprecatedAccessibilityComponentTypes: [
+    'none',
+    'button',
+    'radiobutton_checked',
+    'radiobutton_unchecked',
+  ],
+  // This must be kept in sync with the AccessibilityRolesMask in RCTViewManager.m
+  DeprecatedAccessibilityRoles: [
+    'none',
+    'button',
+    'link',
+    'search',
+    'image',
+    'keyboardkey',
+    'text',
+    'adjustable',
+    'imagebutton',
+    'header',
+    'summary',
+  ],
+  // This must be kept in sync with the AccessibilityStatesMask in RCTViewManager.m
+  DeprecatedAccessibilityStates: ['selected', 'disabled'],
+};
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedViewPropTypes.js b/Libraries/DeprecatedPropTypes/DeprecatedViewPropTypes.js
new file mode 100644
index 00000000000000..0d5b0746c4a3d8
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedViewPropTypes.js
@@ -0,0 +1,409 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 DeprecatedEdgeInsetsPropType = require('DeprecatedEdgeInsetsPropType');
+const PlatformViewPropTypes = require('PlatformViewPropTypes');
+const PropTypes = require('prop-types');
+const DeprecatedStyleSheetPropType = require('DeprecatedStyleSheetPropType');
+const DeprecatedViewStylePropTypes = require('DeprecatedViewStylePropTypes');
+
+const {
+  DeprecatedAccessibilityComponentTypes,
+  DeprecatedAccessibilityTraits,
+  DeprecatedAccessibilityRoles,
+  DeprecatedAccessibilityStates,
+} = require('DeprecatedViewAccessibility');
+
+const stylePropType = DeprecatedStyleSheetPropType(
+  DeprecatedViewStylePropTypes,
+);
+
+module.exports = {
+  /**
+   * When `true`, indicates that the view is an accessibility element.
+   * By default, all the touchable elements are accessible.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessible
+   */
+  accessible: PropTypes.bool,
+
+  /**
+   * 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.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilitylabel
+   */
+  accessibilityLabel: PropTypes.node,
+
+  /**
+   * 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.
+   *
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilityHint
+   */
+  accessibilityHint: PropTypes.string,
+
+  /**
+   * Provides an array of custom actions available for accessibility.
+   *
+   * @platform ios
+   */
+  accessibilityActions: PropTypes.arrayOf(PropTypes.string),
+
+  /**
+   * Prevents view from being inverted if set to true and color inversion is turned on.
+   *
+   * @platform ios
+   */
+  accessibilityIgnoresInvertColors: PropTypes.bool,
+
+  /**
+   * Indicates to accessibility services to treat UI component like a
+   * native one. Works for Android only.
+   *
+   * @platform android
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilitycomponenttype
+   */
+  accessibilityComponentType: PropTypes.oneOf(
+    DeprecatedAccessibilityComponentTypes,
+  ),
+
+  /**
+   * Indicates to accessibility services to treat UI component like a specific role.
+   */
+  accessibilityRole: PropTypes.oneOf(DeprecatedAccessibilityRoles),
+
+  /**
+   * Indicates to accessibility services that UI Component is in a specific State.
+   */
+  accessibilityStates: PropTypes.arrayOf(
+    PropTypes.oneOf(DeprecatedAccessibilityStates),
+  ),
+  /**
+   * Indicates to accessibility services whether the user should be notified
+   * when this view changes. Works for Android API >= 19 only.
+   *
+   * @platform android
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilityliveregion
+   */
+  accessibilityLiveRegion: PropTypes.oneOf(['none', 'polite', 'assertive']),
+
+  /**
+   * 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.
+   *
+   * @platform android
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#importantforaccessibility
+   */
+  importantForAccessibility: PropTypes.oneOf([
+    'auto',
+    'yes',
+    'no',
+    'no-hide-descendants',
+  ]),
+
+  /**
+   * Provides additional traits to screen reader. By default no traits are
+   * provided unless specified otherwise in element.
+   *
+   * You can provide one trait or an array of many traits.
+   *
+   * @platform ios
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilitytraits
+   */
+  accessibilityTraits: PropTypes.oneOfType([
+    PropTypes.oneOf(DeprecatedAccessibilityTraits),
+    PropTypes.arrayOf(PropTypes.oneOf(DeprecatedAccessibilityTraits)),
+  ]),
+
+  /**
+   * A value indicating whether VoiceOver should ignore the elements
+   * within views that are siblings of the receiver.
+   * Default is `false`.
+   *
+   * @platform ios
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilityviewismodal
+   */
+  accessibilityViewIsModal: PropTypes.bool,
+
+  /**
+   * A value indicating whether the accessibility elements contained within
+   * this accessibility element are hidden.
+   *
+   * @platform ios
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#accessibilityElementsHidden
+   */
+  accessibilityElementsHidden: PropTypes.bool,
+
+  /**
+   * When `accessible` is true, the system will try to invoke this function
+   * when the user performs an accessibility custom action.
+   *
+   * @platform ios
+   */
+  onAccessibilityAction: PropTypes.func,
+
+  /**
+   * When `accessible` is true, the system will try to invoke this function
+   * when the user performs accessibility tap gesture.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onaccessibilitytap
+   */
+  onAccessibilityTap: PropTypes.func,
+
+  /**
+   * When `accessible` is `true`, the system will invoke this function when the
+   * user performs the magic tap gesture.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onmagictap
+   */
+  onMagicTap: PropTypes.func,
+
+  /**
+   * Used to locate this view in end-to-end tests.
+   *
+   * > This disables the 'layout-only view removal' optimization for this view!
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#testid
+   */
+  testID: PropTypes.string,
+
+  /**
+   * Used to locate this view from native classes.
+   *
+   * > This disables the 'layout-only view removal' optimization for this view!
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#nativeid
+   */
+  nativeID: PropTypes.string,
+
+  /**
+   * For most touch interactions, you'll simply want to wrap your component in
+   * `TouchableHighlight` or `TouchableOpacity`. Check out `Touchable.js`,
+   * `ScrollResponder.js` and `ResponderEventPlugin.js` for more discussion.
+   */
+
+  /**
+   * The View is now responding for touch events. This is the time to highlight
+   * and show the user what is happening.
+   *
+   * `View.props.onResponderGrant: (event) => {}`, where `event` is a synthetic
+   * touch event as described above.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onrespondergrant
+   */
+  onResponderGrant: PropTypes.func,
+
+  /**
+   * The user is moving their finger.
+   *
+   * `View.props.onResponderMove: (event) => {}`, where `event` is a synthetic
+   * touch event as described above.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onrespondermove
+   */
+  onResponderMove: PropTypes.func,
+
+  /**
+   * Another responder is already active and will not release it to that `View`
+   * asking to be the responder.
+   *
+   * `View.props.onResponderReject: (event) => {}`, where `event` is a
+   * synthetic touch event as described above.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onresponderreject
+   */
+  onResponderReject: PropTypes.func,
+
+  /**
+   * Fired at the end of the touch.
+   *
+   * `View.props.onResponderRelease: (event) => {}`, where `event` is a
+   * synthetic touch event as described above.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onresponderrelease
+   */
+  onResponderRelease: PropTypes.func,
+
+  /**
+   * 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 (e.g., happens with control center/ notification
+   * center on iOS)
+   *
+   * `View.props.onResponderTerminate: (event) => {}`, where `event` is a
+   * synthetic touch event as described above.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onresponderterminate
+   */
+  onResponderTerminate: PropTypes.func,
+
+  /**
+   * Some other `View` wants to become responder and is asking this `View` to
+   * release its responder. Returning `true` allows its release.
+   *
+   * `View.props.onResponderTerminationRequest: (event) => {}`, where `event`
+   * is a synthetic touch event as described above.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onresponderterminationrequest
+   */
+  onResponderTerminationRequest: PropTypes.func,
+
+  /**
+   * Does this view want to become responder on the start of a touch?
+   *
+   * `View.props.onStartShouldSetResponder: (event) => [true | false]`, where
+   * `event` is a synthetic touch event as described above.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onstartshouldsetresponder
+   */
+  onStartShouldSetResponder: PropTypes.func,
+
+  /**
+   * If a parent `View` wants to prevent a child `View` from becoming responder
+   * on a touch start, it should have this handler which returns `true`.
+   *
+   * `View.props.onStartShouldSetResponderCapture: (event) => [true | false]`,
+   * where `event` is a synthetic touch event as described above.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onstartshouldsetrespondercapture
+   */
+  onStartShouldSetResponderCapture: PropTypes.func,
+
+  /**
+   * Does this view want to "claim" touch responsiveness? This is called for
+   * every touch move on the `View` when it is not the responder.
+   *
+   * `View.props.onMoveShouldSetResponder: (event) => [true | false]`, where
+   * `event` is a synthetic touch event as described above.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onmoveshouldsetresponder
+   */
+  onMoveShouldSetResponder: PropTypes.func,
+
+  /**
+   * If a parent `View` wants to prevent a child `View` from becoming responder
+   * on a move, it should have this handler which returns `true`.
+   *
+   * `View.props.onMoveShouldSetResponderCapture: (event) => [true | false]`,
+   * where `event` is a synthetic touch event as described above.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onMoveShouldsetrespondercapture
+   */
+  onMoveShouldSetResponderCapture: PropTypes.func,
+
+  /**
+   * 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.
+   *
+   * > 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.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#hitslop
+   */
+  hitSlop: DeprecatedEdgeInsetsPropType,
+
+  /**
+   * Invoked on mount and layout changes with:
+   *
+   * `{nativeEvent: { layout: {x, y, width, height}}}`
+   *
+   * This event is fired immediately once the layout has been calculated, but
+   * the new layout may not yet be reflected on the screen at the time the
+   * event is received, especially if a layout animation is in progress.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#onlayout
+   */
+  onLayout: PropTypes.func,
+
+  /**
+   * Controls whether the `View` can be the target of touch events.
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#pointerevents
+   */
+  pointerEvents: PropTypes.oneOf(['box-none', 'none', 'box-only', 'auto']),
+
+  /**
+   * See http://facebook.github.io/react-native/docs/style.html
+   */
+  style: stylePropType,
+
+  /**
+   * 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).
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#removeclippedsubviews
+   */
+  removeClippedSubviews: PropTypes.bool,
+
+  /**
+   * Whether this `View` should render itself (and all of its children) into a
+   * single hardware texture on the GPU.
+   *
+   * @platform android
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#rendertohardwaretextureandroid
+   */
+  renderToHardwareTextureAndroid: PropTypes.bool,
+
+  /**
+   * Whether this `View` should be rendered as a bitmap before compositing.
+   *
+   * @platform ios
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#shouldrasterizeios
+   */
+  shouldRasterizeIOS: PropTypes.bool,
+
+  /**
+   * 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.
+   *
+   * @platform android
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#collapsable
+   */
+  collapsable: PropTypes.bool,
+
+  /**
+   * Whether this `View` needs to rendered offscreen and composited with an
+   * alpha in order to preserve 100% correct colors and blending behavior.
+   *
+   * @platform android
+   *
+   * See http://facebook.github.io/react-native/docs/view.html#needsoffscreenalphacompositing
+   */
+  needsOffscreenAlphaCompositing: PropTypes.bool,
+
+  /**
+   * Any additional platform-specific view prop types, or prop type overrides.
+   */
+  ...PlatformViewPropTypes,
+};
diff --git a/Libraries/Components/View/ViewStylePropTypes.js b/Libraries/DeprecatedPropTypes/DeprecatedViewStylePropTypes.js
similarity index 63%
rename from Libraries/Components/View/ViewStylePropTypes.js
rename to Libraries/DeprecatedPropTypes/DeprecatedViewStylePropTypes.js
index 8f690fb32f6891..546da9cee33e8d 100644
--- a/Libraries/Components/View/ViewStylePropTypes.js
+++ b/Libraries/DeprecatedPropTypes/DeprecatedViewStylePropTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,28 +10,28 @@
 
 'use strict';
 
-const ColorPropType = require('ColorPropType');
-const LayoutPropTypes = require('LayoutPropTypes');
+const DeprecatedColorPropType = require('DeprecatedColorPropType');
+const DeprecatedLayoutPropTypes = require('DeprecatedLayoutPropTypes');
 const ReactPropTypes = require('prop-types');
-const ShadowPropTypesIOS = require('ShadowPropTypesIOS');
-const TransformPropTypes = require('TransformPropTypes');
+const DeprecatedShadowPropTypesIOS = require('DeprecatedShadowPropTypesIOS');
+const DeprecatedTransformPropTypes = require('DeprecatedTransformPropTypes');
 
 /**
  * Warning: Some of these properties may not be supported in all releases.
  */
-const ViewStylePropTypes = {
-  ...LayoutPropTypes,
-  ...ShadowPropTypesIOS,
-  ...TransformPropTypes,
+const DeprecatedViewStylePropTypes = {
+  ...DeprecatedLayoutPropTypes,
+  ...DeprecatedShadowPropTypesIOS,
+  ...DeprecatedTransformPropTypes,
   backfaceVisibility: ReactPropTypes.oneOf(['visible', 'hidden']),
-  backgroundColor: ColorPropType,
-  borderColor: ColorPropType,
-  borderTopColor: ColorPropType,
-  borderRightColor: ColorPropType,
-  borderBottomColor: ColorPropType,
-  borderLeftColor: ColorPropType,
-  borderStartColor: ColorPropType,
-  borderEndColor: ColorPropType,
+  backgroundColor: DeprecatedColorPropType,
+  borderColor: DeprecatedColorPropType,
+  borderTopColor: DeprecatedColorPropType,
+  borderRightColor: DeprecatedColorPropType,
+  borderBottomColor: DeprecatedColorPropType,
+  borderLeftColor: DeprecatedColorPropType,
+  borderStartColor: DeprecatedColorPropType,
+  borderEndColor: DeprecatedColorPropType,
   borderRadius: ReactPropTypes.number,
   borderTopLeftRadius: ReactPropTypes.number,
   borderTopRightRadius: ReactPropTypes.number,
@@ -58,4 +58,4 @@ const ViewStylePropTypes = {
   elevation: ReactPropTypes.number,
 };
 
-module.exports = ViewStylePropTypes;
+module.exports = DeprecatedViewStylePropTypes;
diff --git a/Libraries/Utilities/createStrictShapeTypeChecker.js b/Libraries/DeprecatedPropTypes/deprecatedCreateStrictShapeTypeChecker.js
similarity index 92%
rename from Libraries/Utilities/createStrictShapeTypeChecker.js
rename to Libraries/DeprecatedPropTypes/deprecatedCreateStrictShapeTypeChecker.js
index ad097e9682344e..524e605ca05b72 100644
--- a/Libraries/Utilities/createStrictShapeTypeChecker.js
+++ b/Libraries/DeprecatedPropTypes/deprecatedCreateStrictShapeTypeChecker.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,7 +13,7 @@
 const invariant = require('fbjs/lib/invariant');
 const merge = require('merge');
 
-function createStrictShapeTypeChecker(shapeTypes: {
+function deprecatedCreateStrictShapeTypeChecker(shapeTypes: {
   [key: string]: ReactPropsCheckType,
 }): ReactPropsChainableTypeChecker {
   function checkType(
@@ -83,4 +83,4 @@ function createStrictShapeTypeChecker(shapeTypes: {
   return chainedCheckType;
 }
 
-module.exports = createStrictShapeTypeChecker;
+module.exports = deprecatedCreateStrictShapeTypeChecker;
diff --git a/Libraries/EventEmitter/MissingNativeEventEmitterShim.js b/Libraries/EventEmitter/MissingNativeEventEmitterShim.js
index 562964b85f4cf4..1b9a51c708a637 100644
--- a/Libraries/EventEmitter/MissingNativeEventEmitterShim.js
+++ b/Libraries/EventEmitter/MissingNativeEventEmitterShim.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/EventEmitter/NativeEventEmitter.js b/Libraries/EventEmitter/NativeEventEmitter.js
index 2220670fc76909..8aa370b8e4b581 100644
--- a/Libraries/EventEmitter/NativeEventEmitter.js
+++ b/Libraries/EventEmitter/NativeEventEmitter.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/EventEmitter/RCTDeviceEventEmitter.js b/Libraries/EventEmitter/RCTDeviceEventEmitter.js
index b0977f219abc25..342aa733bf08ff 100644
--- a/Libraries/EventEmitter/RCTDeviceEventEmitter.js
+++ b/Libraries/EventEmitter/RCTDeviceEventEmitter.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/EventEmitter/RCTEventEmitter.js b/Libraries/EventEmitter/RCTEventEmitter.js
index 1a51905ba20d1e..f84bca058ed366 100644
--- a/Libraries/EventEmitter/RCTEventEmitter.js
+++ b/Libraries/EventEmitter/RCTEventEmitter.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/EventEmitter/RCTNativeAppEventEmitter.js b/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
index a32cfcef7cf9c7..2d302c014feebb 100644
--- a/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
+++ b/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
index e822b72c73c192..e34e60e2e9f201 100644
--- a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
+++ b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Experimental/Incremental.js b/Libraries/Experimental/Incremental.js
index cfd0c69fd03cfe..b20fb543e947c5 100644
--- a/Libraries/Experimental/Incremental.js
+++ b/Libraries/Experimental/Incremental.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -90,7 +90,7 @@ export type Props = {
    * Tags instances and associated tasks for easier debugging.
    */
   name: string,
-  children?: any,
+  children: React.Node,
 };
 type DefaultProps = {
   name: string,
diff --git a/Libraries/Experimental/IncrementalExample.js b/Libraries/Experimental/IncrementalExample.js
index 3cc441fff38591..e63f59a996f974 100644
--- a/Libraries/Experimental/IncrementalExample.js
+++ b/Libraries/Experimental/IncrementalExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Experimental/IncrementalGroup.js b/Libraries/Experimental/IncrementalGroup.js
index af1a7ad63ddb79..03421e92c58f4c 100644
--- a/Libraries/Experimental/IncrementalGroup.js
+++ b/Libraries/Experimental/IncrementalGroup.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Experimental/IncrementalPresenter.js b/Libraries/Experimental/IncrementalPresenter.js
index 9927179d173966..742d0e93443f24 100644
--- a/Libraries/Experimental/IncrementalPresenter.js
+++ b/Libraries/Experimental/IncrementalPresenter.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,13 +11,13 @@
 'use strict';
 
 const IncrementalGroup = require('IncrementalGroup');
-const React = require('React');
 const PropTypes = require('prop-types');
+const React = require('React');
 const View = require('View');
 
-const ViewPropTypes = require('ViewPropTypes');
-
 import type {Context} from 'Incremental';
+import type {ViewStyleProp} from 'StyleSheet';
+import type {LayoutEvent} from 'CoreEventTypes';
 
 /**
  * WARNING: EXPERIMENTAL. Breaking changes will probably happen a lot and will
@@ -31,25 +31,19 @@ import type {Context} from 'Incremental';
  *
  * See Incremental.js for more info.
  */
-type Props = {
+type Props = $ReadOnly<{|
   name: string,
   disabled?: boolean,
-  onDone?: () => void,
-  onLayout?: (event: Object) => void,
-  style?: mixed,
-  children?: any,
-};
+  onDone?: () => mixed,
+  onLayout?: (event: LayoutEvent) => mixed,
+  style?: ViewStyleProp,
+  children?: React.Node,
+|}>;
+
 class IncrementalPresenter extends React.Component<Props> {
   context: Context;
   _isDone: boolean;
 
-  static propTypes = {
-    name: PropTypes.string,
-    disabled: PropTypes.bool,
-    onDone: PropTypes.func,
-    onLayout: PropTypes.func,
-    style: ViewPropTypes.style,
-  };
   static contextTypes = {
     incrementalGroup: PropTypes.object,
     incrementalGroupEnabled: PropTypes.bool,
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js b/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js
index b01fea760dd0f4..cf54d9d502f7f8 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,23 +17,31 @@ const React = require('React');
 const SwipeableRow = require('SwipeableRow');
 const FlatList = require('FlatList');
 
+// TODO: Make this $ReadOnly and Exact. Will require doing the same to the props in
+//       Libraries/Lists/*
 type SwipableListProps = {
   /**
    * To alert the user that swiping is possible, the first row can bounce
    * on component mount.
    */
   bounceFirstRowOnMount: boolean,
-  // Maximum distance to open to after a swipe
+
+  /**
+   * Maximum distance to open to after a swipe
+   */
   maxSwipeDistance: number | (Object => number),
-  // Callback method to render the view that will be unveiled on swipe
+
+  /**
+   * Callback method to render the view that will be unveiled on swipe
+   */
   renderQuickActions: renderItemType,
 };
 
 type Props<ItemT> = SwipableListProps & FlatListProps<ItemT>;
 
-type State = {
+type State = {|
   openRowKey: ?string,
-};
+|};
 
 /**
  * A container component that renders multiple SwipeableRow's in a FlatList
@@ -53,29 +61,9 @@ type State = {
  */
 
 class SwipeableFlatList<ItemT> extends React.Component<Props<ItemT>, State> {
-  props: Props<ItemT>;
-  state: State;
-
   _flatListRef: ?FlatList<ItemT> = null;
   _shouldBounceFirstRowOnMount: boolean = false;
 
-  static propTypes = {
-    ...FlatList.propTypes,
-
-    /**
-     * To alert the user that swiping is possible, the first row can bounce
-     * on component mount.
-     */
-    bounceFirstRowOnMount: PropTypes.bool.isRequired,
-
-    // Maximum distance to open to after a swipe
-    maxSwipeDistance: PropTypes.oneOfType([PropTypes.number, PropTypes.func])
-      .isRequired,
-
-    // Callback method to render the view that will be unveiled on swipe
-    renderQuickActions: PropTypes.func.isRequired,
-  };
-
   static defaultProps = {
     ...FlatList.defaultProps,
     bounceFirstRowOnMount: true,
@@ -100,6 +88,7 @@ class SwipeableFlatList<ItemT> extends React.Component<Props<ItemT>, State> {
         }}
         onScroll={this._onScroll}
         renderItem={this._renderItem}
+        extraData={this.state}
       />
     );
   }
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListView.js b/Libraries/Experimental/SwipeableRow/SwipeableListView.js
index bae4eb5f2ff846..3189b728a7962a 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableListView.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableListView.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,30 +11,53 @@
 'use strict';
 
 const ListView = require('ListView');
-const PropTypes = require('prop-types');
 const React = require('React');
 const SwipeableListViewDataSource = require('SwipeableListViewDataSource');
 const SwipeableRow = require('SwipeableRow');
 
-type DefaultProps = {
-  bounceFirstRowOnMount: boolean,
-  renderQuickActions: Function,
-};
+type ListViewProps = React.ElementConfig<typeof ListView>;
+
+type Props = $ReadOnly<{|
+  ...ListViewProps,
 
-type Props = {
+  /**
+   * To alert the user that swiping is possible, the first row can bounce
+   * on component mount.
+   */
   bounceFirstRowOnMount: boolean,
+  /**
+   * Use `SwipeableListView.getNewDataSource()` to get a data source to use,
+   * then use it just like you would a normal ListView data source
+   */
   dataSource: SwipeableListViewDataSource,
+  /**
+   * Maximum distance to open to after a swipe
+   */
   maxSwipeDistance:
     | number
-    | ((rowData: any, sectionID: string, rowID: string) => number),
+    | ((rowData: Object, sectionID: string, rowID: string) => number),
   onScroll?: ?Function,
-  renderRow: Function,
-  renderQuickActions: Function,
-};
+  /**
+   * Callback method to render the swipeable view
+   */
+  renderRow: (
+    rowData: Object,
+    sectionID: string,
+    rowID: string,
+  ) => React.Element<any>,
+  /**
+   * Callback method to render the view that will be unveiled on swipe
+   */
+  renderQuickActions: (
+    rowData: Object,
+    sectionID: string,
+    rowID: string,
+  ) => ?React.Element<any>,
+|}>;
 
-type State = {
+type State = {|
   dataSource: Object,
-};
+|};
 
 /**
  * A container component that renders multiple SwipeableRow's in a ListView
@@ -70,26 +93,6 @@ class SwipeableListView extends React.Component<Props, State> {
     });
   }
 
-  static propTypes = {
-    /**
-     * To alert the user that swiping is possible, the first row can bounce
-     * on component mount.
-     */
-    bounceFirstRowOnMount: PropTypes.bool.isRequired,
-    /**
-     * Use `SwipeableListView.getNewDataSource()` to get a data source to use,
-     * then use it just like you would a normal ListView data source
-     */
-    dataSource: PropTypes.instanceOf(SwipeableListViewDataSource).isRequired,
-    // Maximum distance to open to after a swipe
-    maxSwipeDistance: PropTypes.oneOfType([PropTypes.number, PropTypes.func])
-      .isRequired,
-    // Callback method to render the swipeable view
-    renderRow: PropTypes.func.isRequired,
-    // Callback method to render the view that will be unveiled on swipe
-    renderQuickActions: PropTypes.func.isRequired,
-  };
-
   static defaultProps = {
     bounceFirstRowOnMount: false,
     renderQuickActions: () => null,
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
index 6c409a9acad1c4..38e03c66140d0f 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
index e0ea2ce8cabd23..82e1f7a0ae5e47 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,12 +10,12 @@
 
 'use strict';
 
+const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
 const Image = require('Image');
 const React = require('React');
 const Text = require('Text');
 const TouchableHighlight = require('TouchableHighlight');
 const View = require('View');
-const ViewPropTypes = require('ViewPropTypes');
 
 import type {ImageSource} from 'ImageSource';
 
@@ -27,13 +27,22 @@ import type {ImageSource} from 'ImageSource';
 class SwipeableQuickActionButton extends React.Component<{
   accessibilityLabel?: string,
   imageSource?: ?(ImageSource | number),
-  imageStyle?: ?ViewPropTypes.style,
+  /* $FlowFixMe(>=0.82.0 site=react_native_fb) This comment suppresses an error
+   * found when Flow v0.82 was deployed. To see the error delete this comment
+   * and run Flow. */
+  imageStyle?: ?DeprecatedViewPropTypes.style,
   mainView?: ?React.Node,
   onPress?: Function,
-  style?: ?ViewPropTypes.style,
+  /* $FlowFixMe(>=0.82.0 site=react_native_fb) This comment suppresses an error
+   * found when Flow v0.82 was deployed. To see the error delete this comment
+   * and run Flow. */
+  style?: ?DeprecatedViewPropTypes.style,
   testID?: string,
   text?: ?(string | Object | Array<string | Object>),
-  textStyle?: ?ViewPropTypes.style,
+  /* $FlowFixMe(>=0.82.0 site=react_native_fb) This comment suppresses an error
+   * found when Flow v0.82 was deployed. To see the error delete this comment
+   * and run Flow. */
+  textStyle?: ?DeprecatedViewPropTypes.style,
 }> {
   render(): React.Node {
     if (!this.props.imageSource && !this.props.text && !this.props.mainView) {
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
index 3642b135d43191..c97f77648af76f 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
@@ -14,7 +14,12 @@ const React = require('React');
 const StyleSheet = require('StyleSheet');
 const View = require('View');
 
-const ViewPropTypes = require('ViewPropTypes');
+import type {ViewStyleProp} from 'StyleSheet';
+
+type Props = $ReadOnly<{|
+  style?: ?ViewStyleProp,
+  children: React.Node,
+|}>;
 
 /**
  * A thin wrapper around standard quick action buttons that can, if the user
@@ -26,13 +31,8 @@ const ViewPropTypes = require('ViewPropTypes');
  *   <SwipeableQuickActionButton {..props} />
  * </SwipeableQuickActions>
  */
-class SwipeableQuickActions extends React.Component<{style?: $FlowFixMe}> {
-  static propTypes = {
-    style: ViewPropTypes.style,
-  };
-
+class SwipeableQuickActions extends React.Component<Props> {
   render(): React.Node {
-    // $FlowFixMe found when converting React.createClass to ES6
     const children = this.props.children;
     let buttons = [];
 
@@ -41,8 +41,7 @@ class SwipeableQuickActions extends React.Component<{style?: $FlowFixMe}> {
       for (let i = 0; i < children.length; i++) {
         buttons.push(children[i]);
 
-        // $FlowFixMe found when converting React.createClass to ES6
-        if (i < this.props.children.length - 1) {
+        if (i < children.length - 1) {
           // Not last button
           buttons.push(<View key={i} style={styles.divider} />);
         }
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableRow.js b/Libraries/Experimental/SwipeableRow/SwipeableRow.js
index 3cbeb3d6ca2558..5e9e796cdcdb79 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableRow.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableRow.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -16,15 +16,14 @@ const PanResponder = require('PanResponder');
 const React = require('React');
 const PropTypes = require('prop-types');
 const StyleSheet = require('StyleSheet');
-/* $FlowFixMe(>=0.54.0 site=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. */
-const TimerMixin = require('react-timer-mixin');
 const View = require('View');
 
 const createReactClass = require('create-react-class');
 const emptyFunction = require('fbjs/lib/emptyFunction');
 
+import type {LayoutEvent, PressEvent} from 'CoreEventTypes';
+import type {GestureState} from 'PanResponder';
+
 const IS_RTL = I18nManager.isRTL;
 
 // NOTE: Eventually convert these consts to an input object of configurations
@@ -82,8 +81,7 @@ const SwipeableRow = createReactClass({
   displayName: 'SwipeableRow',
   _panResponder: {},
   _previousLeft: CLOSED_LEFT_POSITION,
-
-  mixins: [TimerMixin],
+  _timeoutID: (null: ?TimeoutID),
 
   propTypes: {
     children: PropTypes.any,
@@ -154,7 +152,7 @@ const SwipeableRow = createReactClass({
        * Do the on mount bounce after a delay because if we animate when other
        * components are loading, the animation will be laggy
        */
-      this.setTimeout(() => {
+      this._timeoutID = setTimeout(() => {
         this._animateBounceBack(ON_MOUNT_BOUNCE_DURATION);
       }, ON_MOUNT_BOUNCE_DELAY);
     }
@@ -170,6 +168,12 @@ const SwipeableRow = createReactClass({
     }
   },
 
+  componentWillUnmount() {
+    if (this._timeoutID != null) {
+      clearTimeout(this._timeoutID);
+    }
+  },
+
   render(): React.Element<any> {
     // The view hidden behind the main view
     let slideOutView;
@@ -204,7 +208,7 @@ const SwipeableRow = createReactClass({
     this._animateToClosedPosition();
   },
 
-  _onSwipeableViewLayout(event: Object): void {
+  _onSwipeableViewLayout(event: LayoutEvent): void {
     this.setState({
       isSwipeableViewRendered: true,
       rowHeight: event.nativeEvent.layout.height,
@@ -212,16 +216,19 @@ const SwipeableRow = createReactClass({
   },
 
   _handleMoveShouldSetPanResponderCapture(
-    event: Object,
-    gestureState: Object,
+    event: PressEvent,
+    gestureState: GestureState,
   ): boolean {
     // Decides whether a swipe is responded to by this component or its child
     return gestureState.dy < 10 && this._isValidSwipe(gestureState);
   },
 
-  _handlePanResponderGrant(event: Object, gestureState: Object): void {},
+  _handlePanResponderGrant(
+    event: PressEvent,
+    gestureState: GestureState,
+  ): void {},
 
-  _handlePanResponderMove(event: Object, gestureState: Object): void {
+  _handlePanResponderMove(event: PressEvent, gestureState: GestureState): void {
     if (this._isSwipingExcessivelyRightFromClosedPosition(gestureState)) {
       return;
     }
@@ -235,22 +242,24 @@ const SwipeableRow = createReactClass({
     }
   },
 
-  _isSwipingRightFromClosed(gestureState: Object): boolean {
+  _isSwipingRightFromClosed(gestureState: GestureState): boolean {
     const gestureStateDx = IS_RTL ? -gestureState.dx : gestureState.dx;
     return this._previousLeft === CLOSED_LEFT_POSITION && gestureStateDx > 0;
   },
 
-  _swipeFullSpeed(gestureState: Object): void {
+  _swipeFullSpeed(gestureState: GestureState): void {
     this.state.currentLeft.setValue(this._previousLeft + gestureState.dx);
   },
 
-  _swipeSlowSpeed(gestureState: Object): void {
+  _swipeSlowSpeed(gestureState: GestureState): void {
     this.state.currentLeft.setValue(
       this._previousLeft + gestureState.dx / SLOW_SPEED_SWIPE_FACTOR,
     );
   },
 
-  _isSwipingExcessivelyRightFromClosedPosition(gestureState: Object): boolean {
+  _isSwipingExcessivelyRightFromClosedPosition(
+    gestureState: GestureState,
+  ): boolean {
     /**
      * We want to allow a BIT of right swipe, to allow users to know that
      * swiping is available, but swiping right does not do anything
@@ -264,8 +273,8 @@ const SwipeableRow = createReactClass({
   },
 
   _onPanResponderTerminationRequest(
-    event: Object,
-    gestureState: Object,
+    event: PressEvent,
+    gestureState: GestureState,
   ): boolean {
     return false;
   },
@@ -338,7 +347,7 @@ const SwipeableRow = createReactClass({
   },
 
   // Ignore swipes due to user's finger moving slightly when tapping
-  _isValidSwipe(gestureState: Object): boolean {
+  _isValidSwipe(gestureState: GestureState): boolean {
     if (
       this.props.preventSwipeRight &&
       this._previousLeft === CLOSED_LEFT_POSITION &&
@@ -350,7 +359,7 @@ const SwipeableRow = createReactClass({
     return Math.abs(gestureState.dx) > HORIZONTAL_SWIPE_DISTANCE_THRESHOLD;
   },
 
-  _shouldAnimateRemainder(gestureState: Object): boolean {
+  _shouldAnimateRemainder(gestureState: GestureState): boolean {
     /**
      * If user has swiped past a certain distance, animate the rest of the way
      * if they let go
@@ -361,7 +370,7 @@ const SwipeableRow = createReactClass({
     );
   },
 
-  _handlePanResponderEnd(event: Object, gestureState: Object): void {
+  _handlePanResponderEnd(event: PressEvent, gestureState: GestureState): void {
     const horizontalDistance = IS_RTL ? -gestureState.dx : gestureState.dx;
     if (this._isSwipingRightFromClosed(gestureState)) {
       this.props.onOpen();
diff --git a/Libraries/Experimental/WindowedListView.js b/Libraries/Experimental/WindowedListView.js
index 15f1d0b4a8755a..830d653d9a39a5 100644
--- a/Libraries/Experimental/WindowedListView.js
+++ b/Libraries/Experimental/WindowedListView.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -24,7 +24,7 @@ const clamp = require('clamp');
 const deepDiffer = require('deepDiffer');
 const infoLog = require('infoLog');
 const invariant = require('fbjs/lib/invariant');
-const nullthrows = require('fbjs/lib/nullthrows');
+const nullthrows = require('nullthrows');
 
 import type {NativeMethodsMixinType} from 'ReactNativeTypes';
 
diff --git a/Libraries/Geolocation/Geolocation.js b/Libraries/Geolocation/Geolocation.js
index d252da95bca58f..0cde34c59456bc 100644
--- a/Libraries/Geolocation/Geolocation.js
+++ b/Libraries/Geolocation/Geolocation.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Geolocation/RCTLocationObserver.h b/Libraries/Geolocation/RCTLocationObserver.h
index 5de0ea289d881d..f3f9e19b8f2902 100644
--- a/Libraries/Geolocation/RCTLocationObserver.h
+++ b/Libraries/Geolocation/RCTLocationObserver.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Geolocation/RCTLocationObserver.m b/Libraries/Geolocation/RCTLocationObserver.m
index 9e15facfa7ef68..904538d8a64110 100644
--- a/Libraries/Geolocation/RCTLocationObserver.m
+++ b/Libraries/Geolocation/RCTLocationObserver.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/AssetRegistry.js b/Libraries/Image/AssetRegistry.js
index b050a9e239cd27..7d9626f8771f42 100644
--- a/Libraries/Image/AssetRegistry.js
+++ b/Libraries/Image/AssetRegistry.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/AssetSourceResolver.js b/Libraries/Image/AssetSourceResolver.js
index a870a325242838..b5650620ae1481 100644
--- a/Libraries/Image/AssetSourceResolver.js
+++ b/Libraries/Image/AssetSourceResolver.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/Image.android.js b/Libraries/Image/Image.android.js
index d0e685a5e64229..3eda5a7c52d2ec 100644
--- a/Libraries/Image/Image.android.js
+++ b/Libraries/Image/Image.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,25 +10,24 @@
 
 'use strict';
 
-const ImageStylePropTypes = require('ImageStylePropTypes');
+const DeprecatedImageStylePropTypes = require('DeprecatedImageStylePropTypes');
+const DeprecatedStyleSheetPropType = require('DeprecatedStyleSheetPropType');
+const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
+const ImageViewNativeComponent = require('ImageViewNativeComponent');
 const NativeModules = require('NativeModules');
+const PropTypes = require('prop-types');
 const React = require('React');
 const ReactNative = require('ReactNative');
-const PropTypes = require('prop-types');
 const StyleSheet = require('StyleSheet');
-const StyleSheetPropType = require('StyleSheetPropType');
 const TextAncestor = require('TextAncestor');
-const ViewPropTypes = require('ViewPropTypes');
 
 const flattenStyle = require('flattenStyle');
 const merge = require('merge');
-const requireNativeComponent = require('requireNativeComponent');
 const resolveAssetSource = require('resolveAssetSource');
 
 const {ImageLoader} = NativeModules;
 
-const RKImage = requireNativeComponent('RCTImageView');
-const RCTTextInlineImage = requireNativeComponent('RCTTextInlineImage');
+const TextInlineImageNativeComponent = require('TextInlineImageNativeComponent');
 
 import type {ImageProps as ImagePropsType} from 'ImageProps';
 
@@ -38,8 +37,8 @@ function generateRequestId() {
 }
 
 const ImageProps = {
-  ...ViewPropTypes,
-  style: StyleSheetPropType(ImageStylePropTypes),
+  ...DeprecatedViewPropTypes,
+  style: DeprecatedStyleSheetPropType(DeprecatedImageStylePropTypes),
   /**
    * See https://facebook.github.io/react-native/docs/image.html#source
    */
@@ -182,17 +181,14 @@ declare class ImageComponentType extends ReactNative.NativeComponent<
  */
 let Image = (
   props: ImagePropsType,
-  forwardedRef: ?React.Ref<'RCTTextInlineImage' | 'RKImage'>,
+  forwardedRef: ?React.Ref<'RCTTextInlineImage' | 'ImageViewNativeComponent'>,
 ) => {
-  const source = resolveAssetSource(props.source);
+  let source = resolveAssetSource(props.source);
   const defaultSource = resolveAssetSource(props.defaultSource);
   const loadingIndicatorSource = resolveAssetSource(
     props.loadingIndicatorSource,
   );
 
-  // As opposed to the ios version, here we render `null` when there is no source, source.uri
-  // or source array.
-
   if (source && source.uri === '') {
     console.warn('source.uri should not be an empty string');
   }
@@ -215,15 +211,19 @@ let Image = (
     );
   }
 
-  if (!source || (!source.uri && !Array.isArray(source))) {
-    return null;
+  if (source && !source.uri && !Array.isArray(source)) {
+    source = null;
   }
 
   let style;
   let sources;
-  if (source.uri) {
+  if (source?.uri != null) {
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     const {width, height} = source;
     style = flattenStyle([{width, height}, styles.base, props.style]);
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     sources = [{uri: source.uri}];
   } else {
     style = flattenStyle([styles.base, props.style]);
@@ -235,7 +235,9 @@ let Image = (
     style,
     shouldNotifyLoadEvents: !!(onLoadStart || onLoad || onLoadEnd || onError),
     src: sources,
-    headers: source.headers,
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
+    headers: source?.headers,
     defaultSrc: defaultSource ? defaultSource.uri : null,
     loadingIndicatorSrc: loadingIndicatorSource
       ? loadingIndicatorSource.uri
@@ -247,9 +249,9 @@ let Image = (
     <TextAncestor.Consumer>
       {hasTextAncestor =>
         hasTextAncestor ? (
-          <RCTTextInlineImage {...nativeProps} />
+          <TextInlineImageNativeComponent {...nativeProps} />
         ) : (
-          <RKImage {...nativeProps} />
+          <ImageViewNativeComponent {...nativeProps} />
         )
       }
     </TextAncestor.Consumer>
diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js
index 82e651c0362924..29532dea908e89 100644
--- a/Libraries/Image/Image.ios.js
+++ b/Libraries/Image/Image.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-const ImageProps = require('ImageProps');
+const DeprecatedImagePropType = require('DeprecatedImagePropType');
 const NativeModules = require('NativeModules');
 const React = require('React');
 const ReactNative = require('ReactNative');
@@ -23,6 +23,7 @@ const ImageViewManager = NativeModules.ImageViewManager;
 
 const RCTImageView = requireNativeComponent('RCTImageView');
 
+import type {ImageStyleProp} from 'StyleSheet';
 import type {ImageProps as ImagePropsType} from 'ImageProps';
 
 function getSize(
@@ -44,13 +45,20 @@ function prefetch(url: string) {
   return ImageViewManager.prefetchImage(url);
 }
 
+async function queryCache(
+  urls: Array<string>,
+): Promise<Map<string, 'memory' | 'disk'>> {
+  return await ImageViewManager.queryCache(urls);
+}
+
 declare class ImageComponentType extends ReactNative.NativeComponent<
   ImagePropsType,
 > {
   static getSize: typeof getSize;
   static prefetch: typeof prefetch;
+  static queryCache: typeof queryCache;
   static resolveAssetSource: typeof resolveAssetSource;
-  static propTypes: typeof ImageProps;
+  static propTypes: typeof DeprecatedImagePropType;
 }
 
 /**
@@ -71,12 +79,14 @@ let Image = (
   };
 
   let sources;
-  let style;
+  let style: ImageStyleProp;
   if (Array.isArray(source)) {
+    // $FlowFixMe flattenStyle is not strong enough
     style = flattenStyle([styles.base, props.style]) || {};
     sources = source;
   } else {
     const {width, height, uri} = source;
+    // $FlowFixMe flattenStyle is not strong enough
     style = flattenStyle([{width, height}, styles.base, props.style]) || {};
     sources = [source];
 
@@ -130,6 +140,13 @@ Image.getSize = getSize;
  */
 Image.prefetch = prefetch;
 
+/**
+ * Performs cache interrogation.
+ *
+ *  See https://facebook.github.io/react-native/docs/image.html#querycache
+ */
+Image.queryCache = queryCache;
+
 /**
  * Resolves an asset reference into an object.
  *
@@ -137,7 +154,7 @@ Image.prefetch = prefetch;
  */
 Image.resolveAssetSource = resolveAssetSource;
 
-Image.propTypes = ImageProps;
+Image.propTypes = DeprecatedImagePropType;
 
 const styles = StyleSheet.create({
   base: {
diff --git a/Libraries/Image/ImageBackground.js b/Libraries/Image/ImageBackground.js
index a128880a17807c..7d04576dcc0c92 100644
--- a/Libraries/Image/ImageBackground.js
+++ b/Libraries/Image/ImageBackground.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/ImageEditor.js b/Libraries/Image/ImageEditor.js
index 66504b501293db..53785b680c15c1 100644
--- a/Libraries/Image/ImageEditor.js
+++ b/Libraries/Image/ImageEditor.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -16,25 +16,25 @@ type ImageCropData = {
    * The top-left corner of the cropped image, specified in the original
    * image's coordinate space.
    */
-  offset: {
+  offset: {|
     x: number,
     y: number,
-  },
+  |},
   /**
    * The size (dimensions) of the cropped image, specified in the original
    * image's coordinate space.
    */
-  size: {
+  size: {|
     width: number,
     height: number,
-  },
+  |},
   /**
    * (Optional) size to scale the cropped image to.
    */
-  displaySize?: ?{
+  displaySize?: ?{|
     width: number,
     height: number,
-  },
+  |},
   /**
    * (Optional) the resizing mode to use when scaling the image. If the
    * `displaySize` param is not specified, this has no effect.
@@ -50,7 +50,9 @@ class ImageEditor {
   /**
    * Crop the image specified by the URI param. If URI points to a remote
    * image, it will be downloaded automatically. If the image cannot be
-   * loaded/downloaded, the failure callback will be called.
+   * loaded/downloaded, the failure callback will be called. On Android, a
+   * downloaded image may be cached in external storage, a publicly accessible
+   * location, if it has more available space than internal storage.
    *
    * If the cropping process is successful, the resultant cropped image
    * will be stored in the ImageStore, and the URI returned in the success
diff --git a/Libraries/Image/ImageProps.js b/Libraries/Image/ImageProps.js
index 54f6250e1f1458..9dcf083be07841 100644
--- a/Libraries/Image/ImageProps.js
+++ b/Libraries/Image/ImageProps.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,18 +10,12 @@
 
 'use strict';
 
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
-const ImageSourcePropType = require('ImageSourcePropType');
-const ImageStylePropTypes = require('ImageStylePropTypes');
-const PropTypes = require('prop-types');
-const StyleSheetPropType = require('StyleSheetPropType');
-
+import type {SyntheticEvent, LayoutEvent} from 'CoreEventTypes';
+import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
+import type {ImageSource} from 'ImageSource';
+import type {ViewStyleProp, ImageStyleProp} from 'StyleSheet';
 import type {DimensionValue} from 'StyleSheetTypes';
 import type {ViewProps} from 'ViewPropTypes';
-import type {ImageSource} from 'ImageSource';
-import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
-import type {SyntheticEvent} from 'CoreEventTypes';
-import type {ImageStyleProp} from 'StyleSheet';
 
 type OnLoadEvent = SyntheticEvent<
   $ReadOnly<{|
@@ -37,8 +31,23 @@ type OnLoadEvent = SyntheticEvent<
 >;
 
 type IOSImageProps = $ReadOnly<{|
+  /**
+   * A static image to display while loading the image source.
+   *
+   * See https://facebook.github.io/react-native/docs/image.html#defaultsource
+   */
   defaultSource?: ?ImageSource,
+  /**
+   * Invoked when a partial load of the image is complete.
+   *
+   * See https://facebook.github.io/react-native/docs/image.html#onpartialload
+   */
   onPartialLoad?: ?() => void,
+  /**
+   * Invoked on download progress with `{nativeEvent: {loaded, total}}`.
+   *
+   * See https://facebook.github.io/react-native/docs/image.html#onprogress
+   */
   onProgress?: ?(
     event: SyntheticEvent<$ReadOnly<{|loaded: number, total: number|}>>,
   ) => void,
@@ -51,142 +60,111 @@ type AndroidImageProps = $ReadOnly<{|
 |}>;
 
 export type ImageProps = {|
-  ...ViewProps,
+  ...$Diff<ViewProps, $ReadOnly<{|style: ?ViewStyleProp|}>>,
   ...IOSImageProps,
   ...AndroidImageProps,
-  blurRadius?: number,
-  capInsets?: ?EdgeInsetsProp,
 
-  onError?: ?(event: SyntheticEvent<$ReadOnly<{||}>>) => void,
-  onLoad?: ?(event: OnLoadEvent) => void,
-  onLoadEnd?: ?() => void,
-  onLoadStart?: ?() => void,
-  resizeMethod?: ?('auto' | 'resize' | 'scale'),
-  source?: ?ImageSource,
-  style?: ImageStyleProp,
-
-  // Can be set via props or style, for now
-  height?: DimensionValue,
-  width?: DimensionValue,
-  resizeMode?: ?('cover' | 'contain' | 'stretch' | 'repeat' | 'center'),
-
-  src?: empty,
-  children?: empty,
-|};
-
-module.exports = {
-  /**
-   * See https://facebook.github.io/react-native/docs/image.html#style
-   */
-  style: StyleSheetPropType(ImageStylePropTypes),
-  /**
-   * The image source (either a remote URL or a local file resource).
-   *
-   * See https://facebook.github.io/react-native/docs/image.html#source
-   */
-  source: ImageSourcePropType,
-  /**
-   * A static image to display while loading the image source.
-   *
-   * See https://facebook.github.io/react-native/docs/image.html#defaultsource
-   */
-  defaultSource: PropTypes.oneOfType([
-    PropTypes.shape({
-      uri: PropTypes.string,
-      width: PropTypes.number,
-      height: PropTypes.number,
-      scale: PropTypes.number,
-    }),
-    PropTypes.number,
-  ]),
   /**
    * When true, indicates the image is an accessibility element.
    *
    * See https://facebook.github.io/react-native/docs/image.html#accessible
    */
-  accessible: PropTypes.bool,
+  accessible?: ?boolean,
+
   /**
    * The text that's read by the screen reader when the user interacts with
    * the image.
    *
    * See https://facebook.github.io/react-native/docs/image.html#accessibilitylabel
    */
-  accessibilityLabel: PropTypes.node,
+  accessibilityLabel?: ?Stringish,
+
   /**
    * blurRadius: the blur radius of the blur filter added to the image
    *
    * See https://facebook.github.io/react-native/docs/image.html#blurradius
    */
-  blurRadius: PropTypes.number,
+  blurRadius?: ?number,
+
   /**
    * See https://facebook.github.io/react-native/docs/image.html#capinsets
    */
-  capInsets: EdgeInsetsPropType,
+  capInsets?: ?EdgeInsetsProp,
+
   /**
-   * See https://facebook.github.io/react-native/docs/image.html#resizemethod
+   * Invoked on load error with `{nativeEvent: {error}}`.
+   *
+   * See https://facebook.github.io/react-native/docs/image.html#onerror
    */
-  resizeMethod: PropTypes.oneOf(['auto', 'resize', 'scale']),
+  onError?: ?(event: SyntheticEvent<$ReadOnly<{||}>>) => void,
+
   /**
-   * Determines how to resize the image when the frame doesn't match the raw
-   * image dimensions.
+   * Invoked on mount and layout changes with
+   * `{nativeEvent: {layout: {x, y, width, height}}}`.
    *
-   * See https://facebook.github.io/react-native/docs/image.html#resizemode
+   * See https://facebook.github.io/react-native/docs/image.html#onlayout
    */
-  resizeMode: PropTypes.oneOf([
-    'cover',
-    'contain',
-    'stretch',
-    'repeat',
-    'center',
-  ]),
+
+  onLayout?: ?(event: LayoutEvent) => mixed,
+
   /**
-   * A unique identifier for this element to be used in UI Automation
-   * testing scripts.
+   * Invoked when load completes successfully.
    *
-   * See https://facebook.github.io/react-native/docs/image.html#testid
+   * See https://facebook.github.io/react-native/docs/image.html#onload
    */
-  testID: PropTypes.string,
+  onLoad?: ?(event: OnLoadEvent) => void,
+
   /**
-   * Invoked on mount and layout changes with
-   * `{nativeEvent: {layout: {x, y, width, height}}}`.
+   * Invoked when load either succeeds or fails.
    *
-   * See https://facebook.github.io/react-native/docs/image.html#onlayout
+   * See https://facebook.github.io/react-native/docs/image.html#onloadend
    */
-  onLayout: PropTypes.func,
+  onLoadEnd?: ?() => void,
+
   /**
    * Invoked on load start.
    *
    * See https://facebook.github.io/react-native/docs/image.html#onloadstart
    */
-  onLoadStart: PropTypes.func,
+  onLoadStart?: ?() => void,
+
   /**
-   * Invoked on download progress with `{nativeEvent: {loaded, total}}`.
-   *
-   * See https://facebook.github.io/react-native/docs/image.html#onprogress
+   * See https://facebook.github.io/react-native/docs/image.html#resizemethod
    */
-  onProgress: PropTypes.func,
+  resizeMethod?: ?('auto' | 'resize' | 'scale'),
+
   /**
-   * Invoked on load error with `{nativeEvent: {error}}`.
+   * The image source (either a remote URL or a local file resource).
    *
-   * See https://facebook.github.io/react-native/docs/image.html#onerror
+   * See https://facebook.github.io/react-native/docs/image.html#source
    */
-  onError: PropTypes.func,
+  source?: ?ImageSource,
+
   /**
-   * Invoked when a partial load of the image is complete.
-   *
-   * See https://facebook.github.io/react-native/docs/image.html#onpartialload
+   * See https://facebook.github.io/react-native/docs/image.html#style
    */
-  onPartialLoad: PropTypes.func,
+  style?: ?ImageStyleProp,
+
+  // Can be set via props or style, for now
+  height?: ?DimensionValue,
+  width?: ?DimensionValue,
+
   /**
-   * Invoked when load completes successfully.
+   * Determines how to resize the image when the frame doesn't match the raw
+   * image dimensions.
    *
-   * See https://facebook.github.io/react-native/docs/image.html#onload
+   * See https://facebook.github.io/react-native/docs/image.html#resizemode
    */
-  onLoad: PropTypes.func,
+  resizeMode?: ?('cover' | 'contain' | 'stretch' | 'repeat' | 'center'),
+
   /**
-   * Invoked when load either succeeds or fails.
+   * A unique identifier for this element to be used in UI Automation
+   * testing scripts.
    *
-   * See https://facebook.github.io/react-native/docs/image.html#onloadend
+   * See https://facebook.github.io/react-native/docs/image.html#testid
    */
-  onLoadEnd: PropTypes.func,
-};
+  testID?: ?string,
+
+  src?: empty,
+  children?: empty,
+|};
diff --git a/Libraries/Image/ImageResizeMode.js b/Libraries/Image/ImageResizeMode.js
index 48779e383f3119..1dad3309b1588d 100644
--- a/Libraries/Image/ImageResizeMode.js
+++ b/Libraries/Image/ImageResizeMode.js
@@ -1,52 +1,36 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  * @format
  */
-'use strict';
 
-/* $FlowFixMe(>=0.54.0 site=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. */
-const keyMirror = require('fbjs/lib/keyMirror');
+'use strict';
 
 /**
- * ImageResizeMode - Enum for different image resizing modes, set via
- * `resizeMode` style property on `<Image>` components.
+ * ImageResizeMode defines valid values for different image resizing modes set
+ * via the `resizeMode` style property on `<Image>`.
  */
-const ImageResizeMode = keyMirror({
-  /**
-   * contain - The image will be resized such that it will be completely
-   * visible, contained within the frame of the View.
-   */
-  contain: null,
-  /**
-   * 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: null,
-  /**
-   * 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,
-   * distorting it.
-   */
-  stretch: null,
-  /**
-   * 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: null,
+export type ImageResizeMode =
+  // Resize by scaling down such that it is completely visible, if bigger than
+  // the area of the view. The image will not be scaled up.
+  | 'center'
+
+  // Resize such that it will be completely visible, contained within the frame
+  // of the View.
+  | 'contain'
+
+  // Resize such that the entire area of the view is covered by the image,
+  // potentially clipping parts of the image.
+  | 'cover'
 
-  /**
-   * repeat - The image will be repeated to cover the frame of the View. The
-   * image will keep it's size and aspect ratio.
-   */
-  repeat: null,
-});
+  // Resize by repeating to cover the frame of the View. The image will keep its
+  // size and aspect ratio.
+  | 'repeat'
 
-module.exports = ImageResizeMode;
+  // Resize by stretching it to fill the entire frame of the view without
+  // clipping. This may change the aspect ratio of the image, distorting it.
+  | 'stretch';
diff --git a/Libraries/Image/ImageSource.js b/Libraries/Image/ImageSource.js
index 5c3c84df901209..0e03dc78c0f5d1 100644
--- a/Libraries/Image/ImageSource.js
+++ b/Libraries/Image/ImageSource.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,15 +14,73 @@
 // that might have more keys. This also has to be inexact to support taking
 // instances of classes like FBIcon.
 // https://fburl.com/8lynhvtw
-type ImageURISource = $ReadOnly<{
+export type ImageURISource = $ReadOnly<{
+  /**
+   * `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,
+
+  /**
+   * `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,
+
+  /**
+   * `method` is the HTTP Method to use. Defaults to GET if not specified.
+   */
   method?: ?string,
+
+  /**
+   * `headers` is an object representing the HTTP headers to send along with the
+   * request for a remote image.
+   */
   headers?: ?Object,
+
+  /**
+   * `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,
+
+  /**
+   * `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'),
+
+  /**
+   * `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,
   height?: ?number,
+
+  /**
+   * `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,
 }>;
 
diff --git a/Libraries/Image/ImageSourcePropType.js b/Libraries/Image/ImageSourcePropType.js
deleted file mode 100644
index 6f67113fe1bf18..00000000000000
--- a/Libraries/Image/ImageSourcePropType.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @no-flow
- * @format
- */
-'use strict';
-
-const PropTypes = require('prop-types');
-
-const ImageURISourcePropType = PropTypes.shape({
-  /**
-   * `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: PropTypes.string,
-  /**
-   * `bundle` is the iOS asset bundle which the image is included in. This
-   * will default to [NSBundle mainBundle] if not set.
-   * @platform ios
-   */
-  bundle: PropTypes.string,
-  /**
-   * `method` is the HTTP Method to use. Defaults to GET if not specified.
-   */
-  method: PropTypes.string,
-  /**
-   * `headers` is an object representing the HTTP headers to send along with the
-   * request for a remote image.
-   */
-  headers: PropTypes.objectOf(PropTypes.string),
-  /**
-   * `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: PropTypes.string,
-  /**
-   * `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: PropTypes.oneOf([
-    'default',
-    'reload',
-    'force-cache',
-    'only-if-cached',
-  ]),
-  /**
-   * `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: PropTypes.number,
-  height: PropTypes.number,
-  /**
-   * `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: PropTypes.number,
-});
-
-const ImageSourcePropType = PropTypes.oneOfType([
-  ImageURISourcePropType,
-  // Opaque type returned by require('./image.jpg')
-  PropTypes.number,
-  // Multiple sources
-  PropTypes.arrayOf(ImageURISourcePropType),
-]);
-
-module.exports = ImageSourcePropType;
diff --git a/Libraries/Image/ImageStore.js b/Libraries/Image/ImageStore.js
index 5373020376a5f1..60273b79f201f2 100644
--- a/Libraries/Image/ImageStore.js
+++ b/Libraries/Image/ImageStore.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/ImageViewNativeComponent.js b/Libraries/Image/ImageViewNativeComponent.js
new file mode 100644
index 00000000000000..47f8d531f756d8
--- /dev/null
+++ b/Libraries/Image/ImageViewNativeComponent.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 requireNativeComponent = require('requireNativeComponent');
+
+const ImageViewNativeComponent = requireNativeComponent('RCTImageView');
+
+module.exports = ImageViewNativeComponent;
diff --git a/Libraries/Image/RCTGIFImageDecoder.h b/Libraries/Image/RCTGIFImageDecoder.h
index 1f942aef4c8ce6..f9cc0eef4ebf94 100644
--- a/Libraries/Image/RCTGIFImageDecoder.h
+++ b/Libraries/Image/RCTGIFImageDecoder.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTGIFImageDecoder.m b/Libraries/Image/RCTGIFImageDecoder.m
index 48ca8aefcf74b4..322d137cda733c 100644
--- a/Libraries/Image/RCTGIFImageDecoder.m
+++ b/Libraries/Image/RCTGIFImageDecoder.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageBlurUtils.h b/Libraries/Image/RCTImageBlurUtils.h
index 44df37441af92a..2ec7b358d240ee 100644
--- a/Libraries/Image/RCTImageBlurUtils.h
+++ b/Libraries/Image/RCTImageBlurUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageBlurUtils.m b/Libraries/Image/RCTImageBlurUtils.m
index 84c90019bfbcc9..8ee3282de4de4e 100644
--- a/Libraries/Image/RCTImageBlurUtils.m
+++ b/Libraries/Image/RCTImageBlurUtils.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -35,6 +35,12 @@
   size_t bytes = buffer1.rowBytes * buffer1.height;
   buffer1.data = malloc(bytes);
   buffer2.data = malloc(bytes);
+  if (!buffer1.data || !buffer2.data) {
+    // CWE - 391 : Unchecked error condition
+    // https://www.cvedetails.com/cwe-details/391/Unchecked-Error-Condition.html
+    // https://eli.thegreenplace.net/2009/10/30/handling-out-of-memory-conditions-in-c
+    abort();
+  }
 
   // A description of how to compute the box kernel width from the Gaussian
   // radius (aka standard deviation) appears in the SVG spec:
@@ -45,6 +51,12 @@
   //create temp buffer
   void *tempBuffer = malloc((size_t)vImageBoxConvolve_ARGB8888(&buffer1, &buffer2, NULL, 0, 0, boxSize, boxSize,
                                                                NULL, kvImageEdgeExtend + kvImageGetTempBufferSize));
+  if (!tempBuffer) {
+    // CWE - 391 : Unchecked error condition
+    // https://www.cvedetails.com/cwe-details/391/Unchecked-Error-Condition.html
+    // https://eli.thegreenplace.net/2009/10/30/handling-out-of-memory-conditions-in-c
+    abort();
+  }
 
   //copy image data
   CFDataRef dataSource = CGDataProviderCopyData(CGImageGetDataProvider(imageRef));
diff --git a/Libraries/Image/RCTImageCache.h b/Libraries/Image/RCTImageCache.h
index c0d24ad25a2d41..b7acc1126ca6cd 100644
--- a/Libraries/Image/RCTImageCache.h
+++ b/Libraries/Image/RCTImageCache.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageCache.m b/Libraries/Image/RCTImageCache.m
index 4d4803c4ab08e0..1c864f5056e894 100644
--- a/Libraries/Image/RCTImageCache.m
+++ b/Libraries/Image/RCTImageCache.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageEditingManager.h b/Libraries/Image/RCTImageEditingManager.h
index dda409af33fc22..684855f999e3b1 100644
--- a/Libraries/Image/RCTImageEditingManager.h
+++ b/Libraries/Image/RCTImageEditingManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageEditingManager.m b/Libraries/Image/RCTImageEditingManager.m
index 2c8330ee9a302b..eb87df96fa77b5 100644
--- a/Libraries/Image/RCTImageEditingManager.m
+++ b/Libraries/Image/RCTImageEditingManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageLoader.h b/Libraries/Image/RCTImageLoader.h
index a0c6e798a8a960..30d472d52dd783 100644
--- a/Libraries/Image/RCTImageLoader.h
+++ b/Libraries/Image/RCTImageLoader.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -129,6 +129,14 @@ typedef dispatch_block_t RCTImageLoaderCancellationBlock;
  */
 - (RCTImageLoaderCancellationBlock)getImageSizeForURLRequest:(NSURLRequest *)imageURLRequest
                                                        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:
+ * "disk" for images known to be cached in non-volatile storage, "memory" for images known
+ * to be cached in memory. Dictionary items corresponding to images that are not known to be
+ * cached are simply missing.
+ */
+- (NSDictionary *)getImageCacheStatus:(NSArray *)requests;
 
 /**
  * Allows developers to set their own caching implementation for
diff --git a/Libraries/Image/RCTImageLoader.m b/Libraries/Image/RCTImageLoader.m
index 775e53e95f7a08..035bc3535f18c4 100644
--- a/Libraries/Image/RCTImageLoader.m
+++ b/Libraries/Image/RCTImageLoader.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -779,45 +779,69 @@ - (RCTImageLoaderCancellationBlock)getImageSizeForURLRequest:(NSURLRequest *)ima
                                 completionBlock:completion];
 }
 
-#pragma mark - RCTURLRequestHandler
-
-- (BOOL)canHandleRequest:(NSURLRequest *)request
+- (NSDictionary *)getImageCacheStatus:(NSArray *)requests
 {
-    NSURL *requestURL = request.URL;
-
-    // If the data being loaded is a video, return NO
-    // Even better may be to implement this on the RCTImageURLLoader that would try to load it,
-    // but we'd have to run the logic both in RCTPhotoLibraryImageLoader and
-    // RCTAssetsLibraryRequestHandler. Once we drop iOS7 though, we'd drop
-    // RCTAssetsLibraryRequestHandler and can move it there.
-    static NSRegularExpression *videoRegex = nil;
-    if (!videoRegex) {
-      NSError *error = nil;
-      videoRegex = [NSRegularExpression regularExpressionWithPattern:@"(?:&|^)ext=MOV(?:&|$)"
-                                                             options:NSRegularExpressionCaseInsensitive
-                                                               error:&error];
-      if (error) {
-        RCTLogError(@"%@", error);
+  NSMutableDictionary *results = [NSMutableDictionary dictionary];
+  for (id request in requests) {
+    NSURLRequest *urlRequest = [RCTConvert NSURLRequest:request];
+    if (urlRequest) {
+      NSCachedURLResponse *cachedResponse = [NSURLCache.sharedURLCache cachedResponseForRequest:urlRequest];
+      if (cachedResponse) {
+        if (cachedResponse.storagePolicy == NSURLCacheStorageAllowedInMemoryOnly) {
+          [results setObject:@"memory" forKey:urlRequest.URL.absoluteString];
+        } else {
+          [results setObject:@"disk" forKey:urlRequest.URL.absoluteString];
+        }
       }
     }
+  }
+  return results;
+}
 
-    NSString *query = requestURL.query;
-    if (query != nil && [videoRegex firstMatchInString:query
-                                               options:0
-                                                 range:NSMakeRange(0, query.length)]) {
-      return NO;
-    }
+#pragma mark - RCTURLRequestHandler
 
-    for (id<RCTImageURLLoader> loader in _loaders) {
-        // 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]) {
-            return YES;
-        }
+- (BOOL)canHandleRequest:(NSURLRequest *)request
+{
+  NSURL *requestURL = request.URL;
+
+  // If the data being loaded is a video, return NO
+  // Even better may be to implement this on the RCTImageURLLoader that would try to load it,
+  // but we'd have to run the logic both in RCTPhotoLibraryImageLoader and
+  // RCTAssetsLibraryRequestHandler. Once we drop iOS7 though, we'd drop
+  // RCTAssetsLibraryRequestHandler and can move it there.
+  static NSRegularExpression *videoRegex;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    NSError *error = nil;
+    videoRegex = [NSRegularExpression regularExpressionWithPattern:@"(?:&|^)ext=MOV(?:&|$)"
+                                                           options:NSRegularExpressionCaseInsensitive
+                                                             error:&error];
+    if (error) {
+      RCTLogError(@"%@", error);
     }
+  });
+
+  NSString *query = requestURL.query;
+  if (
+    query != nil &&
+    [videoRegex firstMatchInString:query
+                           options:0
+                             range:NSMakeRange(0, query.length)]
+  ) {
     return NO;
+  }
+
+  for (id<RCTImageURLLoader> loader in _loaders) {
+    // 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]) {
+      return YES;
+    }
+  }
+
+  return NO;
 }
 
 - (id)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequestDelegate>)delegate
diff --git a/Libraries/Image/RCTImageShadowView.h b/Libraries/Image/RCTImageShadowView.h
index 168f0f4c1de86d..f79281e731ad99 100644
--- a/Libraries/Image/RCTImageShadowView.h
+++ b/Libraries/Image/RCTImageShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageShadowView.m b/Libraries/Image/RCTImageShadowView.m
index c9ba82e32188cc..9102dc1b3b0b73 100644
--- a/Libraries/Image/RCTImageShadowView.m
+++ b/Libraries/Image/RCTImageShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageStoreManager.h b/Libraries/Image/RCTImageStoreManager.h
index 3f070ada1d27be..b1969044524ec5 100644
--- a/Libraries/Image/RCTImageStoreManager.h
+++ b/Libraries/Image/RCTImageStoreManager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageStoreManager.m b/Libraries/Image/RCTImageStoreManager.m
index 443885becfff2e..03656e4ea3312d 100644
--- a/Libraries/Image/RCTImageStoreManager.m
+++ b/Libraries/Image/RCTImageStoreManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageUtils.h b/Libraries/Image/RCTImageUtils.h
index d6090ac67ffb48..a4b8216c401dc2 100644
--- a/Libraries/Image/RCTImageUtils.h
+++ b/Libraries/Image/RCTImageUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageUtils.m b/Libraries/Image/RCTImageUtils.m
index 52fe3893307307..5470c8f782895a 100644
--- a/Libraries/Image/RCTImageUtils.m
+++ b/Libraries/Image/RCTImageUtils.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageView.h b/Libraries/Image/RCTImageView.h
index 70357c359b142e..38f82db455d12b 100644
--- a/Libraries/Image/RCTImageView.h
+++ b/Libraries/Image/RCTImageView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageView.m b/Libraries/Image/RCTImageView.m
index a754bb1078dc3b..3392a54c56ed47 100644
--- a/Libraries/Image/RCTImageView.m
+++ b/Libraries/Image/RCTImageView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageViewManager.h b/Libraries/Image/RCTImageViewManager.h
index f718a70246ef41..9aef96cd72a957 100644
--- a/Libraries/Image/RCTImageViewManager.h
+++ b/Libraries/Image/RCTImageViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTImageViewManager.m b/Libraries/Image/RCTImageViewManager.m
index bd382e4bf191d0..70c5cb98cd52ad 100644
--- a/Libraries/Image/RCTImageViewManager.m
+++ b/Libraries/Image/RCTImageViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -82,4 +82,11 @@ - (UIView *)view
                                           }];
 }
 
+RCT_EXPORT_METHOD(queryCache:(NSArray *)requests
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+{
+  resolve([self.bridge.imageLoader getImageCacheStatus:requests]);
+}
+
 @end
diff --git a/Libraries/Image/RCTLocalAssetImageLoader.h b/Libraries/Image/RCTLocalAssetImageLoader.h
index 4cd79bd403c5a2..df3918ad548c1a 100644
--- a/Libraries/Image/RCTLocalAssetImageLoader.h
+++ b/Libraries/Image/RCTLocalAssetImageLoader.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTLocalAssetImageLoader.m b/Libraries/Image/RCTLocalAssetImageLoader.m
index 091cd70e0eafef..68407f38064ab0 100644
--- a/Libraries/Image/RCTLocalAssetImageLoader.m
+++ b/Libraries/Image/RCTLocalAssetImageLoader.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTResizeMode.h b/Libraries/Image/RCTResizeMode.h
index ce0fba5e31afad..9d49f2d32cfeb9 100644
--- a/Libraries/Image/RCTResizeMode.h
+++ b/Libraries/Image/RCTResizeMode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RCTResizeMode.m b/Libraries/Image/RCTResizeMode.m
index 1094b7ff96e8c9..34027f8e8a2ec0 100644
--- a/Libraries/Image/RCTResizeMode.m
+++ b/Libraries/Image/RCTResizeMode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/RelativeImageStub.js b/Libraries/Image/RelativeImageStub.js
index dcdeb9b916ac45..f5592d18167102 100644
--- a/Libraries/Image/RelativeImageStub.js
+++ b/Libraries/Image/RelativeImageStub.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/TextInlineImageNativeComponent.js b/Libraries/Image/TextInlineImageNativeComponent.js
new file mode 100644
index 00000000000000..6cbe56362576f9
--- /dev/null
+++ b/Libraries/Image/TextInlineImageNativeComponent.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 requireNativeComponent = require('requireNativeComponent');
+
+const TextInlineImage = requireNativeComponent('RCTTextInlineImage');
+
+module.exports = TextInlineImage;
diff --git a/Libraries/Image/__tests__/assetRelativePathInSnapshot.js b/Libraries/Image/__tests__/assetRelativePathInSnapshot.js
index 973d7171c0cd56..13cb6ac075f81e 100644
--- a/Libraries/Image/__tests__/assetRelativePathInSnapshot.js
+++ b/Libraries/Image/__tests__/assetRelativePathInSnapshot.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/__tests__/resolveAssetSource-test.js b/Libraries/Image/__tests__/resolveAssetSource-test.js
index c22f32a6520413..fb297899f6655a 100644
--- a/Libraries/Image/__tests__/resolveAssetSource-test.js
+++ b/Libraries/Image/__tests__/resolveAssetSource-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/nativeImageSource.js b/Libraries/Image/nativeImageSource.js
index 1fdbe1caa97615..3acf36f0bd8519 100644
--- a/Libraries/Image/nativeImageSource.js
+++ b/Libraries/Image/nativeImageSource.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Image/resolveAssetSource.js b/Libraries/Image/resolveAssetSource.js
index 9c811e574400b1..ebd19e3354fe6e 100644
--- a/Libraries/Image/resolveAssetSource.js
+++ b/Libraries/Image/resolveAssetSource.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Inspector/BorderBox.js b/Libraries/Inspector/BorderBox.js
index b172871df8e2f2..93d0dd158e14d1 100644
--- a/Libraries/Inspector/BorderBox.js
+++ b/Libraries/Inspector/BorderBox.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Inspector/BoxInspector.js b/Libraries/Inspector/BoxInspector.js
index af373460053609..05b0580c635b2a 100644
--- a/Libraries/Inspector/BoxInspector.js
+++ b/Libraries/Inspector/BoxInspector.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Inspector/ElementBox.js b/Libraries/Inspector/ElementBox.js
index dea05dad737894..d360485bcbe5f5 100644
--- a/Libraries/Inspector/ElementBox.js
+++ b/Libraries/Inspector/ElementBox.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Inspector/ElementProperties.js b/Libraries/Inspector/ElementProperties.js
index 1e360944716fd2..9b6c222ed5babd 100644
--- a/Libraries/Inspector/ElementProperties.js
+++ b/Libraries/Inspector/ElementProperties.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,7 +11,6 @@
 'use strict';
 
 const BoxInspector = require('BoxInspector');
-const PropTypes = require('prop-types');
 const React = require('React');
 const StyleInspector = require('StyleInspector');
 const StyleSheet = require('StyleSheet');
@@ -24,32 +23,23 @@ const flattenStyle = require('flattenStyle');
 const mapWithSeparator = require('mapWithSeparator');
 const openFileInEditor = require('openFileInEditor');
 
-import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
+import type {ViewStyleProp} from 'StyleSheet';
 
-class ElementProperties extends React.Component<{
-  hierarchy: Array<$FlowFixMe>,
-  style?: DangerouslyImpreciseStyleProp,
-  source?: {
+type Props = $ReadOnly<{|
+  hierarchy: Array<{|name: string|}>,
+  style?: ?ViewStyleProp,
+  source?: ?{
     fileName?: string,
     lineNumber?: number,
   },
-}> {
-  static propTypes = {
-    hierarchy: PropTypes.array.isRequired,
-    style: PropTypes.oneOfType([
-      PropTypes.object,
-      PropTypes.array,
-      PropTypes.number,
-    ]),
-    source: PropTypes.shape({
-      fileName: PropTypes.string,
-      lineNumber: PropTypes.number,
-    }),
-  };
+  frame?: ?Object,
+  selection?: ?number,
+  setSelection?: number => mixed,
+|}>;
 
+class ElementProperties extends React.Component<Props> {
   render() {
     const style = flattenStyle(this.props.style);
-    // $FlowFixMe found when converting React.createClass to ES6
     const selection = this.props.selection;
     let openFileButton;
     const source = this.props.source;
@@ -96,10 +86,7 @@ class ElementProperties extends React.Component<{
               <StyleInspector style={style} />
               {openFileButton}
             </View>
-            {
-              // $FlowFixMe found when converting React.createClass to ES6
-              <BoxInspector style={style} frame={this.props.frame} />
-            }
+            {<BoxInspector style={style} frame={this.props.frame} />}
           </View>
         </View>
       </TouchableWithoutFeedback>
diff --git a/Libraries/Inspector/Inspector.js b/Libraries/Inspector/Inspector.js
index a5ab122b0cde5b..86d519258b62ed 100644
--- a/Libraries/Inspector/Inspector.js
+++ b/Libraries/Inspector/Inspector.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -21,10 +21,6 @@ const Touchable = require('Touchable');
 const UIManager = require('UIManager');
 const View = require('View');
 
-/* $FlowFixMe(>=0.54.0 site=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. */
-const emptyObject = require('fbjs/lib/emptyObject');
 const invariant = require('fbjs/lib/invariant');
 
 export type ReactRenderer = {
@@ -131,7 +127,7 @@ class Inspector extends React.Component<
           hierarchy: [],
           inspected: {
             frame: {left, top, width, height},
-            style: props ? props.style : emptyObject,
+            style: props ? props.style : {},
           },
         });
       });
diff --git a/Libraries/Inspector/InspectorOverlay.js b/Libraries/Inspector/InspectorOverlay.js
index 4de9cb2ab8183e..79e2156111c1e2 100644
--- a/Libraries/Inspector/InspectorOverlay.js
+++ b/Libraries/Inspector/InspectorOverlay.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,33 +12,29 @@
 
 const Dimensions = require('Dimensions');
 const ElementBox = require('ElementBox');
-const PropTypes = require('prop-types');
 const React = require('React');
 const StyleSheet = require('StyleSheet');
 const UIManager = require('UIManager');
 const View = require('View');
 
+import type {ViewStyleProp} from 'StyleSheet';
+
 type EventLike = {
   nativeEvent: Object,
 };
 
-class InspectorOverlay extends React.Component<{
-  inspected?: {
-    frame?: Object,
-    style?: any,
-  },
-  inspectedViewTag?: number,
-  onTouchViewTag: (tag: number, frame: Object, pointerY: number) => void,
-}> {
-  static propTypes = {
-    inspected: PropTypes.shape({
-      frame: PropTypes.object,
-      style: PropTypes.any,
-    }),
-    inspectedViewTag: PropTypes.number,
-    onTouchViewTag: PropTypes.func.isRequired,
-  };
+type Inspected = $ReadOnly<{|
+  frame?: Object,
+  style?: ViewStyleProp,
+|}>;
+
+type Props = $ReadOnly<{|
+  inspected?: Inspected,
+  inspectedViewTag?: ?number,
+  onTouchViewTag: (tag: number, frame: Object, pointerY: number) => mixed,
+|}>;
 
+class InspectorOverlay extends React.Component<Props> {
   findViewForTouchEvent = (e: EventLike) => {
     const {locationX, locationY} = e.nativeEvent.touches[0];
     UIManager.findSubviewIn(
diff --git a/Libraries/Inspector/InspectorPanel.js b/Libraries/Inspector/InspectorPanel.js
index 2793452d90e578..42c191d7ed530c 100644
--- a/Libraries/Inspector/InspectorPanel.js
+++ b/Libraries/Inspector/InspectorPanel.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
@@ -14,14 +14,43 @@ const ElementProperties = require('ElementProperties');
 const NetworkOverlay = require('NetworkOverlay');
 const PerformanceOverlay = require('PerformanceOverlay');
 const React = require('React');
-const PropTypes = require('prop-types');
 const ScrollView = require('ScrollView');
 const StyleSheet = require('StyleSheet');
 const Text = require('Text');
 const TouchableHighlight = require('TouchableHighlight');
 const View = require('View');
 
-class InspectorPanel extends React.Component<$FlowFixMeProps> {
+import type {ViewStyleProp} from 'StyleSheet';
+
+type Props = $ReadOnly<{|
+  devtoolsIsOpen: boolean,
+  inspecting: boolean,
+  setInspecting: (val: boolean) => void,
+  perfing: boolean,
+  setPerfing: (val: boolean) => void,
+  touchTargeting: boolean,
+  setTouchTargeting: (val: boolean) => void,
+  networking: boolean,
+  setNetworking: (val: boolean) => void,
+  hierarchy?: ?Array<{|name: string|}>,
+  selection?: ?number,
+  setSelection: number => mixed,
+  inspected?: ?$ReadOnly<{|
+    style?: ?ViewStyleProp,
+    frame?: ?$ReadOnly<{|
+      top?: ?number,
+      left?: ?number,
+      width?: ?number,
+      height: ?number,
+    |}>,
+    source?: ?{|
+      fileName?: string,
+      lineNumber?: number,
+    |},
+  |}>,
+|}>;
+
+class InspectorPanel extends React.Component<Props> {
   renderWaiting() {
     if (this.props.inspecting) {
       return (
@@ -40,6 +69,7 @@ class InspectorPanel extends React.Component<$FlowFixMeProps> {
             style={this.props.inspected.style}
             frame={this.props.inspected.frame}
             source={this.props.inspected.source}
+            // $FlowFixMe: Hierarchy should be non-nullable
             hierarchy={this.props.hierarchy}
             selection={this.props.selection}
             setSelection={this.props.setSelection}
@@ -57,22 +87,22 @@ class InspectorPanel extends React.Component<$FlowFixMeProps> {
       <View style={styles.container}>
         {!this.props.devtoolsIsOpen && contents}
         <View style={styles.buttonRow}>
-          <Button
+          <InspectorPanelButton
             title={'Inspect'}
             pressed={this.props.inspecting}
             onClick={this.props.setInspecting}
           />
-          <Button
+          <InspectorPanelButton
             title={'Perf'}
             pressed={this.props.perfing}
             onClick={this.props.setPerfing}
           />
-          <Button
+          <InspectorPanelButton
             title={'Network'}
             pressed={this.props.networking}
             onClick={this.props.setNetworking}
           />
-          <Button
+          <InspectorPanelButton
             title={'Touchables'}
             pressed={this.props.touchTargeting}
             onClick={this.props.setTouchTargeting}
@@ -83,20 +113,13 @@ class InspectorPanel extends React.Component<$FlowFixMeProps> {
   }
 }
 
-InspectorPanel.propTypes = {
-  devtoolsIsOpen: PropTypes.bool,
-  inspecting: PropTypes.bool,
-  setInspecting: PropTypes.func,
-  inspected: PropTypes.object,
-  perfing: PropTypes.bool,
-  setPerfing: PropTypes.func,
-  touchTargeting: PropTypes.bool,
-  setTouchTargeting: PropTypes.func,
-  networking: PropTypes.bool,
-  setNetworking: PropTypes.func,
-};
+type InspectorPanelButtonProps = $ReadOnly<{|
+  onClick: (val: boolean) => void,
+  pressed: boolean,
+  title: string,
+|}>;
 
-class Button extends React.Component<$FlowFixMeProps> {
+class InspectorPanelButton extends React.Component<InspectorPanelButtonProps> {
   render() {
     return (
       <TouchableHighlight
diff --git a/Libraries/Inspector/NetworkOverlay.js b/Libraries/Inspector/NetworkOverlay.js
index ee60a7e004928b..abeda34abcdeca 100644
--- a/Libraries/Inspector/NetworkOverlay.js
+++ b/Libraries/Inspector/NetworkOverlay.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Inspector/PerformanceOverlay.js b/Libraries/Inspector/PerformanceOverlay.js
index 3e2936621a2058..2384769bc5475b 100644
--- a/Libraries/Inspector/PerformanceOverlay.js
+++ b/Libraries/Inspector/PerformanceOverlay.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Inspector/StyleInspector.js b/Libraries/Inspector/StyleInspector.js
index 0f06cd40f6b686..c902c9d3805f07 100644
--- a/Libraries/Inspector/StyleInspector.js
+++ b/Libraries/Inspector/StyleInspector.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Inspector/resolveBoxStyle.js b/Libraries/Inspector/resolveBoxStyle.js
index 767b9edbc5f061..26aec4310ce0fc 100644
--- a/Libraries/Inspector/resolveBoxStyle.js
+++ b/Libraries/Inspector/resolveBoxStyle.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Interaction/Batchinator.js b/Libraries/Interaction/Batchinator.js
index eea02e45ed3fe2..eda4c00450e44f 100644
--- a/Libraries/Interaction/Batchinator.js
+++ b/Libraries/Interaction/Batchinator.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Interaction/BridgeSpyStallHandler.js b/Libraries/Interaction/BridgeSpyStallHandler.js
index d2933584a32f27..f90bbd225dc7c0 100644
--- a/Libraries/Interaction/BridgeSpyStallHandler.js
+++ b/Libraries/Interaction/BridgeSpyStallHandler.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Interaction/FrameRateLogger.js b/Libraries/Interaction/FrameRateLogger.js
index b9d872e80ff960..d9c928af0cd7c4 100644
--- a/Libraries/Interaction/FrameRateLogger.js
+++ b/Libraries/Interaction/FrameRateLogger.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Interaction/InteractionManager.js b/Libraries/Interaction/InteractionManager.js
index d8b57d0a9b998a..94590ce663025a 100644
--- a/Libraries/Interaction/InteractionManager.js
+++ b/Libraries/Interaction/InteractionManager.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,9 +17,6 @@ const TaskQueue = require('TaskQueue');
 
 const infoLog = require('infoLog');
 const invariant = require('fbjs/lib/invariant');
-/* $FlowFixMe(>=0.54.0 site=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. */
 const keyMirror = require('fbjs/lib/keyMirror');
 
 type Handle = number;
diff --git a/Libraries/Interaction/InteractionMixin.js b/Libraries/Interaction/InteractionMixin.js
index 78b81f295cdc33..ff99337105ae5e 100644
--- a/Libraries/Interaction/InteractionMixin.js
+++ b/Libraries/Interaction/InteractionMixin.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Interaction/InteractionStallDebugger.js b/Libraries/Interaction/InteractionStallDebugger.js
index 899eee0ec1143a..8f78852068f776 100644
--- a/Libraries/Interaction/InteractionStallDebugger.js
+++ b/Libraries/Interaction/InteractionStallDebugger.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Interaction/JSEventLoopWatchdog.js b/Libraries/Interaction/JSEventLoopWatchdog.js
index 5d5328325c1872..81919e657bdaff 100644
--- a/Libraries/Interaction/JSEventLoopWatchdog.js
+++ b/Libraries/Interaction/JSEventLoopWatchdog.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Interaction/PanResponder.js b/Libraries/Interaction/PanResponder.js
index fb974c9931e069..aad7eced088cbf 100644
--- a/Libraries/Interaction/PanResponder.js
+++ b/Libraries/Interaction/PanResponder.js
@@ -1,9 +1,10 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
  */
 
@@ -12,6 +13,8 @@
 const InteractionManager = require('./InteractionManager');
 const TouchHistoryMath = require('./TouchHistoryMath');
 
+import type {PressEvent} from 'CoreEventTypes';
+
 const currentCentroidXOfTouchesChangedAfter =
   TouchHistoryMath.currentCentroidXOfTouchesChangedAfter;
 const currentCentroidYOfTouchesChangedAfter =
@@ -121,6 +124,93 @@ const currentCentroidY = TouchHistoryMath.currentCentroidY;
  * [PanResponder example in RNTester](https://github.com/facebook/react-native/blob/master/RNTester/js/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 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,
+|}>;
+
 const PanResponder = {
   /**
    *
@@ -185,7 +275,7 @@ const PanResponder = {
    * - vx/vy: Velocity.
    */
 
-  _initializeGestureState: function(gestureState) {
+  _initializeGestureState(gestureState: GestureState) {
     gestureState.moveX = 0;
     gestureState.moveY = 0;
     gestureState.x0 = 0;
@@ -223,7 +313,10 @@ const PanResponder = {
    * typical responder callback pattern (without using `PanResponder`), but
    * avoids more dispatches than necessary.
    */
-  _updateGestureStateOnMove: function(gestureState, touchHistory) {
+  _updateGestureStateOnMove(
+    gestureState: GestureState,
+    touchHistory: $PropertyType<PressEvent, 'touchHistory'>,
+  ) {
     gestureState.numberActiveTouches = touchHistory.numberActiveTouches;
     gestureState.moveX = currentCentroidXOfTouchesChangedAfter(
       touchHistory,
@@ -290,40 +383,50 @@ const PanResponder = {
    *  accordingly. (numberActiveTouches) may not be totally accurate unless you
    *  are the responder.
    */
-  create: function(config) {
+  create(config: PanResponderConfig) {
     const interactionState = {
       handle: (null: ?number),
     };
-    const gestureState = {
+    const gestureState: GestureState = {
       // Useful for debugging
       stateID: Math.random(),
+      moveX: 0,
+      moveY: 0,
+      x0: 0,
+      y0: 0,
+      dx: 0,
+      dy: 0,
+      vx: 0,
+      vy: 0,
+      numberActiveTouches: 0,
+      _accountsForMovesUpTo: 0,
     };
-    PanResponder._initializeGestureState(gestureState);
     const panHandlers = {
-      onStartShouldSetResponder: function(e) {
-        return config.onStartShouldSetPanResponder === undefined
+      onStartShouldSetResponder(event: PressEvent): boolean {
+        return config.onStartShouldSetPanResponder == null
           ? false
-          : config.onStartShouldSetPanResponder(e, gestureState);
+          : config.onStartShouldSetPanResponder(event, gestureState);
       },
-      onMoveShouldSetResponder: function(e) {
-        return config.onMoveShouldSetPanResponder === undefined
+      onMoveShouldSetResponder(event: PressEvent): boolean {
+        return config.onMoveShouldSetPanResponder == null
           ? false
-          : config.onMoveShouldSetPanResponder(e, gestureState);
+          : config.onMoveShouldSetPanResponder(event, gestureState);
       },
-      onStartShouldSetResponderCapture: function(e) {
+      onStartShouldSetResponderCapture(event: PressEvent): boolean {
         // TODO: Actually, we should reinitialize the state any time
         // touches.length increases from 0 active to > 0 active.
-        if (e.nativeEvent.touches.length === 1) {
+        if (event.nativeEvent.touches.length === 1) {
           PanResponder._initializeGestureState(gestureState);
         }
-        gestureState.numberActiveTouches = e.touchHistory.numberActiveTouches;
-        return config.onStartShouldSetPanResponderCapture !== undefined
-          ? config.onStartShouldSetPanResponderCapture(e, gestureState)
+        gestureState.numberActiveTouches =
+          event.touchHistory.numberActiveTouches;
+        return config.onStartShouldSetPanResponderCapture != null
+          ? config.onStartShouldSetPanResponderCapture(event, gestureState)
           : false;
       },
 
-      onMoveShouldSetResponderCapture: function(e) {
-        const touchHistory = e.touchHistory;
+      onMoveShouldSetResponderCapture(event: PressEvent): boolean {
+        const touchHistory = event.touchHistory;
         // Responder system incorrectly dispatches should* to current responder
         // Filter out any touch moves past the first one - we would have
         // already processed multi-touch geometry during the first event.
@@ -335,56 +438,56 @@ const PanResponder = {
         }
         PanResponder._updateGestureStateOnMove(gestureState, touchHistory);
         return config.onMoveShouldSetPanResponderCapture
-          ? config.onMoveShouldSetPanResponderCapture(e, gestureState)
+          ? config.onMoveShouldSetPanResponderCapture(event, gestureState)
           : false;
       },
 
-      onResponderGrant: function(e) {
+      onResponderGrant(event: PressEvent): boolean {
         if (!interactionState.handle) {
           interactionState.handle = InteractionManager.createInteractionHandle();
         }
-        gestureState.x0 = currentCentroidX(e.touchHistory);
-        gestureState.y0 = currentCentroidY(e.touchHistory);
+        gestureState.x0 = currentCentroidX(event.touchHistory);
+        gestureState.y0 = currentCentroidY(event.touchHistory);
         gestureState.dx = 0;
         gestureState.dy = 0;
         if (config.onPanResponderGrant) {
-          config.onPanResponderGrant(e, gestureState);
+          config.onPanResponderGrant(event, gestureState);
         }
         // TODO: t7467124 investigate if this can be removed
-        return config.onShouldBlockNativeResponder === undefined
+        return config.onShouldBlockNativeResponder == null
           ? true
-          : config.onShouldBlockNativeResponder();
+          : config.onShouldBlockNativeResponder(event, gestureState);
       },
 
-      onResponderReject: function(e) {
+      onResponderReject(event: PressEvent): void {
         clearInteractionHandle(
           interactionState,
           config.onPanResponderReject,
-          e,
+          event,
           gestureState,
         );
       },
 
-      onResponderRelease: function(e) {
+      onResponderRelease(event: PressEvent): void {
         clearInteractionHandle(
           interactionState,
           config.onPanResponderRelease,
-          e,
+          event,
           gestureState,
         );
         PanResponder._initializeGestureState(gestureState);
       },
 
-      onResponderStart: function(e) {
-        const touchHistory = e.touchHistory;
+      onResponderStart(event: PressEvent): void {
+        const touchHistory = event.touchHistory;
         gestureState.numberActiveTouches = touchHistory.numberActiveTouches;
         if (config.onPanResponderStart) {
-          config.onPanResponderStart(e, gestureState);
+          config.onPanResponderStart(event, gestureState);
         }
       },
 
-      onResponderMove: function(e) {
-        const touchHistory = e.touchHistory;
+      onResponderMove(event: PressEvent): void {
+        const touchHistory = event.touchHistory;
         // Guard against the dispatch of two touch moves when there are two
         // simultaneously changed touches.
         if (
@@ -397,35 +500,35 @@ const PanResponder = {
         // already processed multi-touch geometry during the first event.
         PanResponder._updateGestureStateOnMove(gestureState, touchHistory);
         if (config.onPanResponderMove) {
-          config.onPanResponderMove(e, gestureState);
+          config.onPanResponderMove(event, gestureState);
         }
       },
 
-      onResponderEnd: function(e) {
-        const touchHistory = e.touchHistory;
+      onResponderEnd(event: PressEvent): void {
+        const touchHistory = event.touchHistory;
         gestureState.numberActiveTouches = touchHistory.numberActiveTouches;
         clearInteractionHandle(
           interactionState,
           config.onPanResponderEnd,
-          e,
+          event,
           gestureState,
         );
       },
 
-      onResponderTerminate: function(e) {
+      onResponderTerminate(event: PressEvent): void {
         clearInteractionHandle(
           interactionState,
           config.onPanResponderTerminate,
-          e,
+          event,
           gestureState,
         );
         PanResponder._initializeGestureState(gestureState);
       },
 
-      onResponderTerminationRequest: function(e) {
-        return config.onPanResponderTerminationRequest === undefined
+      onResponderTerminationRequest(event: PressEvent): boolean {
+        return config.onPanResponderTerminationRequest == null
           ? true
-          : config.onPanResponderTerminationRequest(e, gestureState);
+          : config.onPanResponderTerminationRequest(event, gestureState);
       },
     };
     return {
@@ -439,9 +542,9 @@ const PanResponder = {
 
 function clearInteractionHandle(
   interactionState: {handle: ?number},
-  callback: Function,
-  event: Object,
-  gestureState: Object,
+  callback: ?(ActiveCallback | PassiveCallback),
+  event: PressEvent,
+  gestureState: GestureState,
 ) {
   if (interactionState.handle) {
     InteractionManager.clearInteractionHandle(interactionState.handle);
@@ -452,4 +555,9 @@ function clearInteractionHandle(
   }
 }
 
+export type PanResponderInstance = $Call<
+  $PropertyType<typeof PanResponder, 'create'>,
+  PanResponderConfig,
+>;
+
 module.exports = PanResponder;
diff --git a/Libraries/Interaction/TaskQueue.js b/Libraries/Interaction/TaskQueue.js
index 90f49a8e84d330..b20a07aeec3837 100644
--- a/Libraries/Interaction/TaskQueue.js
+++ b/Libraries/Interaction/TaskQueue.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Interaction/TouchHistoryMath.js b/Libraries/Interaction/TouchHistoryMath.js
index 8d6d8253390f0c..92d3c5d831b191 100644
--- a/Libraries/Interaction/TouchHistoryMath.js
+++ b/Libraries/Interaction/TouchHistoryMath.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Interaction/__tests__/Batchinator-test.js b/Libraries/Interaction/__tests__/Batchinator-test.js
index 4cd4668fb27e51..900e6b3eafad68 100644
--- a/Libraries/Interaction/__tests__/Batchinator-test.js
+++ b/Libraries/Interaction/__tests__/Batchinator-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Interaction/__tests__/InteractionManager-test.js b/Libraries/Interaction/__tests__/InteractionManager-test.js
index edbdb50fb52762..dfac7db39a1f2d 100644
--- a/Libraries/Interaction/__tests__/InteractionManager-test.js
+++ b/Libraries/Interaction/__tests__/InteractionManager-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Interaction/__tests__/InteractionMixin-test.js b/Libraries/Interaction/__tests__/InteractionMixin-test.js
index 77c75c1e9ca576..4acfc0fbbf8c16 100644
--- a/Libraries/Interaction/__tests__/InteractionMixin-test.js
+++ b/Libraries/Interaction/__tests__/InteractionMixin-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,7 @@
 
 'use strict';
 
-jest.enableAutomock().unmock('InteractionMixin');
+jest.mock('InteractionManager');
 
 describe('InteractionMixin', () => {
   let InteractionManager;
diff --git a/Libraries/Interaction/__tests__/TaskQueue-test.js b/Libraries/Interaction/__tests__/TaskQueue-test.js
index ce00415fefd7df..6f10eeab928c69 100644
--- a/Libraries/Interaction/__tests__/TaskQueue-test.js
+++ b/Libraries/Interaction/__tests__/TaskQueue-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/JSInspector/InspectorAgent.js b/Libraries/JSInspector/InspectorAgent.js
index 2afe86fbe4e080..b3bd461314336b 100644
--- a/Libraries/JSInspector/InspectorAgent.js
+++ b/Libraries/JSInspector/InspectorAgent.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/JSInspector/JSInspector.js b/Libraries/JSInspector/JSInspector.js
index 21ccf7fbc1510c..6d7a2f70037e7f 100644
--- a/Libraries/JSInspector/JSInspector.js
+++ b/Libraries/JSInspector/JSInspector.js
@@ -1,16 +1,16 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
 
-import type EventSender from 'InspectorAgent';
+import type {EventSender} from 'InspectorAgent';
 
 interface Agent {
   constructor(eventSender: EventSender): void;
diff --git a/Libraries/JSInspector/NetworkAgent.js b/Libraries/JSInspector/NetworkAgent.js
index 2b25be3da54c0e..1a91749957a863 100644
--- a/Libraries/JSInspector/NetworkAgent.js
+++ b/Libraries/JSInspector/NetworkAgent.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/LayoutAnimation/LayoutAnimation.js b/Libraries/LayoutAnimation/LayoutAnimation.js
index e739ec8595158d..6f0fed1c0690d2 100644
--- a/Libraries/LayoutAnimation/LayoutAnimation.js
+++ b/Libraries/LayoutAnimation/LayoutAnimation.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,121 +7,79 @@
  * @flow
  * @format
  */
+
 'use strict';
 
-const PropTypes = require('prop-types');
 const UIManager = require('UIManager');
 
-/* $FlowFixMe(>=0.54.0 site=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. */
-const keyMirror = require('fbjs/lib/keyMirror');
-
-const {checkPropTypes} = PropTypes;
-
-const TypesEnum = {
-  spring: true,
-  linear: true,
-  easeInEaseOut: true,
-  easeIn: true,
-  easeOut: true,
-  keyboard: true,
-};
-const Types = keyMirror(TypesEnum);
-
-const PropertiesEnum = {
-  opacity: true,
-  scaleX: true,
-  scaleY: true,
-  scaleXY: true,
-};
-const Properties = keyMirror(PropertiesEnum);
+type Type =
+  | 'spring'
+  | 'linear'
+  | 'easeInEaseOut'
+  | 'easeIn'
+  | 'easeOut'
+  | 'keyboard';
 
-const animType = PropTypes.shape({
-  duration: PropTypes.number,
-  delay: PropTypes.number,
-  springDamping: PropTypes.number,
-  initialVelocity: PropTypes.number,
-  type: PropTypes.oneOf(Object.keys(Types)).isRequired,
-  property: PropTypes.oneOf(
-    // Only applies to create/delete
-    Object.keys(Properties),
-  ),
-});
+type Property = 'opacity' | 'scaleX' | 'scaleY' | 'scaleXY';
 
-type Anim = {
+type AnimationConfig = $ReadOnly<{|
   duration?: number,
   delay?: number,
   springDamping?: number,
   initialVelocity?: number,
-  type?: $Enum<typeof TypesEnum>,
-  property?: $Enum<typeof PropertiesEnum>,
-};
-
-const configType = PropTypes.shape({
-  duration: PropTypes.number.isRequired,
-  create: animType,
-  update: animType,
-  delete: animType,
-});
+  type?: Type,
+  property?: Property,
+|}>;
 
-type Config = {
+type LayoutAnimationConfig = $ReadOnly<{|
   duration: number,
-  create?: Anim,
-  update?: Anim,
-  delete?: Anim,
-};
+  create?: AnimationConfig,
+  update?: AnimationConfig,
+  delete?: AnimationConfig,
+|}>;
 
-function checkConfig(config: Config, location: string, name: string) {
-  checkPropTypes({config: configType}, {config}, location, name);
-}
-
-function configureNext(config: Config, onAnimationDidEnd?: Function) {
-  if (__DEV__) {
-    checkConfig(config, 'config', 'LayoutAnimation.configureNext');
-  }
+function configureNext(
+  config: LayoutAnimationConfig,
+  onAnimationDidEnd?: Function,
+) {
   UIManager.configureNextLayoutAnimation(
     config,
-    onAnimationDidEnd || function() {},
+    onAnimationDidEnd ?? function() {},
     function() {
       /* unused */
     },
   );
 }
 
-function create(duration: number, type, creationProp): Config {
+function create(
+  duration: number,
+  type: Type,
+  property: Property,
+): LayoutAnimationConfig {
   return {
     duration,
-    create: {
-      type,
-      property: creationProp,
-    },
-    update: {
-      type,
-    },
-    delete: {
-      type,
-      property: creationProp,
-    },
+    create: {type, property},
+    update: {type},
+    delete: {type, property},
   };
 }
 
 const Presets = {
-  easeInEaseOut: create(300, Types.easeInEaseOut, Properties.opacity),
-  linear: create(500, Types.linear, Properties.opacity),
+  easeInEaseOut: create(300, 'easeInEaseOut', 'opacity'),
+  linear: create(500, 'linear', 'opacity'),
   spring: {
     duration: 700,
     create: {
-      type: Types.linear,
-      property: Properties.opacity,
+      type: 'linear',
+      property: 'opacity',
     },
     update: {
-      type: Types.spring,
+      type: 'spring',
       springDamping: 0.4,
     },
     delete: {
-      type: Types.linear,
-      property: Properties.opacity,
+      type: 'linear',
+      property: 'opacity',
     },
   },
 };
@@ -143,9 +101,8 @@ const LayoutAnimation = {
    * @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)
+   *   - `create`, `AnimationConfig` for animating in new views
+   *   - `update`, `AnimationConfig` for animating views that have been updated
    *
    * @param onAnimationDidEnd Called when the animation finished.
    * Only supported on iOS.
@@ -156,9 +113,23 @@ const LayoutAnimation = {
    * Helper for creating a config for `configureNext`.
    */
   create,
-  Types,
-  Properties,
-  checkConfig,
+  Types: Object.freeze({
+    spring: 'spring',
+    linear: 'linear',
+    easeInEaseOut: 'easeInEaseOut',
+    easeIn: 'easeIn',
+    easeOut: 'easeOut',
+    keyboard: 'keyboard',
+  }),
+  Properties: Object.freeze({
+    opacity: 'opacity',
+    scaleX: 'scaleX',
+    scaleY: 'scaleY',
+    scaleXY: 'scaleXY',
+  }),
+  checkConfig(...args: Array<mixed>) {
+    console.error('LayoutAnimation.checkConfig(...) has been disabled.');
+  },
   Presets,
   easeInEaseOut: configureNext.bind(null, Presets.easeInEaseOut),
   linear: configureNext.bind(null, Presets.linear),
diff --git a/Libraries/Linking/Linking.js b/Libraries/Linking/Linking.js
index fec44f634fab8c..bcb885b0a9c50a 100644
--- a/Libraries/Linking/Linking.js
+++ b/Libraries/Linking/Linking.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/LinkingIOS/RCTLinkingManager.h b/Libraries/LinkingIOS/RCTLinkingManager.h
index 16d7e8f5986a36..de38c85de62216 100644
--- a/Libraries/LinkingIOS/RCTLinkingManager.h
+++ b/Libraries/LinkingIOS/RCTLinkingManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,17 +11,17 @@
 
 @interface RCTLinkingManager : RCTEventEmitter
 
-+ (BOOL)application:(UIApplication *)app
-            openURL:(NSURL *)URL
-            options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options;
++ (BOOL)application:(nonnull UIApplication *)app
+            openURL:(nonnull NSURL *)URL
+            options:(nonnull NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options;
 
-+ (BOOL)application:(UIApplication *)application
-            openURL:(NSURL *)URL
-  sourceApplication:(NSString *)sourceApplication
-         annotation:(id)annotation;
++ (BOOL)application:(nonnull UIApplication *)application
+              openURL:(nonnull NSURL *)URL
+    sourceApplication:(nullable NSString *)sourceApplication
+           annotation:(nonnull id)annotation;
 
-+ (BOOL)application:(UIApplication *)application
-continueUserActivity:(NSUserActivity *)userActivity
-  restorationHandler:(void (^)(NSArray * __nullable))restorationHandler;
++ (BOOL)application:(nonnull UIApplication *)application
+    continueUserActivity:(nonnull NSUserActivity *)userActivity
+      restorationHandler:(nonnull void (^)(NSArray *__nullable))restorationHandler;
 
 @end
diff --git a/Libraries/LinkingIOS/RCTLinkingManager.m b/Libraries/LinkingIOS/RCTLinkingManager.m
index 4aa6df0882e3d8..768f47edb063b4 100644
--- a/Libraries/LinkingIOS/RCTLinkingManager.m
+++ b/Libraries/LinkingIOS/RCTLinkingManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/FillRateHelper.js b/Libraries/Lists/FillRateHelper.js
index 82b0612cdcf8b6..92d04911e22b24 100644
--- a/Libraries/Lists/FillRateHelper.js
+++ b/Libraries/Lists/FillRateHelper.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index cfa4ae85808824..2b89e5cb11d9ed 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,6 +9,7 @@
  */
 'use strict';
 
+const deepDiffer = require('deepDiffer');
 const MetroListView = require('MetroListView'); // Used as a fallback legacy option
 const React = require('React');
 const View = require('View');
@@ -18,7 +19,7 @@ const StyleSheet = require('StyleSheet');
 
 const invariant = require('fbjs/lib/invariant');
 
-import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
+import type {ViewStyleProp} from 'StyleSheet';
 import type {
   ViewabilityConfig,
   ViewToken,
@@ -88,15 +89,23 @@ type OptionalProps<ItemT> = {
    * 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,
   /**
    * Optional custom style for multi-item rows generated when numColumns > 1.
    */
-  columnWrapperStyle?: DangerouslyImpreciseStyleProp,
+  columnWrapperStyle?: ViewStyleProp,
   /**
    * 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
@@ -181,7 +190,10 @@ type OptionalProps<ItemT> = {
    * @platform android
    */
   progressViewOffset?: number,
-  legacyImplementation?: ?boolean,
+  /**
+   * The legacy implementation is no longer supported.
+   */
+  legacyImplementation?: empty,
   /**
    * Set this true while waiting for new data from a refresh.
    */
@@ -464,7 +476,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
       'Changing onViewableItemsChanged on the fly is not supported',
     );
     invariant(
-      prevProps.viewabilityConfig === this.props.viewabilityConfig,
+      !deepDiffer(prevProps.viewabilityConfig, this.props.viewabilityConfig),
       'Changing viewabilityConfig on the fly is not supported',
     );
     invariant(
@@ -516,8 +528,9 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
       // comparison.
       if (!this._hasWarnedLegacy) {
         console.warn(
-          'FlatList: Using legacyImplementation - some features not supported and performance ' +
-            'may suffer',
+          'FlatList: legacyImplementation is deprecated and will be removed in a ' +
+            'future release - some features not supported and performance may suffer. ' +
+            'Please migrate to the default implementation.',
         );
         this._hasWarnedLegacy = true;
       }
@@ -637,14 +650,8 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
   render() {
     if (this.props.legacyImplementation) {
       return (
-        /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses an
-         * error found when Flow v0.66 was deployed. To see the error delete
-         * this comment and run Flow. */
         <MetroListView
           {...this.props}
-          /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses
-           * an error found when Flow v0.66 was deployed. To see the error
-           * delete this comment and run Flow. */
           items={this.props.data}
           ref={this._captureRef}
         />
diff --git a/Libraries/Lists/ListView/InternalListViewType.js b/Libraries/Lists/ListView/InternalListViewType.js
index 1df93fd565d997..a760775b2c68cf 100644
--- a/Libraries/Lists/ListView/InternalListViewType.js
+++ b/Libraries/Lists/ListView/InternalListViewType.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/ListView/ListView.js b/Libraries/Lists/ListView/ListView.js
index bed5dbda2e2f93..409cd228ea475f 100644
--- a/Libraries/Lists/ListView/ListView.js
+++ b/Libraries/Lists/ListView/ListView.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -18,7 +18,6 @@ const RCTScrollViewManager = require('NativeModules').ScrollViewManager;
 const ScrollView = require('ScrollView');
 const ScrollResponder = require('ScrollResponder');
 const StaticRenderer = require('StaticRenderer');
-const TimerMixin = require('react-timer-mixin');
 const View = require('View');
 const cloneReferencedElement = require('react-clone-referenced-element');
 const createReactClass = require('create-react-class');
@@ -216,6 +215,7 @@ type Props = $ReadOnly<{|
 
 const ListView = createReactClass({
   displayName: 'ListView',
+  _rafIds: ([]: Array<AnimationFrameID>),
   _childFrames: ([]: Array<Object>),
   _sentEndForContentLength: (null: ?number),
   _scrollComponent: (null: ?React.ElementRef<typeof ScrollView>),
@@ -223,7 +223,7 @@ const ListView = createReactClass({
   _visibleRows: ({}: Object),
   scrollProperties: ({}: Object),
 
-  mixins: [ScrollResponder.Mixin, TimerMixin],
+  mixins: [ScrollResponder.Mixin],
 
   statics: {
     DataSource: ListViewDataSource,
@@ -347,16 +347,23 @@ const ListView = createReactClass({
       contentLength: null,
       offset: 0,
     };
+
+    this._rafIds = [];
     this._childFrames = [];
     this._visibleRows = {};
     this._prevRenderedRowsCount = 0;
     this._sentEndForContentLength = null;
   },
 
+  componentWillUnmount: function() {
+    this._rafIds.forEach(cancelAnimationFrame);
+    this._rafIds = [];
+  },
+
   componentDidMount: function() {
     // do this in animation frame until componentDidMount actually runs after
     // the component is laid out
-    this.requestAnimationFrame(() => {
+    this._requestAnimationFrame(() => {
       this._measureAndUpdateScrollProps();
     });
   },
@@ -384,7 +391,7 @@ const ListView = createReactClass({
   },
 
   componentDidUpdate: function() {
-    this.requestAnimationFrame(() => {
+    this._requestAnimationFrame(() => {
       this._measureAndUpdateScrollProps();
     });
   },
@@ -535,6 +542,14 @@ const ListView = createReactClass({
    * Private methods
    */
 
+  _requestAnimationFrame: function(fn: () => void): void {
+    const rafId = requestAnimationFrame(() => {
+      this._rafIds = this._rafIds.filter(id => id !== rafId);
+      fn();
+    });
+    this._rafIds.push(rafId);
+  },
+
   _measureAndUpdateScrollProps: function() {
     const scrollComponent = this.getScrollResponder();
     if (!scrollComponent || !scrollComponent.getInnerViewNode) {
diff --git a/Libraries/Lists/ListView/ListViewDataSource.js b/Libraries/Lists/ListView/ListViewDataSource.js
index b046a58bfd2af1..5945ddb4cacaac 100644
--- a/Libraries/Lists/ListView/ListViewDataSource.js
+++ b/Libraries/Lists/ListView/ListViewDataSource.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/ListView/__mocks__/ListViewMock.js b/Libraries/Lists/ListView/__mocks__/ListViewMock.js
index a691136be39a4f..7dd906dd4ad51c 100644
--- a/Libraries/Lists/ListView/__mocks__/ListViewMock.js
+++ b/Libraries/Lists/ListView/__mocks__/ListViewMock.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 'use strict';
diff --git a/Libraries/Lists/MetroListView.js b/Libraries/Lists/MetroListView.js
index 1d59dba8d16582..0da36d072ca83e 100644
--- a/Libraries/Lists/MetroListView.js
+++ b/Libraries/Lists/MetroListView.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -29,7 +29,6 @@ type NormalProps = {
 
   // Provide either `items` or `sections`
   items?: ?Array<Item>, // By default, an Item is assumed to be {key: string}
-  // $FlowFixMe - Something is a little off with the type Array<Item>
   sections?: ?Array<{key: string, data: Array<Item>}>,
 
   /**
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index 9d7d2eb8195d54..b26a13c58172b9 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,7 +9,6 @@
  */
 'use strict';
 
-const MetroListView = require('MetroListView');
 const Platform = require('Platform');
 const React = require('React');
 const ScrollView = require('ScrollView');
@@ -181,7 +180,10 @@ type OptionalProps<SectionT: SectionBase<any>> = {
    */
   stickySectionHeadersEnabled?: boolean,
 
-  legacyImplementation?: ?boolean,
+  /**
+   * The legacy implementation is no longer supported.
+   */
+  legacyImplementation?: empty,
 };
 
 export type Props<SectionT> = RequiredProps<SectionT> &
@@ -274,7 +276,9 @@ class SectionList<SectionT: SectionBase<any>> extends React.PureComponent<
     viewOffset?: number,
     viewPosition?: number,
   }) {
-    this._wrapperListRef.scrollToLocation(params);
+    if (this._wrapperListRef != null) {
+      this._wrapperListRef.scrollToLocation(params);
+    }
   }
 
   /**
@@ -284,7 +288,6 @@ class SectionList<SectionT: SectionBase<any>> extends React.PureComponent<
    */
   recordInteraction() {
     const listRef = this._wrapperListRef && this._wrapperListRef.getListRef();
-    // $FlowFixMe Found when typing ListView
     listRef && listRef.recordInteraction();
   }
 
@@ -323,20 +326,14 @@ class SectionList<SectionT: SectionBase<any>> extends React.PureComponent<
   }
 
   render() {
-    const List = this.props.legacyImplementation
-      ? MetroListView
-      : VirtualizedSectionList;
     /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses an
      * error found when Flow v0.66 was deployed. To see the error delete this
      * comment and run Flow. */
-    return <List {...this.props} ref={this._captureRef} />;
+    return <VirtualizedSectionList {...this.props} ref={this._captureRef} />;
   }
 
-  _wrapperListRef: MetroListView | VirtualizedSectionList<any>;
+  _wrapperListRef: ?React.ElementRef<typeof VirtualizedSectionList>;
   _captureRef = ref => {
-    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
-     * suppresses an error when upgrading Flow's support for React. To see the
-     * error delete this comment and run Flow. */
     this._wrapperListRef = ref;
   };
 }
diff --git a/Libraries/Lists/ViewabilityHelper.js b/Libraries/Lists/ViewabilityHelper.js
index 415e77895360da..6408845f660346 100644
--- a/Libraries/Lists/ViewabilityHelper.js
+++ b/Libraries/Lists/ViewabilityHelper.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/VirtualizeUtils.js b/Libraries/Lists/VirtualizeUtils.js
index b47ceda1fece63..ba8f48a5030ae5 100644
--- a/Libraries/Lists/VirtualizeUtils.js
+++ b/Libraries/Lists/VirtualizeUtils.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 56364823f06d49..05c15e8d48d8e7 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -31,7 +31,7 @@ const warning = require('fbjs/lib/warning');
 
 const {computeWindowedRenderLimits} = require('VirtualizeUtils');
 
-import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
+import type {ViewStyleProp} from 'StyleSheet';
 import type {
   ViewabilityConfig,
   ViewToken,
@@ -124,11 +124,19 @@ type OptionalProps = {
    * 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
@@ -653,7 +661,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     stickyIndicesFromProps: Set<number>,
     first: number,
     last: number,
-    inversionStyle: ?DangerouslyImpreciseStyleProp,
+    inversionStyle: ViewStyleProp,
   ) {
     const {
       CellRendererComponent,
@@ -756,7 +764,12 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         <VirtualizedCellWrapper
           cellKey={this._getCellKey() + '-header'}
           key="$header">
-          <View onLayout={this._onLayoutHeader} style={inversionStyle}>
+          <View
+            onLayout={this._onLayoutHeader}
+            style={StyleSheet.compose(
+              inversionStyle,
+              this.props.ListHeaderComponentStyle,
+            )}>
             {
               // $FlowFixMe - Typing ReactNativeComponent revealed errors
               element
@@ -792,8 +805,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
             if (stickyIndicesFromProps.has(ii + stickyOffset)) {
               const initBlock = this._getFrameMetricsApprox(lastInitialIndex);
               const stickyBlock = this._getFrameMetricsApprox(ii);
-              const leadSpace =
-                stickyBlock.offset - (initBlock.offset + initBlock.length);
+              const leadSpace = stickyBlock.offset - initBlock.offset;
               cells.push(
                 <View key="$sticky_lead" style={{[spacerKey]: leadSpace}} />,
               );
@@ -892,7 +904,12 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         <VirtualizedCellWrapper
           cellKey={this._getCellKey() + '-footer'}
           key="$footer">
-          <View onLayout={this._onLayoutFooter} style={inversionStyle}>
+          <View
+            onLayout={this._onLayoutFooter}
+            style={StyleSheet.compose(
+              inversionStyle,
+              this.props.ListFooterComponentStyle,
+            )}>
             {
               // $FlowFixMe - Typing ReactNativeComponent revealed errors
               element
@@ -930,7 +947,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       (this.props.renderScrollComponent || this._defaultRenderScrollComponent)(
         scrollProps,
       ),
-      // $FlowFixMe Invalid prop usage
       {
         ref: this._captureScrollRef,
       },
@@ -1602,7 +1618,7 @@ class CellRenderer extends React.Component<
     fillRateHelper: FillRateHelper,
     horizontal: ?boolean,
     index: number,
-    inversionStyle: ?DangerouslyImpreciseStyleProp,
+    inversionStyle: ViewStyleProp,
     item: Item,
     onLayout: (event: Object) => void, // This is extracted by ScrollViewStickyHeader
     onUnmount: (cellKey: string) => void,
diff --git a/Libraries/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js
index 616d976bbe12ef..086a2057bd8fa4 100644
--- a/Libraries/Lists/VirtualizedSectionList.js
+++ b/Libraries/Lists/VirtualizedSectionList.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/__flowtests__/FlatList-flowtest.js b/Libraries/Lists/__flowtests__/FlatList-flowtest.js
index d8cbd75a153db4..766aad581bf1a3 100644
--- a/Libraries/Lists/__flowtests__/FlatList-flowtest.js
+++ b/Libraries/Lists/__flowtests__/FlatList-flowtest.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 
diff --git a/Libraries/Lists/__flowtests__/SectionList-flowtest.js b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
index 93fa77c4631682..07b2adc9eea5f5 100644
--- a/Libraries/Lists/__flowtests__/SectionList-flowtest.js
+++ b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/__tests__/FillRateHelper-test.js b/Libraries/Lists/__tests__/FillRateHelper-test.js
index 612d02c5bf9ab0..20845c862ccbe3 100644
--- a/Libraries/Lists/__tests__/FillRateHelper-test.js
+++ b/Libraries/Lists/__tests__/FillRateHelper-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/__tests__/FlatList-test.js b/Libraries/Lists/__tests__/FlatList-test.js
index 28dd377bd13862..e0ae3805c5a997 100644
--- a/Libraries/Lists/__tests__/FlatList-test.js
+++ b/Libraries/Lists/__tests__/FlatList-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/__tests__/SectionList-test.js b/Libraries/Lists/__tests__/SectionList-test.js
index f669879df839d9..c626d3ce9c3967 100644
--- a/Libraries/Lists/__tests__/SectionList-test.js
+++ b/Libraries/Lists/__tests__/SectionList-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/__tests__/ViewabilityHelper-test.js b/Libraries/Lists/__tests__/ViewabilityHelper-test.js
index ed94f7f7e253d2..389e2a941c412b 100644
--- a/Libraries/Lists/__tests__/ViewabilityHelper-test.js
+++ b/Libraries/Lists/__tests__/ViewabilityHelper-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/__tests__/VirtualizeUtils-test.js b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
index 2361a86aaeff62..7e75993872faba 100644
--- a/Libraries/Lists/__tests__/VirtualizeUtils-test.js
+++ b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/__tests__/VirtualizedList-test.js b/Libraries/Lists/__tests__/VirtualizedList-test.js
index 14aec9140f1195..e6dbe5a7d25a71 100644
--- a/Libraries/Lists/__tests__/VirtualizedList-test.js
+++ b/Libraries/Lists/__tests__/VirtualizedList-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
index d6d008065b2445..7f523be29ac848 100644
--- a/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
@@ -60,7 +60,6 @@ exports[`FlatList renders all the bells and whistles 1`] = `
   <View>
     <View
       onLayout={[Function]}
-      style={null}
     >
       <header />
     </View>
@@ -119,7 +118,6 @@ exports[`FlatList renders all the bells and whistles 1`] = `
     </View>
     <View
       onLayout={[Function]}
-      style={null}
     >
       <footer />
     </View>
diff --git a/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
index f47dd4e8d62603..b15b3cb3dd7148 100644
--- a/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
@@ -341,7 +341,6 @@ exports[`SectionList renders all the bells and whistles 1`] = `
   <View>
     <View
       onLayout={[Function]}
-      style={null}
     >
       <header
         v=""
@@ -484,7 +483,6 @@ exports[`SectionList renders all the bells and whistles 1`] = `
     </View>
     <View
       onLayout={[Function]}
-      style={null}
     >
       <footer
         v=""
diff --git a/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
index cb1a86d7180568..2ae233201f72ba 100644
--- a/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
@@ -665,14 +665,12 @@ exports[`VirtualizedList renders empty list with empty component 1`] = `
   <View>
     <View
       onLayout={[Function]}
-      style={null}
     >
       <header />
     </View>
     <empty />
     <View
       onLayout={[Function]}
-      style={null}
     >
       <footer />
     </View>
diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js
index 1af6fec61486d6..28b55f91f1d2be 100644
--- a/Libraries/Modal/Modal.js
+++ b/Libraries/Modal/Modal.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -31,6 +31,8 @@ const ModalEventEmitter =
     : null;
 
 import type EmitterSubscription from 'EmitterSubscription';
+import type {ViewProps} from 'ViewPropTypes';
+import type {SyntheticEvent} from 'CoreEventTypes';
 
 /**
  * The Modal component is a simple way to present content above an enclosing view.
@@ -44,95 +46,110 @@ import type EmitterSubscription from 'EmitterSubscription';
 // destroyed before the callback is fired.
 let uniqueModalIdentifier = 0;
 
-class Modal extends React.Component<Object> {
-  static propTypes = {
-    /**
-     * The `animationType` prop controls how the modal animates.
-     *
-     * See https://facebook.github.io/react-native/docs/modal.html#animationtype
-     */
-    animationType: PropTypes.oneOf(['none', 'slide', 'fade']),
-    /**
-     * The `presentationStyle` prop controls how the modal appears.
-     *
-     * See https://facebook.github.io/react-native/docs/modal.html#presentationstyle
-     */
-    presentationStyle: PropTypes.oneOf([
-      'fullScreen',
-      'pageSheet',
-      'formSheet',
-      'overFullScreen',
-    ]),
-    /**
-     * The `transparent` prop determines whether your modal will fill the
-     * entire view.
-     *
-     * See https://facebook.github.io/react-native/docs/modal.html#transparent
-     */
-    transparent: PropTypes.bool,
-    /**
-     * The `hardwareAccelerated` prop controls whether to force hardware
-     * acceleration for the underlying window.
-     *
-     * See https://facebook.github.io/react-native/docs/modal.html#hardwareaccelerated
-     */
-    hardwareAccelerated: PropTypes.bool,
-    /**
-     * The `visible` prop determines whether your modal is visible.
-     *
-     * See https://facebook.github.io/react-native/docs/modal.html#visible
-     */
-    visible: PropTypes.bool,
-    /**
-     * The `onRequestClose` callback is called when the user taps the hardware
-     * back button on Android or the menu button on Apple TV.
-     *
-     * See https://facebook.github.io/react-native/docs/modal.html#onrequestclose
-     */
-    onRequestClose:
-      Platform.isTV || Platform.OS === 'android'
-        ? PropTypes.func.isRequired
-        : PropTypes.func,
-    /**
-     * The `onShow` prop allows passing a function that will be called once the
-     * modal has been shown.
-     *
-     * See https://facebook.github.io/react-native/docs/modal.html#onshow
-     */
-    onShow: PropTypes.func,
-    /**
-     * The `onDismiss` prop allows passing a function that will be called once
-     * the modal has been dismissed.
-     *
-     * See https://facebook.github.io/react-native/docs/modal.html#ondismiss
-     */
-    onDismiss: PropTypes.func,
-    animated: deprecatedPropType(
-      PropTypes.bool,
-      'Use the `animationType` prop instead.',
-    ),
-    /**
-     * The `supportedOrientations` prop allows the modal to be rotated to any of the specified orientations.
-     *
-     * See https://facebook.github.io/react-native/docs/modal.html#supportedorientations
-     */
-    supportedOrientations: PropTypes.arrayOf(
-      PropTypes.oneOf([
-        'portrait',
-        'portrait-upside-down',
-        'landscape',
-        'landscape-left',
-        'landscape-right',
-      ]),
-    ),
-    /**
-     * The `onOrientationChange` callback is called when the orientation changes while the modal is being displayed.
-     *
-     * See https://facebook.github.io/react-native/docs/modal.html#onorientationchange
-     */
-    onOrientationChange: PropTypes.func,
-  };
+type OrientationChangeEvent = SyntheticEvent<
+  $ReadOnly<{|
+    orientation: 'portrait' | 'landscape',
+  |}>,
+>;
+
+type Props = $ReadOnly<{|
+  ...ViewProps,
+
+  /**
+   * The `animationType` prop controls how the modal animates.
+   *
+   * See https://facebook.github.io/react-native/docs/modal.html#animationtype
+   */
+  animationType?: ?('none' | 'slide' | 'fade'),
+
+  /**
+   * The `presentationStyle` prop controls how the modal appears.
+   *
+   * See https://facebook.github.io/react-native/docs/modal.html#presentationstyle
+   */
+  presentationStyle?: ?(
+    | 'fullScreen'
+    | 'pageSheet'
+    | 'formSheet'
+    | 'overFullScreen'
+  ),
+
+  /**
+   * The `transparent` prop determines whether your modal will fill the
+   * entire view.
+   *
+   * See https://facebook.github.io/react-native/docs/modal.html#transparent
+   */
+  transparent?: ?boolean,
+
+  /**
+   * The `hardwareAccelerated` prop controls whether to force hardware
+   * acceleration for the underlying window.
+   *
+   * See https://facebook.github.io/react-native/docs/modal.html#hardwareaccelerated
+   */
+  hardwareAccelerated?: ?boolean,
+
+  /**
+   * The `visible` prop determines whether your modal is visible.
+   *
+   * See https://facebook.github.io/react-native/docs/modal.html#visible
+   */
+  visible?: ?boolean,
+
+  /**
+   * 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.
+   *
+   * See https://facebook.github.io/react-native/docs/modal.html#onrequestclose
+   */
+  onRequestClose?: ?(event?: SyntheticEvent<null>) => mixed,
+
+  /**
+   * The `onShow` prop allows passing a function that will be called once the
+   * modal has been shown.
+   *
+   * See https://facebook.github.io/react-native/docs/modal.html#onshow
+   */
+  onShow?: ?(event?: SyntheticEvent<null>) => mixed,
+
+  /**
+   * The `onDismiss` prop allows passing a function that will be called once
+   * the modal has been dismissed.
+   *
+   * See https://facebook.github.io/react-native/docs/modal.html#ondismiss
+   */
+  onDismiss?: ?() => mixed,
+
+  /**
+   * Deprecated. Use the `animationType` prop instead.
+   */
+  animated?: ?boolean,
+
+  /**
+   * The `supportedOrientations` prop allows the modal to be rotated to any of the specified orientations.
+   *
+   * See https://facebook.github.io/react-native/docs/modal.html#supportedorientations
+   */
+  supportedOrientations?: ?$ReadOnlyArray<
+    | 'portrait'
+    | 'portrait-upside-down'
+    | 'landscape'
+    | 'landscape-left'
+    | 'landscape-right',
+  >,
+
+  /**
+   * The `onOrientationChange` callback is called when the orientation changes while the modal is being displayed.
+   *
+   * See https://facebook.github.io/react-native/docs/modal.html#onorientationchange
+   */
+  onOrientationChange?: ?(event: OrientationChangeEvent) => mixed,
+|}>;
 
+class Modal extends React.Component<Props> {
   static defaultProps = {
     visible: true,
     hardwareAccelerated: false,
@@ -145,7 +162,7 @@ class Modal extends React.Component<Object> {
   _identifier: number;
   _eventSubscription: ?EmitterSubscription;
 
-  constructor(props: Object) {
+  constructor(props: Props) {
     super(props);
     Modal._confirmProps(props);
     this._identifier = uniqueModalIdentifier++;
@@ -182,11 +199,11 @@ class Modal extends React.Component<Object> {
     }
   }
 
-  UNSAFE_componentWillReceiveProps(nextProps: Object) {
+  UNSAFE_componentWillReceiveProps(nextProps: Props) {
     Modal._confirmProps(nextProps);
   }
 
-  static _confirmProps(props: Object) {
+  static _confirmProps(props: Props) {
     if (
       props.presentationStyle &&
       props.presentationStyle !== 'overFullScreen' &&
diff --git a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
index 40763fd5b3a281..915606c2d2a993 100644
--- a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
+++ b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
index d6ae6701e6ef99..f4aeaee2fce758 100644
--- a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
index b1e84d675db765..27d4edfc3bb7d3 100644
--- a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 #import <UIKit/UIKit.h>
 #import <React/RCTConvert.h>
 
+#import "RCTAnimationUtils.h"
 #import "RCTValueAnimatedNode.h"
 
 @interface RCTDecayAnimation ()
@@ -100,7 +101,7 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
 
   CGFloat value = _fromValue +
     (_velocity / (1 - _deceleration)) *
-    (1 - exp(-(1 - _deceleration) * (currentTime - _frameStartTime) * 1000.0));
+    (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 c6b6f7979b28bc..db90f961c0bdb2 100644
--- a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
index 9c35b13fc237fa..7ae667bb833df0 100644
--- a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
index 979c45a8c32dfe..3f66d3465bf6f0 100644
--- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
index ddcc056acfe975..a6dfde50012f63 100644
--- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -97,7 +97,7 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
   }
 
   _animationCurrentTime = currentTime;
-  NSTimeInterval currentDuration = _animationCurrentTime - _animationStartTime;
+  NSTimeInterval currentDuration = (_animationCurrentTime - _animationStartTime) / RCTAnimationDragCoefficient();
 
   // Determine how many frames have passed since last update.
   // Get index of frames that surround the current interval
diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
index fe721f61d09d1a..2369cd8e06f311 100644
--- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
index 7356738f22c5c1..b7e784b6ce04ac 100644
--- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,6 +12,7 @@
 #import <React/RCTConvert.h>
 #import <React/RCTDefines.h>
 
+#import "RCTAnimationUtils.h"
 #import "RCTValueAnimatedNode.h"
 
 @interface RCTSpringAnimation ()
@@ -45,7 +46,7 @@ @implementation RCTSpringAnimation
 
   NSInteger _iterations;
   NSInteger _currentLoop;
-  
+
   NSTimeInterval _t; // Current time (startTime + dt)
 }
 
@@ -110,7 +111,7 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
     // Animation has not begun or animation has already finished.
     return;
   }
-  
+
   // calculate delta time
   NSTimeInterval deltaTime;
   if(_animationStartTime == -1) {
@@ -120,22 +121,22 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
   } else {
     // Handle frame drops, and only advance dt by a max of MAX_DELTA_TIME
     deltaTime = MIN(MAX_DELTA_TIME, currentTime - _animationCurrentTime);
-    _t = _t + deltaTime;
+    _t = _t + deltaTime / RCTAnimationDragCoefficient();
   }
-  
+
   // store the timestamp
   _animationCurrentTime = currentTime;
-  
+
   CGFloat c = _damping;
   CGFloat m = _mass;
   CGFloat k = _stiffness;
   CGFloat v0 = -_initialVelocity;
-  
+
   CGFloat zeta = c / (2 * sqrtf(k * m));
   CGFloat omega0 = sqrtf(k / m);
   CGFloat omega1 = omega0 * sqrtf(1.0 - (zeta * zeta));
   CGFloat x0 = _toValue - _fromValue;
-  
+
   CGFloat position;
   CGFloat velocity;
   if (zeta < 1) {
@@ -163,12 +164,12 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
     velocity =
       envelope * (v0 * (_t * omega0 - 1) + _t * x0 * (omega0 * omega0));
   }
-  
+
   _lastPosition = position;
   _lastVelocity = velocity;
-  
+
   [self onUpdate:position];
-  
+
   // Conditions for stopping the spring animation
   BOOL isOvershooting = NO;
   if (_overshootClamping && _stiffness != 0) {
@@ -183,7 +184,7 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
   if (_stiffness != 0) {
     isDisplacement = ABS(_toValue - position) <= _restDisplacementThreshold;
   }
-  
+
   if (isOvershooting || (isVelocity && isDisplacement)) {
     if (_stiffness != 0) {
       // Ensure that we end up with a round value
@@ -192,7 +193,7 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
       }
       [self onUpdate:_toValue];
     }
-    
+
     if (_iterations == -1 || _currentLoop < _iterations) {
       _lastPosition = _fromValue;
       _lastVelocity = _initialVelocity;
diff --git a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h
index 0e2853df2cc151..fba81d61ad79fe 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
index 0bfb4d576be9b6..dfb6f92a2999df 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
index e9d000910ffe3b..81b5b8b903b29e 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
index 71397403a09e72..7d9a2fc6f7e4fb 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h
index 5d89091eafcebc..ca725866d4b904 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
index f2e7d8cd0574a5..569741722ab74f 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h
index 0702012dbab1ec..4a6168f2c1e64e 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
index a66807c3d3f878..d2cd3a1336c95c 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h
index e083525d688da2..aa01c81c6b1213 100644
--- a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
index b7fa8b50974d23..0fbaf57d4b4ac4 100644
--- a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h
index 08de0e1aee2f27..319dab5a57952d 100644
--- a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m
index c2802741d23789..e9b6f13b2a464d 100644
--- a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h
index 481c3d5aa5b310..55c396b8e95f5a 100644
--- a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
index 29c151aed3f9a1..05a664e2e7483a 100644
--- a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h
index 24919120a951b4..4bf39fe3e00726 100644
--- a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
index 24fb1e82da888c..473a921ba3534c 100644
--- a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h
index 637b120c48a42a..b1181a4da977fd 100644
--- a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
index a62d0309306620..665545be9b4edc 100644
--- a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.h
index 45524b69d02591..5f0cdb6f4de14a 100644
--- a/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m
index 91688c9aec51a6..c5489d15abb3b8 100644
--- a/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
index 99e9bd1112a60e..22e5fed8f2e671 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
index 42150285da4cd2..337a1555373ae9 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h
index 59d6951def67ad..b72788acc872b0 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
index fd8ca221f93c72..708cd846455693 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h
index 8360dc659fb810..53b5da3803e51f 100644
--- a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
index c433bba3414c81..949fcad137ff2e 100644
--- a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.h b/Libraries/NativeAnimation/RCTAnimationUtils.h
index d1dba830ee96aa..39f2fe470bedd2 100644
--- a/Libraries/NativeAnimation/RCTAnimationUtils.h
+++ b/Libraries/NativeAnimation/RCTAnimationUtils.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -30,3 +30,9 @@ RCT_EXTERN CGFloat RCTInterpolateValue(CGFloat value,
 
 RCT_EXTERN CGFloat RCTRadiansToDegrees(CGFloat radians);
 RCT_EXTERN CGFloat RCTDegreesToRadians(CGFloat degrees);
+
+/**
+ * Coefficient to slow down animations, respects the ios
+ * simulator `Slow Animations (⌘T)` option.
+ */
+RCT_EXTERN CGFloat RCTAnimationDragCoefficient(void);
diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.m b/Libraries/NativeAnimation/RCTAnimationUtils.m
index 8f8d4cfb817a72..bd4b2c33e249ce 100644
--- a/Libraries/NativeAnimation/RCTAnimationUtils.m
+++ b/Libraries/NativeAnimation/RCTAnimationUtils.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -93,3 +93,23 @@ CGFloat RCTDegreesToRadians(CGFloat degrees)
 {
   return degrees / 180.0 * M_PI;
 }
+
+#if TARGET_IPHONE_SIMULATOR
+// Based on https://stackoverflow.com/a/13307674
+float UIAnimationDragCoefficient(void);
+#endif
+
+CGFloat RCTAnimationDragCoefficient()
+{
+#if TARGET_IPHONE_SIMULATOR
+  if (NSClassFromString(@"XCTest") != nil) {
+    // UIAnimationDragCoefficient is 10.0 in tests for some reason, but
+    // we need it to be 1.0. Fixes T34233294
+    return 1.0;
+  } else {
+    return (CGFloat)UIAnimationDragCoefficient();
+  }
+#else
+  return 1.0;
+#endif
+}
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
index 5ca4e95bd82562..b4af40c71e2227 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
index 2032f3a01a03c8..57f08034e177a1 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
index ae2176684007d6..6f30f96fabe22d 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
@@ -1,16 +1,16 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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 <RCTAnimation/RCTValueAnimatedNode.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTUIManager.h>
 
+@protocol RCTValueAnimatedNodeObserver;
+
 @interface RCTNativeAnimatedNodesManager : NSObject
 
 - (nonnull instancetype)initWithUIManager:(nonnull RCTUIManager *)uiManager;
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
index e649020d5f301f..30ec0e42dafc05 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/FormData.js b/Libraries/Network/FormData.js
index a9de18c067c823..ff618c0180a272 100644
--- a/Libraries/Network/FormData.js
+++ b/Libraries/Network/FormData.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/NetInfo.js b/Libraries/Network/NetInfo.js
index 6d2363967f3a8e..e1cb86e6d77626 100644
--- a/Libraries/Network/NetInfo.js
+++ b/Libraries/Network/NetInfo.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTDataRequestHandler.h b/Libraries/Network/RCTDataRequestHandler.h
index b0ded9161f283a..9beaa7e0c8a32b 100644
--- a/Libraries/Network/RCTDataRequestHandler.h
+++ b/Libraries/Network/RCTDataRequestHandler.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTDataRequestHandler.m b/Libraries/Network/RCTDataRequestHandler.m
index f0e36dfb472654..2a7c42c6a10bf1 100644
--- a/Libraries/Network/RCTDataRequestHandler.m
+++ b/Libraries/Network/RCTDataRequestHandler.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTFileRequestHandler.h b/Libraries/Network/RCTFileRequestHandler.h
index 7ee7952c5259d9..843d0b12712727 100644
--- a/Libraries/Network/RCTFileRequestHandler.h
+++ b/Libraries/Network/RCTFileRequestHandler.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTFileRequestHandler.m b/Libraries/Network/RCTFileRequestHandler.m
index 7c4585a509d0f9..00041a78171689 100644
--- a/Libraries/Network/RCTFileRequestHandler.m
+++ b/Libraries/Network/RCTFileRequestHandler.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTHTTPRequestHandler.h b/Libraries/Network/RCTHTTPRequestHandler.h
index 5148e6a510cc42..74d5fbd74b07e5 100644
--- a/Libraries/Network/RCTHTTPRequestHandler.h
+++ b/Libraries/Network/RCTHTTPRequestHandler.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTHTTPRequestHandler.mm b/Libraries/Network/RCTHTTPRequestHandler.mm
index 6376ad31c812b2..4d922f52d0c750 100644
--- a/Libraries/Network/RCTHTTPRequestHandler.mm
+++ b/Libraries/Network/RCTHTTPRequestHandler.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTNetInfo.h b/Libraries/Network/RCTNetInfo.h
index e38162d2dcbb7b..71a04eeba84d77 100644
--- a/Libraries/Network/RCTNetInfo.h
+++ b/Libraries/Network/RCTNetInfo.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTNetInfo.m b/Libraries/Network/RCTNetInfo.m
index 9b51a5c1ab4ff6..9b90c454f5871b 100644
--- a/Libraries/Network/RCTNetInfo.m
+++ b/Libraries/Network/RCTNetInfo.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -36,12 +36,14 @@
 
 @implementation RCTNetInfo
 {
+  SCNetworkReachabilityRef _firstTimeReachability;
   SCNetworkReachabilityRef _reachability;
   NSString *_connectionType;
   NSString *_effectiveConnectionType;
   NSString *_statusDeprecated;
   NSString *_host;
   BOOL _isObserving;
+  RCTPromiseResolveBlock _resolve;
 }
 
 RCT_EXPORT_MODULE()
@@ -49,7 +51,18 @@ @implementation RCTNetInfo
 static void RCTReachabilityCallback(__unused SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void *info)
 {
   RCTNetInfo *self = (__bridge id)info;
-  if ([self setReachabilityStatus:flags] && self->_isObserving) {
+  BOOL didSetReachabilityFlags = [self setReachabilityStatus:flags];
+  if (self->_firstTimeReachability && self->_resolve) {
+    SCNetworkReachabilityUnscheduleFromRunLoop(self->_firstTimeReachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
+    CFRelease(self->_firstTimeReachability);
+    self->_resolve(@{@"connectionType": self->_connectionType ?: RCTConnectionTypeUnknown,
+                     @"effectiveConnectionType": self->_effectiveConnectionType ?: RCTEffectiveConnectionTypeUnknown,
+                     @"network_info": self->_statusDeprecated ?: RCTReachabilityStateUnknown});
+    self->_firstTimeReachability = nil;
+    self->_resolve = nil;
+  }
+
+  if (didSetReachabilityFlags && self->_isObserving) {
     [self sendEventWithName:@"networkStatusDidChange" body:@{@"connectionType": self->_connectionType,
                                                              @"effectiveConnectionType": self->_effectiveConnectionType,
                                                              @"network_info": self->_statusDeprecated}];
@@ -92,6 +105,16 @@ - (void)stopObserving
   }
 }
 
+- (void)dealloc
+{
+  if (_firstTimeReachability) {
+    SCNetworkReachabilityUnscheduleFromRunLoop(self->_firstTimeReachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
+    CFRelease(self->_firstTimeReachability);
+    _firstTimeReachability = nil;
+    _resolve = nil;
+  }
+}
+
 - (SCNetworkReachabilityRef)getReachabilityRef
 {
   SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, _host.UTF8String ?: "apple.com");
@@ -163,12 +186,14 @@ - (BOOL)setReachabilityStatus:(SCNetworkReachabilityFlags)flags
 RCT_EXPORT_METHOD(getCurrentConnectivity:(RCTPromiseResolveBlock)resolve
                   reject:(__unused RCTPromiseRejectBlock)reject)
 {
-  SCNetworkReachabilityRef reachability = [self getReachabilityRef];
-  SCNetworkReachabilityUnscheduleFromRunLoop(reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
-  CFRelease(reachability);
-  resolve(@{@"connectionType": _connectionType ?: RCTConnectionTypeUnknown,
-            @"effectiveConnectionType": _effectiveConnectionType ?: RCTEffectiveConnectionTypeUnknown,
-            @"network_info": _statusDeprecated ?: RCTReachabilityStateUnknown});
+  if (_firstTimeReachability) {
+    SCNetworkReachabilityUnscheduleFromRunLoop(self->_firstTimeReachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
+    CFRelease(self->_firstTimeReachability);
+    _firstTimeReachability = nil;
+    _resolve = nil;
+  }
+  _firstTimeReachability = [self getReachabilityRef];
+  _resolve = resolve;
 }
 
 @end
diff --git a/Libraries/Network/RCTNetworkTask.h b/Libraries/Network/RCTNetworkTask.h
index 5d54adaf4ffdfd..430d5d01edf66c 100644
--- a/Libraries/Network/RCTNetworkTask.h
+++ b/Libraries/Network/RCTNetworkTask.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTNetworkTask.m b/Libraries/Network/RCTNetworkTask.m
index e13b3f6328b0e6..65be2871cc7448 100644
--- a/Libraries/Network/RCTNetworkTask.m
+++ b/Libraries/Network/RCTNetworkTask.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTNetworking.android.js b/Libraries/Network/RCTNetworking.android.js
index 85db7ed6f46550..f58e00d5571fb9 100644
--- a/Libraries/Network/RCTNetworking.android.js
+++ b/Libraries/Network/RCTNetworking.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTNetworking.h b/Libraries/Network/RCTNetworking.h
index 463dc8f988a107..1783d3af4a6d92 100644
--- a/Libraries/Network/RCTNetworking.h
+++ b/Libraries/Network/RCTNetworking.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTNetworking.ios.js b/Libraries/Network/RCTNetworking.ios.js
index 83f8339ed64a95..b41e63cd7b5e59 100644
--- a/Libraries/Network/RCTNetworking.ios.js
+++ b/Libraries/Network/RCTNetworking.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm
index e7e5ad88c6a8a3..e153fbda972901 100644
--- a/Libraries/Network/RCTNetworking.mm
+++ b/Libraries/Network/RCTNetworking.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -50,6 +50,12 @@ @implementation RCTHTTPFormDataHelper
   const char *boundaryChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.";
 
   char *bytes = (char*)malloc(boundaryLength);
+  if (!bytes) {
+    // CWE - 391 : Unchecked error condition
+    // https://www.cvedetails.com/cwe-details/391/Unchecked-Error-Condition.html
+    // https://eli.thegreenplace.net/2009/10/30/handling-out-of-memory-conditions-in-c
+    abort();
+  }
   size_t charCount = strlen(boundaryChars);
   for (int i = 0; i < boundaryLength; i++) {
     bytes[i] = boundaryChars[arc4random_uniform((u_int32_t)charCount)];
diff --git a/Libraries/Network/XHRInterceptor.js b/Libraries/Network/XHRInterceptor.js
index ced48d39100589..f2ad119397d4b8 100644
--- a/Libraries/Network/XHRInterceptor.js
+++ b/Libraries/Network/XHRInterceptor.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/XMLHttpRequest.js b/Libraries/Network/XMLHttpRequest.js
index e8be40a0ac6540..7267b6d7192738 100644
--- a/Libraries/Network/XMLHttpRequest.js
+++ b/Libraries/Network/XMLHttpRequest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -246,6 +246,8 @@ class XMLHttpRequest extends EventTarget(...XHR_EVENTS) {
       case 'blob':
         if (typeof this._response === 'object' && this._response) {
           this._cachedResponse = BlobManager.createFromOptions(this._response);
+        } else if (this._response === '') {
+          this._cachedResponse = null;
         } else {
           throw new Error(`Invalid response for blob: ${this._response}`);
         }
@@ -522,6 +524,8 @@ class XMLHttpRequest extends EventTarget(...XHR_EVENTS) {
       this._url,
       this._headers,
       data,
+      /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+       * when making Flow check .android.js files. */
       nativeResponseType,
       incrementalEvents,
       this.timeout,
diff --git a/Libraries/Network/__tests__/FormData-test.js b/Libraries/Network/__tests__/FormData-test.js
index 7831a1220c660f..1727928c84a570 100644
--- a/Libraries/Network/__tests__/FormData-test.js
+++ b/Libraries/Network/__tests__/FormData-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/__tests__/XMLHttpRequest-test.js b/Libraries/Network/__tests__/XMLHttpRequest-test.js
index 369fdcb3c63a0c..9a5d7a590cc784 100644
--- a/Libraries/Network/__tests__/XMLHttpRequest-test.js
+++ b/Libraries/Network/__tests__/XMLHttpRequest-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/convertRequestBody.js b/Libraries/Network/convertRequestBody.js
index 84cc9c569078d2..ef6129bb288074 100644
--- a/Libraries/Network/convertRequestBody.js
+++ b/Libraries/Network/convertRequestBody.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Network/fetch.js b/Libraries/Network/fetch.js
index db029ae09987fb..66687e70de2035 100644
--- a/Libraries/Network/fetch.js
+++ b/Libraries/Network/fetch.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Performance/PureComponentDebug.js b/Libraries/Performance/PureComponentDebug.js
index c06dbbb71431b1..1de303bc425300 100644
--- a/Libraries/Performance/PureComponentDebug.js
+++ b/Libraries/Performance/PureComponentDebug.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Performance/QuickPerformanceLogger.js b/Libraries/Performance/QuickPerformanceLogger.js
index abc16ab45fb2a4..2fdafbb8481689 100644
--- a/Libraries/Performance/QuickPerformanceLogger.js
+++ b/Libraries/Performance/QuickPerformanceLogger.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Performance/SamplingProfiler.js b/Libraries/Performance/SamplingProfiler.js
index 6dcda029c5505d..0c09e1c6caf6bb 100644
--- a/Libraries/Performance/SamplingProfiler.js
+++ b/Libraries/Performance/SamplingProfiler.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Performance/Systrace.js b/Libraries/Performance/Systrace.js
index 19105ad3039719..2edcd224202039 100644
--- a/Libraries/Performance/Systrace.js
+++ b/Libraries/Performance/Systrace.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/PermissionsAndroid/PermissionsAndroid.js b/Libraries/PermissionsAndroid/PermissionsAndroid.js
index 123e6bfdd0919b..5974b294acdbff 100644
--- a/Libraries/PermissionsAndroid/PermissionsAndroid.js
+++ b/Libraries/PermissionsAndroid/PermissionsAndroid.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Promise.js b/Libraries/Promise.js
index 2581435a619445..0a277621546f81 100644
--- a/Libraries/Promise.js
+++ b/Libraries/Promise.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/PushNotificationIOS/PushNotificationIOS.js b/Libraries/PushNotificationIOS/PushNotificationIOS.js
index 0b66fe4d9b6400..572caf1fe684f3 100644
--- a/Libraries/PushNotificationIOS/PushNotificationIOS.js
+++ b/Libraries/PushNotificationIOS/PushNotificationIOS.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
index 8f19ede508a7d7..dc16ab488405e0 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
index 77aff3cbe81fa0..b0280744ed4105 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h
index 98e7f9ce2c1c34..661f5622ba2d80 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m
index 9c500274942718..ae83a48d3df6ef 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h
index 21e55d847d2715..501d5b6459078e 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
index 40bc79a085926b..ac66a147c688d2 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/RCTTest/RCTSnapshotManager.h b/Libraries/RCTTest/RCTSnapshotManager.h
index de7ecc818c49b6..8b03ca4cbd201c 100644
--- a/Libraries/RCTTest/RCTSnapshotManager.h
+++ b/Libraries/RCTTest/RCTSnapshotManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/RCTTest/RCTSnapshotManager.m b/Libraries/RCTTest/RCTSnapshotManager.m
index 5f1d97337cbfa2..4536bea7d1b579 100644
--- a/Libraries/RCTTest/RCTSnapshotManager.m
+++ b/Libraries/RCTTest/RCTSnapshotManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/RCTTest/RCTTestModule.h b/Libraries/RCTTest/RCTTestModule.h
index b658a76c1fca9e..42b003664ba6ed 100644
--- a/Libraries/RCTTest/RCTTestModule.h
+++ b/Libraries/RCTTest/RCTTestModule.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/RCTTest/RCTTestModule.m b/Libraries/RCTTest/RCTTestModule.m
index 4f44c4c40c9e68..e4c5c1a9881ecf 100644
--- a/Libraries/RCTTest/RCTTestModule.m
+++ b/Libraries/RCTTest/RCTTestModule.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/RCTTest/RCTTestRunner.h b/Libraries/RCTTest/RCTTestRunner.h
index 39e032650e1477..3f7749086c8037 100644
--- a/Libraries/RCTTest/RCTTestRunner.h
+++ b/Libraries/RCTTest/RCTTestRunner.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -34,7 +34,12 @@
 [[RCTTestRunner alloc] initWithApp:(app__) \
                 referenceDirectory:@FB_REFERENCE_IMAGE_DIR \
                     moduleProvider:(moduleProvider__) \
-                    scriptURL: scriptURL__]
+                         scriptURL: scriptURL__]
+
+#define RCTInitRunnerForAppWithDelegate(app__, bridgeDelegate__) \
+[[RCTTestRunner alloc] initWithApp:(app__) \
+                referenceDirectory:@FB_REFERENCE_IMAGE_DIR \
+                    bridgeDelegate:(bridgeDelegate__)]
 
 @protocol RCTBridgeModule;
 @class RCTBridge;
@@ -64,11 +69,25 @@
  * @param app The path to the app bundle without suffixes, e.g. IntegrationTests/IntegrationTestsApp
  * @param referenceDirectory The path for snapshot references images.
  * @param block A block that returns an array of extra modules to be used by the test runner.
+ * @param scriptURL URL to the JS bundle to use.
+ * @param bridgeDelegate Custom delegate for bridge activities.
  */
 - (instancetype)initWithApp:(NSString *)app
          referenceDirectory:(NSString *)referenceDirectory
              moduleProvider:(RCTBridgeModuleListProvider)block
-                  scriptURL:(NSURL *)scriptURL NS_DESIGNATED_INITIALIZER;
+                  scriptURL:(NSURL *)scriptURL
+             bridgeDelegate:(id<RCTBridgeDelegate>)bridgeDelegate NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)initWithApp:(NSString *)app
+         referenceDirectory:(NSString *)referenceDirectory
+             moduleProvider:(RCTBridgeModuleListProvider)block
+                  scriptURL:(NSURL *)scriptURL;
+
+- (instancetype)initWithApp:(NSString *)app
+         referenceDirectory:(NSString *)referenceDirectory
+             bridgeDelegate:(id<RCTBridgeDelegate>)bridgeDelegate;
+
+- (NSURL *)defaultScriptURL;
 
 /**
  * Simplest runTest function simply mounts the specified JS module with no
diff --git a/Libraries/RCTTest/RCTTestRunner.m b/Libraries/RCTTest/RCTTestRunner.m
index 315371f4abfbf4..74ae98d6108da6 100644
--- a/Libraries/RCTTest/RCTTestRunner.m
+++ b/Libraries/RCTTest/RCTTestRunner.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -25,12 +25,37 @@ @implementation RCTTestRunner
   FBSnapshotTestController *_testController;
   RCTBridgeModuleListProvider _moduleProvider;
   NSString *_appPath;
+  __weak id<RCTBridgeDelegate> _bridgeDelegate;
 }
 
 - (instancetype)initWithApp:(NSString *)app
          referenceDirectory:(NSString *)referenceDirectory
              moduleProvider:(RCTBridgeModuleListProvider)block
                   scriptURL:(NSURL *)scriptURL
+{
+  return [self initWithApp:app
+        referenceDirectory:referenceDirectory
+            moduleProvider:block
+                 scriptURL:scriptURL
+            bridgeDelegate:nil];
+}
+
+- (instancetype)initWithApp:(NSString *)app
+         referenceDirectory:(NSString *)referenceDirectory
+             bridgeDelegate:(id<RCTBridgeDelegate>)bridgeDelegate
+{
+  return [self initWithApp:app
+        referenceDirectory:referenceDirectory
+            moduleProvider:nil
+                 scriptURL:nil
+            bridgeDelegate:bridgeDelegate];
+}
+
+- (instancetype)initWithApp:(NSString *)app
+         referenceDirectory:(NSString *)referenceDirectory
+             moduleProvider:(RCTBridgeModuleListProvider)block
+                  scriptURL:(NSURL *)scriptURL
+             bridgeDelegate:(id<RCTBridgeDelegate>)bridgeDelegate
 {
   RCTAssertParam(app);
   RCTAssertParam(referenceDirectory);
@@ -46,10 +71,11 @@ - (instancetype)initWithApp:(NSString *)app
     _testController.referenceImagesDirectory = referenceDirectory;
     _moduleProvider = [block copy];
     _appPath = app;
+    _bridgeDelegate = bridgeDelegate;
 
     if (scriptURL != nil) {
       _scriptURL = scriptURL;
-    } else {
+    } else if (!_bridgeDelegate) {
       [self updateScript];
     }
   }
@@ -58,13 +84,18 @@ - (instancetype)initWithApp:(NSString *)app
 
 RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
-- (void)updateScript
+- (NSURL *)defaultScriptURL
 {
   if (getenv("CI_USE_PACKAGER") || _useBundler) {
-    _scriptURL = [NSURL URLWithString:[NSString stringWithFormat:@"http://localhost:8081/%@.bundle?platform=ios&dev=true", _appPath]];
+    return [NSURL URLWithString:[NSString stringWithFormat:@"http://localhost:8081/%@.bundle?platform=ios&dev=true", _appPath]];
   } else {
-    _scriptURL = [[NSBundle bundleForClass:[RCTBridge class]] URLForResource:@"main" withExtension:@"jsbundle"];
+    return [[NSBundle bundleForClass:[RCTBridge class]] URLForResource:@"main" withExtension:@"jsbundle"];
   }
+}
+
+- (void)updateScript
+{
+  _scriptURL = [self defaultScriptURL];
   RCTAssert(_scriptURL != nil, @"No scriptURL set");
 }
 
@@ -115,23 +146,28 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
 {
   __weak RCTBridge *batchedBridge;
   NSNumber *rootTag;
-
-  @autoreleasepool {
-    __block NSMutableArray<NSString *> *errors = nil;
-    RCTLogFunction defaultLogFunction = RCTGetLogFunction();
-    RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
-      defaultLogFunction(level, source, fileName, lineNumber, message);
-      if (level >= RCTLogLevelError) {
-        if (errors == nil) {
-          errors = [NSMutableArray new];
-        }
-        [errors addObject:message];
+  RCTLogFunction defaultLogFunction = RCTGetLogFunction();
+  // Catch all error logs, that are equivalent to redboxes in dev mode.
+  __block NSMutableArray<NSString *> *errors = nil;
+  RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
+    defaultLogFunction(level, source, fileName, lineNumber, message);
+    if (level >= RCTLogLevelError) {
+      if (errors == nil) {
+        errors = [NSMutableArray new];
       }
-    });
+      [errors addObject:message];
+    }
+  });
 
-    RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:_scriptURL
-                                              moduleProvider:_moduleProvider
-                                               launchOptions:nil];
+  @autoreleasepool {
+    RCTBridge *bridge;
+    if (_bridgeDelegate) {
+      bridge = [[RCTBridge alloc] initWithDelegate:_bridgeDelegate launchOptions:nil];
+    } else {
+      bridge= [[RCTBridge alloc] initWithBundleURL:_scriptURL
+                                    moduleProvider:_moduleProvider
+                                     launchOptions:nil];
+    }
     [bridge.devSettings setIsDebuggingRemotely:_useJSDebugger];
     batchedBridge = [bridge batchedBridge];
 
@@ -172,7 +208,16 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
       testModule.view = nil;
     }
 
-    RCTSetLogFunction(defaultLogFunction);
+    // From this point on catch only fatal errors.
+    RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
+      defaultLogFunction(level, source, fileName, lineNumber, message);
+      if (level >= RCTLogLevelFatal) {
+        if (errors == nil) {
+          errors = [NSMutableArray new];
+        }
+        [errors addObject:message];
+      }
+    });
 
 #if RCT_DEV
     NSArray<UIView *> *nonLayoutSubviews = [vc.view.subviews filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id subview, NSDictionary *bindings) {
@@ -208,7 +253,10 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
     [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
     [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
   }
+  RCTAssert(errors == nil, @"RedBox errors during bridge invalidation: %@", errors);
   RCTAssert(batchedBridge == nil, @"Bridge should be deallocated after the test");
+
+  RCTSetLogFunction(defaultLogFunction);
 }
 
 @end
diff --git a/Libraries/RCTTest/SnapshotViewIOS.android.js b/Libraries/RCTTest/SnapshotViewIOS.android.js
index 260d559929796f..7a00b6636cf664 100644
--- a/Libraries/RCTTest/SnapshotViewIOS.android.js
+++ b/Libraries/RCTTest/SnapshotViewIOS.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/RCTTest/SnapshotViewIOS.ios.js b/Libraries/RCTTest/SnapshotViewIOS.ios.js
index 9fbc70302cf460..ef2bbdb687017a 100644
--- a/Libraries/RCTTest/SnapshotViewIOS.ios.js
+++ b/Libraries/RCTTest/SnapshotViewIOS.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,37 +11,38 @@
 'use strict';
 
 const React = require('React');
-const PropTypes = require('prop-types');
 const StyleSheet = require('StyleSheet');
-const {TestModule} = require('NativeModules');
 const UIManager = require('UIManager');
 const View = require('View');
 
-const ViewPropTypes = require('ViewPropTypes');
-
 const requireNativeComponent = require('requireNativeComponent');
 
+const {TestModule} = require('NativeModules');
+
+import type {SyntheticEvent} from 'CoreEventTypes';
+import type {ViewProps} from 'ViewPropTypes';
+
 // Verify that RCTSnapshot is part of the UIManager since it is only loaded
 // if you have linked against RCTTest like in tests, otherwise we will have
 // a warning printed out
-const RCTSnapshot = UIManager.RCTSnapshot
+const RCTSnapshot = UIManager.getViewManagerConfig('RCTSnapshot')
   ? requireNativeComponent('RCTSnapshot')
   : View;
 
-class SnapshotViewIOS extends React.Component<{
-  onSnapshotReady?: Function,
-  testIdentifier?: string,
-}> {
-  // $FlowFixMe(>=0.41.0)
-  static propTypes = {
-    ...ViewPropTypes,
-    // A callback when the Snapshot view is ready to be compared
-    onSnapshotReady: PropTypes.func,
-    // A name to identify the individual instance to the SnapshotView
-    testIdentifier: PropTypes.string,
-  };
+type SnapshotReadyEvent = SyntheticEvent<
+  $ReadOnly<{
+    testIdentifier: string,
+  }>,
+>;
+
+type Props = $ReadOnly<{|
+  ...ViewProps,
+  onSnapshotReady?: ?(event: SnapshotReadyEvent) => mixed,
+  testIdentifier?: ?string,
+|}>;
 
-  onDefaultAction = (event: Object) => {
+class SnapshotViewIOS extends React.Component<Props> {
+  onDefaultAction = (event: SnapshotReadyEvent) => {
     TestModule.verifySnapshot(TestModule.markTestPassed);
   };
 
diff --git a/Libraries/ReactNative/AppContainer.js b/Libraries/ReactNative/AppContainer.js
index 58ffb095fe5360..32c55ff7e8e85a 100644
--- a/Libraries/ReactNative/AppContainer.js
+++ b/Libraries/ReactNative/AppContainer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ReactNative/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js
index a2fdf91e632d45..1678f18368b0ee 100644
--- a/Libraries/ReactNative/AppRegistry.js
+++ b/Libraries/ReactNative/AppRegistry.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ReactNative/FabricUIManager.js b/Libraries/ReactNative/FabricUIManager.js
index 20c855b3deafe1..b467ed23c846c6 100644
--- a/Libraries/ReactNative/FabricUIManager.js
+++ b/Libraries/ReactNative/FabricUIManager.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ReactNative/I18nManager.js b/Libraries/ReactNative/I18nManager.js
index 5212d1100dac92..40684614429b20 100644
--- a/Libraries/ReactNative/I18nManager.js
+++ b/Libraries/ReactNative/I18nManager.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 'use strict';
diff --git a/Libraries/ReactNative/ReactFabricIndicator.js b/Libraries/ReactNative/ReactFabricIndicator.js
new file mode 100644
index 00000000000000..2c8d4cb6f6ac04
--- /dev/null
+++ b/Libraries/ReactNative/ReactFabricIndicator.js
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const View = require('View');
+
+function ReactFabricIndicator(): React.Node {
+  return (
+    <View style={styles.container}>
+      <Text style={styles.text}>FABRIC</Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    alignItems: 'center',
+    justifyContent: 'center',
+    backgroundColor: 'rgba(0,0,0, 0.25)',
+    position: 'absolute',
+    top: 0,
+    right: 0,
+    padding: 2,
+  },
+  text: {
+    fontSize: 6,
+    color: '#ffffff',
+  },
+});
+
+module.exports = ReactFabricIndicator;
diff --git a/Libraries/ReactNative/ReactFabricInternals.js b/Libraries/ReactNative/ReactFabricInternals.js
index 47855a8b7c0c29..e78e5dbeecbf10 100644
--- a/Libraries/ReactNative/ReactFabricInternals.js
+++ b/Libraries/ReactNative/ReactFabricInternals.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ReactNative/UIManager.js b/Libraries/ReactNative/UIManager.js
index d137f757b326f7..ae48eaf2f0532a 100644
--- a/Libraries/ReactNative/UIManager.js
+++ b/Libraries/ReactNative/UIManager.js
@@ -1,21 +1,23 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 'use strict';
 
 const NativeModules = require('NativeModules');
 const Platform = require('Platform');
+const UIManagerProperties = require('UIManagerProperties');
 
 const defineLazyObjectProperty = require('defineLazyObjectProperty');
 const invariant = require('fbjs/lib/invariant');
 
 const {UIManager} = NativeModules;
+const viewManagerConfigs = {};
 
 invariant(
   UIManager,
@@ -35,6 +37,81 @@ UIManager.takeSnapshot = function() {
       'Use ReactNative.takeSnapshot instead.',
   );
 };
+const triedLoadingConfig = new Set();
+UIManager.getViewManagerConfig = function(viewManagerName: string) {
+  if (
+    viewManagerConfigs[viewManagerName] === undefined &&
+    UIManager.getConstantsForViewManager
+  ) {
+    try {
+      viewManagerConfigs[
+        viewManagerName
+      ] = UIManager.getConstantsForViewManager(viewManagerName);
+    } catch (e) {
+      viewManagerConfigs[viewManagerName] = null;
+    }
+  }
+
+  const config = viewManagerConfigs[viewManagerName];
+  if (config) {
+    return config;
+  }
+
+  // If we're in the Chrome Debugger, let's not even try calling the sync
+  // method.
+  if (__DEV__) {
+    if (!global.nativeCallSyncHook) {
+      return config;
+    }
+  }
+
+  if (UIManager.lazilyLoadView && !triedLoadingConfig.has(viewManagerName)) {
+    const result = UIManager.lazilyLoadView(viewManagerName);
+    triedLoadingConfig.add(viewManagerName);
+    if (result.viewConfig) {
+      UIManager[viewManagerName] = result.viewConfig;
+      lazifyViewManagerConfig(viewManagerName);
+    }
+  }
+
+  return viewManagerConfigs[viewManagerName];
+};
+
+function lazifyViewManagerConfig(viewName) {
+  const viewConfig = UIManager[viewName];
+  if (viewConfig.Manager) {
+    viewManagerConfigs[viewName] = viewConfig;
+    defineLazyObjectProperty(viewConfig, 'Constants', {
+      get: () => {
+        const viewManager = NativeModules[viewConfig.Manager];
+        const constants = {};
+        viewManager &&
+          Object.keys(viewManager).forEach(key => {
+            const value = viewManager[key];
+            if (typeof value !== 'function') {
+              constants[key] = value;
+            }
+          });
+        return constants;
+      },
+    });
+    defineLazyObjectProperty(viewConfig, 'Commands', {
+      get: () => {
+        const viewManager = NativeModules[viewConfig.Manager];
+        const commands = {};
+        let index = 0;
+        viewManager &&
+          Object.keys(viewManager).forEach(key => {
+            const value = viewManager[key];
+            if (typeof value === 'function') {
+              commands[key] = index++;
+            }
+          });
+        return commands;
+      },
+    });
+  }
+}
 
 /**
  * Copies the ViewManager constants and commands into UIManager. This is
@@ -43,38 +120,7 @@ UIManager.takeSnapshot = function() {
  */
 if (Platform.OS === 'ios') {
   Object.keys(UIManager).forEach(viewName => {
-    const viewConfig = UIManager[viewName];
-    if (viewConfig.Manager) {
-      defineLazyObjectProperty(viewConfig, 'Constants', {
-        get: () => {
-          const viewManager = NativeModules[viewConfig.Manager];
-          const constants = {};
-          viewManager &&
-            Object.keys(viewManager).forEach(key => {
-              const value = viewManager[key];
-              if (typeof value !== 'function') {
-                constants[key] = value;
-              }
-            });
-          return constants;
-        },
-      });
-      defineLazyObjectProperty(viewConfig, 'Commands', {
-        get: () => {
-          const viewManager = NativeModules[viewConfig.Manager];
-          const commands = {};
-          let index = 0;
-          viewManager &&
-            Object.keys(viewManager).forEach(key => {
-              const value = viewManager[key];
-              if (typeof value === 'function') {
-                commands[key] = index++;
-              }
-            });
-          return commands;
-        },
-      });
-    }
+    lazifyViewManagerConfig(viewName);
   });
 } else if (UIManager.ViewManagerNames) {
   // We want to add all the view managers to the UIManager.
@@ -104,4 +150,23 @@ if (Platform.OS === 'ios') {
   if (global.__makePartial) global.__makePartial(UIManager);
 }
 
+if (__DEV__) {
+  Object.keys(UIManager).forEach(viewManagerName => {
+    if (!UIManagerProperties.includes(viewManagerName)) {
+      if (!viewManagerConfigs[viewManagerName]) {
+        viewManagerConfigs[viewManagerName] = UIManager[viewManagerName];
+      }
+      defineLazyObjectProperty(UIManager, viewManagerName, {
+        get: () => {
+          console.warn(
+            `Accessing view manager configs directly off UIManager via UIManager['${viewManagerName}'] ` +
+              `is no longer supported. Use UIManager.getViewManagerConfig('${viewManagerName}') instead.`,
+          );
+          return UIManager.getViewManagerConfig(viewManagerName);
+        },
+      });
+    }
+  });
+}
+
 module.exports = UIManager;
diff --git a/Libraries/ReactNative/UIManagerProperties.js b/Libraries/ReactNative/UIManagerProperties.js
new file mode 100644
index 00000000000000..27956f18c88a0a
--- /dev/null
+++ b/Libraries/ReactNative/UIManagerProperties.js
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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';
+
+/**
+ * The list of non-ViewManager related UIManager properties.
+ *
+ * In an effort to improve startup performance by lazily loading view managers,
+ * the interface to access view managers will change from
+ * UIManager['viewManagerName'] to UIManager.getViewManagerConfig('viewManagerName').
+ * By using a function call instead of a property access, the UIManager will
+ * be able to initialize and load the required view manager from native
+ * synchronously. All of React Native's core components have been updated to
+ * use getViewManagerConfig(). For the next few releases, any usage of
+ * UIManager['viewManagerName'] will result in a warning. Because React Native
+ * does not support Proxy objects, a view manager access is implied if any of
+ * UIManager's properties that are not one of the properties below is being
+ * accessed. Once UIManager property accesses for view managers has been fully
+ * deprecated, this file will also be removed.
+ */
+module.exports = [
+  'clearJSResponder',
+  'configureNextLayoutAnimation',
+  'createView',
+  'dismissPopupMenu',
+  'dispatchViewManagerCommand',
+  'findSubviewIn',
+  'getConstantsForViewManager',
+  'getDefaultEventTypes',
+  'manageChildren',
+  'measure',
+  'measureInWindow',
+  'measureLayout',
+  'measureLayoutRelativeToParent',
+  'playTouchSound',
+  'removeRootView',
+  'removeSubviewsFromContainerWithID',
+  'replaceExistingNonRootView',
+  'sendAccessibilityEvent',
+  'setChildren',
+  'setJSResponder',
+  'setLayoutAnimationEnabledExperimental',
+  'showPopupMenu',
+  'updateView',
+  'viewIsDescendantOf',
+  'PopupMenu',
+  'LazyViewManagersEnabled',
+  'ViewManagerNames',
+  'StyleConstants',
+  'AccessibilityEventTypes',
+  'UIView',
+  '__takeSnapshot',
+  'takeSnapshot',
+  'getViewManagerConfig',
+  'measureViewsInRect',
+  'blur',
+  'focus',
+  'genericBubblingEventTypes',
+  'genericDirectEventTypes',
+  'lazilyLoadView',
+];
diff --git a/Libraries/ReactNative/UIManagerStatTracker.js b/Libraries/ReactNative/UIManagerStatTracker.js
index f0f47f1b3e227d..78e3e0b149df78 100644
--- a/Libraries/ReactNative/UIManagerStatTracker.js
+++ b/Libraries/ReactNative/UIManagerStatTracker.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 'use strict';
diff --git a/Libraries/ReactNative/getNativeComponentAttributes.js b/Libraries/ReactNative/getNativeComponentAttributes.js
new file mode 100644
index 00000000000000..6a8c5491404c40
--- /dev/null
+++ b/Libraries/ReactNative/getNativeComponentAttributes.js
@@ -0,0 +1,188 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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';
+
+const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
+const UIManager = require('UIManager');
+
+const insetsDiffer = require('insetsDiffer');
+const matricesDiffer = require('matricesDiffer');
+const pointsDiffer = require('pointsDiffer');
+const processColor = require('processColor');
+const resolveAssetSource = require('resolveAssetSource');
+const sizesDiffer = require('sizesDiffer');
+const invariant = require('fbjs/lib/invariant');
+const warning = require('fbjs/lib/warning');
+
+function getNativeComponentAttributes(uiViewClassName: string) {
+  const viewConfig = UIManager.getViewManagerConfig(uiViewClassName);
+
+  invariant(
+    viewConfig != null && viewConfig.NativeProps != null,
+    'requireNativeComponent: "%s" was not found in the UIManager.',
+    uiViewClassName,
+  );
+
+  // TODO: This seems like a whole lot of runtime initialization for every
+  // native component that can be either avoided or simplified.
+  let {baseModuleName, bubblingEventTypes, directEventTypes} = viewConfig;
+  let nativeProps = viewConfig.NativeProps;
+  while (baseModuleName) {
+    const baseModule = UIManager.getViewManagerConfig(baseModuleName);
+    if (!baseModule) {
+      warning(false, 'Base module "%s" does not exist', baseModuleName);
+      baseModuleName = null;
+    } else {
+      bubblingEventTypes = {
+        ...baseModule.bubblingEventTypes,
+        ...bubblingEventTypes,
+      };
+      directEventTypes = {
+        ...baseModule.directEventTypes,
+        ...directEventTypes,
+      };
+      nativeProps = {
+        ...baseModule.NativeProps,
+        ...nativeProps,
+      };
+      baseModuleName = baseModule.baseModuleName;
+    }
+  }
+
+  const validAttributes = {};
+
+  for (const key in nativeProps) {
+    const typeName = nativeProps[key];
+    const diff = getDifferForType(typeName);
+    const process = getProcessorForType(typeName);
+
+    validAttributes[key] =
+      diff == null && process == null ? true : {diff, process};
+  }
+
+  // Unfortunately, the current setup declares style properties as top-level
+  // props. This makes it so we allow style properties in the `style` prop.
+  // TODO: Move style properties into a `style` prop and disallow them as
+  // top-level props on the native side.
+  validAttributes.style = ReactNativeStyleAttributes;
+
+  Object.assign(viewConfig, {
+    uiViewClassName,
+    validAttributes,
+    bubblingEventTypes,
+    directEventTypes,
+  });
+
+  if (!hasAttachedDefaultEventTypes) {
+    attachDefaultEventTypes(viewConfig);
+    hasAttachedDefaultEventTypes = true;
+  }
+
+  return viewConfig;
+}
+
+// TODO: Figure out how this makes sense. We're using a global boolean to only
+// initialize this on the first eagerly initialized native component.
+let hasAttachedDefaultEventTypes = false;
+function attachDefaultEventTypes(viewConfig: any) {
+  // This is supported on UIManager platforms (ex: Android),
+  // as lazy view managers are not implemented for all platforms.
+  // See [UIManager] for details on constants and implementations.
+  if (UIManager.ViewManagerNames || UIManager.LazyViewManagersEnabled) {
+    // Lazy view managers enabled.
+    viewConfig = merge(viewConfig, UIManager.getDefaultEventTypes());
+  } else {
+    viewConfig.bubblingEventTypes = merge(
+      viewConfig.bubblingEventTypes,
+      UIManager.genericBubblingEventTypes,
+    );
+    viewConfig.directEventTypes = merge(
+      viewConfig.directEventTypes,
+      UIManager.genericDirectEventTypes,
+    );
+  }
+}
+
+// TODO: Figure out how to avoid all this runtime initialization cost.
+function merge(destination: ?Object, source: ?Object): ?Object {
+  if (!source) {
+    return destination;
+  }
+  if (!destination) {
+    return source;
+  }
+
+  for (const key in source) {
+    if (!source.hasOwnProperty(key)) {
+      continue;
+    }
+
+    let sourceValue = source[key];
+    if (destination.hasOwnProperty(key)) {
+      const destinationValue = destination[key];
+      if (
+        typeof sourceValue === 'object' &&
+        typeof destinationValue === 'object'
+      ) {
+        sourceValue = merge(destinationValue, sourceValue);
+      }
+    }
+    destination[key] = sourceValue;
+  }
+  return destination;
+}
+
+function getDifferForType(
+  typeName: string,
+): ?(prevProp: any, nextProp: any) => boolean {
+  switch (typeName) {
+    // iOS Types
+    case 'CATransform3D':
+      return matricesDiffer;
+    case 'CGPoint':
+      return pointsDiffer;
+    case 'CGSize':
+      return sizesDiffer;
+    case 'UIEdgeInsets':
+      return insetsDiffer;
+    // Android Types
+    // (not yet implemented)
+  }
+  return null;
+}
+
+function getProcessorForType(typeName: string): ?(nextProp: any) => any {
+  switch (typeName) {
+    // iOS Types
+    case 'CGColor':
+    case 'UIColor':
+      return processColor;
+    case 'CGColorArray':
+    case 'UIColorArray':
+      return processColorArray;
+    case 'CGImage':
+    case 'UIImage':
+    case 'RCTImageSource':
+      return resolveAssetSource;
+    // Android Types
+    case 'Color':
+      return processColor;
+    case 'ColorArray':
+      return processColorArray;
+  }
+  return null;
+}
+
+function processColorArray(colors: ?Array<any>): ?Array<?number> {
+  return colors == null ? null : colors.map(processColor);
+}
+
+module.exports = getNativeComponentAttributes;
diff --git a/Libraries/ReactNative/queryLayoutByID.js b/Libraries/ReactNative/queryLayoutByID.js
index 6703612959a968..62fe0b3f0e28ed 100644
--- a/Libraries/ReactNative/queryLayoutByID.js
+++ b/Libraries/ReactNative/queryLayoutByID.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/ReactNative/renderApplication.js b/Libraries/ReactNative/renderApplication.js
index 7d699f754651f0..7be946ec8b4db9 100644
--- a/Libraries/ReactNative/renderApplication.js
+++ b/Libraries/ReactNative/renderApplication.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,6 +12,7 @@
 
 const AppContainer = require('AppContainer');
 const React = require('React');
+const ReactFabricIndicator = require('ReactFabricIndicator');
 
 const invariant = require('fbjs/lib/invariant');
 
@@ -24,12 +25,16 @@ function renderApplication<Props: Object>(
   rootTag: any,
   WrapperComponent?: ?React.ComponentType<*>,
   fabric?: boolean,
+  showFabricIndicator?: boolean,
 ) {
   invariant(rootTag, 'Expect to have a valid rootTag, instead got ', rootTag);
 
   let renderable = (
     <AppContainer rootTag={rootTag} WrapperComponent={WrapperComponent}>
       <RootComponent {...initialProps} rootTag={rootTag} />
+      {fabric === true && showFabricIndicator === true ? (
+        <ReactFabricIndicator />
+      ) : null}
     </AppContainer>
   );
 
diff --git a/Libraries/ReactNative/requireNativeComponent.js b/Libraries/ReactNative/requireNativeComponent.js
index dce6a900bb00d1..4cc24d60595150 100644
--- a/Libraries/ReactNative/requireNativeComponent.js
+++ b/Libraries/ReactNative/requireNativeComponent.js
@@ -1,27 +1,17 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 
 'use strict';
 
-const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
-const UIManager = require('UIManager');
-
 const createReactNativeComponentClass = require('createReactNativeComponentClass');
-const insetsDiffer = require('insetsDiffer');
-const matricesDiffer = require('matricesDiffer');
-const pointsDiffer = require('pointsDiffer');
-const processColor = require('processColor');
-const resolveAssetSource = require('resolveAssetSource');
-const sizesDiffer = require('sizesDiffer');
-const invariant = require('fbjs/lib/invariant');
-const warning = require('fbjs/lib/warning');
+const getNativeComponentAttributes = require('getNativeComponentAttributes');
 
 /**
  * Creates values that can be used like React components which represent native
@@ -32,167 +22,8 @@ const warning = require('fbjs/lib/warning');
  *
  */
 const requireNativeComponent = (uiViewClassName: string): string =>
-  createReactNativeComponentClass(uiViewClassName, () => {
-    const viewConfig = UIManager[uiViewClassName];
-
-    invariant(
-      viewConfig != null && viewConfig.NativeProps != null,
-      'requireNativeComponent: "%s" was not found in the UIManager.',
-      uiViewClassName,
-    );
-
-    // TODO: This seems like a whole lot of runtime initialization for every
-    // native component that can be either avoided or simplified.
-    let {baseModuleName, bubblingEventTypes, directEventTypes} = viewConfig;
-    let nativeProps = viewConfig.NativeProps;
-    while (baseModuleName) {
-      const baseModule = UIManager[baseModuleName];
-      if (!baseModule) {
-        warning(false, 'Base module "%s" does not exist', baseModuleName);
-        baseModuleName = null;
-      } else {
-        bubblingEventTypes = {
-          ...baseModule.bubblingEventTypes,
-          ...bubblingEventTypes,
-        };
-        directEventTypes = {
-          ...baseModule.directEventTypes,
-          ...directEventTypes,
-        };
-        nativeProps = {
-          ...baseModule.NativeProps,
-          ...nativeProps,
-        };
-        baseModuleName = baseModule.baseModuleName;
-      }
-    }
-
-    const validAttributes = {};
-
-    for (const key in nativeProps) {
-      const typeName = nativeProps[key];
-      const diff = getDifferForType(typeName);
-      const process = getProcessorForType(typeName);
-
-      validAttributes[key] =
-        diff == null && process == null ? true : {diff, process};
-    }
-
-    // Unfortunately, the current setup declares style properties as top-level
-    // props. This makes it so we allow style properties in the `style` prop.
-    // TODO: Move style properties into a `style` prop and disallow them as
-    // top-level props on the native side.
-    validAttributes.style = ReactNativeStyleAttributes;
-
-    Object.assign(viewConfig, {
-      uiViewClassName,
-      validAttributes,
-      bubblingEventTypes,
-      directEventTypes,
-    });
-
-    if (!hasAttachedDefaultEventTypes) {
-      attachDefaultEventTypes(viewConfig);
-      hasAttachedDefaultEventTypes = true;
-    }
-
-    return viewConfig;
-  });
-
-// TODO: Figure out how this makes sense. We're using a global boolean to only
-// initialize this on the first eagerly initialized native component.
-let hasAttachedDefaultEventTypes = false;
-function attachDefaultEventTypes(viewConfig: any) {
-  // This is supported on UIManager platforms (ex: Android),
-  // as lazy view managers are not implemented for all platforms.
-  // See [UIManager] for details on constants and implementations.
-  if (UIManager.ViewManagerNames) {
-    // Lazy view managers enabled.
-    viewConfig = merge(viewConfig, UIManager.getDefaultEventTypes());
-  } else {
-    viewConfig.bubblingEventTypes = merge(
-      viewConfig.bubblingEventTypes,
-      UIManager.genericBubblingEventTypes,
-    );
-    viewConfig.directEventTypes = merge(
-      viewConfig.directEventTypes,
-      UIManager.genericDirectEventTypes,
-    );
-  }
-}
-
-// TODO: Figure out how to avoid all this runtime initialization cost.
-function merge(destination: ?Object, source: ?Object): ?Object {
-  if (!source) {
-    return destination;
-  }
-  if (!destination) {
-    return source;
-  }
-
-  for (const key in source) {
-    if (!source.hasOwnProperty(key)) {
-      continue;
-    }
-
-    let sourceValue = source[key];
-    if (destination.hasOwnProperty(key)) {
-      const destinationValue = destination[key];
-      if (
-        typeof sourceValue === 'object' &&
-        typeof destinationValue === 'object'
-      ) {
-        sourceValue = merge(destinationValue, sourceValue);
-      }
-    }
-    destination[key] = sourceValue;
-  }
-  return destination;
-}
-
-function getDifferForType(
-  typeName: string,
-): ?(prevProp: any, nextProp: any) => boolean {
-  switch (typeName) {
-    // iOS Types
-    case 'CATransform3D':
-      return matricesDiffer;
-    case 'CGPoint':
-      return pointsDiffer;
-    case 'CGSize':
-      return sizesDiffer;
-    case 'UIEdgeInsets':
-      return insetsDiffer;
-    // Android Types
-    // (not yet implemented)
-  }
-  return null;
-}
-
-function getProcessorForType(typeName: string): ?(nextProp: any) => any {
-  switch (typeName) {
-    // iOS Types
-    case 'CGColor':
-    case 'UIColor':
-      return processColor;
-    case 'CGColorArray':
-    case 'UIColorArray':
-      return processColorArray;
-    case 'CGImage':
-    case 'UIImage':
-    case 'RCTImageSource':
-      return resolveAssetSource;
-    // Android Types
-    case 'Color':
-      return processColor;
-    case 'ColorArray':
-      return processColorArray;
-  }
-  return null;
-}
-
-function processColorArray(colors: ?Array<any>): ?Array<?number> {
-  return colors == null ? null : colors.map(processColor);
-}
+  createReactNativeComponentClass(uiViewClassName, () =>
+    getNativeComponentAttributes(uiViewClassName),
+  );
 
 module.exports = requireNativeComponent;
diff --git a/Libraries/ReactNative/takeSnapshot.js b/Libraries/ReactNative/takeSnapshot.js
index 5c9e248e5e4af7..6227a18e79a702 100644
--- a/Libraries/ReactNative/takeSnapshot.js
+++ b/Libraries/ReactNative/takeSnapshot.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index 7e020bc8087be8..21b691427f48aa 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-ae14317d6810d5b07d01308a2116a707e5e09983
\ No newline at end of file
+4773fdf7cdf5d6d775ad0960f23ee1a830e7b82b
\ No newline at end of file
diff --git a/Libraries/Renderer/oss/ReactFabric-dev.js b/Libraries/Renderer/oss/ReactFabric-dev.js
index c81fac1813cc06..de566d72b49386 100644
--- a/Libraries/Renderer/oss/ReactFabric-dev.js
+++ b/Libraries/Renderer/oss/ReactFabric-dev.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,29 +17,81 @@ if (__DEV__) {
 "use strict";
 
 require("InitializeCore");
-var invariant = require("fbjs/lib/invariant");
-var warning = require("fbjs/lib/warning");
 var ReactNativeViewConfigRegistry = require("ReactNativeViewConfigRegistry");
 var UIManager = require("UIManager");
 var React = require("react");
-var emptyObject = require("fbjs/lib/emptyObject");
 var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
 var deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev");
 var TextInputState = require("TextInputState");
 var FabricUIManager = require("FabricUIManager");
 var checkPropTypes = require("prop-types/checkPropTypes");
+var tracing = require("scheduler/tracing");
 var ExceptionsManager = require("ExceptionsManager");
 
-var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
-  this._hasCaughtError = false;
-  this._caughtError = null;
+/**
+ * Use invariant() to assert state which your program assumes to be true.
+ *
+ * Provide sprintf-style format (only %s is supported) and arguments
+ * to provide information about what broke and what you were
+ * expecting.
+ *
+ * The invariant message will be stripped in production, but the invariant
+ * will remain to ensure logic does not differ in production.
+ */
+
+var validateFormat = function() {};
+
+{
+  validateFormat = function(format) {
+    if (format === undefined) {
+      throw new Error("invariant requires an error message argument");
+    }
+  };
+}
+
+function invariant(condition, format, a, b, c, d, e, f) {
+  validateFormat(format);
+
+  if (!condition) {
+    var error = void 0;
+    if (format === undefined) {
+      error = new Error(
+        "Minified exception occurred; use the non-minified dev environment " +
+          "for the full error message and additional helpful warnings."
+      );
+    } else {
+      var args = [a, b, c, d, e, f];
+      var argIndex = 0;
+      error = new Error(
+        format.replace(/%s/g, function() {
+          return args[argIndex++];
+        })
+      );
+      error.name = "Invariant Violation";
+    }
+
+    error.framesToPop = 1; // we don't care about invariant's own frame
+    throw error;
+  }
+}
+
+var invokeGuardedCallbackImpl = function(
+  name,
+  func,
+  context,
+  a,
+  b,
+  c,
+  d,
+  e,
+  f
+) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
   try {
     func.apply(context, funcArgs);
   } catch (error) {
-    this._caughtError = error;
-    this._hasCaughtError = true;
+    this.onError(error);
   }
 };
 
@@ -108,6 +160,18 @@ var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
       // the error event at all.
       var didError = true;
 
+      // Keeps track of the value of window.event so that we can reset it
+      // during the callback to let user code access window.event in the
+      // browsers that support it.
+      var windowEvent = window.event;
+
+      // Keeps track of the descriptor of window.event to restore it after event
+      // dispatching: https://github.com/facebook/react/issues/13688
+      var windowEventDescriptor = Object.getOwnPropertyDescriptor(
+        window,
+        "event"
+      );
+
       // Create an event handler for our fake event. We will synchronously
       // dispatch our fake event using `dispatchEvent`. Inside the handler, we
       // call the user-provided callback.
@@ -118,6 +182,18 @@ var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
         // nested call would trigger the fake event handlers of any call higher
         // in the stack.
         fakeNode.removeEventListener(evtType, callCallback, false);
+
+        // We check for window.hasOwnProperty('event') to prevent the
+        // window.event assignment in both IE <= 10 as they throw an error
+        // "Member not found" in strict mode, and in Firefox which does not
+        // support window.event.
+        if (
+          typeof window.event !== "undefined" &&
+          window.hasOwnProperty("event")
+        ) {
+          window.event = windowEvent;
+        }
+
         func.apply(context, funcArgs);
         didError = false;
       }
@@ -138,19 +214,31 @@ var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
       var didSetError = false;
       var isCrossOriginError = false;
 
-      function onError(event) {
+      function handleWindowError(event) {
         error = event.error;
         didSetError = true;
         if (error === null && event.colno === 0 && event.lineno === 0) {
           isCrossOriginError = true;
         }
+        if (event.defaultPrevented) {
+          // Some other error handler has prevented default.
+          // Browsers silence the error report if this happens.
+          // We'll remember this to later decide whether to log it or not.
+          if (error != null && typeof error === "object") {
+            try {
+              error._suppressLogging = true;
+            } catch (inner) {
+              // Ignore.
+            }
+          }
+        }
       }
 
       // Create a fake event type.
       var evtType = "react-" + (name ? name : "invokeguardedcallback");
 
       // Attach our event handlers
-      window.addEventListener("error", onError);
+      window.addEventListener("error", handleWindowError);
       fakeNode.addEventListener(evtType, callCallback, false);
 
       // Synchronously dispatch our fake event. If the user-provided function
@@ -158,6 +246,10 @@ var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
       evt.initEvent(evtType, false, false);
       fakeNode.dispatchEvent(evt);
 
+      if (windowEventDescriptor) {
+        Object.defineProperty(window, "event", windowEventDescriptor);
+      }
+
       if (didError) {
         if (!didSetError) {
           // The callback errored, but the error event never fired.
@@ -178,116 +270,115 @@ var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
               "See https://fb.me/react-crossorigin-error for more information."
           );
         }
-        this._hasCaughtError = true;
-        this._caughtError = error;
-      } else {
-        this._hasCaughtError = false;
-        this._caughtError = null;
+        this.onError(error);
       }
 
       // Remove our event listeners
-      window.removeEventListener("error", onError);
+      window.removeEventListener("error", handleWindowError);
     };
 
-    invokeGuardedCallback = invokeGuardedCallbackDev;
+    invokeGuardedCallbackImpl = invokeGuardedCallbackDev;
   }
 }
 
-var invokeGuardedCallback$1 = invokeGuardedCallback;
+var invokeGuardedCallbackImpl$1 = invokeGuardedCallbackImpl;
 
-var ReactErrorUtils = {
-  // Used by Fiber to simulate a try-catch.
-  _caughtError: null,
-  _hasCaughtError: false,
+// Used by Fiber to simulate a try-catch.
+var hasError = false;
+var caughtError = null;
 
-  // Used by event system to capture/rethrow the first error.
-  _rethrowError: null,
-  _hasRethrowError: false,
-
-  /**
-   * Call a function while guarding against errors that happens within it.
-   * Returns an error if it throws, otherwise null.
-   *
-   * In production, this is implemented using a try-catch. The reason we don't
-   * use a try-catch directly is so that we can swap out a different
-   * implementation in DEV mode.
-   *
-   * @param {String} name of the guard to use for logging or debugging
-   * @param {Function} func The function to invoke
-   * @param {*} context The context to use when calling the function
-   * @param {...*} args Arguments for function
-   */
-  invokeGuardedCallback: function(name, func, context, a, b, c, d, e, f) {
-    invokeGuardedCallback$1.apply(ReactErrorUtils, arguments);
-  },
-
-  /**
-   * Same as invokeGuardedCallback, but instead of returning an error, it stores
-   * it in a global so it can be rethrown by `rethrowCaughtError` later.
-   * TODO: See if _caughtError and _rethrowError can be unified.
-   *
-   * @param {String} name of the guard to use for logging or debugging
-   * @param {Function} func The function to invoke
-   * @param {*} context The context to use when calling the function
-   * @param {...*} args Arguments for function
-   */
-  invokeGuardedCallbackAndCatchFirstError: function(
-    name,
-    func,
-    context,
-    a,
-    b,
-    c,
-    d,
-    e,
-    f
-  ) {
-    ReactErrorUtils.invokeGuardedCallback.apply(this, arguments);
-    if (ReactErrorUtils.hasCaughtError()) {
-      var error = ReactErrorUtils.clearCaughtError();
-      if (!ReactErrorUtils._hasRethrowError) {
-        ReactErrorUtils._hasRethrowError = true;
-        ReactErrorUtils._rethrowError = error;
-      }
-    }
-  },
+// Used by event system to capture/rethrow the first error.
+var hasRethrowError = false;
+var rethrowError = null;
 
-  /**
-   * During execution of guarded functions we will capture the first error which
-   * we will rethrow to be handled by the top level error handler.
-   */
-  rethrowCaughtError: function() {
-    return rethrowCaughtError.apply(ReactErrorUtils, arguments);
-  },
+var reporter = {
+  onError: function(error) {
+    hasError = true;
+    caughtError = error;
+  }
+};
 
-  hasCaughtError: function() {
-    return ReactErrorUtils._hasCaughtError;
-  },
+/**
+ * Call a function while guarding against errors that happens within it.
+ * Returns an error if it throws, otherwise null.
+ *
+ * In production, this is implemented using a try-catch. The reason we don't
+ * use a try-catch directly is so that we can swap out a different
+ * implementation in DEV mode.
+ *
+ * @param {String} name of the guard to use for logging or debugging
+ * @param {Function} func The function to invoke
+ * @param {*} context The context to use when calling the function
+ * @param {...*} args Arguments for function
+ */
+function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
+  hasError = false;
+  caughtError = null;
+  invokeGuardedCallbackImpl$1.apply(reporter, arguments);
+}
 
-  clearCaughtError: function() {
-    if (ReactErrorUtils._hasCaughtError) {
-      var error = ReactErrorUtils._caughtError;
-      ReactErrorUtils._caughtError = null;
-      ReactErrorUtils._hasCaughtError = false;
-      return error;
-    } else {
-      invariant(
-        false,
-        "clearCaughtError was called but no error was captured. This error " +
-          "is likely caused by a bug in React. Please file an issue."
-      );
+/**
+ * Same as invokeGuardedCallback, but instead of returning an error, it stores
+ * it in a global so it can be rethrown by `rethrowCaughtError` later.
+ * TODO: See if caughtError and rethrowError can be unified.
+ *
+ * @param {String} name of the guard to use for logging or debugging
+ * @param {Function} func The function to invoke
+ * @param {*} context The context to use when calling the function
+ * @param {...*} args Arguments for function
+ */
+function invokeGuardedCallbackAndCatchFirstError(
+  name,
+  func,
+  context,
+  a,
+  b,
+  c,
+  d,
+  e,
+  f
+) {
+  invokeGuardedCallback.apply(this, arguments);
+  if (hasError) {
+    var error = clearCaughtError();
+    if (!hasRethrowError) {
+      hasRethrowError = true;
+      rethrowError = error;
     }
   }
-};
+}
 
-var rethrowCaughtError = function() {
-  if (ReactErrorUtils._hasRethrowError) {
-    var error = ReactErrorUtils._rethrowError;
-    ReactErrorUtils._rethrowError = null;
-    ReactErrorUtils._hasRethrowError = false;
+/**
+ * During execution of guarded functions we will capture the first error which
+ * we will rethrow to be handled by the top level error handler.
+ */
+function rethrowCaughtError() {
+  if (hasRethrowError) {
+    var error = rethrowError;
+    hasRethrowError = false;
+    rethrowError = null;
     throw error;
   }
-};
+}
+
+function hasCaughtError() {
+  return hasError;
+}
+
+function clearCaughtError() {
+  if (hasError) {
+    var error = caughtError;
+    hasError = false;
+    caughtError = null;
+    return error;
+  } else {
+    invariant(
+      false,
+      "clearCaughtError was called but no error was captured. This error " +
+        "is likely caused by a bug in React. Please file an issue."
+    );
+  }
+}
 
 /**
  * Injectable ordering of event plugins.
@@ -499,27 +590,132 @@ function injectEventPluginsByName(injectedNamesToPlugins) {
   }
 }
 
+/**
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
+
+var warningWithoutStack = function() {};
+
+{
+  warningWithoutStack = function(condition, format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 2 ? _len - 2 : 0),
+        _key = 2;
+      _key < _len;
+      _key++
+    ) {
+      args[_key - 2] = arguments[_key];
+    }
+
+    if (format === undefined) {
+      throw new Error(
+        "`warningWithoutStack(condition, format, ...args)` requires a warning " +
+          "message argument"
+      );
+    }
+    if (args.length > 8) {
+      // Check before the condition to catch violations early.
+      throw new Error(
+        "warningWithoutStack() currently supports at most 8 arguments."
+      );
+    }
+    if (condition) {
+      return;
+    }
+    if (typeof console !== "undefined") {
+      var _args$map = args.map(function(item) {
+          return "" + item;
+        }),
+        a = _args$map[0],
+        b = _args$map[1],
+        c = _args$map[2],
+        d = _args$map[3],
+        e = _args$map[4],
+        f = _args$map[5],
+        g = _args$map[6],
+        h = _args$map[7];
+
+      var message = "Warning: " + format;
+
+      // We intentionally don't use spread (or .apply) because it breaks IE9:
+      // https://github.com/facebook/react/issues/13610
+      switch (args.length) {
+        case 0:
+          console.error(message);
+          break;
+        case 1:
+          console.error(message, a);
+          break;
+        case 2:
+          console.error(message, a, b);
+          break;
+        case 3:
+          console.error(message, a, b, c);
+          break;
+        case 4:
+          console.error(message, a, b, c, d);
+          break;
+        case 5:
+          console.error(message, a, b, c, d, e);
+          break;
+        case 6:
+          console.error(message, a, b, c, d, e, f);
+          break;
+        case 7:
+          console.error(message, a, b, c, d, e, f, g);
+          break;
+        case 8:
+          console.error(message, a, b, c, d, e, f, g, h);
+          break;
+        default:
+          throw new Error(
+            "warningWithoutStack() currently supports at most 8 arguments."
+          );
+      }
+    }
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      var argIndex = 0;
+      var _message =
+        "Warning: " +
+        format.replace(/%s/g, function() {
+          return args[argIndex++];
+        });
+      throw new Error(_message);
+    } catch (x) {}
+  };
+}
+
+var warningWithoutStack$1 = warningWithoutStack;
+
 var getFiberCurrentPropsFromNode = null;
 var getInstanceFromNode = null;
 var getNodeFromInstance = null;
 
-var injection$1 = {
-  injectComponentTree: function(Injected) {
-    getFiberCurrentPropsFromNode = Injected.getFiberCurrentPropsFromNode;
-    getInstanceFromNode = Injected.getInstanceFromNode;
-    getNodeFromInstance = Injected.getNodeFromInstance;
-
-    {
-      !(getNodeFromInstance && getInstanceFromNode)
-        ? warning(
-            false,
-            "EventPluginUtils.injection.injectComponentTree(...): Injected " +
-              "module is missing getNodeFromInstance or getInstanceFromNode."
-          )
-        : void 0;
-    }
+function setComponentTree(
+  getFiberCurrentPropsFromNodeImpl,
+  getInstanceFromNodeImpl,
+  getNodeFromInstanceImpl
+) {
+  getFiberCurrentPropsFromNode = getFiberCurrentPropsFromNodeImpl;
+  getInstanceFromNode = getInstanceFromNodeImpl;
+  getNodeFromInstance = getNodeFromInstanceImpl;
+  {
+    !(getNodeFromInstance && getInstanceFromNode)
+      ? warningWithoutStack$1(
+          false,
+          "EventPluginUtils.setComponentTree(...): Injected " +
+            "module is missing getNodeFromInstance or getInstanceFromNode."
+        )
+      : void 0;
   }
-};
+}
 
 var validateEventDispatches = void 0;
 {
@@ -530,15 +726,19 @@ var validateEventDispatches = void 0;
     var listenersIsArr = Array.isArray(dispatchListeners);
     var listenersLen = listenersIsArr
       ? dispatchListeners.length
-      : dispatchListeners ? 1 : 0;
+      : dispatchListeners
+        ? 1
+        : 0;
 
     var instancesIsArr = Array.isArray(dispatchInstances);
     var instancesLen = instancesIsArr
       ? dispatchInstances.length
-      : dispatchInstances ? 1 : 0;
+      : dispatchInstances
+        ? 1
+        : 0;
 
     !(instancesIsArr === listenersIsArr && instancesLen === listenersLen)
-      ? warning(false, "EventPluginUtils: Invalid `event`.")
+      ? warningWithoutStack$1(false, "EventPluginUtils: Invalid `event`.")
       : void 0;
   };
 }
@@ -553,12 +753,7 @@ var validateEventDispatches = void 0;
 function executeDispatch(event, simulated, listener, inst) {
   var type = event.type || "unknown-event";
   event.currentTarget = getNodeFromInstance(inst);
-  ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
-    type,
-    listener,
-    undefined,
-    event
-  );
+  invokeGuardedCallbackAndCatchFirstError(type, listener, undefined, event);
   event.currentTarget = null;
 }
 
@@ -919,7 +1114,7 @@ function runEventsInBatch(events, simulated) {
       "an event queue. Support for this has not yet been implemented."
   );
   // This would be a good time to rethrow if any of the event handlers threw.
-  ReactErrorUtils.rethrowCaughtError();
+  rethrowCaughtError();
 }
 
 function runExtractedEventsInBatch(
@@ -937,21 +1132,25 @@ function runExtractedEventsInBatch(
   runEventsInBatch(events, false);
 }
 
-var IndeterminateComponent = 0; // Before we know whether it is functional or class
-var FunctionalComponent = 1;
+var FunctionComponent = 0;
+var FunctionComponentLazy = 1;
 var ClassComponent = 2;
-var HostRoot = 3; // Root of a host tree. Could be nested inside another node.
-var HostPortal = 4; // A subtree. Could be an entry point to a different renderer.
-var HostComponent = 5;
-var HostText = 6;
-
-var Fragment = 10;
-var Mode = 11;
-var ContextConsumer = 12;
-var ContextProvider = 13;
-var ForwardRef = 14;
+var ClassComponentLazy = 3;
+var IndeterminateComponent = 4; // Before we know whether it is function or class
+var HostRoot = 5; // Root of a host tree. Could be nested inside another node.
+var HostPortal = 6; // A subtree. Could be an entry point to a different renderer.
+var HostComponent = 7;
+var HostText = 8;
+var Fragment = 9;
+var Mode = 10;
+var ContextConsumer = 11;
+var ContextProvider = 12;
+var ForwardRef = 13;
+var ForwardRefLazy = 14;
 var Profiler = 15;
-var TimeoutComponent = 16;
+var SuspenseComponent = 16;
+var PureComponent = 17;
+var PureComponentLazy = 18;
 
 function getParent(inst) {
   do {
@@ -1080,7 +1279,9 @@ function listenerAtPhase(inst, event, propagationPhase) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   {
-    !inst ? warning(false, "Dispatching inst must not be null") : void 0;
+    !inst
+      ? warningWithoutStack$1(false, "Dispatching inst must not be null")
+      : void 0;
   }
   var listener = listenerAtPhase(inst, event, phase);
   if (listener) {
@@ -1160,19 +1361,8 @@ function accumulateDirectDispatches(events) {
 
 /* eslint valid-typeof: 0 */
 
-var didWarnForAddedNewProperty = false;
 var EVENT_POOL_SIZE = 10;
 
-var shouldBeReleasedProperties = [
-  "dispatchConfig",
-  "_targetInst",
-  "nativeEvent",
-  "isDefaultPrevented",
-  "isPropagationStopped",
-  "_dispatchListeners",
-  "_dispatchInstances"
-];
-
 /**
  * @interface Event
  * @see http://www.w3.org/TR/DOM-Level-3-Events/
@@ -1231,6 +1421,8 @@ function SyntheticEvent(
     delete this.nativeEvent;
     delete this.preventDefault;
     delete this.stopPropagation;
+    delete this.isDefaultPrevented;
+    delete this.isPropagationStopped;
   }
 
   this.dispatchConfig = dispatchConfig;
@@ -1336,15 +1528,35 @@ Object.assign(SyntheticEvent.prototype, {
         );
       }
     }
-    for (var i = 0; i < shouldBeReleasedProperties.length; i++) {
-      this[shouldBeReleasedProperties[i]] = null;
-    }
+    this.dispatchConfig = null;
+    this._targetInst = null;
+    this.nativeEvent = null;
+    this.isDefaultPrevented = functionThatReturnsFalse;
+    this.isPropagationStopped = functionThatReturnsFalse;
+    this._dispatchListeners = null;
+    this._dispatchInstances = null;
     {
       Object.defineProperty(
         this,
         "nativeEvent",
         getPooledWarningPropertyDefinition("nativeEvent", null)
       );
+      Object.defineProperty(
+        this,
+        "isDefaultPrevented",
+        getPooledWarningPropertyDefinition(
+          "isDefaultPrevented",
+          functionThatReturnsFalse
+        )
+      );
+      Object.defineProperty(
+        this,
+        "isPropagationStopped",
+        getPooledWarningPropertyDefinition(
+          "isPropagationStopped",
+          functionThatReturnsFalse
+        )
+      );
       Object.defineProperty(
         this,
         "preventDefault",
@@ -1385,51 +1597,6 @@ SyntheticEvent.extend = function(Interface) {
   return Class;
 };
 
-/** Proxying after everything set on SyntheticEvent
- * to resolve Proxy issue on some WebKit browsers
- * in which some Event properties are set to undefined (GH#10010)
- */
-{
-  var isProxySupported =
-    typeof Proxy === "function" &&
-    // https://github.com/facebook/react/issues/12011
-    !Object.isSealed(new Proxy({}, {}));
-
-  if (isProxySupported) {
-    /*eslint-disable no-func-assign */
-    SyntheticEvent = new Proxy(SyntheticEvent, {
-      construct: function(target, args) {
-        return this.apply(target, Object.create(target.prototype), args);
-      },
-      apply: function(constructor, that, args) {
-        return new Proxy(constructor.apply(that, args), {
-          set: function(target, prop, value) {
-            if (
-              prop !== "isPersistent" &&
-              !target.constructor.Interface.hasOwnProperty(prop) &&
-              shouldBeReleasedProperties.indexOf(prop) === -1
-            ) {
-              !(didWarnForAddedNewProperty || target.isPersistent())
-                ? warning(
-                    false,
-                    "This synthetic event is reused for performance reasons. If you're " +
-                      "seeing this, you're adding a new property in the synthetic event object. " +
-                      "The property is never released. See " +
-                      "https://fb.me/react-event-pooling for more information."
-                  )
-                : void 0;
-              didWarnForAddedNewProperty = true;
-            }
-            target[prop] = value;
-            return true;
-          }
-        });
-      }
-    });
-    /*eslint-enable no-func-assign */
-  }
-}
-
 addEventPoolingTo(SyntheticEvent);
 
 /**
@@ -1465,7 +1632,7 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
   function warn(action, result) {
     var warningCondition = false;
     !warningCondition
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "This synthetic event is reused for performance reasons. If you're seeing this, " +
             "you're %s `%s` on a released/nullified synthetic event. %s. " +
@@ -1504,7 +1671,7 @@ function releasePooledEvent(event) {
   var EventConstructor = this;
   invariant(
     event instanceof EventConstructor,
-    "Trying to release an event instance  into a pool of a different type."
+    "Trying to release an event instance into a pool of a different type."
   );
   event.destructor();
   if (EventConstructor.eventPool.length < EVENT_POOL_SIZE) {
@@ -1518,14 +1685,12 @@ function addEventPoolingTo(EventConstructor) {
   EventConstructor.release = releasePooledEvent;
 }
 
-var SyntheticEvent$1 = SyntheticEvent;
-
 /**
  * `touchHistory` isn't actually on the native event, but putting it in the
  * interface will ensure that it is cleaned up when pooled/destroyed. The
  * `ResponderEventPlugin` will populate it appropriately.
  */
-var ResponderSyntheticEvent = SyntheticEvent$1.extend({
+var ResponderSyntheticEvent = SyntheticEvent.extend({
   touchHistory: function(nativeEvent) {
     return null; // Actually doesn't even look at the native event.
   }
@@ -1617,7 +1782,7 @@ function getTouchIdentifier(_ref) {
   invariant(identifier != null, "Touch object is missing identifier.");
   {
     !(identifier <= MAX_TOUCH_BANK)
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "Touch identifier %s is greater than maximum supported %s which causes " +
             "performance issues backfilling array locations for all of the indices.",
@@ -1724,7 +1889,7 @@ var ResponderTouchHistoryStore = {
         {
           var activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
           !(activeRecord != null && activeRecord.touchActive)
-            ? warning(false, "Cannot find single active touch.")
+            ? warningWithoutStack$1(false, "Cannot find single active touch.")
             : void 0;
         }
       }
@@ -2279,7 +2444,9 @@ var ResponderEventPlugin = {
       ? eventTypes$1.responderStart
       : isResponderTouchMove
         ? eventTypes$1.responderMove
-        : isResponderTouchEnd ? eventTypes$1.responderEnd : null;
+        : isResponderTouchEnd
+          ? eventTypes$1.responderEnd
+          : null;
 
     if (incrementalTouch) {
       var gesture = ResponderSyntheticEvent.getPooled(
@@ -2302,7 +2469,9 @@ var ResponderEventPlugin = {
       noResponderTouches(nativeEvent);
     var finalTouch = isResponderTerminate
       ? eventTypes$1.responderTerminate
-      : isResponderRelease ? eventTypes$1.responderRelease : null;
+      : isResponderRelease
+        ? eventTypes$1.responderRelease
+        : null;
     if (finalTouch) {
       var finalEvent = ResponderSyntheticEvent.getPooled(
         finalTouch,
@@ -2362,7 +2531,7 @@ var ReactNativeBridgeEventPlugin = {
       'Unsupported top level event type "%s" dispatched',
       topLevelType
     );
-    var event = SyntheticEvent$1.getPooled(
+    var event = SyntheticEvent.getPooled(
       bubbleDispatchConfig || directDispatchConfig,
       targetInst,
       nativeEvent,
@@ -2419,13 +2588,6 @@ function getFiberCurrentPropsFromNode$1(inst) {
   return inst.canonical.currentProps;
 }
 
-var ReactFabricComponentTree = Object.freeze({
-  getClosestInstanceFromNode: getInstanceFromInstance,
-  getInstanceFromNode: getInstanceFromInstance,
-  getNodeFromInstance: getTagFromInstance,
-  getFiberCurrentPropsFromNode: getFiberCurrentPropsFromNode$1
-});
-
 // Module provided by RN:
 var ReactFabricGlobalResponderHandler = {
   onChange: function(from, to, blockNativeResponder) {
@@ -2438,7 +2600,11 @@ var ReactFabricGlobalResponderHandler = {
   }
 };
 
-injection$1.injectComponentTree(ReactFabricComponentTree);
+setComponentTree(
+  getFiberCurrentPropsFromNode$1,
+  getInstanceFromInstance,
+  getTagFromInstance
+);
 
 ResponderEventPlugin.injection.injectGlobalResponderHandler(
   ReactFabricGlobalResponderHandler
@@ -2468,10 +2634,8 @@ function set(key, value) {
   key._reactInternalFiber = value;
 }
 
-var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-var ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
-var ReactDebugCurrentFrame = ReactInternals.ReactDebugCurrentFrame;
+var ReactSharedInternals =
+  React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 
 // The Symbol used to tag the ReactElement-like types. If there is no native Symbol
 // nor polyfill, then a plain number is used for performance.
@@ -2486,17 +2650,20 @@ var REACT_STRICT_MODE_TYPE = hasSymbol
 var REACT_PROFILER_TYPE = hasSymbol ? Symbol.for("react.profiler") : 0xead2;
 var REACT_PROVIDER_TYPE = hasSymbol ? Symbol.for("react.provider") : 0xeacd;
 var REACT_CONTEXT_TYPE = hasSymbol ? Symbol.for("react.context") : 0xeace;
-var REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol.for("react.async_mode") : 0xeacf;
+var REACT_CONCURRENT_MODE_TYPE = hasSymbol
+  ? Symbol.for("react.concurrent_mode")
+  : 0xeacf;
 var REACT_FORWARD_REF_TYPE = hasSymbol
   ? Symbol.for("react.forward_ref")
   : 0xead0;
-var REACT_TIMEOUT_TYPE = hasSymbol ? Symbol.for("react.timeout") : 0xead1;
+var REACT_SUSPENSE_TYPE = hasSymbol ? Symbol.for("react.suspense") : 0xead1;
+var REACT_PURE_TYPE = hasSymbol ? Symbol.for("react.pure") : 0xead3;
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
 var FAUX_ITERATOR_SYMBOL = "@@iterator";
 
 function getIteratorFn(maybeIterable) {
-  if (maybeIterable === null || typeof maybeIterable === "undefined") {
+  if (maybeIterable === null || typeof maybeIterable !== "object") {
     return null;
   }
   var maybeIterator =
@@ -2508,40 +2675,77 @@ function getIteratorFn(maybeIterable) {
   return null;
 }
 
-function getComponentName(fiber) {
-  var type = fiber.type;
+var Pending = 0;
+var Resolved = 1;
+var Rejected = 2;
+
+function getResultFromResolvedThenable(thenable) {
+  return thenable._reactResult;
+}
+
+function refineResolvedThenable(thenable) {
+  return thenable._reactStatus === Resolved ? thenable._reactResult : null;
+}
+
+function getWrappedName(outerType, innerType, wrapperName) {
+  var functionName = innerType.displayName || innerType.name || "";
+  return (
+    outerType.displayName ||
+    (functionName !== "" ? wrapperName + "(" + functionName + ")" : wrapperName)
+  );
+}
 
+function getComponentName(type) {
+  if (type == null) {
+    // Host root, text node or just invalid type.
+    return null;
+  }
+  {
+    if (typeof type.tag === "number") {
+      warningWithoutStack$1(
+        false,
+        "Received an unexpected object in getComponentName(). " +
+          "This is likely a bug in React. Please file an issue."
+      );
+    }
+  }
   if (typeof type === "function") {
-    return type.displayName || type.name;
+    return type.displayName || type.name || null;
   }
   if (typeof type === "string") {
     return type;
   }
   switch (type) {
-    case REACT_ASYNC_MODE_TYPE:
-      return "AsyncMode";
-    case REACT_CONTEXT_TYPE:
-      return "Context.Consumer";
+    case REACT_CONCURRENT_MODE_TYPE:
+      return "ConcurrentMode";
     case REACT_FRAGMENT_TYPE:
-      return "ReactFragment";
+      return "Fragment";
     case REACT_PORTAL_TYPE:
-      return "ReactPortal";
+      return "Portal";
     case REACT_PROFILER_TYPE:
-      return "Profiler(" + fiber.pendingProps.id + ")";
-    case REACT_PROVIDER_TYPE:
-      return "Context.Provider";
+      return "Profiler";
     case REACT_STRICT_MODE_TYPE:
       return "StrictMode";
-    case REACT_TIMEOUT_TYPE:
-      return "Timeout";
+    case REACT_SUSPENSE_TYPE:
+      return "Suspense";
   }
-  if (typeof type === "object" && type !== null) {
+  if (typeof type === "object") {
     switch (type.$$typeof) {
+      case REACT_CONTEXT_TYPE:
+        return "Context.Consumer";
+      case REACT_PROVIDER_TYPE:
+        return "Context.Provider";
       case REACT_FORWARD_REF_TYPE:
-        var functionName = type.render.displayName || type.render.name || "";
-        return functionName !== ""
-          ? "ForwardRef(" + functionName + ")"
-          : "ForwardRef";
+        return getWrappedName(type, type.render, "ForwardRef");
+      case REACT_PURE_TYPE:
+        return getWrappedName(type, type.render, "Pure");
+    }
+    if (typeof type.then === "function") {
+      var thenable = type;
+      var resolvedThenable = refineResolvedThenable(thenable);
+      if (resolvedThenable) {
+        return getComponentName(resolvedThenable);
+      }
     }
   }
   return null;
@@ -2562,12 +2766,17 @@ var DidCapture = /*            */ 64;
 var Ref = /*                   */ 128;
 var Snapshot = /*              */ 256;
 
+// Update & Callback & Ref & Snapshot
+var LifecycleEffectMask = /*   */ 420;
+
 // Union of all host effects
 var HostEffectMask = /*        */ 511;
 
 var Incomplete = /*            */ 512;
 var ShouldCapture = /*         */ 1024;
 
+var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner;
+
 var MOUNTING = 1;
 var MOUNTED = 2;
 var UNMOUNTED = 3;
@@ -2607,19 +2816,22 @@ function isFiberMounted(fiber) {
 
 function isMounted(component) {
   {
-    var owner = ReactCurrentOwner.current;
-    if (owner !== null && owner.tag === ClassComponent) {
+    var owner = ReactCurrentOwner$1.current;
+    if (
+      owner !== null &&
+      (owner.tag === ClassComponent || owner.tag === ClassComponentLazy)
+    ) {
       var ownerFiber = owner;
       var instance = ownerFiber.stateNode;
       !instance._warnedAboutRefsInRender
-        ? warning(
+        ? warningWithoutStack$1(
             false,
             "%s is accessing isMounted inside its render() function. " +
               "render() should be a pure function of props and state. It should " +
               "never access something that requires stale data from the previous " +
               "render, such as refs. Move this logic to componentDidMount and " +
               "componentDidUpdate instead.",
-            getComponentName(ownerFiber) || "A component"
+            getComponentName(ownerFiber.type) || "A component"
           )
         : void 0;
       instance._warnedAboutRefsInRender = true;
@@ -2799,63 +3011,37 @@ function findCurrentHostFiber(parent) {
   return null;
 }
 
-function findCurrentHostFiberWithNoPortals(parent) {
-  var currentParent = findCurrentFiberUsingSlowPath(parent);
-  if (!currentParent) {
-    return null;
-  }
-
-  // Next we'll drill down this component to find the first HostComponent/Text.
-  var node = currentParent;
-  while (true) {
-    if (node.tag === HostComponent || node.tag === HostText) {
-      return node;
-    } else if (node.child && node.tag !== HostPortal) {
-      node.child.return = node;
-      node = node.child;
-      continue;
-    }
-    if (node === currentParent) {
-      return null;
-    }
-    while (!node.sibling) {
-      if (!node.return || node.return === currentParent) {
-        return null;
-      }
-      node = node.return;
-    }
-    node.sibling.return = node.return;
-    node = node.sibling;
-  }
-  // Flow needs the return null here, but ESLint complains about it.
-  // eslint-disable-next-line no-unreachable
-  return null;
-}
-
 /**
  * In the future, we should cleanup callbacks by cancelling them instead of
  * using this.
  */
-function mountSafeCallback(context, callback) {
+function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   return function() {
     if (!callback) {
       return undefined;
     }
+    // This protects against createClass() components.
+    // We don't know if there is code depending on it.
+    // We intentionally don't use isMounted() because even accessing
+    // isMounted property on a React ES6 class will trigger a warning.
     if (typeof context.__isMounted === "boolean") {
-      // TODO(gaearon): this is gross and should be removed.
-      // It is currently necessary because View uses createClass,
-      // and so any measure() calls on View (which are done by React
-      // DevTools) trigger the isMounted() deprecation warning.
       if (!context.__isMounted) {
         return undefined;
       }
-      // The else branch is important so that we don't
-      // trigger the deprecation warning by calling isMounted.
-    } else if (typeof context.isMounted === "function") {
-      if (!context.isMounted()) {
-        return undefined;
-      }
     }
+
+    // FIXME: there used to be other branches that protected
+    // against unmounted host components. But RN host components don't
+    // define isMounted() anymore, so those checks didn't do anything.
+
+    // They caused false positive warning noise so we removed them:
+    // https://github.com/facebook/react-native/issues/18868#issuecomment-413579095
+
+    // However, this means that the callback is NOT guaranteed to be safe
+    // for host components. The solution we should implement is to make
+    // UIManager.measure() and similar calls truly cancelable. Then we
+    // can change our own code calling them to cancel when something unmounts.
+
     return callback.apply(context, arguments);
   };
 }
@@ -2897,7 +3083,7 @@ function warnForStyleProps(props, validAttributes) {
 }
 
 // Modules provided by RN:
-var emptyObject$1 = {};
+var emptyObject = {};
 
 /**
  * Create a payload that contains all the updates between two sets of props.
@@ -2942,8 +3128,8 @@ function restoreDeletedValuesInNestedArray(
       if (!removedKeys[propKey]) {
         continue;
       }
-      var _nextProp = obj[propKey];
-      if (_nextProp === undefined) {
+      var nextProp = obj[propKey];
+      if (nextProp === undefined) {
         continue;
       }
 
@@ -2952,16 +3138,16 @@ function restoreDeletedValuesInNestedArray(
         continue; // not a valid native prop
       }
 
-      if (typeof _nextProp === "function") {
-        _nextProp = true;
+      if (typeof nextProp === "function") {
+        nextProp = true;
       }
-      if (typeof _nextProp === "undefined") {
-        _nextProp = null;
+      if (typeof nextProp === "undefined") {
+        nextProp = null;
       }
 
       if (typeof attributeConfig !== "object") {
         // case: !Object is the default case
-        updatePayload[propKey] = _nextProp;
+        updatePayload[propKey] = nextProp;
       } else if (
         typeof attributeConfig.diff === "function" ||
         typeof attributeConfig.process === "function"
@@ -2969,8 +3155,8 @@ function restoreDeletedValuesInNestedArray(
         // case: CustomAttributeConfiguration
         var nextValue =
           typeof attributeConfig.process === "function"
-            ? attributeConfig.process(_nextProp)
-            : _nextProp;
+            ? attributeConfig.process(nextProp)
+            : nextProp;
         updatePayload[propKey] = nextValue;
       }
       removedKeys[propKey] = false;
@@ -3301,7 +3487,7 @@ function diffProperties(updatePayload, prevProps, nextProps, validAttributes) {
  */
 function addProperties(updatePayload, props, validAttributes) {
   // TODO: Fast path
-  return diffProperties(updatePayload, emptyObject$1, props, validAttributes);
+  return diffProperties(updatePayload, emptyObject, props, validAttributes);
 }
 
 /**
@@ -3310,12 +3496,7 @@ function addProperties(updatePayload, props, validAttributes) {
  */
 function clearProperties(updatePayload, prevProps, validAttributes) {
   // TODO: Fast path
-  return diffProperties(
-    updatePayload,
-    prevProps,
-    emptyObject$1,
-    validAttributes
-  );
+  return diffProperties(updatePayload, prevProps, emptyObject, validAttributes);
 }
 
 function create(props, validAttributes) {
@@ -3387,8 +3568,7 @@ function cancelDeferredCallback$1(callbackID) {
 
 // Use to restore controlled state after a change event has fired.
 
-var fiberHostComponent = null;
-
+var restoreImpl = null;
 var restoreTarget = null;
 var restoreQueue = null;
 
@@ -3401,17 +3581,12 @@ function restoreStateOfTarget(target) {
     return;
   }
   invariant(
-    fiberHostComponent &&
-      typeof fiberHostComponent.restoreControlledState === "function",
-    "Fiber needs to be injected to handle a fiber target for controlled " +
+    typeof restoreImpl === "function",
+    "setRestoreImplementation() needs to be called to handle a target for controlled " +
       "events. This error is likely caused by a bug in React. Please file an issue."
   );
   var props = getFiberCurrentPropsFromNode(internalInstance.stateNode);
-  fiberHostComponent.restoreControlledState(
-    internalInstance.stateNode,
-    internalInstance.type,
-    props
-  );
+  restoreImpl(internalInstance.stateNode, internalInstance.type, props);
 }
 
 function needsStateRestore() {
@@ -3442,13 +3617,10 @@ function restoreStateIfNeeded() {
 // scheduled work and instead do synchronous work.
 
 // Defaults
-var _batchedUpdates = function(fn, bookkeeping) {
+var _batchedUpdatesImpl = function(fn, bookkeeping) {
   return fn(bookkeeping);
 };
-var _interactiveUpdates = function(fn, a, b) {
-  return fn(a, b);
-};
-var _flushInteractiveUpdates = function() {};
+var _flushInteractiveUpdatesImpl = function() {};
 
 var isBatching = false;
 function batchedUpdates(fn, bookkeeping) {
@@ -3459,7 +3631,7 @@ function batchedUpdates(fn, bookkeeping) {
   }
   isBatching = true;
   try {
-    return _batchedUpdates(fn, bookkeeping);
+    return _batchedUpdatesImpl(fn, bookkeeping);
   } finally {
     // Here we wait until all updates have propagated, which is important
     // when using controlled components within layers:
@@ -3471,19 +3643,20 @@ function batchedUpdates(fn, bookkeeping) {
       // If a controlled event was fired, we may need to restore the state of
       // the DOM node back to the controlled value. This is necessary when React
       // bails out of the update without touching the DOM.
-      _flushInteractiveUpdates();
+      _flushInteractiveUpdatesImpl();
       restoreStateIfNeeded();
     }
   }
 }
 
-var injection$2 = {
-  injectRenderer: function(renderer) {
-    _batchedUpdates = renderer.batchedUpdates;
-    _interactiveUpdates = renderer.interactiveUpdates;
-    _flushInteractiveUpdates = renderer.flushInteractiveUpdates;
-  }
-};
+function setBatchingImplementation(
+  batchedUpdatesImpl,
+  interactiveUpdatesImpl,
+  flushInteractiveUpdatesImpl
+) {
+  _batchedUpdatesImpl = batchedUpdatesImpl;
+  _flushInteractiveUpdatesImpl = flushInteractiveUpdatesImpl;
+}
 
 function dispatchEvent(target, topLevelType, nativeEvent) {
   var targetFiber = target;
@@ -3596,7 +3769,10 @@ var ReactFabricHostComponent = (function() {
   };
 
   ReactFabricHostComponent.prototype.measure = function measure(callback) {
-    UIManager.measure(this._nativeTag, mountSafeCallback(this, callback));
+    UIManager.measure(
+      this._nativeTag,
+      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
+    );
   };
 
   ReactFabricHostComponent.prototype.measureInWindow = function measureInWindow(
@@ -3604,7 +3780,7 @@ var ReactFabricHostComponent = (function() {
   ) {
     UIManager.measureInWindow(
       this._nativeTag,
-      mountSafeCallback(this, callback)
+      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
     );
   };
 
@@ -3616,8 +3792,8 @@ var ReactFabricHostComponent = (function() {
     UIManager.measureLayout(
       this._nativeTag,
       relativeToNativeNode,
-      mountSafeCallback(this, onFail),
-      mountSafeCallback(this, onSuccess)
+      mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+      mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
     );
   };
 
@@ -3798,6 +3974,10 @@ var now = now$1;
 var scheduleDeferredCallback = scheduleDeferredCallback$1;
 var cancelDeferredCallback = cancelDeferredCallback$1;
 
+var scheduleTimeout = setTimeout;
+var cancelTimeout = clearTimeout;
+var noTimeout = -1;
+
 // -------------------
 //     Persistence
 // -------------------
@@ -3818,26 +3998,18 @@ function cloneInstance(
   var clone = void 0;
   if (keepChildren) {
     if (updatePayload !== null) {
-      clone = FabricUIManager.cloneNodeWithNewProps(
-        node,
-        updatePayload,
-        internalInstanceHandle
-      );
+      clone = FabricUIManager.cloneNodeWithNewProps(node, updatePayload);
     } else {
-      clone = FabricUIManager.cloneNode(node, internalInstanceHandle);
+      clone = FabricUIManager.cloneNode(node);
     }
   } else {
     if (updatePayload !== null) {
       clone = FabricUIManager.cloneNodeWithNewChildrenAndProps(
         node,
-        updatePayload,
-        internalInstanceHandle
+        updatePayload
       );
     } else {
-      clone = FabricUIManager.cloneNodeWithNewChildren(
-        node,
-        internalInstanceHandle
-      );
+      clone = FabricUIManager.cloneNodeWithNewChildren(node);
     }
   }
   return {
@@ -3858,32 +4030,51 @@ function finalizeContainerChildren(container, newChildren) {
   FabricUIManager.completeRoot(container, newChildren);
 }
 
+var BEFORE_SLASH_RE = /^(.*)[\\\/]/;
+
 var describeComponentFrame = function(name, source, ownerName) {
-  return (
-    "\n    in " +
-    (name || "Unknown") +
-    (source
-      ? " (at " +
-        source.fileName.replace(/^.*[\\\/]/, "") +
-        ":" +
-        source.lineNumber +
-        ")"
-      : ownerName ? " (created by " + ownerName + ")" : "")
-  );
+  var sourceInfo = "";
+  if (source) {
+    var path = source.fileName;
+    var fileName = path.replace(BEFORE_SLASH_RE, "");
+    {
+      // In DEV, include code for a common special case:
+      // prefer "folder/index.js" instead of just "index.js".
+      if (/^index\./.test(fileName)) {
+        var match = path.match(BEFORE_SLASH_RE);
+        if (match) {
+          var pathBeforeSlash = match[1];
+          if (pathBeforeSlash) {
+            var folderName = pathBeforeSlash.replace(BEFORE_SLASH_RE, "");
+            fileName = folderName + "/" + fileName;
+          }
+        }
+      }
+    }
+    sourceInfo = " (at " + fileName + ":" + source.lineNumber + ")";
+  } else if (ownerName) {
+    sourceInfo = " (created by " + ownerName + ")";
+  }
+  return "\n    in " + (name || "Unknown") + sourceInfo;
 };
 
+var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
 function describeFiber(fiber) {
   switch (fiber.tag) {
     case IndeterminateComponent:
-    case FunctionalComponent:
+    case FunctionComponent:
+    case FunctionComponentLazy:
     case ClassComponent:
+    case ClassComponentLazy:
     case HostComponent:
+    case Mode:
       var owner = fiber._debugOwner;
       var source = fiber._debugSource;
-      var name = getComponentName(fiber);
+      var name = getComponentName(fiber.type);
       var ownerName = null;
       if (owner) {
-        ownerName = getComponentName(owner);
+        ownerName = getComponentName(owner.type);
       }
       return describeComponentFrame(name, source, ownerName);
     default:
@@ -3891,82 +4082,73 @@ function describeFiber(fiber) {
   }
 }
 
-// This function can only be called with a work-in-progress fiber and
-// only during begin or complete phase. Do not call it under any other
-// circumstances.
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
+function getStackByFiberInDevAndProd(workInProgress) {
   var info = "";
   var node = workInProgress;
   do {
     info += describeFiber(node);
-    // Otherwise this return pointer might point to the wrong tree:
     node = node.return;
   } while (node);
   return info;
 }
 
-function getCurrentFiberOwnerName() {
+var current = null;
+var phase = null;
+
+function getCurrentFiberOwnerNameInDevOrNull() {
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
+    if (current === null) {
       return null;
     }
-    var owner = fiber._debugOwner;
+    var owner = current._debugOwner;
     if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner);
+      return getComponentName(owner.type);
     }
   }
   return null;
 }
 
-function getCurrentFiberStackAddendum() {
+function getCurrentFiberStackInDev() {
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
+    if (current === null) {
+      return "";
     }
     // Safe because if current fiber exists, we are reconciling,
     // and it is guaranteed to be the work-in-progress version.
-    return getStackAddendumByWorkInProgressFiber(fiber);
+    return getStackByFiberInDevAndProd(current);
   }
-  return null;
+  return "";
 }
 
 function resetCurrentFiber() {
-  ReactDebugCurrentFrame.getCurrentStack = null;
-  ReactDebugCurrentFiber.current = null;
-  ReactDebugCurrentFiber.phase = null;
+  {
+    ReactDebugCurrentFrame.getCurrentStack = null;
+    current = null;
+    phase = null;
+  }
 }
 
 function setCurrentFiber(fiber) {
-  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
-  ReactDebugCurrentFiber.current = fiber;
-  ReactDebugCurrentFiber.phase = null;
+  {
+    ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackInDev;
+    current = fiber;
+    phase = null;
+  }
 }
 
-function setCurrentPhase(phase) {
-  ReactDebugCurrentFiber.phase = phase;
+function setCurrentPhase(lifeCyclePhase) {
+  {
+    phase = lifeCyclePhase;
+  }
 }
 
-var ReactDebugCurrentFiber = {
-  current: null,
-  phase: null,
-  resetCurrentFiber: resetCurrentFiber,
-  setCurrentFiber: setCurrentFiber,
-  setCurrentPhase: setCurrentPhase,
-  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
-};
-
 var debugRenderPhaseSideEffects = false;
 var debugRenderPhaseSideEffectsForStrictMode = false;
 var enableUserTimingAPI = true;
-var enableGetDerivedStateFromCatch = false;
-var enableSuspense = false;
 var warnAboutDeprecatedLifecycles = false;
-var warnAboutLegacyContextAPI = false;
 var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
 var enableProfilerTimer = true;
+var enableSchedulerTracing = true;
 
 // Only used in www builds.
 
@@ -4007,9 +4189,9 @@ var formatMarkName = function(markName) {
   return reactEmoji + " " + markName;
 };
 
-var formatLabel = function(label, warning$$1) {
-  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
-  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
+var formatLabel = function(label, warning) {
+  var prefix = warning ? warningEmoji + " " : reactEmoji + " ";
+  var suffix = warning ? " Warning: " + warning : "";
   return "" + prefix + label + suffix;
 };
 
@@ -4021,9 +4203,9 @@ var clearMark = function(markName) {
   performance.clearMarks(formatMarkName(markName));
 };
 
-var endMark = function(label, markName, warning$$1) {
+var endMark = function(label, markName, warning) {
   var formattedMarkName = formatMarkName(markName);
-  var formattedLabel = formatLabel(label, warning$$1);
+  var formattedLabel = formatLabel(label, warning);
   try {
     performance.measure(formattedLabel, formattedMarkName);
   } catch (err) {}
@@ -4051,7 +4233,7 @@ var getFiberLabel = function(componentName, isMounted, phase) {
 };
 
 var beginFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
+  var componentName = getComponentName(fiber.type) || "Unknown";
   var debugID = fiber._debugID;
   var isMounted = fiber.alternate !== null;
   var label = getFiberLabel(componentName, isMounted, phase);
@@ -4070,7 +4252,7 @@ var beginFiberMark = function(fiber, phase) {
 };
 
 var clearFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
+  var componentName = getComponentName(fiber.type) || "Unknown";
   var debugID = fiber._debugID;
   var isMounted = fiber.alternate !== null;
   var label = getFiberLabel(componentName, isMounted, phase);
@@ -4078,13 +4260,13 @@ var clearFiberMark = function(fiber, phase) {
   clearMark(markName);
 };
 
-var endFiberMark = function(fiber, phase, warning$$1) {
-  var componentName = getComponentName(fiber) || "Unknown";
+var endFiberMark = function(fiber, phase, warning) {
+  var componentName = getComponentName(fiber.type) || "Unknown";
   var debugID = fiber._debugID;
   var isMounted = fiber.alternate !== null;
   var label = getFiberLabel(componentName, isMounted, phase);
   var markName = getFiberMarkName(label, debugID);
-  endMark(label, markName, warning$$1);
+  endMark(label, markName, warning);
 };
 
 var shouldIgnoreFiber = function(fiber) {
@@ -4176,13 +4358,13 @@ function stopRequestCallbackTimer(didExpire, expirationTime) {
   if (enableUserTimingAPI) {
     if (supportsUserTiming) {
       isWaitingForCallback = false;
-      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
+      var warning = didExpire ? "React was blocked by main thread" : null;
       endMark(
         "(Waiting for async callback... will force flush in " +
           expirationTime +
           " ms)",
         "(Waiting for async callback...)",
-        warning$$1
+        warning
       );
     }
   }
@@ -4240,8 +4422,11 @@ function stopFailedWorkTimer(fiber) {
       return;
     }
     fiber._debugIsCurrentlyTiming = false;
-    var warning$$1 = "An error was thrown inside this error boundary";
-    endFiberMark(fiber, null, warning$$1);
+    var warning =
+      fiber.tag === SuspenseComponent
+        ? "Rendering was suspended"
+        : "An error was thrown inside this error boundary";
+    endFiberMark(fiber, null, warning);
   }
 }
 
@@ -4265,10 +4450,10 @@ function stopPhaseTimer() {
       return;
     }
     if (currentPhase !== null && currentPhaseFiber !== null) {
-      var warning$$1 = hasScheduledUpdateInCurrentPhase
+      var warning = hasScheduledUpdateInCurrentPhase
         ? "Scheduled a cascading update"
         : null;
-      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
+      endFiberMark(currentPhaseFiber, currentPhase, warning);
     }
     currentPhase = null;
     currentPhaseFiber = null;
@@ -4295,17 +4480,17 @@ function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
     if (!supportsUserTiming) {
       return;
     }
-    var warning$$1 = null;
+    var warning = null;
     if (interruptedBy !== null) {
       if (interruptedBy.tag === HostRoot) {
-        warning$$1 = "A top-level update interrupted the previous render";
+        warning = "A top-level update interrupted the previous render";
       } else {
-        var componentName = getComponentName(interruptedBy) || "Unknown";
-        warning$$1 =
+        var componentName = getComponentName(interruptedBy.type) || "Unknown";
+        warning =
           "An update to " + componentName + " interrupted the previous render";
       }
     } else if (commitCountInCurrentWorkLoop > 1) {
-      warning$$1 = "There were cascading updates";
+      warning = "There were cascading updates";
     }
     commitCountInCurrentWorkLoop = 0;
     var label = didCompleteRoot
@@ -4313,7 +4498,7 @@ function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
       : "(React Tree Reconciliation: Yielded)";
     // Pause any measurements until the next loop.
     pauseTimers();
-    endMark(label, "(React Tree Reconciliation)", warning$$1);
+    endMark(label, "(React Tree Reconciliation)", warning);
   }
 }
 
@@ -4335,18 +4520,18 @@ function stopCommitTimer() {
       return;
     }
 
-    var warning$$1 = null;
+    var warning = null;
     if (hasScheduledUpdateInCurrentCommit) {
-      warning$$1 = "Lifecycle hook scheduled a cascading update";
+      warning = "Lifecycle hook scheduled a cascading update";
     } else if (commitCountInCurrentWorkLoop > 0) {
-      warning$$1 = "Caused by a cascading update in earlier commit";
+      warning = "Caused by a cascading update in earlier commit";
     }
     hasScheduledUpdateInCurrentCommit = false;
     commitCountInCurrentWorkLoop++;
     isCommitting = false;
     labelsInCurrentCommit.clear();
 
-    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
+    endMark("(Committing Changes)", "(Committing Changes)", warning);
   }
 }
 
@@ -4444,14 +4629,14 @@ function createCursor(defaultValue) {
 function pop(cursor, fiber) {
   if (index < 0) {
     {
-      warning(false, "Unexpected pop.");
+      warningWithoutStack$1(false, "Unexpected pop.");
     }
     return;
   }
 
   {
     if (fiber !== fiberStack[index]) {
-      warning(false, "Unexpected Fiber popped.");
+      warningWithoutStack$1(false, "Unexpected Fiber popped.");
     }
   }
 
@@ -4481,7 +4666,7 @@ function push(cursor, value, fiber) {
 function checkThatStackIsEmpty() {
   {
     if (index !== -1) {
-      warning(
+      warningWithoutStack$1(
         false,
         "Expected an empty stack. Something was not reset properly."
       );
@@ -4503,20 +4688,28 @@ var warnedAboutMissingGetChildContext = void 0;
   warnedAboutMissingGetChildContext = {};
 }
 
+var emptyContextObject = {};
+{
+  Object.freeze(emptyContextObject);
+}
+
 // A cursor to the current merged context object on the stack.
-var contextStackCursor = createCursor(emptyObject);
+var contextStackCursor = createCursor(emptyContextObject);
 // A cursor to a boolean indicating whether the context has changed.
 var didPerformWorkStackCursor = createCursor(false);
 // Keep track of the previous context object that was on the stack.
 // We use this to get access to the parent context after we have already
 // pushed the next context provider, and now need to merge their contexts.
-var previousContext = emptyObject;
+var previousContext = emptyContextObject;
 
-function getUnmaskedContext(workInProgress) {
-  var hasOwnContext = isContextProvider(workInProgress);
-  if (hasOwnContext) {
+function getUnmaskedContext(
+  workInProgress,
+  Component,
+  didPushOwnContextIfProvider
+) {
+  if (didPushOwnContextIfProvider && isContextProvider(Component)) {
     // If the fiber is a context provider itself, when we read its context
-    // we have already pushed its own child context on the stack. A context
+    // we may have already pushed its own child context on the stack. A context
     // provider should not "see" its own child context. Therefore we read the
     // previous (parent) context instead for a context provider.
     return previousContext;
@@ -4534,7 +4727,7 @@ function getMaskedContext(workInProgress, unmaskedContext) {
   var type = workInProgress.type;
   var contextTypes = type.contextTypes;
   if (!contextTypes) {
-    return emptyObject;
+    return emptyContextObject;
   }
 
   // Avoid recreating masked context unless unmasked context has changed.
@@ -4554,13 +4747,13 @@ function getMaskedContext(workInProgress, unmaskedContext) {
   }
 
   {
-    var name = getComponentName(workInProgress) || "Unknown";
+    var name = getComponentName(type) || "Unknown";
     checkPropTypes(
       contextTypes,
       context,
       "context",
       name,
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      getCurrentFiberStackInDev
     );
   }
 
@@ -4577,19 +4770,12 @@ function hasContextChanged() {
   return didPerformWorkStackCursor.current;
 }
 
-function isContextConsumer(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
+function isContextProvider(type) {
+  var childContextTypes = type.childContextTypes;
+  return childContextTypes !== null && childContextTypes !== undefined;
 }
 
-function isContextProvider(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
-}
-
-function popContextProvider(fiber) {
-  if (!isContextProvider(fiber)) {
-    return;
-  }
-
+function popContext(fiber) {
   pop(didPerformWorkStackCursor, fiber);
   pop(contextStackCursor, fiber);
 }
@@ -4601,7 +4787,7 @@ function popTopLevelContextObject(fiber) {
 
 function pushTopLevelContextObject(fiber, context, didChange) {
   invariant(
-    contextStackCursor.current === emptyObject,
+    contextStackCursor.current === emptyContextObject,
     "Unexpected context found on stack. " +
       "This error is likely caused by a bug in React. Please file an issue."
   );
@@ -4610,19 +4796,19 @@ function pushTopLevelContextObject(fiber, context, didChange) {
   push(didPerformWorkStackCursor, didChange, fiber);
 }
 
-function processChildContext(fiber, parentContext) {
+function processChildContext(fiber, type, parentContext) {
   var instance = fiber.stateNode;
-  var childContextTypes = fiber.type.childContextTypes;
+  var childContextTypes = type.childContextTypes;
 
   // TODO (bvaughn) Replace this behavior with an invariant() in the future.
   // It has only been added in Fiber to match the (unintentional) behavior in Stack.
   if (typeof instance.getChildContext !== "function") {
     {
-      var componentName = getComponentName(fiber) || "Unknown";
+      var componentName = getComponentName(type) || "Unknown";
 
       if (!warnedAboutMissingGetChildContext[componentName]) {
         warnedAboutMissingGetChildContext[componentName] = true;
-        warning(
+        warningWithoutStack$1(
           false,
           "%s.childContextTypes is specified but there is no getChildContext() method " +
             "on the instance. You can either define getChildContext() on %s or remove " +
@@ -4637,24 +4823,24 @@ function processChildContext(fiber, parentContext) {
 
   var childContext = void 0;
   {
-    ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
+    setCurrentPhase("getChildContext");
   }
   startPhaseTimer(fiber, "getChildContext");
   childContext = instance.getChildContext();
   stopPhaseTimer();
   {
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+    setCurrentPhase(null);
   }
   for (var contextKey in childContext) {
     invariant(
       contextKey in childContextTypes,
       '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
+      getComponentName(type) || "Unknown",
       contextKey
     );
   }
   {
-    var name = getComponentName(fiber) || "Unknown";
+    var name = getComponentName(type) || "Unknown";
     checkPropTypes(
       childContextTypes,
       childContext,
@@ -4665,7 +4851,7 @@ function processChildContext(fiber, parentContext) {
       // context from the parent component instance. The stack will be missing
       // because it's outside of the reconciliation, and so the pointer has not
       // been set. This is rare and doesn't matter. We'll also remove that API.
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      getCurrentFiberStackInDev
     );
   }
 
@@ -4673,17 +4859,13 @@ function processChildContext(fiber, parentContext) {
 }
 
 function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) {
-    return false;
-  }
-
   var instance = workInProgress.stateNode;
   // We push the context as early as possible to ensure stack integrity.
   // If the instance does not exist yet, we will push null at first,
   // and replace it on the stack later when invalidating the context.
   var memoizedMergedChildContext =
     (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
+    emptyContextObject;
 
   // Remember the parent context so we can merge with it later.
   // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
@@ -4698,7 +4880,7 @@ function pushContextProvider(workInProgress) {
   return true;
 }
 
-function invalidateContextProvider(workInProgress, didChange) {
+function invalidateContextProvider(workInProgress, type, didChange) {
   var instance = workInProgress.stateNode;
   invariant(
     instance,
@@ -4710,7 +4892,11 @@ function invalidateContextProvider(workInProgress, didChange) {
     // Merge parent and own context.
     // Skip this if we're not updating due to sCU.
     // This avoids unnecessarily recomputing memoized values.
-    var mergedContext = processChildContext(workInProgress, previousContext);
+    var mergedContext = processChildContext(
+      workInProgress,
+      type,
+      previousContext
+    );
     instance.__reactInternalMemoizedMergedChildContext = mergedContext;
 
     // Replace the old (or empty) context with the new one.
@@ -4730,35 +4916,131 @@ function findCurrentUnmaskedContext(fiber) {
   // Currently this is only used with renderSubtreeIntoContainer; not sure if it
   // makes sense elsewhere
   invariant(
-    isFiberMounted(fiber) && fiber.tag === ClassComponent,
+    isFiberMounted(fiber) &&
+      (fiber.tag === ClassComponent || fiber.tag === ClassComponentLazy),
     "Expected subtree parent to be a mounted class component. " +
       "This error is likely caused by a bug in React. Please file an issue."
   );
 
   var node = fiber;
-  while (node.tag !== HostRoot) {
-    if (isContextProvider(node)) {
-      return node.stateNode.__reactInternalMemoizedMergedChildContext;
+  do {
+    switch (node.tag) {
+      case HostRoot:
+        return node.stateNode.context;
+      case ClassComponent: {
+        var Component = node.type;
+        if (isContextProvider(Component)) {
+          return node.stateNode.__reactInternalMemoizedMergedChildContext;
+        }
+        break;
+      }
+      case ClassComponentLazy: {
+        var _Component = getResultFromResolvedThenable(node.type);
+        if (isContextProvider(_Component)) {
+          return node.stateNode.__reactInternalMemoizedMergedChildContext;
+        }
+        break;
+      }
     }
-    var parent = node.return;
-    invariant(
-      parent,
-      "Found unexpected detached subtree parent. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
-    node = parent;
+    node = node.return;
+  } while (node !== null);
+  invariant(
+    false,
+    "Found unexpected detached subtree parent. " +
+      "This error is likely caused by a bug in React. Please file an issue."
+  );
+}
+
+var onCommitFiberRoot = null;
+var onCommitFiberUnmount = null;
+var hasLoggedError = false;
+
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {
+      if (true && !hasLoggedError) {
+        hasLoggedError = true;
+        warningWithoutStack$1(
+          false,
+          "React DevTools encountered an error: %s",
+          err
+        );
+      }
+    }
+  };
+}
+
+var isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined";
+
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
+  }
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
+  }
+  if (!hook.supportsFiber) {
+    {
+      warningWithoutStack$1(
+        false,
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://fb.me/react-devtools"
+      );
+    }
+    // DevTools exists, even though it doesn't support Fiber.
+    return true;
+  }
+  try {
+    var rendererID = hook.inject(internals);
+    // We have successfully injected, so now it is safe to set up hooks.
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      warningWithoutStack$1(
+        false,
+        "React DevTools encountered an error: %s.",
+        err
+      );
+    }
+  }
+  // DevTools exists
+  return true;
+}
+
+function onCommitRoot(root) {
+  if (typeof onCommitFiberRoot === "function") {
+    onCommitFiberRoot(root);
+  }
+}
+
+function onCommitUnmount(fiber) {
+  if (typeof onCommitFiberUnmount === "function") {
+    onCommitFiberUnmount(fiber);
   }
-  return node.stateNode.context;
 }
 
 // Max 31 bit integer. The max integer size in V8 for 32-bit systems.
 // Math.pow(2, 30) - 1
 // 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
+var maxSigned31BitInt = 1073741823;
 
 var NoWork = 0;
 var Sync = 1;
-var Never = MAX_SIGNED_31_BIT_INT;
+var Never = maxSigned31BitInt;
 
 var UNIT_SIZE = 10;
 var MAGIC_NUMBER_OFFSET = 2;
@@ -4787,8 +5069,41 @@ function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
   );
 }
 
+var LOW_PRIORITY_EXPIRATION = 5000;
+var LOW_PRIORITY_BATCH_SIZE = 250;
+
+function computeAsyncExpiration(currentTime) {
+  return computeExpirationBucket(
+    currentTime,
+    LOW_PRIORITY_EXPIRATION,
+    LOW_PRIORITY_BATCH_SIZE
+  );
+}
+
+// We intentionally set a higher expiration time for interactive updates in
+// dev than in production.
+//
+// If the main thread is being blocked so long that you hit the expiration,
+// it's a problem that could be solved with better scheduling.
+//
+// People will be more likely to notice this and fix it with the long
+// expiration time in development.
+//
+// In production we opt for better UX at the risk of masking scheduling
+// problems, by expiring fast.
+var HIGH_PRIORITY_EXPIRATION = 500;
+var HIGH_PRIORITY_BATCH_SIZE = 100;
+
+function computeInteractiveExpiration(currentTime) {
+  return computeExpirationBucket(
+    currentTime,
+    HIGH_PRIORITY_EXPIRATION,
+    HIGH_PRIORITY_BATCH_SIZE
+  );
+}
+
 var NoContext = 0;
-var AsyncMode = 1;
+var ConcurrentMode = 1;
 var StrictMode = 2;
 var ProfileMode = 4;
 
@@ -4839,6 +5154,7 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.memoizedProps = null;
   this.updateQueue = null;
   this.memoizedState = null;
+  this.firstContextDependency = null;
 
   this.mode = mode;
 
@@ -4850,14 +5166,15 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.lastEffect = null;
 
   this.expirationTime = NoWork;
+  this.childExpirationTime = NoWork;
 
   this.alternate = null;
 
   if (enableProfilerTimer) {
     this.actualDuration = 0;
-    this.actualStartTime = 0;
-    this.selfBaseTime = 0;
-    this.treeBaseTime = 0;
+    this.actualStartTime = -1;
+    this.selfBaseDuration = 0;
+    this.treeBaseDuration = 0;
   }
 
   {
@@ -4890,7 +5207,25 @@ var createFiber = function(tag, pendingProps, key, mode) {
 };
 
 function shouldConstruct(Component) {
-  return !!(Component.prototype && Component.prototype.isReactComponent);
+  var prototype = Component.prototype;
+  return !!(prototype && prototype.isReactComponent);
+}
+
+function resolveLazyComponentTag(fiber, Component) {
+  if (typeof Component === "function") {
+    return shouldConstruct(Component)
+      ? ClassComponentLazy
+      : FunctionComponentLazy;
+  } else if (Component !== undefined && Component !== null) {
+    var $$typeof = Component.$$typeof;
+    if ($$typeof === REACT_FORWARD_REF_TYPE) {
+      return ForwardRefLazy;
+    }
+    if ($$typeof === REACT_PURE_TYPE) {
+      return PureComponentLazy;
+    }
+  }
+  return IndeterminateComponent;
 }
 
 // This is used to create an alternate fiber to do work on.
@@ -4938,16 +5273,18 @@ function createWorkInProgress(current, pendingProps, expirationTime) {
       // This has the downside of resetting values for different priority renders,
       // But works for yielding (the common case) and should support resuming.
       workInProgress.actualDuration = 0;
-      workInProgress.actualStartTime = 0;
+      workInProgress.actualStartTime = -1;
     }
   }
 
-  workInProgress.expirationTime = expirationTime;
+  workInProgress.childExpirationTime = current.childExpirationTime;
+  workInProgress.expirationTime = current.expirationTime;
 
   workInProgress.child = current.child;
   workInProgress.memoizedProps = current.memoizedProps;
   workInProgress.memoizedState = current.memoizedState;
   workInProgress.updateQueue = current.updateQueue;
+  workInProgress.firstContextDependency = current.firstContextDependency;
 
   // These will be overridden during the parent's reconciliation
   workInProgress.sibling = current.sibling;
@@ -4955,15 +5292,23 @@ function createWorkInProgress(current, pendingProps, expirationTime) {
   workInProgress.ref = current.ref;
 
   if (enableProfilerTimer) {
-    workInProgress.selfBaseTime = current.selfBaseTime;
-    workInProgress.treeBaseTime = current.treeBaseTime;
+    workInProgress.selfBaseDuration = current.selfBaseDuration;
+    workInProgress.treeBaseDuration = current.treeBaseDuration;
   }
 
   return workInProgress;
 }
 
-function createHostRootFiber(isAsync) {
-  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
+function createHostRootFiber(isConcurrent) {
+  var mode = isConcurrent ? ConcurrentMode | StrictMode : NoContext;
+
+  if (enableProfilerTimer && isDevToolsPresent) {
+    // Always collect profile timings when DevTools are present.
+    // This enables DevTools to start capturing timing at any point–
+    // Without some nodes in the tree having empty base times.
+    mode |= ProfileMode;
+  }
+
   return createFiber(HostRoot, null, null, mode);
 }
 
@@ -4984,7 +5329,7 @@ function createFiberFromElement(element, mode, expirationTime) {
   } else if (typeof type === "string") {
     fiberTag = HostComponent;
   } else {
-    switch (type) {
+    getTag: switch (type) {
       case REACT_FRAGMENT_TYPE:
         return createFiberFromFragment(
           pendingProps.children,
@@ -4992,9 +5337,9 @@ function createFiberFromElement(element, mode, expirationTime) {
           expirationTime,
           key
         );
-      case REACT_ASYNC_MODE_TYPE:
+      case REACT_CONCURRENT_MODE_TYPE:
         fiberTag = Mode;
-        mode |= AsyncMode | StrictMode;
+        mode |= ConcurrentMode | StrictMode;
         break;
       case REACT_STRICT_MODE_TYPE:
         fiberTag = Mode;
@@ -5002,15 +5347,60 @@ function createFiberFromElement(element, mode, expirationTime) {
         break;
       case REACT_PROFILER_TYPE:
         return createFiberFromProfiler(pendingProps, mode, expirationTime, key);
-      case REACT_TIMEOUT_TYPE:
-        fiberTag = TimeoutComponent;
-        // Suspense does not require async, but its children should be strict
-        // mode compatible.
-        mode |= StrictMode;
-        break;
-      default:
-        fiberTag = getFiberTagFromObjectType(type, owner);
+      case REACT_SUSPENSE_TYPE:
+        fiberTag = SuspenseComponent;
         break;
+      default: {
+        if (typeof type === "object" && type !== null) {
+          switch (type.$$typeof) {
+            case REACT_PROVIDER_TYPE:
+              fiberTag = ContextProvider;
+              break getTag;
+            case REACT_CONTEXT_TYPE:
+              // This is a consumer
+              fiberTag = ContextConsumer;
+              break getTag;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = ForwardRef;
+              break getTag;
+            case REACT_PURE_TYPE:
+              fiberTag = PureComponent;
+              break getTag;
+            default: {
+              if (typeof type.then === "function") {
+                fiberTag = IndeterminateComponent;
+                break getTag;
+              }
+            }
+          }
+        }
+        var info = "";
+        {
+          if (
+            type === undefined ||
+            (typeof type === "object" &&
+              type !== null &&
+              Object.keys(type).length === 0)
+          ) {
+            info +=
+              " You likely forgot to export your component from the file " +
+              "it's defined in, or you might have mixed up default and " +
+              "named imports.";
+          }
+          var ownerName = owner ? getComponentName(owner.type) : null;
+          if (ownerName) {
+            info += "\n\nCheck the render method of `" + ownerName + "`.";
+          }
+        }
+        invariant(
+          false,
+          "Element type is invalid: expected a string (for built-in " +
+            "components) or a class/function (for composite components) " +
+            "but got: %s.%s",
+          type == null ? type : typeof type,
+          info
+        );
+      }
     }
   }
 
@@ -5026,49 +5416,6 @@ function createFiberFromElement(element, mode, expirationTime) {
   return fiber;
 }
 
-function getFiberTagFromObjectType(type, owner) {
-  var $$typeof =
-    typeof type === "object" && type !== null ? type.$$typeof : null;
-
-  switch ($$typeof) {
-    case REACT_PROVIDER_TYPE:
-      return ContextProvider;
-    case REACT_CONTEXT_TYPE:
-      // This is a consumer
-      return ContextConsumer;
-    case REACT_FORWARD_REF_TYPE:
-      return ForwardRef;
-    default: {
-      var info = "";
-      {
-        if (
-          type === undefined ||
-          (typeof type === "object" &&
-            type !== null &&
-            Object.keys(type).length === 0)
-        ) {
-          info +=
-            " You likely forgot to export your component from the file " +
-            "it's defined in, or you might have mixed up default and " +
-            "named imports.";
-        }
-        var ownerName = owner ? getComponentName(owner) : null;
-        if (ownerName) {
-          info += "\n\nCheck the render method of `" + ownerName + "`.";
-        }
-      }
-      invariant(
-        false,
-        "Element type is invalid: expected a string (for built-in " +
-          "components) or a class/function (for composite components) " +
-          "but got: %s.%s",
-        type == null ? type : typeof type,
-        info
-      );
-    }
-  }
-}
-
 function createFiberFromFragment(elements, mode, expirationTime, key) {
   var fiber = createFiber(Fragment, elements, key, mode);
   fiber.expirationTime = expirationTime;
@@ -5081,7 +5428,7 @@ function createFiberFromProfiler(pendingProps, mode, expirationTime, key) {
       typeof pendingProps.id !== "string" ||
       typeof pendingProps.onRender !== "function"
     ) {
-      invariant(
+      warningWithoutStack$1(
         false,
         'Profiler must specify an "id" string and "onRender" function as props'
       );
@@ -5146,18 +5493,20 @@ function assignFiberPropertiesInDEV(target, source) {
   target.memoizedProps = source.memoizedProps;
   target.updateQueue = source.updateQueue;
   target.memoizedState = source.memoizedState;
+  target.firstContextDependency = source.firstContextDependency;
   target.mode = source.mode;
   target.effectTag = source.effectTag;
   target.nextEffect = source.nextEffect;
   target.firstEffect = source.firstEffect;
   target.lastEffect = source.lastEffect;
   target.expirationTime = source.expirationTime;
+  target.childExpirationTime = source.childExpirationTime;
   target.alternate = source.alternate;
   if (enableProfilerTimer) {
     target.actualDuration = source.actualDuration;
     target.actualStartTime = source.actualStartTime;
-    target.selfBaseTime = source.selfBaseTime;
-    target.treeBaseTime = source.treeBaseTime;
+    target.selfBaseDuration = source.selfBaseDuration;
+    target.treeBaseDuration = source.treeBaseDuration;
   }
   target._debugID = source._debugID;
   target._debugSource = source._debugSource;
@@ -5168,135 +5517,114 @@ function assignFiberPropertiesInDEV(target, source) {
 
 // TODO: This should be lifted into the renderer.
 
-function createFiberRoot(containerInfo, isAsync, hydrate) {
+// The following attributes are only used by interaction tracing builds.
+// They enable interactions to be associated with their async work,
+// And expose interaction metadata to the React DevTools Profiler plugin.
+// Note that these attributes are only defined when the enableSchedulerTracing flag is enabled.
+
+// Exported FiberRoot type includes all properties,
+// To avoid requiring potentially error-prone :any casts throughout the project.
+// Profiling properties are only safe to access in profiling builds (when enableSchedulerTracing is true).
+// The types are defined separately within this file to ensure they stay in sync.
+// (We don't have to use an inline :any cast when enableSchedulerTracing is disabled.)
+
+function createFiberRoot(containerInfo, isConcurrent, hydrate) {
   // Cyclic construction. This cheats the type system right now because
   // stateNode is any.
-  var uninitializedFiber = createHostRootFiber(isAsync);
-  var root = {
-    current: uninitializedFiber,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-
-    earliestPendingTime: NoWork,
-    latestPendingTime: NoWork,
-    earliestSuspendedTime: NoWork,
-    latestSuspendedTime: NoWork,
-    latestPingedTime: NoWork,
-
-    didError: false,
-
-    pendingCommitExpirationTime: NoWork,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    nextExpirationTimeToWorkOn: NoWork,
-    expirationTime: NoWork,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
+  var uninitializedFiber = createHostRootFiber(isConcurrent);
+
+  var root = void 0;
+  if (enableSchedulerTracing) {
+    root = {
+      current: uninitializedFiber,
+      containerInfo: containerInfo,
+      pendingChildren: null,
+
+      earliestPendingTime: NoWork,
+      latestPendingTime: NoWork,
+      earliestSuspendedTime: NoWork,
+      latestSuspendedTime: NoWork,
+      latestPingedTime: NoWork,
+
+      didError: false,
+
+      pendingCommitExpirationTime: NoWork,
+      finishedWork: null,
+      timeoutHandle: noTimeout,
+      context: null,
+      pendingContext: null,
+      hydrate: hydrate,
+      nextExpirationTimeToWorkOn: NoWork,
+      expirationTime: NoWork,
+      firstBatch: null,
+      nextScheduledRoot: null,
+
+      interactionThreadID: tracing.unstable_getThreadID(),
+      memoizedInteractions: new Set(),
+      pendingInteractionMap: new Map()
+    };
+  } else {
+    root = {
+      current: uninitializedFiber,
+      containerInfo: containerInfo,
+      pendingChildren: null,
+
+      earliestPendingTime: NoWork,
+      latestPendingTime: NoWork,
+      earliestSuspendedTime: NoWork,
+      latestSuspendedTime: NoWork,
+      latestPingedTime: NoWork,
+
+      didError: false,
+
+      pendingCommitExpirationTime: NoWork,
+      finishedWork: null,
+      timeoutHandle: noTimeout,
+      context: null,
+      pendingContext: null,
+      hydrate: hydrate,
+      nextExpirationTimeToWorkOn: NoWork,
+      expirationTime: NoWork,
+      firstBatch: null,
+      nextScheduledRoot: null
+    };
+  }
+
   uninitializedFiber.stateNode = root;
+
+  // The reason for the way the Flow types are structured in this file,
+  // Is to avoid needing :any casts everywhere interaction tracing fields are used.
+  // Unfortunately that requires an :any cast for non-interaction tracing capable builds.
+  // $FlowFixMe Remove this :any cast and replace it with something better.
   return root;
 }
 
-var onCommitFiberRoot = null;
-var onCommitFiberUnmount = null;
-var hasLoggedError = false;
+/**
+ * Forked from fbjs/warning:
+ * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
+ *
+ * Only change is we use console.warn instead of console.error,
+ * and do nothing when 'console' is not supported.
+ * This really simplifies the code.
+ * ---
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
 
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {
-      if (true && !hasLoggedError) {
-        hasLoggedError = true;
-        warning(false, "React DevTools encountered an error: %s", err);
-      }
-    }
-  };
-}
-
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
-  }
-  if (!hook.supportsFiber) {
-    {
-      warning(
-        false,
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://fb.me/react-devtools"
-      );
-    }
-    // DevTools exists, even though it doesn't support Fiber.
-    return true;
-  }
-  try {
-    var rendererID = hook.inject(internals);
-    // We have successfully injected, so now it is safe to set up hooks.
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      warning(false, "React DevTools encountered an error: %s.", err);
-    }
-  }
-  // DevTools exists
-  return true;
-}
-
-function onCommitRoot(root) {
-  if (typeof onCommitFiberRoot === "function") {
-    onCommitFiberRoot(root);
-  }
-}
-
-function onCommitUnmount(fiber) {
-  if (typeof onCommitFiberUnmount === "function") {
-    onCommitFiberUnmount(fiber);
-  }
-}
-
-/**
- * Forked from fbjs/warning:
- * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
- *
- * Only change is we use console.warn instead of console.error,
- * and do nothing when 'console' is not supported.
- * This really simplifies the code.
- * ---
- * Similar to invariant but only logs a warning if the condition is not met.
- * This can be used to log issues in development environments in critical
- * paths. Removing the logging code for production environments will keep the
- * same logic and follow the same code paths.
- */
-
-var lowPriorityWarning = function() {};
-
-{
-  var printWarning = function(format) {
-    for (
-      var _len = arguments.length,
-        args = Array(_len > 1 ? _len - 1 : 0),
-        _key = 1;
-      _key < _len;
-      _key++
-    ) {
-      args[_key - 1] = arguments[_key];
+var lowPriorityWarning = function() {};
+
+{
+  var printWarning = function(format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 1 ? _len - 1 : 0),
+        _key = 1;
+      _key < _len;
+      _key++
+    ) {
+      args[_key - 1] = arguments[_key];
     }
 
     var argIndex = 0;
@@ -5319,7 +5647,7 @@ var lowPriorityWarning = function() {};
   lowPriorityWarning = function(condition, format) {
     if (format === undefined) {
       throw new Error(
-        "`warning(condition, format, ...args)` requires a warning " +
+        "`lowPriorityWarning(condition, format, ...args)` requires a warning " +
           "message argument"
       );
     }
@@ -5397,7 +5725,7 @@ var ReactStrictModeWarnings = {
         if (lifecycleWarnings.length > 0) {
           var componentNames = new Set();
           lifecycleWarnings.forEach(function(fiber) {
-            componentNames.add(getComponentName(fiber) || "Component");
+            componentNames.add(getComponentName(fiber.type) || "Component");
             didWarnAboutUnsafeLifecycles.add(fiber.type);
           });
 
@@ -5414,11 +5742,9 @@ var ReactStrictModeWarnings = {
       });
 
       if (lifecyclesWarningMesages.length > 0) {
-        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-          strictRoot
-        );
+        var strictRootComponentStack = getStackByFiberInDevAndProd(strictRoot);
 
-        warning(
+        warningWithoutStack$1(
           false,
           "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
             "\n\n%s" +
@@ -5451,7 +5777,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillMountWarnings.length > 0) {
       var uniqueNames = new Set();
       pendingComponentWillMountWarnings.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
+        uniqueNames.add(getComponentName(fiber.type) || "Component");
         didWarnAboutDeprecatedLifecycles.add(fiber.type);
       });
 
@@ -5474,7 +5800,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillReceivePropsWarnings.length > 0) {
       var _uniqueNames = new Set();
       pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
-        _uniqueNames.add(getComponentName(fiber) || "Component");
+        _uniqueNames.add(getComponentName(fiber.type) || "Component");
         didWarnAboutDeprecatedLifecycles.add(fiber.type);
       });
 
@@ -5496,7 +5822,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillUpdateWarnings.length > 0) {
       var _uniqueNames2 = new Set();
       pendingComponentWillUpdateWarnings.forEach(function(fiber) {
-        _uniqueNames2.add(getComponentName(fiber) || "Component");
+        _uniqueNames2.add(getComponentName(fiber.type) || "Component");
         didWarnAboutDeprecatedLifecycles.add(fiber.type);
       });
 
@@ -5553,7 +5879,7 @@ var ReactStrictModeWarnings = {
   ) {
     var strictRoot = findStrictRoot(fiber);
     if (strictRoot === null) {
-      warning(
+      warningWithoutStack$1(
         false,
         "Expected to find a StrictMode component in a strict mode tree. " +
           "This error is likely caused by a bug in React. Please file an issue."
@@ -5620,7 +5946,7 @@ var ReactStrictModeWarnings = {
   ) {
     var strictRoot = findStrictRoot(fiber);
     if (strictRoot === null) {
-      warning(
+      warningWithoutStack$1(
         false,
         "Expected to find a StrictMode component in a strict mode tree. " +
           "This error is likely caused by a bug in React. Please file an issue."
@@ -5652,16 +5978,14 @@ var ReactStrictModeWarnings = {
     pendingLegacyContextWarning.forEach(function(fiberArray, strictRoot) {
       var uniqueNames = new Set();
       fiberArray.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
+        uniqueNames.add(getComponentName(fiber.type) || "Component");
         didWarnAboutLegacyContext.add(fiber.type);
       });
 
       var sortedNames = setToSortedString(uniqueNames);
-      var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-        strictRoot
-      );
+      var strictRootComponentStack = getStackByFiberInDevAndProd(strictRoot);
 
-      warning(
+      warningWithoutStack$1(
         false,
         "Legacy context API has been detected within a strict-mode tree: %s" +
           "\n\nPlease update the following components: %s" +
@@ -5684,7 +6008,9 @@ var ReactFiberInstrumentation = {
 
 var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
 
-// TODO: Offscreen updates
+// TODO: Offscreen updates should never suspend. However, a promise that
+// suspended inside an offscreen subtree should be able to ping at the priority
+// of the outer render.
 
 function markPendingPriorityLevel(root, expirationTime) {
   // If there's a gap between completing a failed root and retrying it,
@@ -5709,10 +6035,10 @@ function markPendingPriorityLevel(root, expirationTime) {
       }
     }
   }
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(expirationTime, root);
 }
 
-function markCommittedPriorityLevels(root, currentTime, earliestRemainingTime) {
+function markCommittedPriorityLevels(root, earliestRemainingTime) {
   root.didError = false;
 
   if (earliestRemainingTime === NoWork) {
@@ -5722,7 +6048,7 @@ function markCommittedPriorityLevels(root, currentTime, earliestRemainingTime) {
     root.earliestSuspendedTime = NoWork;
     root.latestSuspendedTime = NoWork;
     root.latestPingedTime = NoWork;
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
@@ -5751,7 +6077,7 @@ function markCommittedPriorityLevels(root, currentTime, earliestRemainingTime) {
     // There's no suspended work. Treat the earliest remaining level as a
     // pending level.
     markPendingPriorityLevel(root, earliestRemainingTime);
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
@@ -5766,7 +6092,7 @@ function markCommittedPriorityLevels(root, currentTime, earliestRemainingTime) {
     // There's no suspended work. Treat the earliest remaining level as a
     // pending level.
     markPendingPriorityLevel(root, earliestRemainingTime);
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
@@ -5774,31 +6100,41 @@ function markCommittedPriorityLevels(root, currentTime, earliestRemainingTime) {
     // The earliest remaining time is earlier than all the suspended work.
     // Treat it as a pending update.
     markPendingPriorityLevel(root, earliestRemainingTime);
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
   // The earliest remaining time falls within the range of known suspended
   // levels. We should treat this as suspended work.
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(NoWork, root);
 }
 
-function hasLowerPriorityWork(root, renderExpirationTime) {
+function hasLowerPriorityWork(root, erroredExpirationTime) {
+  var latestPendingTime = root.latestPendingTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
+  var latestPingedTime = root.latestPingedTime;
   return (
-    renderExpirationTime !== root.latestPendingTime &&
-    renderExpirationTime !== root.latestSuspendedTime
+    (latestPendingTime !== NoWork &&
+      latestPendingTime > erroredExpirationTime) ||
+    (latestSuspendedTime !== NoWork &&
+      latestSuspendedTime > erroredExpirationTime) ||
+    (latestPingedTime !== NoWork && latestPingedTime > erroredExpirationTime)
   );
 }
 
-function markSuspendedPriorityLevel(root, suspendedTime, didError) {
-  if (didError && !hasLowerPriorityWork(root, suspendedTime)) {
-    // TODO: When we add back resuming, we need to ensure the progressed work
-    // is thrown out and not reused during the restarted render. One way to
-    // invalidate the progressed work is to restart at expirationTime + 1.
-    root.didError = true;
-    findNextPendingPriorityLevel(root);
-    return;
-  }
+function isPriorityLevelSuspended(root, expirationTime) {
+  var earliestSuspendedTime = root.earliestSuspendedTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
+  return (
+    earliestSuspendedTime !== NoWork &&
+    expirationTime >= earliestSuspendedTime &&
+    expirationTime <= latestSuspendedTime
+  );
+}
+
+function markSuspendedPriorityLevel(root, suspendedTime) {
+  root.didError = false;
+  clearPing(root, suspendedTime);
 
   // First, check the known pending levels and update them if needed.
   var earliestPendingTime = root.earliestPendingTime;
@@ -5818,15 +6154,9 @@ function markSuspendedPriorityLevel(root, suspendedTime, didError) {
     root.latestPendingTime = earliestPendingTime;
   }
 
-  // Next, if we're working on the lowest known suspended level, clear the ping.
-  // TODO: What if a promise suspends and pings before the root completes?
-  var latestSuspendedTime = root.latestSuspendedTime;
-  if (latestSuspendedTime === suspendedTime) {
-    root.latestPingedTime = NoWork;
-  }
-
   // Finally, update the known suspended levels.
   var earliestSuspendedTime = root.earliestSuspendedTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
   if (earliestSuspendedTime === NoWork) {
     // No other suspended levels.
     root.earliestSuspendedTime = root.latestSuspendedTime = suspendedTime;
@@ -5839,44 +6169,94 @@ function markSuspendedPriorityLevel(root, suspendedTime, didError) {
       root.latestSuspendedTime = suspendedTime;
     }
   }
-  findNextPendingPriorityLevel(root);
+
+  findNextExpirationTimeToWorkOn(suspendedTime, root);
 }
 
 function markPingedPriorityLevel(root, pingedTime) {
-  var latestSuspendedTime = root.latestSuspendedTime;
-  if (latestSuspendedTime !== NoWork && latestSuspendedTime <= pingedTime) {
-    var latestPingedTime = root.latestPingedTime;
-    if (latestPingedTime === NoWork || latestPingedTime < pingedTime) {
-      root.latestPingedTime = pingedTime;
-    }
+  root.didError = false;
+
+  // TODO: When we add back resuming, we need to ensure the progressed work
+  // is thrown out and not reused during the restarted render. One way to
+  // invalidate the progressed work is to restart at expirationTime + 1.
+  var latestPingedTime = root.latestPingedTime;
+  if (latestPingedTime === NoWork || latestPingedTime < pingedTime) {
+    root.latestPingedTime = pingedTime;
   }
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(pingedTime, root);
 }
 
-function findNextPendingPriorityLevel(root) {
+function clearPing(root, completedTime) {
+  // TODO: Track whether the root was pinged during the render phase. If so,
+  // we need to make sure we don't lose track of it.
+  var latestPingedTime = root.latestPingedTime;
+  if (latestPingedTime !== NoWork && latestPingedTime <= completedTime) {
+    root.latestPingedTime = NoWork;
+  }
+}
+
+function findEarliestOutstandingPriorityLevel(root, renderExpirationTime) {
+  var earliestExpirationTime = renderExpirationTime;
+
+  var earliestPendingTime = root.earliestPendingTime;
+  var earliestSuspendedTime = root.earliestSuspendedTime;
+  if (
+    earliestExpirationTime === NoWork ||
+    (earliestPendingTime !== NoWork &&
+      earliestPendingTime < earliestExpirationTime)
+  ) {
+    earliestExpirationTime = earliestPendingTime;
+  }
+  if (
+    earliestExpirationTime === NoWork ||
+    (earliestSuspendedTime !== NoWork &&
+      earliestSuspendedTime < earliestExpirationTime)
+  ) {
+    earliestExpirationTime = earliestSuspendedTime;
+  }
+  return earliestExpirationTime;
+}
+
+function didExpireAtExpirationTime(root, currentTime) {
+  var expirationTime = root.expirationTime;
+  if (expirationTime !== NoWork && currentTime >= expirationTime) {
+    // The root has expired. Flush all work up to the current time.
+    root.nextExpirationTimeToWorkOn = currentTime;
+  }
+}
+
+function findNextExpirationTimeToWorkOn(completedExpirationTime, root) {
   var earliestSuspendedTime = root.earliestSuspendedTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
   var earliestPendingTime = root.earliestPendingTime;
-  var nextExpirationTimeToWorkOn = void 0;
-  var expirationTime = void 0;
-  if (earliestSuspendedTime === NoWork) {
-    // Fast path. There's no suspended work.
-    nextExpirationTimeToWorkOn = expirationTime = earliestPendingTime;
-  } else if (earliestPendingTime !== NoWork) {
-    // Check if there's known pending work.
-    nextExpirationTimeToWorkOn = earliestPendingTime;
-    expirationTime =
-      earliestSuspendedTime < earliestPendingTime
-        ? earliestSuspendedTime
-        : earliestPendingTime;
-  } else {
-    // Finally, if a suspended level was pinged, work on that. Otherwise there's
-    // nothing to work on.
-    nextExpirationTimeToWorkOn = expirationTime = root.latestPingedTime;
+  var latestPingedTime = root.latestPingedTime;
+
+  // Work on the earliest pending time. Failing that, work on the latest
+  // pinged time.
+  var nextExpirationTimeToWorkOn =
+    earliestPendingTime !== NoWork ? earliestPendingTime : latestPingedTime;
+
+  // If there is no pending or pinged work, check if there's suspended work
+  // that's lower priority than what we just completed.
+  if (
+    nextExpirationTimeToWorkOn === NoWork &&
+    (completedExpirationTime === NoWork ||
+      latestSuspendedTime > completedExpirationTime)
+  ) {
+    // The lowest priority suspended work is the work most likely to be
+    // committed next. Let's start rendering it again, so that if it times out,
+    // it's ready to commit.
+    nextExpirationTimeToWorkOn = latestSuspendedTime;
   }
 
-  if (root.didError) {
-    // Revert to synchronous mode.
-    expirationTime = Sync;
+  var expirationTime = nextExpirationTimeToWorkOn;
+  if (
+    expirationTime !== NoWork &&
+    earliestSuspendedTime !== NoWork &&
+    earliestSuspendedTime < expirationTime
+  ) {
+    // Expire using the earliest known expiration time.
+    expirationTime = earliestSuspendedTime;
   }
 
   root.nextExpirationTimeToWorkOn = nextExpirationTimeToWorkOn;
@@ -5983,7 +6363,6 @@ var resetCurrentlyProcessingQueue = void 0;
 
 function createUpdateQueue(baseState) {
   var queue = {
-    expirationTime: NoWork,
     baseState: baseState,
     firstUpdate: null,
     lastUpdate: null,
@@ -5999,7 +6378,6 @@ function createUpdateQueue(baseState) {
 
 function cloneUpdateQueue(currentQueue) {
   var queue = {
-    expirationTime: currentQueue.expirationTime,
     baseState: currentQueue.baseState,
     firstUpdate: currentQueue.firstUpdate,
     lastUpdate: currentQueue.lastUpdate,
@@ -6031,7 +6409,7 @@ function createUpdate(expirationTime) {
   };
 }
 
-function appendUpdateToQueue(queue, update, expirationTime) {
+function appendUpdateToQueue(queue, update) {
   // Append the update to the end of the list.
   if (queue.lastUpdate === null) {
     // Queue is empty
@@ -6040,17 +6418,9 @@ function appendUpdateToQueue(queue, update, expirationTime) {
     queue.lastUpdate.next = update;
     queue.lastUpdate = update;
   }
-  if (
-    queue.expirationTime === NoWork ||
-    queue.expirationTime > expirationTime
-  ) {
-    // The incoming update has the earliest expiration of any update in the
-    // queue. Update the queue's expiration time.
-    queue.expirationTime = expirationTime;
-  }
 }
 
-function enqueueUpdate(fiber, update, expirationTime) {
+function enqueueUpdate(fiber, update) {
   // Update queues are created lazily.
   var alternate = fiber.alternate;
   var queue1 = void 0;
@@ -6088,19 +6458,19 @@ function enqueueUpdate(fiber, update, expirationTime) {
   }
   if (queue2 === null || queue1 === queue2) {
     // There's only a single queue.
-    appendUpdateToQueue(queue1, update, expirationTime);
+    appendUpdateToQueue(queue1, update);
   } else {
     // There are two queues. We need to append the update to both queues,
     // while accounting for the persistent structure of the list — we don't
     // want the same update to be added multiple times.
     if (queue1.lastUpdate === null || queue2.lastUpdate === null) {
       // One of the queues is not empty. We must add the update to both queues.
-      appendUpdateToQueue(queue1, update, expirationTime);
-      appendUpdateToQueue(queue2, update, expirationTime);
+      appendUpdateToQueue(queue1, update);
+      appendUpdateToQueue(queue2, update);
     } else {
       // Both queues are non-empty. The last update is the same in both lists,
       // because of structural sharing. So, only append to one of the lists.
-      appendUpdateToQueue(queue1, update, expirationTime);
+      appendUpdateToQueue(queue1, update);
       // But we still need to update the `lastUpdate` pointer of queue2.
       queue2.lastUpdate = update;
     }
@@ -6108,12 +6478,12 @@ function enqueueUpdate(fiber, update, expirationTime) {
 
   {
     if (
-      fiber.tag === ClassComponent &&
+      (fiber.tag === ClassComponent || fiber.tag === ClassComponentLazy) &&
       (currentlyProcessingQueue === queue1 ||
         (queue2 !== null && currentlyProcessingQueue === queue2)) &&
       !didWarnUpdateInsideUpdate
     ) {
-      warning(
+      warningWithoutStack$1(
         false,
         "An update (setState, replaceState, or forceUpdate) was scheduled " +
           "from inside an update function. Update functions should be pure, " +
@@ -6125,7 +6495,7 @@ function enqueueUpdate(fiber, update, expirationTime) {
   }
 }
 
-function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
+function enqueueCapturedUpdate(workInProgress, update) {
   // Captured updates go into a separate list, and only on the work-in-
   // progress queue.
   var workInProgressQueue = workInProgress.updateQueue;
@@ -6151,14 +6521,6 @@ function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
     workInProgressQueue.lastCapturedUpdate.next = update;
     workInProgressQueue.lastCapturedUpdate = update;
   }
-  if (
-    workInProgressQueue.expirationTime === NoWork ||
-    workInProgressQueue.expirationTime > renderExpirationTime
-  ) {
-    // The incoming update has the earliest expiration of any update in the
-    // queue. Update the queue's expiration time.
-    workInProgressQueue.expirationTime = renderExpirationTime;
-  }
 }
 
 function ensureWorkInProgressQueueIsAClone(workInProgress, queue) {
@@ -6248,14 +6610,6 @@ function processUpdateQueue(
 ) {
   hasForceUpdate = false;
 
-  if (
-    queue.expirationTime === NoWork ||
-    queue.expirationTime > renderExpirationTime
-  ) {
-    // Insufficient priority. Bailout.
-    return;
-  }
-
   queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
 
   {
@@ -6387,8 +6741,15 @@ function processUpdateQueue(
   queue.baseState = newBaseState;
   queue.firstUpdate = newFirstUpdate;
   queue.firstCapturedUpdate = newFirstCapturedUpdate;
-  queue.expirationTime = newExpirationTime;
 
+  // Set the remaining expiration time to be whatever is remaining in the queue.
+  // This should be fine because the only two other things that contribute to
+  // expiration time are props and context. We're already in the middle of the
+  // begin phase by the time we start processing the queue, so we've already
+  // dealt with the props. Context in components that specify
+  // shouldComponentUpdate is tricky; but we'll have to account for
+  // that regardless.
+  workInProgress.expirationTime = newExpirationTime;
   workInProgress.memoizedState = resultState;
 
   {
@@ -6435,8 +6796,14 @@ function commitUpdateQueue(
   }
 
   // Commit the effects
-  var effect = finishedQueue.firstEffect;
+  commitUpdateEffects(finishedQueue.firstEffect, instance);
   finishedQueue.firstEffect = finishedQueue.lastEffect = null;
+
+  commitUpdateEffects(finishedQueue.firstCapturedEffect, instance);
+  finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
+}
+
+function commitUpdateEffects(effect, instance) {
   while (effect !== null) {
     var _callback3 = effect.callback;
     if (_callback3 !== null) {
@@ -6445,17 +6812,6 @@ function commitUpdateQueue(
     }
     effect = effect.nextEffect;
   }
-
-  effect = finishedQueue.firstCapturedEffect;
-  finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
-  while (effect !== null) {
-    var _callback4 = effect.callback;
-    if (_callback4 !== null) {
-      effect.callback = null;
-      callCallback(_callback4, instance);
-    }
-    effect = effect.nextEffect;
-  }
 }
 
 function createCapturedValue(value, source) {
@@ -6464,13 +6820,48 @@ function createCapturedValue(value, source) {
   return {
     value: value,
     source: source,
-    stack: getStackAddendumByWorkInProgressFiber(source)
+    stack: getStackByFiberInDevAndProd(source)
+  };
+}
+
+/**
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
+
+var warning = warningWithoutStack$1;
+
+{
+  warning = function(condition, format) {
+    if (condition) {
+      return;
+    }
+    var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+    var stack = ReactDebugCurrentFrame.getStackAddendum();
+    // eslint-disable-next-line react-internal/warning-and-invariant-args
+
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 2 ? _len - 2 : 0),
+        _key = 2;
+      _key < _len;
+      _key++
+    ) {
+      args[_key - 2] = arguments[_key];
+    }
+
+    warningWithoutStack$1.apply(
+      undefined,
+      [false, format + "%s"].concat(args, [stack])
+    );
   };
 }
 
-var providerCursor = createCursor(null);
+var warning$1 = warning;
+
 var valueCursor = createCursor(null);
-var changedBitsCursor = createCursor(0);
 
 var rendererSigil = void 0;
 {
@@ -6478,23 +6869,32 @@ var rendererSigil = void 0;
   rendererSigil = {};
 }
 
-function pushProvider(providerFiber) {
+var currentlyRenderingFiber = null;
+var lastContextDependency = null;
+var lastContextWithAllBitsObserved = null;
+
+function resetContextDependences() {
+  // This is called right before React yields execution, to ensure `readContext`
+  // cannot be called outside the render phase.
+  currentlyRenderingFiber = null;
+  lastContextDependency = null;
+  lastContextWithAllBitsObserved = null;
+}
+
+function pushProvider(providerFiber, nextValue) {
   var context = providerFiber.type._context;
 
   if (isPrimaryRenderer) {
-    push(changedBitsCursor, context._changedBits, providerFiber);
     push(valueCursor, context._currentValue, providerFiber);
-    push(providerCursor, providerFiber, providerFiber);
 
-    context._currentValue = providerFiber.pendingProps.value;
-    context._changedBits = providerFiber.stateNode;
+    context._currentValue = nextValue;
     {
       !(
         context._currentRenderer === undefined ||
         context._currentRenderer === null ||
         context._currentRenderer === rendererSigil
       )
-        ? warning(
+        ? warningWithoutStack$1(
             false,
             "Detected multiple renderers concurrently rendering the " +
               "same context provider. This is currently unsupported."
@@ -6503,19 +6903,16 @@ function pushProvider(providerFiber) {
       context._currentRenderer = rendererSigil;
     }
   } else {
-    push(changedBitsCursor, context._changedBits2, providerFiber);
     push(valueCursor, context._currentValue2, providerFiber);
-    push(providerCursor, providerFiber, providerFiber);
 
-    context._currentValue2 = providerFiber.pendingProps.value;
-    context._changedBits2 = providerFiber.stateNode;
+    context._currentValue2 = nextValue;
     {
       !(
         context._currentRenderer2 === undefined ||
         context._currentRenderer2 === null ||
         context._currentRenderer2 === rendererSigil
       )
-        ? warning(
+        ? warningWithoutStack$1(
             false,
             "Detected multiple renderers concurrently rendering the " +
               "same context provider. This is currently unsupported."
@@ -6527,56 +6924,245 @@ function pushProvider(providerFiber) {
 }
 
 function popProvider(providerFiber) {
-  var changedBits = changedBitsCursor.current;
   var currentValue = valueCursor.current;
 
-  pop(providerCursor, providerFiber);
   pop(valueCursor, providerFiber);
-  pop(changedBitsCursor, providerFiber);
 
   var context = providerFiber.type._context;
   if (isPrimaryRenderer) {
     context._currentValue = currentValue;
-    context._changedBits = changedBits;
   } else {
     context._currentValue2 = currentValue;
-    context._changedBits2 = changedBits;
   }
 }
 
-function getContextCurrentValue(context) {
-  return isPrimaryRenderer ? context._currentValue : context._currentValue2;
-}
+function calculateChangedBits(context, newValue, oldValue) {
+  // Use Object.is to compare the new context value to the old value. Inlined
+  // Object.is polyfill.
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+  if (
+    (oldValue === newValue &&
+      (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
+    (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
+  ) {
+    // No change
+    return 0;
+  } else {
+    var changedBits =
+      typeof context._calculateChangedBits === "function"
+        ? context._calculateChangedBits(oldValue, newValue)
+        : maxSigned31BitInt;
 
-function getContextChangedBits(context) {
-  return isPrimaryRenderer ? context._changedBits : context._changedBits2;
+    {
+      !((changedBits & maxSigned31BitInt) === changedBits)
+        ? warning$1(
+            false,
+            "calculateChangedBits: Expected the return value to be a " +
+              "31-bit integer. Instead received: %s",
+            changedBits
+          )
+        : void 0;
+    }
+    return changedBits | 0;
+  }
 }
 
-var NO_CONTEXT = {};
+function propagateContextChange(
+  workInProgress,
+  context,
+  changedBits,
+  renderExpirationTime
+) {
+  var fiber = workInProgress.child;
+  if (fiber !== null) {
+    // Set the return pointer of the child to the work-in-progress fiber.
+    fiber.return = workInProgress;
+  }
+  while (fiber !== null) {
+    var nextFiber = void 0;
 
-var contextStackCursor$1 = createCursor(NO_CONTEXT);
-var contextFiberStackCursor = createCursor(NO_CONTEXT);
-var rootInstanceStackCursor = createCursor(NO_CONTEXT);
+    // Visit this fiber.
+    var dependency = fiber.firstContextDependency;
+    if (dependency !== null) {
+      do {
+        // Check if the context matches.
+        if (
+          dependency.context === context &&
+          (dependency.observedBits & changedBits) !== 0
+        ) {
+          // Match! Schedule an update on this fiber.
 
-function requiredContext(c) {
-  invariant(
-    c !== NO_CONTEXT,
-    "Expected host context to exist. This error is likely caused by a bug " +
-      "in React. Please file an issue."
-  );
-  return c;
-}
+          if (
+            fiber.tag === ClassComponent ||
+            fiber.tag === ClassComponentLazy
+          ) {
+            // Schedule a force update on the work-in-progress.
+            var update = createUpdate(renderExpirationTime);
+            update.tag = ForceUpdate;
+            // TODO: Because we don't have a work-in-progress, this will add the
+            // update to the current fiber, too, which means it will persist even if
+            // this render is thrown away. Since it's a race condition, not sure it's
+            // worth fixing.
+            enqueueUpdate(fiber, update);
+          }
 
-function getRootHostContainer() {
-  var rootInstance = requiredContext(rootInstanceStackCursor.current);
-  return rootInstance;
-}
+          if (
+            fiber.expirationTime === NoWork ||
+            fiber.expirationTime > renderExpirationTime
+          ) {
+            fiber.expirationTime = renderExpirationTime;
+          }
+          var alternate = fiber.alternate;
+          if (
+            alternate !== null &&
+            (alternate.expirationTime === NoWork ||
+              alternate.expirationTime > renderExpirationTime)
+          ) {
+            alternate.expirationTime = renderExpirationTime;
+          }
+          // Update the child expiration time of all the ancestors, including
+          // the alternates.
+          var node = fiber.return;
+          while (node !== null) {
+            alternate = node.alternate;
+            if (
+              node.childExpirationTime === NoWork ||
+              node.childExpirationTime > renderExpirationTime
+            ) {
+              node.childExpirationTime = renderExpirationTime;
+              if (
+                alternate !== null &&
+                (alternate.childExpirationTime === NoWork ||
+                  alternate.childExpirationTime > renderExpirationTime)
+              ) {
+                alternate.childExpirationTime = renderExpirationTime;
+              }
+            } else if (
+              alternate !== null &&
+              (alternate.childExpirationTime === NoWork ||
+                alternate.childExpirationTime > renderExpirationTime)
+            ) {
+              alternate.childExpirationTime = renderExpirationTime;
+            } else {
+              // Neither alternate was updated, which means the rest of the
+              // ancestor path already has sufficient priority.
+              break;
+            }
+            node = node.return;
+          }
+        }
+        nextFiber = fiber.child;
+        dependency = dependency.next;
+      } while (dependency !== null);
+    } else if (fiber.tag === ContextProvider) {
+      // Don't scan deeper if this is a matching provider
+      nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
+    } else {
+      // Traverse down.
+      nextFiber = fiber.child;
+    }
 
-function pushHostContainer(fiber, nextRootInstance) {
-  // Push current root instance onto the stack;
-  // This allows us to reset root when portals are popped.
-  push(rootInstanceStackCursor, nextRootInstance, fiber);
-  // Track the context and the Fiber that provided it.
+    if (nextFiber !== null) {
+      // Set the return pointer of the child to the work-in-progress fiber.
+      nextFiber.return = fiber;
+    } else {
+      // No child. Traverse to next sibling.
+      nextFiber = fiber;
+      while (nextFiber !== null) {
+        if (nextFiber === workInProgress) {
+          // We're back to the root of this subtree. Exit.
+          nextFiber = null;
+          break;
+        }
+        var sibling = nextFiber.sibling;
+        if (sibling !== null) {
+          // Set the return pointer of the sibling to the work-in-progress fiber.
+          sibling.return = nextFiber.return;
+          nextFiber = sibling;
+          break;
+        }
+        // No more siblings. Traverse up.
+        nextFiber = nextFiber.return;
+      }
+    }
+    fiber = nextFiber;
+  }
+}
+
+function prepareToReadContext(workInProgress, renderExpirationTime) {
+  currentlyRenderingFiber = workInProgress;
+  lastContextDependency = null;
+  lastContextWithAllBitsObserved = null;
+
+  // Reset the work-in-progress list
+  workInProgress.firstContextDependency = null;
+}
+
+function readContext(context, observedBits) {
+  if (lastContextWithAllBitsObserved === context) {
+    // Nothing to do. We already observe everything in this context.
+  } else if (observedBits === false || observedBits === 0) {
+    // Do not observe any updates.
+  } else {
+    var resolvedObservedBits = void 0; // Avoid deopting on observable arguments or heterogeneous types.
+    if (
+      typeof observedBits !== "number" ||
+      observedBits === maxSigned31BitInt
+    ) {
+      // Observe all updates.
+      lastContextWithAllBitsObserved = context;
+      resolvedObservedBits = maxSigned31BitInt;
+    } else {
+      resolvedObservedBits = observedBits;
+    }
+
+    var contextItem = {
+      context: context,
+      observedBits: resolvedObservedBits,
+      next: null
+    };
+
+    if (lastContextDependency === null) {
+      invariant(
+        currentlyRenderingFiber !== null,
+        "Context.unstable_read(): Context can only be read while React is " +
+          "rendering, e.g. inside the render method or getDerivedStateFromProps."
+      );
+      // This is the first dependency in the list
+      currentlyRenderingFiber.firstContextDependency = lastContextDependency = contextItem;
+    } else {
+      // Append a new context item.
+      lastContextDependency = lastContextDependency.next = contextItem;
+    }
+  }
+  return isPrimaryRenderer ? context._currentValue : context._currentValue2;
+}
+
+var NO_CONTEXT = {};
+
+var contextStackCursor$1 = createCursor(NO_CONTEXT);
+var contextFiberStackCursor = createCursor(NO_CONTEXT);
+var rootInstanceStackCursor = createCursor(NO_CONTEXT);
+
+function requiredContext(c) {
+  invariant(
+    c !== NO_CONTEXT,
+    "Expected host context to exist. This error is likely caused by a bug " +
+      "in React. Please file an issue."
+  );
+  return c;
+}
+
+function getRootHostContainer() {
+  var rootInstance = requiredContext(rootInstanceStackCursor.current);
+  return rootInstance;
+}
+
+function pushHostContainer(fiber, nextRootInstance) {
+  // Push current root instance onto the stack;
+  // This allows us to reset root when portals are popped.
+  push(rootInstanceStackCursor, nextRootInstance, fiber);
+  // Track the context and the Fiber that provided it.
   // This enables us to pop only Fibers that provide unique contexts.
   push(contextFiberStackCursor, fiber, fiber);
 
@@ -6631,6 +7217,7 @@ function popHostContext(fiber) {
 }
 
 var commitTime = 0;
+var profilerStartTime = -1;
 
 function getCommitTime() {
   return commitTime;
@@ -6643,127 +7230,38 @@ function recordCommitTime() {
   commitTime = now();
 }
 
-/**
- * The "actual" render time is total time required to render the descendants of a Profiler component.
- * This time is stored as a stack, since Profilers can be nested.
- * This time is started during the "begin" phase and stopped during the "complete" phase.
- * It is paused (and accumulated) in the event of an interruption or an aborted render.
- */
-
-var fiberStack$1 = void 0;
-
-{
-  fiberStack$1 = [];
-}
-
-var timerPausedAt = 0;
-var totalElapsedPauseTime = 0;
-
-function checkActualRenderTimeStackEmpty() {
-  if (!enableProfilerTimer) {
-    return;
-  }
-  {
-    !(fiberStack$1.length === 0)
-      ? warning(
-          false,
-          "Expected an empty stack. Something was not reset properly."
-        )
-      : void 0;
-  }
-}
-
-function markActualRenderTimeStarted(fiber) {
-  if (!enableProfilerTimer) {
-    return;
-  }
-  {
-    fiberStack$1.push(fiber);
-  }
-
-  fiber.actualDuration = now() - fiber.actualDuration - totalElapsedPauseTime;
-  fiber.actualStartTime = now();
-}
-
-function pauseActualRenderTimerIfRunning() {
-  if (!enableProfilerTimer) {
-    return;
-  }
-  if (timerPausedAt === 0) {
-    timerPausedAt = now();
-  }
-}
-
-function recordElapsedActualRenderTime(fiber) {
+function startProfilerTimer(fiber) {
   if (!enableProfilerTimer) {
     return;
   }
-  {
-    !(fiber === fiberStack$1.pop())
-      ? warning(false, "Unexpected Fiber (%s) popped.", getComponentName(fiber))
-      : void 0;
-  }
 
-  fiber.actualDuration = now() - totalElapsedPauseTime - fiber.actualDuration;
-}
+  profilerStartTime = now();
 
-function resetActualRenderTimer() {
-  if (!enableProfilerTimer) {
-    return;
+  if (fiber.actualStartTime < 0) {
+    fiber.actualStartTime = now();
   }
-  totalElapsedPauseTime = 0;
 }
 
-function resumeActualRenderTimerIfPaused() {
+function stopProfilerTimerIfRunning(fiber) {
   if (!enableProfilerTimer) {
     return;
   }
-  if (timerPausedAt > 0) {
-    totalElapsedPauseTime += now() - timerPausedAt;
-    timerPausedAt = 0;
-  }
+  profilerStartTime = -1;
 }
 
-/**
- * The "base" render time is the duration of the “begin” phase of work for a particular fiber.
- * This time is measured and stored on each fiber.
- * The time for all sibling fibers are accumulated and stored on their parent during the "complete" phase.
- * If a fiber bails out (sCU false) then its "base" timer is cancelled and the fiber is not updated.
- */
-
-var baseStartTime = -1;
-
-function recordElapsedBaseRenderTimeIfRunning(fiber) {
+function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
   if (!enableProfilerTimer) {
     return;
   }
-  if (baseStartTime !== -1) {
-    fiber.selfBaseTime = now() - baseStartTime;
-  }
-}
 
-function startBaseRenderTimer() {
-  if (!enableProfilerTimer) {
-    return;
-  }
-  {
-    if (baseStartTime !== -1) {
-      warning(
-        false,
-        "Cannot start base timer that is already running. " +
-          "This error is likely caused by a bug in React. " +
-          "Please file an issue."
-      );
+  if (profilerStartTime >= 0) {
+    var elapsedTime = now() - profilerStartTime;
+    fiber.actualDuration += elapsedTime;
+    if (overrideBaseTime) {
+      fiber.selfBaseDuration = elapsedTime;
     }
+    profilerStartTime = -1;
   }
-  baseStartTime = now();
-}
-
-function stopBaseRenderTimerIfRunning() {
-  if (!enableProfilerTimer) {
-    return;
-  }
-  baseStartTime = -1;
 }
 
 /*eslint-disable no-self-compare */
@@ -6827,7 +7325,11 @@ function shallowEqual(objA, objB) {
 }
 
 var fakeInternalInstance = {};
-var isArray = Array.isArray;
+var isArray$1 = Array.isArray;
+
+// React.Component uses a shared frozen object by default.
+// We'll use it to determine whether we need to initialize legacy refs.
+var emptyRefsObject = new React.Component().refs;
 
 var didWarnAboutStateAssignmentForComponent = void 0;
 var didWarnAboutUninitializedState = void 0;
@@ -6836,13 +7338,19 @@ var didWarnAboutLegacyLifecyclesAndDerivedState = void 0;
 var didWarnAboutUndefinedDerivedState = void 0;
 var warnOnUndefinedDerivedState = void 0;
 var warnOnInvalidCallback = void 0;
+var didWarnAboutDirectlyAssigningPropsToState = void 0;
+var didWarnAboutContextTypeAndContextTypes = void 0;
+var didWarnAboutInvalidateContextType = void 0;
 
 {
   didWarnAboutStateAssignmentForComponent = new Set();
   didWarnAboutUninitializedState = new Set();
   didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = new Set();
   didWarnAboutLegacyLifecyclesAndDerivedState = new Set();
+  didWarnAboutDirectlyAssigningPropsToState = new Set();
   didWarnAboutUndefinedDerivedState = new Set();
+  didWarnAboutContextTypeAndContextTypes = new Set();
+  didWarnAboutInvalidateContextType = new Set();
 
   var didWarnOnInvalidCallback = new Set();
 
@@ -6853,7 +7361,7 @@ var warnOnInvalidCallback = void 0;
     var key = callerName + "_" + callback;
     if (!didWarnOnInvalidCallback.has(key)) {
       didWarnOnInvalidCallback.add(key);
-      warning(
+      warningWithoutStack$1(
         false,
         "%s(...): Expected the last optional `callback` argument to be a " +
           "function. Instead received: %s.",
@@ -6863,12 +7371,12 @@ var warnOnInvalidCallback = void 0;
     }
   };
 
-  warnOnUndefinedDerivedState = function(workInProgress, partialState) {
+  warnOnUndefinedDerivedState = function(type, partialState) {
     if (partialState === undefined) {
-      var componentName = getComponentName(workInProgress) || "Component";
+      var componentName = getComponentName(type) || "Component";
       if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
         didWarnAboutUndefinedDerivedState.add(componentName);
-        warning(
+        warningWithoutStack$1(
           false,
           "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
             "You have returned undefined.",
@@ -6902,6 +7410,7 @@ var warnOnInvalidCallback = void 0;
 
 function applyDerivedStateFromProps(
   workInProgress,
+  ctor,
   getDerivedStateFromProps,
   nextProps
 ) {
@@ -6921,7 +7430,7 @@ function applyDerivedStateFromProps(
   var partialState = getDerivedStateFromProps(nextProps, prevState);
 
   {
-    warnOnUndefinedDerivedState(workInProgress, partialState);
+    warnOnUndefinedDerivedState(ctor, partialState);
   }
   // Merge the partial state and the previous state.
   var memoizedState =
@@ -6933,7 +7442,7 @@ function applyDerivedStateFromProps(
   // Once the update queue is empty, persist the derived state onto the
   // base state.
   var updateQueue = workInProgress.updateQueue;
-  if (updateQueue !== null && updateQueue.expirationTime === NoWork) {
+  if (updateQueue !== null && workInProgress.expirationTime === NoWork) {
     updateQueue.baseState = memoizedState;
   }
 }
@@ -6942,7 +7451,7 @@ var classComponentUpdater = {
   isMounted: isMounted,
   enqueueSetState: function(inst, payload, callback) {
     var fiber = get$1(inst);
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     var expirationTime = computeExpirationForFiber(currentTime, fiber);
 
     var update = createUpdate(expirationTime);
@@ -6954,12 +7463,12 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update, expirationTime);
+    enqueueUpdate(fiber, update);
     scheduleWork(fiber, expirationTime);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     var fiber = get$1(inst);
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     var expirationTime = computeExpirationForFiber(currentTime, fiber);
 
     var update = createUpdate(expirationTime);
@@ -6973,12 +7482,12 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update, expirationTime);
+    enqueueUpdate(fiber, update);
     scheduleWork(fiber, expirationTime);
   },
   enqueueForceUpdate: function(inst, callback) {
     var fiber = get$1(inst);
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     var expirationTime = computeExpirationForFiber(currentTime, fiber);
 
     var update = createUpdate(expirationTime);
@@ -6991,37 +7500,37 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update, expirationTime);
+    enqueueUpdate(fiber, update);
     scheduleWork(fiber, expirationTime);
   }
 };
 
 function checkShouldComponentUpdate(
   workInProgress,
+  ctor,
   oldProps,
   newProps,
   oldState,
   newState,
-  newContext
+  nextContext
 ) {
   var instance = workInProgress.stateNode;
-  var ctor = workInProgress.type;
   if (typeof instance.shouldComponentUpdate === "function") {
     startPhaseTimer(workInProgress, "shouldComponentUpdate");
     var shouldUpdate = instance.shouldComponentUpdate(
       newProps,
       newState,
-      newContext
+      nextContext
     );
     stopPhaseTimer();
 
     {
       !(shouldUpdate !== undefined)
-        ? warning(
+        ? warningWithoutStack$1(
             false,
             "%s.shouldComponentUpdate(): Returned undefined instead of a " +
               "boolean value. Make sure to return true or false.",
-            getComponentName(workInProgress) || "Component"
+            getComponentName(ctor) || "Component"
           )
         : void 0;
     }
@@ -7038,23 +7547,22 @@ function checkShouldComponentUpdate(
   return true;
 }
 
-function checkClassInstance(workInProgress) {
+function checkClassInstance(workInProgress, ctor, newProps) {
   var instance = workInProgress.stateNode;
-  var type = workInProgress.type;
   {
-    var name = getComponentName(workInProgress) || "Component";
+    var name = getComponentName(ctor) || "Component";
     var renderPresent = instance.render;
 
     if (!renderPresent) {
-      if (type.prototype && typeof type.prototype.render === "function") {
-        warning(
+      if (ctor.prototype && typeof ctor.prototype.render === "function") {
+        warningWithoutStack$1(
           false,
           "%s(...): No `render` method found on the returned component " +
             "instance: did you accidentally return an object from the constructor?",
           name
         );
       } else {
-        warning(
+        warningWithoutStack$1(
           false,
           "%s(...): No `render` method found on the returned component " +
             "instance: you may have forgotten to define `render`.",
@@ -7068,7 +7576,7 @@ function checkClassInstance(workInProgress) {
       instance.getInitialState.isReactClassApproved ||
       instance.state;
     !noGetInitialStateOnES6
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "getInitialState was defined on %s, a plain JavaScript class. " +
             "This is only supported for classes created using React.createClass. " +
@@ -7080,7 +7588,7 @@ function checkClassInstance(workInProgress) {
       !instance.getDefaultProps ||
       instance.getDefaultProps.isReactClassApproved;
     !noGetDefaultPropsOnES6
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "getDefaultProps was defined on %s, a plain JavaScript class. " +
             "This is only supported for classes created using React.createClass. " +
@@ -7090,26 +7598,50 @@ function checkClassInstance(workInProgress) {
       : void 0;
     var noInstancePropTypes = !instance.propTypes;
     !noInstancePropTypes
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "propTypes was defined as an instance property on %s. Use a static " +
             "property to define propTypes instead.",
           name
         )
       : void 0;
+    var noInstanceContextType = !instance.contextType;
+    !noInstanceContextType
+      ? warningWithoutStack$1(
+          false,
+          "contextType was defined as an instance property on %s. Use a static " +
+            "property to define contextType instead.",
+          name
+        )
+      : void 0;
     var noInstanceContextTypes = !instance.contextTypes;
     !noInstanceContextTypes
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "contextTypes was defined as an instance property on %s. Use a static " +
             "property to define contextTypes instead.",
           name
         )
       : void 0;
+
+    if (
+      ctor.contextType &&
+      ctor.contextTypes &&
+      !didWarnAboutContextTypeAndContextTypes.has(ctor)
+    ) {
+      didWarnAboutContextTypeAndContextTypes.add(ctor);
+      warningWithoutStack$1(
+        false,
+        "%s declares both contextTypes and contextType static properties. " +
+          "The legacy contextTypes property will be ignored.",
+        name
+      );
+    }
+
     var noComponentShouldUpdate =
       typeof instance.componentShouldUpdate !== "function";
     !noComponentShouldUpdate
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s has a method called " +
             "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
@@ -7119,22 +7651,22 @@ function checkClassInstance(workInProgress) {
         )
       : void 0;
     if (
-      type.prototype &&
-      type.prototype.isPureReactComponent &&
+      ctor.prototype &&
+      ctor.prototype.isPureReactComponent &&
       typeof instance.shouldComponentUpdate !== "undefined"
     ) {
-      warning(
+      warningWithoutStack$1(
         false,
         "%s has a method called shouldComponentUpdate(). " +
           "shouldComponentUpdate should not be used when extending React.PureComponent. " +
           "Please extend React.Component if shouldComponentUpdate is used.",
-        getComponentName(workInProgress) || "A pure component"
+        getComponentName(ctor) || "A pure component"
       );
     }
     var noComponentDidUnmount =
       typeof instance.componentDidUnmount !== "function";
     !noComponentDidUnmount
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s has a method called " +
             "componentDidUnmount(). But there is no such lifecycle method. " +
@@ -7145,7 +7677,7 @@ function checkClassInstance(workInProgress) {
     var noComponentDidReceiveProps =
       typeof instance.componentDidReceiveProps !== "function";
     !noComponentDidReceiveProps
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s has a method called " +
             "componentDidReceiveProps(). But there is no such lifecycle method. " +
@@ -7158,7 +7690,7 @@ function checkClassInstance(workInProgress) {
     var noComponentWillRecieveProps =
       typeof instance.componentWillRecieveProps !== "function";
     !noComponentWillRecieveProps
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s has a method called " +
             "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
@@ -7168,16 +7700,16 @@ function checkClassInstance(workInProgress) {
     var noUnsafeComponentWillRecieveProps =
       typeof instance.UNSAFE_componentWillRecieveProps !== "function";
     !noUnsafeComponentWillRecieveProps
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s has a method called " +
             "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
           name
         )
       : void 0;
-    var hasMutatedProps = instance.props !== workInProgress.pendingProps;
+    var hasMutatedProps = instance.props !== newProps;
     !(instance.props === undefined || !hasMutatedProps)
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s(...): When calling super() in `%s`, make sure to pass " +
             "up the same props that your component's constructor was passed.",
@@ -7187,7 +7719,7 @@ function checkClassInstance(workInProgress) {
       : void 0;
     var noInstanceDefaultProps = !instance.defaultProps;
     !noInstanceDefaultProps
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
             " Instead, define defaultProps as a static property on %s.",
@@ -7199,21 +7731,21 @@ function checkClassInstance(workInProgress) {
     if (
       typeof instance.getSnapshotBeforeUpdate === "function" &&
       typeof instance.componentDidUpdate !== "function" &&
-      !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
+      !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(ctor)
     ) {
-      didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
-      warning(
+      didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(ctor);
+      warningWithoutStack$1(
         false,
         "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
           "This component defines getSnapshotBeforeUpdate() only.",
-        getComponentName(workInProgress)
+        getComponentName(ctor)
       );
     }
 
     var noInstanceGetDerivedStateFromProps =
       typeof instance.getDerivedStateFromProps !== "function";
     !noInstanceGetDerivedStateFromProps
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s: getDerivedStateFromProps() is defined as an instance method " +
             "and will be ignored. Instead, declare it as a static method.",
@@ -7221,19 +7753,19 @@ function checkClassInstance(workInProgress) {
         )
       : void 0;
     var noInstanceGetDerivedStateFromCatch =
-      typeof instance.getDerivedStateFromCatch !== "function";
+      typeof instance.getDerivedStateFromError !== "function";
     !noInstanceGetDerivedStateFromCatch
-      ? warning(
+      ? warningWithoutStack$1(
           false,
-          "%s: getDerivedStateFromCatch() is defined as an instance method " +
+          "%s: getDerivedStateFromError() is defined as an instance method " +
             "and will be ignored. Instead, declare it as a static method.",
           name
         )
       : void 0;
     var noStaticGetSnapshotBeforeUpdate =
-      typeof type.getSnapshotBeforeUpdate !== "function";
+      typeof ctor.getSnapshotBeforeUpdate !== "function";
     !noStaticGetSnapshotBeforeUpdate
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s: getSnapshotBeforeUpdate() is defined as a static method " +
             "and will be ignored. Instead, declare it as an instance method.",
@@ -7241,12 +7773,16 @@ function checkClassInstance(workInProgress) {
         )
       : void 0;
     var _state = instance.state;
-    if (_state && (typeof _state !== "object" || isArray(_state))) {
-      warning(false, "%s.state: must be set to an object or null", name);
+    if (_state && (typeof _state !== "object" || isArray$1(_state))) {
+      warningWithoutStack$1(
+        false,
+        "%s.state: must be set to an object or null",
+        name
+      );
     }
     if (typeof instance.getChildContext === "function") {
-      !(typeof type.childContextTypes === "object")
-        ? warning(
+      !(typeof ctor.childContextTypes === "object")
+        ? warningWithoutStack$1(
             false,
             "%s.getChildContext(): childContextTypes must be defined in order to " +
               "use getChildContext().",
@@ -7267,13 +7803,43 @@ function adoptClassInstance(workInProgress, instance) {
   }
 }
 
-function constructClassInstance(workInProgress, props, renderExpirationTime) {
-  var ctor = workInProgress.type;
-  var unmaskedContext = getUnmaskedContext(workInProgress);
-  var needsContext = isContextConsumer(workInProgress);
-  var context = needsContext
-    ? getMaskedContext(workInProgress, unmaskedContext)
-    : emptyObject;
+function constructClassInstance(
+  workInProgress,
+  ctor,
+  props,
+  renderExpirationTime
+) {
+  var isLegacyContextConsumer = false;
+  var unmaskedContext = emptyContextObject;
+  var context = null;
+  var contextType = ctor.contextType;
+  if (typeof contextType === "object" && contextType !== null) {
+    {
+      if (
+        typeof contextType.unstable_read !== "function" &&
+        !didWarnAboutInvalidateContextType.has(ctor)
+      ) {
+        didWarnAboutInvalidateContextType.add(ctor);
+        warningWithoutStack$1(
+          false,
+          "%s defines an invalid contextType. " +
+            "contextType should point to the Context object returned by React.createContext(). " +
+            "Did you accidentally pass the Context.Provider instead?",
+          getComponentName(ctor) || "Component"
+        );
+      }
+    }
+
+    context = contextType.unstable_read();
+  } else {
+    unmaskedContext = getUnmaskedContext(workInProgress, ctor, true);
+    var contextTypes = ctor.contextTypes;
+    isLegacyContextConsumer =
+      contextTypes !== null && contextTypes !== undefined;
+    context = isLegacyContextConsumer
+      ? getMaskedContext(workInProgress, unmaskedContext)
+      : emptyContextObject;
+  }
 
   // Instantiate twice to help detect side-effects.
   {
@@ -7295,15 +7861,18 @@ function constructClassInstance(workInProgress, props, renderExpirationTime) {
 
   {
     if (typeof ctor.getDerivedStateFromProps === "function" && state === null) {
-      var componentName = getComponentName(workInProgress) || "Component";
+      var componentName = getComponentName(ctor) || "Component";
       if (!didWarnAboutUninitializedState.has(componentName)) {
         didWarnAboutUninitializedState.add(componentName);
-        warning(
+        warningWithoutStack$1(
           false,
-          "%s: Did not properly initialize state during construction. " +
-            "Expected state to be an object, but it was %s.",
+          "`%s` uses `getDerivedStateFromProps` but its initial state is " +
+            "%s. This is not recommended. Instead, define the initial state by " +
+            "assigning an object to `this.state` in the constructor of `%s`. " +
+            "This ensures that `getDerivedStateFromProps` arguments have a consistent shape.",
           componentName,
-          instance.state === null ? "null" : "undefined"
+          instance.state === null ? "null" : "undefined",
+          componentName
         );
       }
     }
@@ -7349,14 +7918,14 @@ function constructClassInstance(workInProgress, props, renderExpirationTime) {
         foundWillReceivePropsName !== null ||
         foundWillUpdateName !== null
       ) {
-        var _componentName = getComponentName(workInProgress) || "Component";
+        var _componentName = getComponentName(ctor) || "Component";
         var newApiName =
           typeof ctor.getDerivedStateFromProps === "function"
             ? "getDerivedStateFromProps()"
             : "getSnapshotBeforeUpdate()";
         if (!didWarnAboutLegacyLifecyclesAndDerivedState.has(_componentName)) {
           didWarnAboutLegacyLifecyclesAndDerivedState.add(_componentName);
-          warning(
+          warningWithoutStack$1(
             false,
             "Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n" +
               "%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n" +
@@ -7377,7 +7946,7 @@ function constructClassInstance(workInProgress, props, renderExpirationTime) {
 
   // Cache unmasked context so we can avoid recreating masked context unless necessary.
   // ReactFiberContext usually updates this cache but can't for newly-created instances.
-  if (needsContext) {
+  if (isLegacyContextConsumer) {
     cacheContext(workInProgress, unmaskedContext, context);
   }
 
@@ -7399,12 +7968,12 @@ function callComponentWillMount(workInProgress, instance) {
 
   if (oldState !== instance.state) {
     {
-      warning(
+      warningWithoutStack$1(
         false,
         "%s.componentWillMount(): Assigning directly to this.state is " +
           "deprecated (except inside a component's " +
           "constructor). Use setState instead.",
-        getComponentName(workInProgress) || "Component"
+        getComponentName(workInProgress.type) || "Component"
       );
     }
     classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
@@ -7415,24 +7984,24 @@ function callComponentWillReceiveProps(
   workInProgress,
   instance,
   newProps,
-  newContext
+  nextContext
 ) {
   var oldState = instance.state;
   startPhaseTimer(workInProgress, "componentWillReceiveProps");
   if (typeof instance.componentWillReceiveProps === "function") {
-    instance.componentWillReceiveProps(newProps, newContext);
+    instance.componentWillReceiveProps(newProps, nextContext);
   }
   if (typeof instance.UNSAFE_componentWillReceiveProps === "function") {
-    instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    instance.UNSAFE_componentWillReceiveProps(newProps, nextContext);
   }
   stopPhaseTimer();
 
   if (instance.state !== oldState) {
     {
-      var componentName = getComponentName(workInProgress) || "Component";
+      var componentName = getComponentName(workInProgress.type) || "Component";
       if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
         didWarnAboutStateAssignmentForComponent.add(componentName);
-        warning(
+        warningWithoutStack$1(
           false,
           "%s.componentWillReceiveProps(): Assigning directly to " +
             "this.state is deprecated (except inside a component's " +
@@ -7446,23 +8015,44 @@ function callComponentWillReceiveProps(
 }
 
 // Invokes the mount life-cycles on a previously never rendered instance.
-function mountClassInstance(workInProgress, renderExpirationTime) {
-  var ctor = workInProgress.type;
-
+function mountClassInstance(
+  workInProgress,
+  ctor,
+  newProps,
+  renderExpirationTime
+) {
   {
-    checkClassInstance(workInProgress);
+    checkClassInstance(workInProgress, ctor, newProps);
   }
 
   var instance = workInProgress.stateNode;
-  var props = workInProgress.pendingProps;
-  var unmaskedContext = getUnmaskedContext(workInProgress);
-
-  instance.props = props;
+  instance.props = newProps;
   instance.state = workInProgress.memoizedState;
-  instance.refs = emptyObject;
-  instance.context = getMaskedContext(workInProgress, unmaskedContext);
+  instance.refs = emptyRefsObject;
+
+  var contextType = ctor.contextType;
+  if (typeof contextType === "object" && contextType !== null) {
+    instance.context = contextType.unstable_read();
+  } else {
+    var unmaskedContext = getUnmaskedContext(workInProgress, ctor, true);
+    instance.context = getMaskedContext(workInProgress, unmaskedContext);
+  }
 
   {
+    if (instance.state === newProps) {
+      var componentName = getComponentName(ctor) || "Component";
+      if (!didWarnAboutDirectlyAssigningPropsToState.has(componentName)) {
+        didWarnAboutDirectlyAssigningPropsToState.add(componentName);
+        warningWithoutStack$1(
+          false,
+          "%s: It is not recommended to assign props directly to state " +
+            "because updates to props won't be reflected in state. " +
+            "In most cases, it is better to use props directly.",
+          componentName
+        );
+      }
+    }
+
     if (workInProgress.mode & StrictMode) {
       ReactStrictModeWarnings.recordUnsafeLifecycleWarnings(
         workInProgress,
@@ -7488,16 +8078,21 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
     processUpdateQueue(
       workInProgress,
       updateQueue,
-      props,
+      newProps,
       instance,
       renderExpirationTime
     );
     instance.state = workInProgress.memoizedState;
   }
 
-  var getDerivedStateFromProps = workInProgress.type.getDerivedStateFromProps;
+  var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
   if (typeof getDerivedStateFromProps === "function") {
-    applyDerivedStateFromProps(workInProgress, getDerivedStateFromProps, props);
+    applyDerivedStateFromProps(
+      workInProgress,
+      ctor,
+      getDerivedStateFromProps,
+      newProps
+    );
     instance.state = workInProgress.memoizedState;
   }
 
@@ -7517,7 +8112,7 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
       processUpdateQueue(
         workInProgress,
         updateQueue,
-        props,
+        newProps,
         instance,
         renderExpirationTime
       );
@@ -7530,17 +8125,30 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
   }
 }
 
-function resumeMountClassInstance(workInProgress, renderExpirationTime) {
-  var ctor = workInProgress.type;
+function resumeMountClassInstance(
+  workInProgress,
+  ctor,
+  newProps,
+  renderExpirationTime
+) {
   var instance = workInProgress.stateNode;
 
   var oldProps = workInProgress.memoizedProps;
-  var newProps = workInProgress.pendingProps;
   instance.props = oldProps;
 
   var oldContext = instance.context;
-  var newUnmaskedContext = getUnmaskedContext(workInProgress);
-  var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+  var contextType = ctor.contextType;
+  var nextContext = void 0;
+  if (typeof contextType === "object" && contextType !== null) {
+    nextContext = contextType.unstable_read();
+  } else {
+    var nextLegacyUnmaskedContext = getUnmaskedContext(
+      workInProgress,
+      ctor,
+      true
+    );
+    nextContext = getMaskedContext(workInProgress, nextLegacyUnmaskedContext);
+  }
 
   var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
   var hasNewLifecycles =
@@ -7558,12 +8166,12 @@ function resumeMountClassInstance(workInProgress, renderExpirationTime) {
     (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
       typeof instance.componentWillReceiveProps === "function")
   ) {
-    if (oldProps !== newProps || oldContext !== newContext) {
+    if (oldProps !== newProps || oldContext !== nextContext) {
       callComponentWillReceiveProps(
         workInProgress,
         instance,
         newProps,
-        newContext
+        nextContext
       );
     }
   }
@@ -7600,6 +8208,7 @@ function resumeMountClassInstance(workInProgress, renderExpirationTime) {
   if (typeof getDerivedStateFromProps === "function") {
     applyDerivedStateFromProps(
       workInProgress,
+      ctor,
       getDerivedStateFromProps,
       newProps
     );
@@ -7610,11 +8219,12 @@ function resumeMountClassInstance(workInProgress, renderExpirationTime) {
     checkHasForceUpdateAfterProcessing() ||
     checkShouldComponentUpdate(
       workInProgress,
+      ctor,
       oldProps,
       newProps,
       oldState,
       newState,
-      newContext
+      nextContext
     );
 
   if (shouldUpdate) {
@@ -7654,23 +8264,33 @@ function resumeMountClassInstance(workInProgress, renderExpirationTime) {
   // if shouldComponentUpdate returns false.
   instance.props = newProps;
   instance.state = newState;
-  instance.context = newContext;
+  instance.context = nextContext;
 
   return shouldUpdate;
 }
 
 // Invokes the update life-cycles and returns false if it shouldn't rerender.
-function updateClassInstance(current, workInProgress, renderExpirationTime) {
-  var ctor = workInProgress.type;
+function updateClassInstance(
+  current,
+  workInProgress,
+  ctor,
+  newProps,
+  renderExpirationTime
+) {
   var instance = workInProgress.stateNode;
 
   var oldProps = workInProgress.memoizedProps;
-  var newProps = workInProgress.pendingProps;
   instance.props = oldProps;
 
   var oldContext = instance.context;
-  var newUnmaskedContext = getUnmaskedContext(workInProgress);
-  var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+  var contextType = ctor.contextType;
+  var nextContext = void 0;
+  if (typeof contextType === "object" && contextType !== null) {
+    nextContext = contextType.unstable_read();
+  } else {
+    var nextUnmaskedContext = getUnmaskedContext(workInProgress, ctor, true);
+    nextContext = getMaskedContext(workInProgress, nextUnmaskedContext);
+  }
 
   var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
   var hasNewLifecycles =
@@ -7688,12 +8308,12 @@ function updateClassInstance(current, workInProgress, renderExpirationTime) {
     (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
       typeof instance.componentWillReceiveProps === "function")
   ) {
-    if (oldProps !== newProps || oldContext !== newContext) {
+    if (oldProps !== newProps || oldContext !== nextContext) {
       callComponentWillReceiveProps(
         workInProgress,
         instance,
         newProps,
-        newContext
+        nextContext
       );
     }
   }
@@ -7744,6 +8364,7 @@ function updateClassInstance(current, workInProgress, renderExpirationTime) {
   if (typeof getDerivedStateFromProps === "function") {
     applyDerivedStateFromProps(
       workInProgress,
+      ctor,
       getDerivedStateFromProps,
       newProps
     );
@@ -7754,11 +8375,12 @@ function updateClassInstance(current, workInProgress, renderExpirationTime) {
     checkHasForceUpdateAfterProcessing() ||
     checkShouldComponentUpdate(
       workInProgress,
+      ctor,
       oldProps,
       newProps,
       oldState,
       newState,
-      newContext
+      nextContext
     );
 
   if (shouldUpdate) {
@@ -7771,10 +8393,10 @@ function updateClassInstance(current, workInProgress, renderExpirationTime) {
     ) {
       startPhaseTimer(workInProgress, "componentWillUpdate");
       if (typeof instance.componentWillUpdate === "function") {
-        instance.componentWillUpdate(newProps, newState, newContext);
+        instance.componentWillUpdate(newProps, newState, nextContext);
       }
       if (typeof instance.UNSAFE_componentWillUpdate === "function") {
-        instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
+        instance.UNSAFE_componentWillUpdate(newProps, newState, nextContext);
       }
       stopPhaseTimer();
     }
@@ -7814,15 +8436,13 @@ function updateClassInstance(current, workInProgress, renderExpirationTime) {
   // if shouldComponentUpdate returns false.
   instance.props = newProps;
   instance.state = newState;
-  instance.context = newContext;
+  instance.context = nextContext;
 
   return shouldUpdate;
 }
 
-var getCurrentFiberStackAddendum$2 =
-  ReactDebugCurrentFiber.getCurrentFiberStackAddendum;
-
 var didWarnAboutMaps = void 0;
+var didWarnAboutGenerators = void 0;
 var didWarnAboutStringRefInStrictMode = void 0;
 var ownerHasKeyUseWarning = void 0;
 var ownerHasFunctionTypeWarning = void 0;
@@ -7830,6 +8450,7 @@ var warnForMissingKey = function(child) {};
 
 {
   didWarnAboutMaps = false;
+  didWarnAboutGenerators = false;
   didWarnAboutStringRefInStrictMode = {};
 
   /**
@@ -7858,25 +8479,24 @@ var warnForMissingKey = function(child) {};
       "Each child in an array or iterator should have a unique " +
       '"key" prop. See https://fb.me/react-warning-keys for ' +
       "more information." +
-      (getCurrentFiberStackAddendum$2() || "");
+      getCurrentFiberStackInDev();
     if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
       return;
     }
     ownerHasKeyUseWarning[currentComponentErrorInfo] = true;
 
-    warning(
+    warning$1(
       false,
       "Each child in an array or iterator should have a unique " +
         '"key" prop. See https://fb.me/react-warning-keys for ' +
-        "more information.%s",
-      getCurrentFiberStackAddendum$2()
+        "more information."
     );
   };
 }
 
-var isArray$1 = Array.isArray;
+var isArray = Array.isArray;
 
-function coerceRef(returnFiber, current, element) {
+function coerceRef(returnFiber, current$$1, element) {
   var mixedRef = element.ref;
   if (
     mixedRef !== null &&
@@ -7885,18 +8505,18 @@ function coerceRef(returnFiber, current, element) {
   ) {
     {
       if (returnFiber.mode & StrictMode) {
-        var componentName = getComponentName(returnFiber) || "Component";
+        var componentName = getComponentName(returnFiber.type) || "Component";
         if (!didWarnAboutStringRefInStrictMode[componentName]) {
-          warning(
+          warningWithoutStack$1(
             false,
-            'A string ref, "%s", has been found within a strict mode tree. ' +
+            'A string ref, "%s", has been found within a strict mode tree. ' +
               "String refs are a source of potential bugs and should be avoided. " +
               "We recommend using createRef() instead." +
               "\n%s" +
               "\n\nLearn more about using refs safely here:" +
               "\nhttps://fb.me/react-strict-mode-string-ref",
             mixedRef,
-            getStackAddendumByWorkInProgressFiber(returnFiber)
+            getStackByFiberInDevAndProd(returnFiber)
           );
           didWarnAboutStringRefInStrictMode[componentName] = true;
         }
@@ -7909,8 +8529,9 @@ function coerceRef(returnFiber, current, element) {
       if (owner) {
         var ownerFiber = owner;
         invariant(
-          ownerFiber.tag === ClassComponent,
-          "Stateless function components cannot have refs."
+          ownerFiber.tag === ClassComponent ||
+            ownerFiber.tag === ClassComponentLazy,
+          "Function components cannot have refs."
         );
         inst = ownerFiber.stateNode;
       }
@@ -7923,15 +8544,19 @@ function coerceRef(returnFiber, current, element) {
       var stringRef = "" + mixedRef;
       // Check if previous string ref matches new string ref
       if (
-        current !== null &&
-        current.ref !== null &&
-        typeof current.ref === "function" &&
-        current.ref._stringRef === stringRef
+        current$$1 !== null &&
+        current$$1.ref !== null &&
+        typeof current$$1.ref === "function" &&
+        current$$1.ref._stringRef === stringRef
       ) {
-        return current.ref;
+        return current$$1.ref;
       }
       var ref = function(value) {
-        var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
+        var refs = inst.refs;
+        if (refs === emptyRefsObject) {
+          // This is a lazy pooled frozen object, so we need to initialize.
+          refs = inst.refs = {};
+        }
         if (value === null) {
           delete refs[stringRef];
         } else {
@@ -7943,13 +8568,13 @@ function coerceRef(returnFiber, current, element) {
     } else {
       invariant(
         typeof mixedRef === "string",
-        "Expected ref to be a function or a string."
+        "Expected ref to be a function, a string, an object returned by React.createRef(), or null."
       );
       invariant(
         element._owner,
         "Element ref was specified as a string (%s) but no owner was set. This could happen for one of" +
           " the following reasons:\n" +
-          "1. You may be adding a ref to a functional component\n" +
+          "1. You may be adding a ref to a function component\n" +
           "2. You may be adding a ref to a component that was not created inside a component's render method\n" +
           "3. You have multiple copies of React loaded\n" +
           "See https://fb.me/react-refs-must-have-owner for more information.",
@@ -7967,7 +8592,7 @@ function throwOnInvalidObjectType(returnFiber, newChild) {
       addendum =
         " If you meant to render a collection of children, use an array " +
         "instead." +
-        (getCurrentFiberStackAddendum$2() || "");
+        getCurrentFiberStackInDev();
     }
     invariant(
       false,
@@ -7985,19 +8610,18 @@ function warnOnFunctionType() {
     "Functions are not valid as a React child. This may happen if " +
     "you return a Component instead of <Component /> from render. " +
     "Or maybe you meant to call this function rather than return it." +
-    (getCurrentFiberStackAddendum$2() || "");
+    getCurrentFiberStackInDev();
 
   if (ownerHasFunctionTypeWarning[currentComponentErrorInfo]) {
     return;
   }
   ownerHasFunctionTypeWarning[currentComponentErrorInfo] = true;
 
-  warning(
+  warning$1(
     false,
     "Functions are not valid as a React child. This may happen if " +
       "you return a Component instead of <Component /> from render. " +
-      "Or maybe you meant to call this function rather than return it.%s",
-    getCurrentFiberStackAddendum$2() || ""
+      "Or maybe you meant to call this function rather than return it."
   );
 }
 
@@ -8075,9 +8699,9 @@ function ChildReconciler(shouldTrackSideEffects) {
       // Noop.
       return lastPlacedIndex;
     }
-    var current = newFiber.alternate;
-    if (current !== null) {
-      var oldIndex = current.index;
+    var current$$1 = newFiber.alternate;
+    if (current$$1 !== null) {
+      var oldIndex = current$$1.index;
       if (oldIndex < lastPlacedIndex) {
         // This is a move.
         newFiber.effectTag = Placement;
@@ -8102,8 +8726,13 @@ function ChildReconciler(shouldTrackSideEffects) {
     return newFiber;
   }
 
-  function updateTextNode(returnFiber, current, textContent, expirationTime) {
-    if (current === null || current.tag !== HostText) {
+  function updateTextNode(
+    returnFiber,
+    current$$1,
+    textContent,
+    expirationTime
+  ) {
+    if (current$$1 === null || current$$1.tag !== HostText) {
       // Insert
       var created = createFiberFromText(
         textContent,
@@ -8114,17 +8743,17 @@ function ChildReconciler(shouldTrackSideEffects) {
       return created;
     } else {
       // Update
-      var existing = useFiber(current, textContent, expirationTime);
+      var existing = useFiber(current$$1, textContent, expirationTime);
       existing.return = returnFiber;
       return existing;
     }
   }
 
-  function updateElement(returnFiber, current, element, expirationTime) {
-    if (current !== null && current.type === element.type) {
+  function updateElement(returnFiber, current$$1, element, expirationTime) {
+    if (current$$1 !== null && current$$1.type === element.type) {
       // Move based on index
-      var existing = useFiber(current, element.props, expirationTime);
-      existing.ref = coerceRef(returnFiber, current, element);
+      var existing = useFiber(current$$1, element.props, expirationTime);
+      existing.ref = coerceRef(returnFiber, current$$1, element);
       existing.return = returnFiber;
       {
         existing._debugSource = element._source;
@@ -8138,18 +8767,18 @@ function ChildReconciler(shouldTrackSideEffects) {
         returnFiber.mode,
         expirationTime
       );
-      created.ref = coerceRef(returnFiber, current, element);
+      created.ref = coerceRef(returnFiber, current$$1, element);
       created.return = returnFiber;
       return created;
     }
   }
 
-  function updatePortal(returnFiber, current, portal, expirationTime) {
+  function updatePortal(returnFiber, current$$1, portal, expirationTime) {
     if (
-      current === null ||
-      current.tag !== HostPortal ||
-      current.stateNode.containerInfo !== portal.containerInfo ||
-      current.stateNode.implementation !== portal.implementation
+      current$$1 === null ||
+      current$$1.tag !== HostPortal ||
+      current$$1.stateNode.containerInfo !== portal.containerInfo ||
+      current$$1.stateNode.implementation !== portal.implementation
     ) {
       // Insert
       var created = createFiberFromPortal(
@@ -8161,14 +8790,24 @@ function ChildReconciler(shouldTrackSideEffects) {
       return created;
     } else {
       // Update
-      var existing = useFiber(current, portal.children || [], expirationTime);
+      var existing = useFiber(
+        current$$1,
+        portal.children || [],
+        expirationTime
+      );
       existing.return = returnFiber;
       return existing;
     }
   }
 
-  function updateFragment(returnFiber, current, fragment, expirationTime, key) {
-    if (current === null || current.tag !== Fragment) {
+  function updateFragment(
+    returnFiber,
+    current$$1,
+    fragment,
+    expirationTime,
+    key
+  ) {
+    if (current$$1 === null || current$$1.tag !== Fragment) {
       // Insert
       var created = createFiberFromFragment(
         fragment,
@@ -8180,7 +8819,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       return created;
     } else {
       // Update
-      var existing = useFiber(current, fragment, expirationTime);
+      var existing = useFiber(current$$1, fragment, expirationTime);
       existing.return = returnFiber;
       return existing;
     }
@@ -8223,7 +8862,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _created3 = createFiberFromFragment(
           newChild,
           returnFiber.mode,
@@ -8303,7 +8942,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         if (key !== null) {
           return null;
         }
@@ -8385,7 +9024,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _matchedFiber3 = existingChildren.get(newIdx) || null;
         return updateFragment(
           returnFiber,
@@ -8433,15 +9072,14 @@ function ChildReconciler(shouldTrackSideEffects) {
             knownKeys.add(key);
             break;
           }
-          warning(
+          warning$1(
             false,
             "Encountered two children with the same key, `%s`. " +
               "Keys should be unique so that components maintain their identity " +
               "across updates. Non-unique keys may cause children to be " +
               "duplicated and/or omitted — the behavior is unsupported and " +
-              "could change in a future version.%s",
-            key,
-            getCurrentFiberStackAddendum$2()
+              "could change in a future version.",
+            key
           );
           break;
         default:
@@ -8629,15 +9267,34 @@ function ChildReconciler(shouldTrackSideEffects) {
     );
 
     {
+      // We don't support rendering Generators because it's a mutation.
+      // See https://github.com/facebook/react/issues/12995
+      if (
+        typeof Symbol === "function" &&
+        // $FlowFixMe Flow doesn't know about toStringTag
+        newChildrenIterable[Symbol.toStringTag] === "Generator"
+      ) {
+        !didWarnAboutGenerators
+          ? warning$1(
+              false,
+              "Using Generators as children is unsupported and will likely yield " +
+                "unexpected results because enumerating a generator mutates it. " +
+                "You may convert it to an array with `Array.from()` or the " +
+                "`[...spread]` operator before rendering. Keep in mind " +
+                "you might need to polyfill these features for older browsers."
+            )
+          : void 0;
+        didWarnAboutGenerators = true;
+      }
+
       // Warn about using Maps as children
       if (newChildrenIterable.entries === iteratorFn) {
         !didWarnAboutMaps
-          ? warning(
+          ? warning$1(
               false,
               "Using Maps as children is unsupported and will likely yield " +
                 "unexpected results. Convert it to a sequence/iterable of keyed " +
-                "ReactElements instead.%s",
-              getCurrentFiberStackAddendum$2()
+                "ReactElements instead."
             )
           : void 0;
         didWarnAboutMaps = true;
@@ -8982,7 +9639,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       );
     }
 
-    if (isArray$1(newChild)) {
+    if (isArray(newChild)) {
       return reconcileChildrenArray(
         returnFiber,
         currentFirstChild,
@@ -9014,7 +9671,8 @@ function ChildReconciler(shouldTrackSideEffects) {
       // component, throw an error. If Fiber return types are disabled,
       // we already threw above.
       switch (returnFiber.tag) {
-        case ClassComponent: {
+        case ClassComponent:
+        case ClassComponentLazy: {
           {
             var instance = returnFiber.stateNode;
             if (instance.render._isMockFunction) {
@@ -9026,7 +9684,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         // Intentionally fall through to the next case, which handles both
         // functions and classes
         // eslint-disable-next-lined no-fallthrough
-        case FunctionalComponent: {
+        case FunctionComponent: {
           var Component = returnFiber.type;
           invariant(
             false,
@@ -9049,9 +9707,9 @@ function ChildReconciler(shouldTrackSideEffects) {
 var reconcileChildFibers = ChildReconciler(true);
 var mountChildFibers = ChildReconciler(false);
 
-function cloneChildFibers(current, workInProgress) {
+function cloneChildFibers(current$$1, workInProgress) {
   invariant(
-    current === null || workInProgress.child === current.child,
+    current$$1 === null || workInProgress.child === current$$1.child,
     "Resuming work not yet implemented."
   );
 
@@ -9397,36 +10055,70 @@ function resetHydrationState() {
   isHydrating = false;
 }
 
-var getCurrentFiberStackAddendum$1 =
-  ReactDebugCurrentFiber.getCurrentFiberStackAddendum;
+function readLazyComponentType(thenable) {
+  var status = thenable._reactStatus;
+  switch (status) {
+    case Resolved:
+      var Component = thenable._reactResult;
+      return Component;
+    case Rejected:
+      throw thenable._reactResult;
+    case Pending:
+      throw thenable;
+    default: {
+      thenable._reactStatus = Pending;
+      thenable.then(
+        function(resolvedValue) {
+          if (thenable._reactStatus === Pending) {
+            thenable._reactStatus = Resolved;
+            if (typeof resolvedValue === "object" && resolvedValue !== null) {
+              // If the `default` property is not empty, assume it's the result
+              // of an async import() and use that. Otherwise, use the
+              // resolved value itself.
+              var defaultExport = resolvedValue.default;
+              resolvedValue =
+                defaultExport !== undefined && defaultExport !== null
+                  ? defaultExport
+                  : resolvedValue;
+            } else {
+              resolvedValue = resolvedValue;
+            }
+            thenable._reactResult = resolvedValue;
+          }
+        },
+        function(error) {
+          if (thenable._reactStatus === Pending) {
+            thenable._reactStatus = Rejected;
+            thenable._reactResult = error;
+          }
+        }
+      );
+      throw thenable;
+    }
+  }
+}
+
+var ReactCurrentOwner$3 = ReactSharedInternals.ReactCurrentOwner;
 
 var didWarnAboutBadClass = void 0;
-var didWarnAboutGetDerivedStateOnFunctionalComponent = void 0;
-var didWarnAboutStatelessRefs = void 0;
+var didWarnAboutContextTypeOnFunctionComponent = void 0;
+var didWarnAboutGetDerivedStateOnFunctionComponent = void 0;
+var didWarnAboutFunctionRefs = void 0;
 
 {
   didWarnAboutBadClass = {};
-  didWarnAboutGetDerivedStateOnFunctionalComponent = {};
-  didWarnAboutStatelessRefs = {};
-}
-
-// TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
-function reconcileChildren(current, workInProgress, nextChildren) {
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    workInProgress.expirationTime
-  );
+  didWarnAboutContextTypeOnFunctionComponent = {};
+  didWarnAboutGetDerivedStateOnFunctionComponent = {};
+  didWarnAboutFunctionRefs = {};
 }
 
-function reconcileChildrenAtExpirationTime(
-  current,
+function reconcileChildren(
+  current$$1,
   workInProgress,
   nextChildren,
   renderExpirationTime
 ) {
-  if (current === null) {
+  if (current$$1 === null) {
     // If this is a fresh new component that hasn't been rendered yet, we
     // won't update its child set by applying minimal side-effects. Instead,
     // we will add them all to the child before it gets rendered. That means
@@ -9446,161 +10138,280 @@ function reconcileChildrenAtExpirationTime(
     // let's throw it out.
     workInProgress.child = reconcileChildFibers(
       workInProgress,
-      current.child,
+      current$$1.child,
       nextChildren,
       renderExpirationTime
     );
   }
 }
 
-function updateForwardRef(current, workInProgress) {
-  var render = workInProgress.type.render;
-  var nextProps = workInProgress.pendingProps;
-  var ref = workInProgress.ref;
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (workInProgress.memoizedProps === nextProps) {
-    var currentRef = current !== null ? current.ref : null;
-    if (ref === currentRef) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-  }
-
-  var nextChildren = void 0;
-  {
-    ReactCurrentOwner.current = workInProgress;
-    ReactDebugCurrentFiber.setCurrentPhase("render");
-    nextChildren = render(nextProps, ref);
-    ReactDebugCurrentFiber.setCurrentPhase(null);
-  }
-
-  reconcileChildren(current, workInProgress, nextChildren);
-  memoizeProps(workInProgress, nextProps);
-  return workInProgress.child;
+function forceUnmountCurrentAndReconcile(
+  current$$1,
+  workInProgress,
+  nextChildren,
+  renderExpirationTime
+) {
+  // This function is fork of reconcileChildren. It's used in cases where we
+  // want to reconcile without matching against the existing set. This has the
+  // effect of all current children being unmounted; even if the type and key
+  // are the same, the old child is unmounted and a new child is created.
+  //
+  // To do this, we're going to go through the reconcile algorithm twice. In
+  // the first pass, we schedule a deletion for all the current children by
+  // passing null.
+  workInProgress.child = reconcileChildFibers(
+    workInProgress,
+    current$$1.child,
+    null,
+    renderExpirationTime
+  );
+  // In the second pass, we mount the new children. The trick here is that we
+  // pass null in place of where we usually pass the current child set. This has
+  // the effect of remounting all children regardless of whether their their
+  // identity matches.
+  workInProgress.child = reconcileChildFibers(
+    workInProgress,
+    null,
+    nextChildren,
+    renderExpirationTime
+  );
 }
 
-function updateFragment(current, workInProgress) {
-  var nextChildren = workInProgress.pendingProps;
+function updateForwardRef(
+  current$$1,
+  workInProgress,
+  type,
+  nextProps,
+  renderExpirationTime
+) {
+  var render = type.render;
+  var ref = workInProgress.ref;
   if (hasContextChanged()) {
     // Normally we can bail out on props equality but if context has changed
     // we don't do the bailout and we have to reuse existing props instead.
-  } else if (workInProgress.memoizedProps === nextChildren) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  } else if (workInProgress.memoizedProps === nextProps) {
+    var currentRef = current$$1 !== null ? current$$1.ref : null;
+    if (ref === currentRef) {
+      return bailoutOnAlreadyFinishedWork(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      );
+    }
   }
-  reconcileChildren(current, workInProgress, nextChildren);
-  memoizeProps(workInProgress, nextChildren);
+
+  var nextChildren = void 0;
+  {
+    ReactCurrentOwner$3.current = workInProgress;
+    setCurrentPhase("render");
+    nextChildren = render(nextProps, ref);
+    setCurrentPhase(null);
+  }
+
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
+  memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
 
-function updateMode(current, workInProgress) {
-  var nextChildren = workInProgress.pendingProps.children;
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (
-    nextChildren === null ||
-    workInProgress.memoizedProps === nextChildren
+function updatePureComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  updateExpirationTime,
+  renderExpirationTime
+) {
+  var render = Component.render;
+  var ref = workInProgress.ref;
+
+  if (
+    current$$1 !== null &&
+    (updateExpirationTime === NoWork ||
+      updateExpirationTime > renderExpirationTime)
   ) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    var prevProps = current$$1.memoizedProps;
+    // Default to shallow comparison
+    var compare = Component.compare;
+    compare = compare !== null ? compare : shallowEqual;
+    if (
+      workInProgress.ref === current$$1.ref &&
+      compare(prevProps, nextProps)
+    ) {
+      return bailoutOnAlreadyFinishedWork(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      );
+    }
   }
-  reconcileChildren(current, workInProgress, nextChildren);
+
+  // The rest is a fork of updateFunctionComponent
+  var nextChildren = void 0;
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  {
+    ReactCurrentOwner$3.current = workInProgress;
+    setCurrentPhase("render");
+    nextChildren = render(nextProps, ref);
+    setCurrentPhase(null);
+  }
+
+  // React DevTools reads this flag.
+  workInProgress.effectTag |= PerformedWork;
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
+  memoizeProps(workInProgress, nextProps);
+  return workInProgress.child;
+}
+
+function updateFragment(current$$1, workInProgress, renderExpirationTime) {
+  var nextChildren = workInProgress.pendingProps;
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
   memoizeProps(workInProgress, nextChildren);
   return workInProgress.child;
 }
 
-function updateProfiler(current, workInProgress) {
-  var nextProps = workInProgress.pendingProps;
+function updateMode(current$$1, workInProgress, renderExpirationTime) {
+  var nextChildren = workInProgress.pendingProps.children;
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
+  memoizeProps(workInProgress, nextChildren);
+  return workInProgress.child;
+}
+
+function updateProfiler(current$$1, workInProgress, renderExpirationTime) {
   if (enableProfilerTimer) {
     workInProgress.effectTag |= Update;
   }
-  if (workInProgress.memoizedProps === nextProps) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
+  var nextProps = workInProgress.pendingProps;
   var nextChildren = nextProps.children;
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
   memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
 
-function markRef(current, workInProgress) {
+function markRef(current$$1, workInProgress) {
   var ref = workInProgress.ref;
   if (
-    (current === null && ref !== null) ||
-    (current !== null && current.ref !== ref)
+    (current$$1 === null && ref !== null) ||
+    (current$$1 !== null && current$$1.ref !== ref)
   ) {
     // Schedule a Ref effect
     workInProgress.effectTag |= Ref;
   }
 }
 
-function updateFunctionalComponent(current, workInProgress) {
-  var fn = workInProgress.type;
-  var nextProps = workInProgress.pendingProps;
-
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else {
-    if (workInProgress.memoizedProps === nextProps) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    // TODO: consider bringing fn.shouldComponentUpdate() back.
-    // It used to be here.
-  }
-
-  var unmaskedContext = getUnmaskedContext(workInProgress);
+function updateFunctionComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
+  var unmaskedContext = getUnmaskedContext(workInProgress, Component, true);
   var context = getMaskedContext(workInProgress, unmaskedContext);
 
   var nextChildren = void 0;
-
+  prepareToReadContext(workInProgress, renderExpirationTime);
   {
-    ReactCurrentOwner.current = workInProgress;
-    ReactDebugCurrentFiber.setCurrentPhase("render");
-    nextChildren = fn(nextProps, context);
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+    ReactCurrentOwner$3.current = workInProgress;
+    setCurrentPhase("render");
+    nextChildren = Component(nextProps, context);
+    setCurrentPhase(null);
   }
+
   // React DevTools reads this flag.
   workInProgress.effectTag |= PerformedWork;
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
   memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
 
-function updateClassComponent(current, workInProgress, renderExpirationTime) {
+function updateClassComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
   // Push context providers early to prevent context stack mismatches.
   // During mounting we don't know the child context yet as the instance doesn't exist.
   // We will invalidate the child context in finishClassComponent() right after rendering.
-  var hasContext = pushContextProvider(workInProgress);
+  var hasContext = void 0;
+  if (isContextProvider(Component)) {
+    hasContext = true;
+    pushContextProvider(workInProgress);
+  } else {
+    hasContext = false;
+  }
+  prepareToReadContext(workInProgress, renderExpirationTime);
+
   var shouldUpdate = void 0;
-  if (current === null) {
+  if (current$$1 === null) {
     if (workInProgress.stateNode === null) {
       // In the initial pass we might need to construct the instance.
       constructClassInstance(
         workInProgress,
-        workInProgress.pendingProps,
+        Component,
+        nextProps,
+        renderExpirationTime
+      );
+      mountClassInstance(
+        workInProgress,
+        Component,
+        nextProps,
         renderExpirationTime
       );
-      mountClassInstance(workInProgress, renderExpirationTime);
-
       shouldUpdate = true;
     } else {
       // In a resume, we'll already have an instance we can reuse.
       shouldUpdate = resumeMountClassInstance(
         workInProgress,
+        Component,
+        nextProps,
         renderExpirationTime
       );
     }
   } else {
     shouldUpdate = updateClassInstance(
-      current,
+      current$$1,
       workInProgress,
+      Component,
+      nextProps,
       renderExpirationTime
     );
   }
   return finishClassComponent(
-    current,
+    current$$1,
     workInProgress,
+    Component,
     shouldUpdate,
     hasContext,
     renderExpirationTime
@@ -9608,36 +10419,39 @@ function updateClassComponent(current, workInProgress, renderExpirationTime) {
 }
 
 function finishClassComponent(
-  current,
+  current$$1,
   workInProgress,
+  Component,
   shouldUpdate,
   hasContext,
   renderExpirationTime
 ) {
   // Refs should update even if shouldComponentUpdate returns false
-  markRef(current, workInProgress);
+  markRef(current$$1, workInProgress);
 
   var didCaptureError = (workInProgress.effectTag & DidCapture) !== NoEffect;
 
   if (!shouldUpdate && !didCaptureError) {
     // Context providers should defer to sCU for rendering
     if (hasContext) {
-      invalidateContextProvider(workInProgress, false);
+      invalidateContextProvider(workInProgress, Component, false);
     }
 
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
   }
 
-  var ctor = workInProgress.type;
   var instance = workInProgress.stateNode;
 
   // Rerender
-  ReactCurrentOwner.current = workInProgress;
+  ReactCurrentOwner$3.current = workInProgress;
   var nextChildren = void 0;
   if (
     didCaptureError &&
-    (!enableGetDerivedStateFromCatch ||
-      typeof ctor.getDerivedStateFromCatch !== "function")
+    typeof Component.getDerivedStateFromError !== "function"
   ) {
     // If we captured an error, but getDerivedStateFrom catch is not defined,
     // unmount all the children. componentDidCatch will schedule an update to
@@ -9647,11 +10461,11 @@ function finishClassComponent(
     nextChildren = null;
 
     if (enableProfilerTimer) {
-      stopBaseRenderTimerIfRunning();
+      stopProfilerTimerIfRunning(workInProgress);
     }
   } else {
     {
-      ReactDebugCurrentFiber.setCurrentPhase("render");
+      setCurrentPhase("render");
       nextChildren = instance.render();
       if (
         debugRenderPhaseSideEffects ||
@@ -9660,32 +10474,32 @@ function finishClassComponent(
       ) {
         instance.render();
       }
-      ReactDebugCurrentFiber.setCurrentPhase(null);
+      setCurrentPhase(null);
     }
   }
 
   // React DevTools reads this flag.
   workInProgress.effectTag |= PerformedWork;
-  if (didCaptureError) {
-    // If we're recovering from an error, reconcile twice: first to delete
-    // all the existing children.
-    reconcileChildrenAtExpirationTime(
-      current,
+  if (current$$1 !== null && didCaptureError) {
+    // If we're recovering from an error, reconcile without reusing any of
+    // the existing children. Conceptually, the normal children and the children
+    // that are shown on error are two different sets, so we shouldn't reuse
+    // normal children even if their identities match.
+    forceUnmountCurrentAndReconcile(
+      current$$1,
       workInProgress,
-      null,
+      nextChildren,
+      renderExpirationTime
+    );
+  } else {
+    reconcileChildren(
+      current$$1,
+      workInProgress,
+      nextChildren,
       renderExpirationTime
     );
-    workInProgress.child = null;
-    // Now we can continue reconciling like normal. This has the effect of
-    // remounting all children regardless of whether their their
-    // identity matches.
   }
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    renderExpirationTime
-  );
+
   // Memoize props and state using the values we just used to render.
   // TODO: Restructure so we never read values from the instance.
   memoizeState(workInProgress, instance.state);
@@ -9693,7 +10507,7 @@ function finishClassComponent(
 
   // The context might have changed so we need to recalculate it.
   if (hasContext) {
-    invalidateContextProvider(workInProgress, true);
+    invalidateContextProvider(workInProgress, Component, true);
   }
 
   return workInProgress.child;
@@ -9714,99 +10528,89 @@ function pushHostRootContext(workInProgress) {
   pushHostContainer(workInProgress, root.containerInfo);
 }
 
-function updateHostRoot(current, workInProgress, renderExpirationTime) {
+function updateHostRoot(current$$1, workInProgress, renderExpirationTime) {
   pushHostRootContext(workInProgress);
   var updateQueue = workInProgress.updateQueue;
-  if (updateQueue !== null) {
-    var nextProps = workInProgress.pendingProps;
-    var prevState = workInProgress.memoizedState;
-    var prevChildren = prevState !== null ? prevState.element : null;
-    processUpdateQueue(
+  invariant(
+    updateQueue !== null,
+    "If the root does not have an updateQueue, we should have already " +
+      "bailed out. This error is likely caused by a bug in React. Please " +
+      "file an issue."
+  );
+  var nextProps = workInProgress.pendingProps;
+  var prevState = workInProgress.memoizedState;
+  var prevChildren = prevState !== null ? prevState.element : null;
+  processUpdateQueue(
+    workInProgress,
+    updateQueue,
+    nextProps,
+    null,
+    renderExpirationTime
+  );
+  var nextState = workInProgress.memoizedState;
+  // Caution: React DevTools currently depends on this property
+  // being called "element".
+  var nextChildren = nextState.element;
+  if (nextChildren === prevChildren) {
+    // If the state is the same as before, that's a bailout because we had
+    // no work that expires at this time.
+    resetHydrationState();
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
+  }
+  var root = workInProgress.stateNode;
+  if (
+    (current$$1 === null || current$$1.child === null) &&
+    root.hydrate &&
+    enterHydrationState(workInProgress)
+  ) {
+    // If we don't have any current children this might be the first pass.
+    // We always try to hydrate. If this isn't a hydration pass there won't
+    // be any children to hydrate which is effectively the same thing as
+    // not hydrating.
+
+    // This is a bit of a hack. We track the host root as a placement to
+    // know that we're currently in a mounting state. That way isMounted
+    // works as expected. We must reset this before committing.
+    // TODO: Delete this when we delete isMounted and findDOMNode.
+    workInProgress.effectTag |= Placement;
+
+    // Ensure that children mount into this root without tracking
+    // side-effects. This ensures that we don't store Placement effects on
+    // nodes that will be hydrated.
+    workInProgress.child = mountChildFibers(
       workInProgress,
-      updateQueue,
-      nextProps,
       null,
+      nextChildren,
       renderExpirationTime
     );
-    var nextState = workInProgress.memoizedState;
-    // Caution: React DevTools currently depends on this property
-    // being called "element".
-    var nextChildren = nextState.element;
-
-    if (nextChildren === prevChildren) {
-      // If the state is the same as before, that's a bailout because we had
-      // no work that expires at this time.
-      resetHydrationState();
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    var root = workInProgress.stateNode;
-    if (
-      (current === null || current.child === null) &&
-      root.hydrate &&
-      enterHydrationState(workInProgress)
-    ) {
-      // If we don't have any current children this might be the first pass.
-      // We always try to hydrate. If this isn't a hydration pass there won't
-      // be any children to hydrate which is effectively the same thing as
-      // not hydrating.
-
-      // This is a bit of a hack. We track the host root as a placement to
-      // know that we're currently in a mounting state. That way isMounted
-      // works as expected. We must reset this before committing.
-      // TODO: Delete this when we delete isMounted and findDOMNode.
-      workInProgress.effectTag |= Placement;
-
-      // Ensure that children mount into this root without tracking
-      // side-effects. This ensures that we don't store Placement effects on
-      // nodes that will be hydrated.
-      workInProgress.child = mountChildFibers(
-        workInProgress,
-        null,
-        nextChildren,
-        renderExpirationTime
-      );
-    } else {
-      // Otherwise reset hydration state in case we aborted and resumed another
-      // root.
-      resetHydrationState();
-      reconcileChildren(current, workInProgress, nextChildren);
-    }
-    return workInProgress.child;
+  } else {
+    // Otherwise reset hydration state in case we aborted and resumed another
+    // root.
+    reconcileChildren(
+      current$$1,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
+    resetHydrationState();
   }
-  resetHydrationState();
-  // If there is no update queue, that's a bailout because the root has no props.
-  return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  return workInProgress.child;
 }
 
-function updateHostComponent(current, workInProgress, renderExpirationTime) {
+function updateHostComponent(current$$1, workInProgress, renderExpirationTime) {
   pushHostContext(workInProgress);
 
-  if (current === null) {
+  if (current$$1 === null) {
     tryToClaimNextHydratableInstance(workInProgress);
   }
 
   var type = workInProgress.type;
-  var memoizedProps = workInProgress.memoizedProps;
   var nextProps = workInProgress.pendingProps;
-  var prevProps = current !== null ? current.memoizedProps : null;
-
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (memoizedProps === nextProps) {
-    var isHidden =
-      workInProgress.mode & AsyncMode &&
-      shouldDeprioritizeSubtree(type, nextProps);
-    if (isHidden) {
-      // Before bailing out, make sure we've deprioritized a hidden component.
-      workInProgress.expirationTime = Never;
-    }
-    if (!isHidden || renderExpirationTime !== Never) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    // If we're rendering a hidden node at hidden priority, don't bailout. The
-    // parent is complete, but the children may not be.
-  }
+  var prevProps = current$$1 !== null ? current$$1.memoizedProps : null;
 
   var nextChildren = nextProps.children;
   var isDirectTextChild = shouldSetTextContent(type, nextProps);
@@ -9817,34 +10621,38 @@ function updateHostComponent(current, workInProgress, renderExpirationTime) {
     // this in the host environment that also have access to this prop. That
     // avoids allocating another HostText fiber and traversing it.
     nextChildren = null;
-  } else if (prevProps && shouldSetTextContent(type, prevProps)) {
+  } else if (prevProps !== null && shouldSetTextContent(type, prevProps)) {
     // If we're switching from a direct text child to a normal child, or to
     // empty, we need to schedule the text content to be reset.
     workInProgress.effectTag |= ContentReset;
   }
 
-  markRef(current, workInProgress);
+  markRef(current$$1, workInProgress);
 
   // Check the host config to see if the children are offscreen/hidden.
   if (
     renderExpirationTime !== Never &&
-    workInProgress.mode & AsyncMode &&
+    workInProgress.mode & ConcurrentMode &&
     shouldDeprioritizeSubtree(type, nextProps)
   ) {
-    // Down-prioritize the children.
+    // Schedule this fiber to re-render at offscreen priority. Then bailout.
     workInProgress.expirationTime = Never;
-    // Bailout and come back to this fiber later.
     workInProgress.memoizedProps = nextProps;
     return null;
   }
 
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
   memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
 
-function updateHostText(current, workInProgress) {
-  if (current === null) {
+function updateHostText(current$$1, workInProgress) {
+  if (current$$1 === null) {
     tryToClaimNextHydratableInstance(workInProgress);
   }
   var nextProps = workInProgress.pendingProps;
@@ -9854,29 +10662,125 @@ function updateHostText(current, workInProgress) {
   return null;
 }
 
+function resolveDefaultProps(Component, baseProps) {
+  if (Component && Component.defaultProps) {
+    // Resolve default props. Taken from ReactElement
+    var props = Object.assign({}, baseProps);
+    var defaultProps = Component.defaultProps;
+    for (var propName in defaultProps) {
+      if (props[propName] === undefined) {
+        props[propName] = defaultProps[propName];
+      }
+    }
+    return props;
+  }
+  return baseProps;
+}
+
 function mountIndeterminateComponent(
-  current,
+  current$$1,
   workInProgress,
+  Component,
+  updateExpirationTime,
   renderExpirationTime
 ) {
   invariant(
-    current === null,
+    current$$1 === null,
     "An indeterminate component should never have mounted. This error is " +
       "likely caused by a bug in React. Please file an issue."
   );
-  var fn = workInProgress.type;
+
   var props = workInProgress.pendingProps;
-  var unmaskedContext = getUnmaskedContext(workInProgress);
+  if (
+    typeof Component === "object" &&
+    Component !== null &&
+    typeof Component.then === "function"
+  ) {
+    // We can't start a User Timing measurement with correct label yet.
+    // Cancel and resume right after we know the tag.
+    cancelWorkTimer(workInProgress);
+    Component = readLazyComponentType(Component);
+    var resolvedTag = (workInProgress.tag = resolveLazyComponentTag(
+      workInProgress,
+      Component
+    ));
+    startWorkTimer(workInProgress);
+    var resolvedProps = resolveDefaultProps(Component, props);
+    var child = void 0;
+    switch (resolvedTag) {
+      case FunctionComponentLazy: {
+        child = updateFunctionComponent(
+          current$$1,
+          workInProgress,
+          Component,
+          resolvedProps,
+          renderExpirationTime
+        );
+        break;
+      }
+      case ClassComponentLazy: {
+        child = updateClassComponent(
+          current$$1,
+          workInProgress,
+          Component,
+          resolvedProps,
+          renderExpirationTime
+        );
+        break;
+      }
+      case ForwardRefLazy: {
+        child = updateForwardRef(
+          current$$1,
+          workInProgress,
+          Component,
+          resolvedProps,
+          renderExpirationTime
+        );
+        break;
+      }
+      case PureComponentLazy: {
+        child = updatePureComponent(
+          current$$1,
+          workInProgress,
+          Component,
+          resolvedProps,
+          updateExpirationTime,
+          renderExpirationTime
+        );
+        break;
+      }
+      default: {
+        // This message intentionally doesn't metion ForwardRef or PureComponent
+        // because the fact that it's a separate type of work is an
+        // implementation detail.
+        invariant(
+          false,
+          "Element type is invalid. Received a promise that resolves to: %s. " +
+            "Promise elements must resolve to a class or function.",
+          Component
+        );
+      }
+    }
+    workInProgress.memoizedProps = props;
+    return child;
+  }
+
+  var unmaskedContext = getUnmaskedContext(workInProgress, Component, false);
   var context = getMaskedContext(workInProgress, unmaskedContext);
 
+  prepareToReadContext(workInProgress, renderExpirationTime);
+
   var value = void 0;
 
   {
-    if (fn.prototype && typeof fn.prototype.render === "function") {
-      var componentName = getComponentName(workInProgress) || "Unknown";
+    if (
+      Component.prototype &&
+      typeof Component.prototype.render === "function"
+    ) {
+      var componentName = getComponentName(Component) || "Unknown";
 
       if (!didWarnAboutBadClass[componentName]) {
-        warning(
+        warningWithoutStack$1(
           false,
           "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
             "This is likely to cause errors. Change %s to extend React.Component instead.",
@@ -9891,8 +10795,8 @@ function mountIndeterminateComponent(
       ReactStrictModeWarnings.recordLegacyContextWarning(workInProgress, null);
     }
 
-    ReactCurrentOwner.current = workInProgress;
-    value = fn(props, context);
+    ReactCurrentOwner$3.current = workInProgress;
+    value = Component(props, context);
   }
   // React DevTools reads this flag.
   workInProgress.effectTag |= PerformedWork;
@@ -9903,11 +10807,20 @@ function mountIndeterminateComponent(
     typeof value.render === "function" &&
     value.$$typeof === undefined
   ) {
-    var Component = workInProgress.type;
-
     // Proceed under the assumption that this is a class instance
     workInProgress.tag = ClassComponent;
 
+    // Push context providers early to prevent context stack mismatches.
+    // During mounting we don't know the child context yet as the instance doesn't exist.
+    // We will invalidate the child context in finishClassComponent() right after rendering.
+    var hasContext = false;
+    if (isContextProvider(Component)) {
+      hasContext = true;
+      pushContextProvider(workInProgress);
+    } else {
+      hasContext = false;
+    }
+
     workInProgress.memoizedState =
       value.state !== null && value.state !== undefined ? value.state : null;
 
@@ -9915,42 +10828,38 @@ function mountIndeterminateComponent(
     if (typeof getDerivedStateFromProps === "function") {
       applyDerivedStateFromProps(
         workInProgress,
+        Component,
         getDerivedStateFromProps,
         props
       );
     }
 
-    // Push context providers early to prevent context stack mismatches.
-    // During mounting we don't know the child context yet as the instance doesn't exist.
-    // We will invalidate the child context in finishClassComponent() right after rendering.
-    var hasContext = pushContextProvider(workInProgress);
     adoptClassInstance(workInProgress, value);
-    mountClassInstance(workInProgress, renderExpirationTime);
+    mountClassInstance(workInProgress, Component, props, renderExpirationTime);
     return finishClassComponent(
-      current,
+      current$$1,
       workInProgress,
+      Component,
       true,
       hasContext,
       renderExpirationTime
     );
   } else {
-    // Proceed under the assumption that this is a functional component
-    workInProgress.tag = FunctionalComponent;
+    // Proceed under the assumption that this is a function component
+    workInProgress.tag = FunctionComponent;
     {
-      var _Component = workInProgress.type;
-
-      if (_Component) {
-        !!_Component.childContextTypes
-          ? warning(
+      if (Component) {
+        !!Component.childContextTypes
+          ? warningWithoutStack$1(
               false,
-              "%s(...): childContextTypes cannot be defined on a functional component.",
-              _Component.displayName || _Component.name || "Component"
+              "%s(...): childContextTypes cannot be defined on a function component.",
+              Component.displayName || Component.name || "Component"
             )
           : void 0;
       }
       if (workInProgress.ref !== null) {
         var info = "";
-        var ownerName = ReactDebugCurrentFiber.getCurrentFiberOwnerName();
+        var ownerName = getCurrentFiberOwnerNameInDevOrNull();
         if (ownerName) {
           info += "\n\nCheck the render method of `" + ownerName + "`.";
         }
@@ -9960,80 +10869,128 @@ function mountIndeterminateComponent(
         if (debugSource) {
           warningKey = debugSource.fileName + ":" + debugSource.lineNumber;
         }
-        if (!didWarnAboutStatelessRefs[warningKey]) {
-          didWarnAboutStatelessRefs[warningKey] = true;
-          warning(
+        if (!didWarnAboutFunctionRefs[warningKey]) {
+          didWarnAboutFunctionRefs[warningKey] = true;
+          warning$1(
             false,
-            "Stateless function components cannot be given refs. " +
-              "Attempts to access this ref will fail.%s%s",
-            info,
-            ReactDebugCurrentFiber.getCurrentFiberStackAddendum()
+            "Function components cannot be given refs. " +
+              "Attempts to access this ref will fail.%s",
+            info
           );
         }
       }
 
-      if (typeof fn.getDerivedStateFromProps === "function") {
-        var _componentName = getComponentName(workInProgress) || "Unknown";
+      if (typeof Component.getDerivedStateFromProps === "function") {
+        var _componentName = getComponentName(Component) || "Unknown";
 
-        if (!didWarnAboutGetDerivedStateOnFunctionalComponent[_componentName]) {
-          warning(
+        if (!didWarnAboutGetDerivedStateOnFunctionComponent[_componentName]) {
+          warningWithoutStack$1(
             false,
-            "%s: Stateless functional components do not support getDerivedStateFromProps.",
+            "%s: Function components do not support getDerivedStateFromProps.",
             _componentName
           );
-          didWarnAboutGetDerivedStateOnFunctionalComponent[
-            _componentName
-          ] = true;
+          didWarnAboutGetDerivedStateOnFunctionComponent[_componentName] = true;
+        }
+      }
+
+      if (
+        typeof Component.contextType === "object" &&
+        Component.contextType !== null
+      ) {
+        var _componentName2 = getComponentName(Component) || "Unknown";
+
+        if (!didWarnAboutContextTypeOnFunctionComponent[_componentName2]) {
+          warningWithoutStack$1(
+            false,
+            "%s: Function components do not support contextType.",
+            _componentName2
+          );
+          didWarnAboutContextTypeOnFunctionComponent[_componentName2] = true;
         }
       }
     }
-    reconcileChildren(current, workInProgress, value);
+    reconcileChildren(current$$1, workInProgress, value, renderExpirationTime);
     memoizeProps(workInProgress, props);
     return workInProgress.child;
   }
 }
 
-function updateTimeoutComponent(current, workInProgress, renderExpirationTime) {
-  if (enableSuspense) {
-    var nextProps = workInProgress.pendingProps;
-    var prevProps = workInProgress.memoizedProps;
+function updateSuspenseComponent(
+  current$$1,
+  workInProgress,
+  renderExpirationTime
+) {
+  var nextProps = workInProgress.pendingProps;
 
-    var prevDidTimeout = workInProgress.memoizedState;
+  // Check if we already attempted to render the normal state. If we did,
+  // and we timed out, render the placeholder state.
+  var alreadyCaptured = (workInProgress.effectTag & DidCapture) === NoEffect;
 
-    // Check if we already attempted to render the normal state. If we did,
-    // and we timed out, render the placeholder state.
-    var alreadyCaptured = (workInProgress.effectTag & DidCapture) === NoEffect;
-    var nextDidTimeout = !alreadyCaptured;
+  var nextDidTimeout = void 0;
+  if (current$$1 !== null && workInProgress.updateQueue !== null) {
+    // We're outside strict mode. Something inside this Placeholder boundary
+    // suspended during the last commit. Switch to the placholder.
+    workInProgress.updateQueue = null;
+    nextDidTimeout = true;
+  } else {
+    nextDidTimeout = !alreadyCaptured;
+  }
 
-    if (hasContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (nextProps === prevProps && nextDidTimeout === prevDidTimeout) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  if ((workInProgress.mode & StrictMode) !== NoEffect) {
+    if (nextDidTimeout) {
+      // If the timed-out view commits, schedule an update effect to record
+      // the committed time.
+      workInProgress.effectTag |= Update;
+    } else {
+      // The state node points to the time at which placeholder timed out.
+      // We can clear it once we switch back to the normal children.
+      workInProgress.stateNode = null;
     }
+  }
 
-    var render = nextProps.children;
-    var nextChildren = render(nextDidTimeout);
-    workInProgress.memoizedProps = nextProps;
-    workInProgress.memoizedState = nextDidTimeout;
-    reconcileChildren(current, workInProgress, nextChildren);
-    return workInProgress.child;
+  // If the `children` prop is a function, treat it like a render prop.
+  // TODO: This is temporary until we finalize a lower level API.
+  var children = nextProps.children;
+  var nextChildren = void 0;
+  if (typeof children === "function") {
+    nextChildren = children(nextDidTimeout);
   } else {
-    return null;
+    nextChildren = nextDidTimeout ? nextProps.fallback : children;
+  }
+
+  if (current$$1 !== null && nextDidTimeout !== workInProgress.memoizedState) {
+    // We're about to switch from the placeholder children to the normal
+    // children, or vice versa. These are two different conceptual sets that
+    // happen to be stored in the same set. Call this special function to
+    // force the new set not to match with the current set.
+    // TODO: The proper way to model this is by storing each set separately.
+    forceUnmountCurrentAndReconcile(
+      current$$1,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
+  } else {
+    reconcileChildren(
+      current$$1,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
   }
+  workInProgress.memoizedProps = nextProps;
+  workInProgress.memoizedState = nextDidTimeout;
+  return workInProgress.child;
 }
 
-function updatePortalComponent(current, workInProgress, renderExpirationTime) {
+function updatePortalComponent(
+  current$$1,
+  workInProgress,
+  renderExpirationTime
+) {
   pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
   var nextChildren = workInProgress.pendingProps;
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (workInProgress.memoizedProps === nextChildren) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-
-  if (current === null) {
+  if (current$$1 === null) {
     // Portals are special because we don't append the children during mount
     // but at commit. Therefore we need to track insertions which the normal
     // flow doesn't do during mount. This doesn't happen at the root because
@@ -10047,123 +11004,27 @@ function updatePortalComponent(current, workInProgress, renderExpirationTime) {
     );
     memoizeProps(workInProgress, nextChildren);
   } else {
-    reconcileChildren(current, workInProgress, nextChildren);
+    reconcileChildren(
+      current$$1,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
     memoizeProps(workInProgress, nextChildren);
   }
   return workInProgress.child;
 }
 
-function propagateContextChange(
+function updateContextProvider(
+  current$$1,
   workInProgress,
-  context,
-  changedBits,
   renderExpirationTime
 ) {
-  var fiber = workInProgress.child;
-  if (fiber !== null) {
-    // Set the return pointer of the child to the work-in-progress fiber.
-    fiber.return = workInProgress;
-  }
-  while (fiber !== null) {
-    var nextFiber = void 0;
-    // Visit this fiber.
-    switch (fiber.tag) {
-      case ContextConsumer:
-        // Check if the context matches.
-        var observedBits = fiber.stateNode | 0;
-        if (fiber.type === context && (observedBits & changedBits) !== 0) {
-          // Update the expiration time of all the ancestors, including
-          // the alternates.
-          var node = fiber;
-          while (node !== null) {
-            var alternate = node.alternate;
-            if (
-              node.expirationTime === NoWork ||
-              node.expirationTime > renderExpirationTime
-            ) {
-              node.expirationTime = renderExpirationTime;
-              if (
-                alternate !== null &&
-                (alternate.expirationTime === NoWork ||
-                  alternate.expirationTime > renderExpirationTime)
-              ) {
-                alternate.expirationTime = renderExpirationTime;
-              }
-            } else if (
-              alternate !== null &&
-              (alternate.expirationTime === NoWork ||
-                alternate.expirationTime > renderExpirationTime)
-            ) {
-              alternate.expirationTime = renderExpirationTime;
-            } else {
-              // Neither alternate was updated, which means the rest of the
-              // ancestor path already has sufficient priority.
-              break;
-            }
-            node = node.return;
-          }
-          // Don't scan deeper than a matching consumer. When we render the
-          // consumer, we'll continue scanning from that point. This way the
-          // scanning work is time-sliced.
-          nextFiber = null;
-        } else {
-          // Traverse down.
-          nextFiber = fiber.child;
-        }
-        break;
-      case ContextProvider:
-        // Don't scan deeper if this is a matching provider
-        nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
-        break;
-      default:
-        // Traverse down.
-        nextFiber = fiber.child;
-        break;
-    }
-    if (nextFiber !== null) {
-      // Set the return pointer of the child to the work-in-progress fiber.
-      nextFiber.return = fiber;
-    } else {
-      // No child. Traverse to next sibling.
-      nextFiber = fiber;
-      while (nextFiber !== null) {
-        if (nextFiber === workInProgress) {
-          // We're back to the root of this subtree. Exit.
-          nextFiber = null;
-          break;
-        }
-        var sibling = nextFiber.sibling;
-        if (sibling !== null) {
-          // Set the return pointer of the sibling to the work-in-progress fiber.
-          sibling.return = nextFiber.return;
-          nextFiber = sibling;
-          break;
-        }
-        // No more siblings. Traverse up.
-        nextFiber = nextFiber.return;
-      }
-    }
-    fiber = nextFiber;
-  }
-}
-
-function updateContextProvider(current, workInProgress, renderExpirationTime) {
   var providerType = workInProgress.type;
   var context = providerType._context;
 
   var newProps = workInProgress.pendingProps;
   var oldProps = workInProgress.memoizedProps;
-  var canBailOnProps = true;
-
-  if (hasContextChanged()) {
-    canBailOnProps = false;
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (oldProps === newProps) {
-    workInProgress.stateNode = 0;
-    pushProvider(workInProgress);
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
 
   var newValue = newProps.value;
   workInProgress.memoizedProps = newProps;
@@ -10177,132 +11038,82 @@ function updateContextProvider(current, workInProgress, renderExpirationTime) {
         newProps,
         "prop",
         "Context.Provider",
-        getCurrentFiberStackAddendum$1
+        getCurrentFiberStackInDev
       );
     }
   }
 
-  var changedBits = void 0;
-  if (oldProps === null) {
-    // Initial render
-    changedBits = MAX_SIGNED_31_BIT_INT;
-  } else {
-    if (oldProps.value === newProps.value) {
+  pushProvider(workInProgress, newValue);
+
+  if (oldProps !== null) {
+    var oldValue = oldProps.value;
+    var changedBits = calculateChangedBits(context, newValue, oldValue);
+    if (changedBits === 0) {
       // No change. Bailout early if children are the same.
-      if (oldProps.children === newProps.children && canBailOnProps) {
-        workInProgress.stateNode = 0;
-        pushProvider(workInProgress);
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      if (oldProps.children === newProps.children && !hasContextChanged()) {
+        return bailoutOnAlreadyFinishedWork(
+          current$$1,
+          workInProgress,
+          renderExpirationTime
+        );
       }
-      changedBits = 0;
     } else {
-      var oldValue = oldProps.value;
-      // Use Object.is to compare the new context value to the old value.
-      // Inlined Object.is polyfill.
-      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-      if (
-        (oldValue === newValue &&
-          (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
-        (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
-      ) {
-        // No change. Bailout early if children are the same.
-        if (oldProps.children === newProps.children && canBailOnProps) {
-          workInProgress.stateNode = 0;
-          pushProvider(workInProgress);
-          return bailoutOnAlreadyFinishedWork(current, workInProgress);
-        }
-        changedBits = 0;
-      } else {
-        changedBits =
-          typeof context._calculateChangedBits === "function"
-            ? context._calculateChangedBits(oldValue, newValue)
-            : MAX_SIGNED_31_BIT_INT;
-        {
-          !((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits)
-            ? warning(
-                false,
-                "calculateChangedBits: Expected the return value to be a " +
-                  "31-bit integer. Instead received: %s",
-                changedBits
-              )
-            : void 0;
-        }
-        changedBits |= 0;
-
-        if (changedBits === 0) {
-          // No change. Bailout early if children are the same.
-          if (oldProps.children === newProps.children && canBailOnProps) {
-            workInProgress.stateNode = 0;
-            pushProvider(workInProgress);
-            return bailoutOnAlreadyFinishedWork(current, workInProgress);
-          }
-        } else {
-          propagateContextChange(
-            workInProgress,
-            context,
-            changedBits,
-            renderExpirationTime
-          );
-        }
-      }
+      // The context value changed. Search for matching consumers and schedule
+      // them to update.
+      propagateContextChange(
+        workInProgress,
+        context,
+        changedBits,
+        renderExpirationTime
+      );
     }
   }
 
-  workInProgress.stateNode = changedBits;
-  pushProvider(workInProgress);
-
   var newChildren = newProps.children;
-  reconcileChildren(current, workInProgress, newChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    newChildren,
+    renderExpirationTime
+  );
   return workInProgress.child;
 }
 
-function updateContextConsumer(current, workInProgress, renderExpirationTime) {
-  var context = workInProgress.type;
-  var newProps = workInProgress.pendingProps;
-  var oldProps = workInProgress.memoizedProps;
-
-  var newValue = getContextCurrentValue(context);
-  var changedBits = getContextChangedBits(context);
-
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (changedBits === 0 && oldProps === newProps) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-  workInProgress.memoizedProps = newProps;
-
-  var observedBits = newProps.unstable_observedBits;
-  if (observedBits === undefined || observedBits === null) {
-    // Subscribe to all changes by default
-    observedBits = MAX_SIGNED_31_BIT_INT;
-  }
-  // Store the observedBits on the fiber's stateNode for quick access.
-  workInProgress.stateNode = observedBits;
-
-  if ((changedBits & observedBits) !== 0) {
-    // Context change propagation stops at matching consumers, for time-
-    // slicing. Continue the propagation here.
-    propagateContextChange(
-      workInProgress,
-      context,
-      changedBits,
-      renderExpirationTime
-    );
-  } else if (oldProps === newProps) {
-    // Skip over a memoized parent with a bitmask bailout even
-    // if we began working on it because of a deeper matching child.
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-  // There is no bailout on `children` equality because we expect people
-  // to often pass a bound method as a child, but it may reference
-  // `this.state` or `this.props` (and thus needs to re-render on `setState`).
+var hasWarnedAboutUsingContextAsConsumer = false;
 
+function updateContextConsumer(
+  current$$1,
+  workInProgress,
+  renderExpirationTime
+) {
+  var context = workInProgress.type;
+  // The logic below for Context differs depending on PROD or DEV mode. In
+  // DEV mode, we create a separate object for Context.Consumer that acts
+  // like a proxy to Context. This proxy object adds unnecessary code in PROD
+  // so we use the old behaviour (Context.Consumer references Context) to
+  // reduce size and overhead. The separate object references context via
+  // a property called "_context", which also gives us the ability to check
+  // in DEV mode if this property exists or not and warn if it does not.
+  {
+    if (context._context === undefined) {
+      if (!hasWarnedAboutUsingContextAsConsumer) {
+        hasWarnedAboutUsingContextAsConsumer = true;
+        warning$1(
+          false,
+          "Rendering <Context> directly is not supported and will be removed in " +
+            "a future major release. Did you mean to render <Context.Consumer> instead?"
+        );
+      }
+    } else {
+      context = context._context;
+    }
+  }
+  var newProps = workInProgress.pendingProps;
   var render = newProps.children;
 
   {
     !(typeof render === "function")
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "A context consumer was rendered with multiple children, or a child " +
             "that isn't a function. A context consumer expects a single child " +
@@ -10312,17 +11123,25 @@ function updateContextConsumer(current, workInProgress, renderExpirationTime) {
       : void 0;
   }
 
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  var newValue = readContext(context, newProps.unstable_observedBits);
   var newChildren = void 0;
   {
-    ReactCurrentOwner.current = workInProgress;
-    ReactDebugCurrentFiber.setCurrentPhase("render");
+    ReactCurrentOwner$3.current = workInProgress;
+    setCurrentPhase("render");
     newChildren = render(newValue);
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+    setCurrentPhase(null);
   }
 
   // React DevTools reads this flag.
   workInProgress.effectTag |= PerformedWork;
-  reconcileChildren(current, workInProgress, newChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    newChildren,
+    renderExpirationTime
+  );
+  workInProgress.memoizedProps = newProps;
   return workInProgress.child;
 }
 
@@ -10345,59 +11164,39 @@ function updateContextConsumer(current, workInProgress, renderExpirationTime) {
   }
   */
 
-function bailoutOnAlreadyFinishedWork(current, workInProgress) {
+function bailoutOnAlreadyFinishedWork(
+  current$$1,
+  workInProgress,
+  renderExpirationTime
+) {
   cancelWorkTimer(workInProgress);
 
-  if (enableProfilerTimer) {
-    // Don't update "base" render times for bailouts.
-    stopBaseRenderTimerIfRunning();
-  }
-
-  // TODO: We should ideally be able to bail out early if the children have no
-  // more work to do. However, since we don't have a separation of this
-  // Fiber's priority and its children yet - we don't know without doing lots
-  // of the same work we do anyway. Once we have that separation we can just
-  // bail out here if the children has no more work at this priority level.
-  // if (workInProgress.priorityOfChildren <= priorityLevel) {
-  //   // If there are side-effects in these children that have not yet been
-  //   // committed we need to ensure that they get properly transferred up.
-  //   if (current && current.child !== workInProgress.child) {
-  //     reuseChildrenEffects(workInProgress, child);
-  //   }
-  //   return null;
-  // }
-
-  cloneChildFibers(current, workInProgress);
-  return workInProgress.child;
-}
-
-function bailoutOnLowPriority(current, workInProgress) {
-  cancelWorkTimer(workInProgress);
+  if (current$$1 !== null) {
+    // Reuse previous context list
+    workInProgress.firstContextDependency = current$$1.firstContextDependency;
+  }
 
   if (enableProfilerTimer) {
     // Don't update "base" render times for bailouts.
-    stopBaseRenderTimerIfRunning();
+    stopProfilerTimerIfRunning(workInProgress);
   }
 
-  // TODO: Handle HostComponent tags here as well and call pushHostContext()?
-  // See PR 8590 discussion for context
-  switch (workInProgress.tag) {
-    case HostRoot:
-      pushHostRootContext(workInProgress);
-      break;
-    case ClassComponent:
-      pushContextProvider(workInProgress);
-      break;
-    case HostPortal:
-      pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
-      break;
-    case ContextProvider:
-      pushProvider(workInProgress);
-      break;
+  // Check if the children have any pending work.
+  var childExpirationTime = workInProgress.childExpirationTime;
+  if (
+    childExpirationTime === NoWork ||
+    childExpirationTime > renderExpirationTime
+  ) {
+    // The children don't have any work either. We can skip them.
+    // TODO: Once we add back resuming, we should check if the children are
+    // a work-in-progress set. If so, we need to transfer their effects.
+    return null;
+  } else {
+    // This fiber doesn't have work, but its subtree does. Clone the child
+    // fibers and continue.
+    cloneChildFibers(current$$1, workInProgress);
+    return workInProgress.child;
   }
-  // TODO: What if this is currently in progress?
-  // How can that happen? How is this not being cloned?
-  return null;
 }
 
 // TODO: Delete memoizeProps/State and move to reconcile/bailout instead
@@ -10411,73 +11210,223 @@ function memoizeState(workInProgress, nextState) {
   // is handled by processUpdateQueue.
 }
 
-function beginWork(current, workInProgress, renderExpirationTime) {
-  if (enableProfilerTimer) {
-    if (workInProgress.mode & ProfileMode) {
-      markActualRenderTimeStarted(workInProgress);
+function beginWork(current$$1, workInProgress, renderExpirationTime) {
+  var updateExpirationTime = workInProgress.expirationTime;
+
+  if (current$$1 !== null) {
+    var oldProps = current$$1.memoizedProps;
+    var newProps = workInProgress.pendingProps;
+    if (
+      oldProps === newProps &&
+      !hasContextChanged() &&
+      (updateExpirationTime === NoWork ||
+        updateExpirationTime > renderExpirationTime)
+    ) {
+      // This fiber does not have any pending work. Bailout without entering
+      // the begin phase. There's still some bookkeeping we that needs to be done
+      // in this optimized path, mostly pushing stuff onto the stack.
+      switch (workInProgress.tag) {
+        case HostRoot:
+          pushHostRootContext(workInProgress);
+          resetHydrationState();
+          break;
+        case HostComponent:
+          pushHostContext(workInProgress);
+          break;
+        case ClassComponent: {
+          var Component = workInProgress.type;
+          if (isContextProvider(Component)) {
+            pushContextProvider(workInProgress);
+          }
+          break;
+        }
+        case ClassComponentLazy: {
+          var thenable = workInProgress.type;
+          var _Component = getResultFromResolvedThenable(thenable);
+          if (isContextProvider(_Component)) {
+            pushContextProvider(workInProgress);
+          }
+          break;
+        }
+        case HostPortal:
+          pushHostContainer(
+            workInProgress,
+            workInProgress.stateNode.containerInfo
+          );
+          break;
+        case ContextProvider: {
+          var newValue = workInProgress.memoizedProps.value;
+          pushProvider(workInProgress, newValue);
+          break;
+        }
+        case Profiler:
+          if (enableProfilerTimer) {
+            workInProgress.effectTag |= Update;
+          }
+          break;
+      }
+      return bailoutOnAlreadyFinishedWork(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      );
     }
   }
 
-  if (
-    workInProgress.expirationTime === NoWork ||
-    workInProgress.expirationTime > renderExpirationTime
-  ) {
-    return bailoutOnLowPriority(current, workInProgress);
-  }
+  // Before entering the begin phase, clear the expiration time.
+  workInProgress.expirationTime = NoWork;
 
   switch (workInProgress.tag) {
-    case IndeterminateComponent:
+    case IndeterminateComponent: {
+      var _Component2 = workInProgress.type;
       return mountIndeterminateComponent(
-        current,
+        current$$1,
         workInProgress,
+        _Component2,
+        updateExpirationTime,
         renderExpirationTime
       );
-    case FunctionalComponent:
-      return updateFunctionalComponent(current, workInProgress);
-    case ClassComponent:
+    }
+    case FunctionComponent: {
+      var _Component3 = workInProgress.type;
+      var unresolvedProps = workInProgress.pendingProps;
+      return updateFunctionComponent(
+        current$$1,
+        workInProgress,
+        _Component3,
+        unresolvedProps,
+        renderExpirationTime
+      );
+    }
+    case FunctionComponentLazy: {
+      var _thenable = workInProgress.type;
+      var _Component4 = getResultFromResolvedThenable(_thenable);
+      var _unresolvedProps = workInProgress.pendingProps;
+      var child = updateFunctionComponent(
+        current$$1,
+        workInProgress,
+        _Component4,
+        resolveDefaultProps(_Component4, _unresolvedProps),
+        renderExpirationTime
+      );
+      workInProgress.memoizedProps = _unresolvedProps;
+      return child;
+    }
+    case ClassComponent: {
+      var _Component5 = workInProgress.type;
+      var _unresolvedProps2 = workInProgress.pendingProps;
       return updateClassComponent(
-        current,
+        current$$1,
+        workInProgress,
+        _Component5,
+        _unresolvedProps2,
+        renderExpirationTime
+      );
+    }
+    case ClassComponentLazy: {
+      var _thenable2 = workInProgress.type;
+      var _Component6 = getResultFromResolvedThenable(_thenable2);
+      var _unresolvedProps3 = workInProgress.pendingProps;
+      var _child = updateClassComponent(
+        current$$1,
         workInProgress,
+        _Component6,
+        resolveDefaultProps(_Component6, _unresolvedProps3),
         renderExpirationTime
       );
+      workInProgress.memoizedProps = _unresolvedProps3;
+      return _child;
+    }
     case HostRoot:
-      return updateHostRoot(current, workInProgress, renderExpirationTime);
+      return updateHostRoot(current$$1, workInProgress, renderExpirationTime);
     case HostComponent:
-      return updateHostComponent(current, workInProgress, renderExpirationTime);
+      return updateHostComponent(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      );
     case HostText:
-      return updateHostText(current, workInProgress);
-    case TimeoutComponent:
-      return updateTimeoutComponent(
-        current,
+      return updateHostText(current$$1, workInProgress);
+    case SuspenseComponent:
+      return updateSuspenseComponent(
+        current$$1,
         workInProgress,
         renderExpirationTime
       );
     case HostPortal:
       return updatePortalComponent(
-        current,
+        current$$1,
         workInProgress,
         renderExpirationTime
       );
-    case ForwardRef:
-      return updateForwardRef(current, workInProgress);
+    case ForwardRef: {
+      var type = workInProgress.type;
+      return updateForwardRef(
+        current$$1,
+        workInProgress,
+        type,
+        workInProgress.pendingProps,
+        renderExpirationTime
+      );
+    }
+    case ForwardRefLazy: {
+      var _thenable3 = workInProgress.type;
+      var _Component7 = getResultFromResolvedThenable(_thenable3);
+      var _unresolvedProps4 = workInProgress.pendingProps;
+      var _child2 = updateForwardRef(
+        current$$1,
+        workInProgress,
+        _Component7,
+        resolveDefaultProps(_Component7, _unresolvedProps4),
+        renderExpirationTime
+      );
+      workInProgress.memoizedProps = _unresolvedProps4;
+      return _child2;
+    }
     case Fragment:
-      return updateFragment(current, workInProgress);
+      return updateFragment(current$$1, workInProgress, renderExpirationTime);
     case Mode:
-      return updateMode(current, workInProgress);
+      return updateMode(current$$1, workInProgress, renderExpirationTime);
     case Profiler:
-      return updateProfiler(current, workInProgress);
+      return updateProfiler(current$$1, workInProgress, renderExpirationTime);
     case ContextProvider:
       return updateContextProvider(
-        current,
+        current$$1,
         workInProgress,
         renderExpirationTime
       );
     case ContextConsumer:
       return updateContextConsumer(
-        current,
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      );
+    case PureComponent: {
+      var _type = workInProgress.type;
+      return updatePureComponent(
+        current$$1,
+        workInProgress,
+        _type,
+        workInProgress.pendingProps,
+        updateExpirationTime,
+        renderExpirationTime
+      );
+    }
+    case PureComponentLazy: {
+      var _thenable4 = workInProgress.type;
+      var _Component8 = getResultFromResolvedThenable(_thenable4);
+      var _unresolvedProps5 = workInProgress.pendingProps;
+      var _child3 = updatePureComponent(
+        current$$1,
         workInProgress,
+        _Component8,
+        resolveDefaultProps(_Component8, _unresolvedProps5),
+        updateExpirationTime,
         renderExpirationTime
       );
+      workInProgress.memoizedProps = _unresolvedProps5;
+      return _child3;
+    }
     default:
       invariant(
         false,
@@ -10539,13 +11488,36 @@ if (supportsMutation) {
   updateHostComponent$1 = function(
     current,
     workInProgress,
-    updatePayload,
     type,
-    oldProps,
     newProps,
-    rootContainerInstance,
-    currentHostContext
+    rootContainerInstance
   ) {
+    // If we have an alternate, that means this is an update and we need to
+    // schedule a side-effect to do the updates.
+    var oldProps = current.memoizedProps;
+    if (oldProps === newProps) {
+      // In mutation mode, this is sufficient for a bailout because
+      // we won't touch this node even if children changed.
+      return;
+    }
+
+    // If we get updated because one of our children updated, we don't
+    // have newProps so we'll have to reuse them.
+    // TODO: Split the update API as separate for the props vs. children.
+    // Even better would be if children weren't special cased at all tho.
+    var instance = workInProgress.stateNode;
+    var currentHostContext = getHostContext();
+    // TODO: Experiencing an error where oldProps is null. Suggests a host
+    // component is hitting the resume path. Figure out why. Possibly
+    // related to `hidden`.
+    var updatePayload = prepareUpdate(
+      instance,
+      type,
+      oldProps,
+      newProps,
+      rootContainerInstance,
+      currentHostContext
+    );
     // TODO: Type this specific to this type of component.
     workInProgress.updateQueue = updatePayload;
     // If the update payload indicates that there is a change or if there
@@ -10615,54 +11587,70 @@ if (supportsMutation) {
   updateHostComponent$1 = function(
     current,
     workInProgress,
-    updatePayload,
     type,
-    oldProps,
     newProps,
-    rootContainerInstance,
-    currentHostContext
+    rootContainerInstance
   ) {
+    var currentInstance = current.stateNode;
+    var oldProps = current.memoizedProps;
     // If there are no effects associated with this node, then none of our children had any updates.
     // This guarantees that we can reuse all of them.
     var childrenUnchanged = workInProgress.firstEffect === null;
-    var currentInstance = current.stateNode;
-    if (childrenUnchanged && updatePayload === null) {
+    if (childrenUnchanged && oldProps === newProps) {
       // No changes, just reuse the existing instance.
       // Note that this might release a previous clone.
       workInProgress.stateNode = currentInstance;
-    } else {
-      var recyclableInstance = workInProgress.stateNode;
-      var newInstance = cloneInstance(
-        currentInstance,
-        updatePayload,
+      return;
+    }
+    var recyclableInstance = workInProgress.stateNode;
+    var currentHostContext = getHostContext();
+    var updatePayload = null;
+    if (oldProps !== newProps) {
+      updatePayload = prepareUpdate(
+        recyclableInstance,
         type,
         oldProps,
         newProps,
-        workInProgress,
-        childrenUnchanged,
-        recyclableInstance
+        rootContainerInstance,
+        currentHostContext
       );
-      if (
-        finalizeInitialChildren(
-          newInstance,
-          type,
-          newProps,
-          rootContainerInstance,
-          currentHostContext
-        )
-      ) {
-        markUpdate(workInProgress);
-      }
-      workInProgress.stateNode = newInstance;
-      if (childrenUnchanged) {
-        // If there are no other effects in this tree, we need to flag this node as having one.
-        // Even though we're not going to use it for anything.
-        // Otherwise parents won't know that there are new children to propagate upwards.
-        markUpdate(workInProgress);
-      } else {
-        // If children might have changed, we have to add them all to the set.
-        appendAllChildren(newInstance, workInProgress);
-      }
+    }
+    if (childrenUnchanged && updatePayload === null) {
+      // No changes, just reuse the existing instance.
+      // Note that this might release a previous clone.
+      workInProgress.stateNode = currentInstance;
+      return;
+    }
+    var newInstance = cloneInstance(
+      currentInstance,
+      updatePayload,
+      type,
+      oldProps,
+      newProps,
+      workInProgress,
+      childrenUnchanged,
+      recyclableInstance
+    );
+    if (
+      finalizeInitialChildren(
+        newInstance,
+        type,
+        newProps,
+        rootContainerInstance,
+        currentHostContext
+      )
+    ) {
+      markUpdate(workInProgress);
+    }
+    workInProgress.stateNode = newInstance;
+    if (childrenUnchanged) {
+      // If there are no other effects in this tree, we need to flag this node as having one.
+      // Even though we're not going to use it for anything.
+      // Otherwise parents won't know that there are new children to propagate upwards.
+      markUpdate(workInProgress);
+    } else {
+      // If children might have changed, we have to add them all to the set.
+      appendAllChildren(newInstance, workInProgress);
     }
   };
   updateHostText$1 = function(current, workInProgress, oldText, newText) {
@@ -10689,12 +11677,9 @@ if (supportsMutation) {
   updateHostComponent$1 = function(
     current,
     workInProgress,
-    updatePayload,
     type,
-    oldProps,
     newProps,
-    rootContainerInstance,
-    currentHostContext
+    rootContainerInstance
   ) {
     // Noop
   };
@@ -10706,19 +11691,23 @@ if (supportsMutation) {
 function completeWork(current, workInProgress, renderExpirationTime) {
   var newProps = workInProgress.pendingProps;
 
-  if (enableProfilerTimer) {
-    if (workInProgress.mode & ProfileMode) {
-      recordElapsedActualRenderTime(workInProgress);
-    }
-  }
-
   switch (workInProgress.tag) {
-    case FunctionalComponent:
-      return null;
+    case FunctionComponent:
+    case FunctionComponentLazy:
+      break;
     case ClassComponent: {
-      // We are leaving this subtree, so pop context if any.
-      popContextProvider(workInProgress);
-      return null;
+      var Component = workInProgress.type;
+      if (isContextProvider(Component)) {
+        popContext(workInProgress);
+      }
+      break;
+    }
+    case ClassComponentLazy: {
+      var _Component = getResultFromResolvedThenable(workInProgress.type);
+      if (isContextProvider(_Component)) {
+        popContext(workInProgress);
+      }
+      break;
     }
     case HostRoot: {
       popHostContainer(workInProgress);
@@ -10737,43 +11726,19 @@ function completeWork(current, workInProgress, renderExpirationTime) {
         workInProgress.effectTag &= ~Placement;
       }
       updateHostContainer(workInProgress);
-      return null;
+      break;
     }
     case HostComponent: {
       popHostContext(workInProgress);
       var rootContainerInstance = getRootHostContainer();
       var type = workInProgress.type;
       if (current !== null && workInProgress.stateNode != null) {
-        // If we have an alternate, that means this is an update and we need to
-        // schedule a side-effect to do the updates.
-        var oldProps = current.memoizedProps;
-        // If we get updated because one of our children updated, we don't
-        // have newProps so we'll have to reuse them.
-        // TODO: Split the update API as separate for the props vs. children.
-        // Even better would be if children weren't special cased at all tho.
-        var instance = workInProgress.stateNode;
-        var currentHostContext = getHostContext();
-        // TODO: Experiencing an error where oldProps is null. Suggests a host
-        // component is hitting the resume path. Figure out why. Possibly
-        // related to `hidden`.
-        var updatePayload = prepareUpdate(
-          instance,
-          type,
-          oldProps,
-          newProps,
-          rootContainerInstance,
-          currentHostContext
-        );
-
         updateHostComponent$1(
           current,
           workInProgress,
-          updatePayload,
           type,
-          oldProps,
           newProps,
-          rootContainerInstance,
-          currentHostContext
+          rootContainerInstance
         );
 
         if (current.ref !== workInProgress.ref) {
@@ -10787,10 +11752,10 @@ function completeWork(current, workInProgress, renderExpirationTime) {
               "caused by a bug in React. Please file an issue."
           );
           // This can happen when we abort work.
-          return null;
+          break;
         }
 
-        var _currentHostContext = getHostContext();
+        var currentHostContext = getHostContext();
         // TODO: Move createInstance to beginWork and keep it on a context
         // "stack" as the parent. Then append children as we go in beginWork
         // or completeWork depending on we want to add then top->down or
@@ -10803,7 +11768,7 @@ function completeWork(current, workInProgress, renderExpirationTime) {
             prepareToHydrateHostInstance(
               workInProgress,
               rootContainerInstance,
-              _currentHostContext
+              currentHostContext
             )
           ) {
             // If changes to the hydrated node needs to be applied at the
@@ -10811,31 +11776,31 @@ function completeWork(current, workInProgress, renderExpirationTime) {
             markUpdate(workInProgress);
           }
         } else {
-          var _instance = createInstance(
+          var instance = createInstance(
             type,
             newProps,
             rootContainerInstance,
-            _currentHostContext,
+            currentHostContext,
             workInProgress
           );
 
-          appendAllChildren(_instance, workInProgress);
+          appendAllChildren(instance, workInProgress);
 
           // Certain renderers require commit-time effects for initial mount.
           // (eg DOM renderer supports auto-focus for certain elements).
           // Make sure such renderers get scheduled for later work.
           if (
             finalizeInitialChildren(
-              _instance,
+              instance,
               type,
               newProps,
               rootContainerInstance,
-              _currentHostContext
+              currentHostContext
             )
           ) {
             markUpdate(workInProgress);
           }
-          workInProgress.stateNode = _instance;
+          workInProgress.stateNode = instance;
         }
 
         if (workInProgress.ref !== null) {
@@ -10843,7 +11808,7 @@ function completeWork(current, workInProgress, renderExpirationTime) {
           markRef$1(workInProgress);
         }
       }
-      return null;
+      break;
     }
     case HostText: {
       var newText = newProps;
@@ -10860,10 +11825,9 @@ function completeWork(current, workInProgress, renderExpirationTime) {
               "caused by a bug in React. Please file an issue."
           );
           // This can happen when we abort work.
-          return null;
         }
         var _rootContainerInstance = getRootHostContainer();
-        var _currentHostContext2 = getHostContext();
+        var _currentHostContext = getHostContext();
         var _wasHydrated = popHydrationState(workInProgress);
         if (_wasHydrated) {
           if (prepareToHydrateHostTextInstance(workInProgress)) {
@@ -10873,33 +11837,37 @@ function completeWork(current, workInProgress, renderExpirationTime) {
           workInProgress.stateNode = createTextInstance(
             newText,
             _rootContainerInstance,
-            _currentHostContext2,
+            _currentHostContext,
             workInProgress
           );
         }
       }
-      return null;
+      break;
     }
     case ForwardRef:
-      return null;
-    case TimeoutComponent:
-      return null;
+    case ForwardRefLazy:
+      break;
+    case SuspenseComponent:
+      break;
     case Fragment:
-      return null;
+      break;
     case Mode:
-      return null;
+      break;
     case Profiler:
-      return null;
+      break;
     case HostPortal:
       popHostContainer(workInProgress);
       updateHostContainer(workInProgress);
-      return null;
+      break;
     case ContextProvider:
       // Pop provider fiber
       popProvider(workInProgress);
-      return null;
+      break;
     case ContextConsumer:
-      return null;
+      break;
+    case PureComponent:
+    case PureComponentLazy:
+      break;
     // Error cases
     case IndeterminateComponent:
       invariant(
@@ -10916,6 +11884,8 @@ function completeWork(current, workInProgress, renderExpirationTime) {
           "React. Please file an issue."
       );
   }
+
+  return null;
 }
 
 // Module provided by RN:
@@ -10969,11 +11939,6 @@ function logCapturedError(capturedError) {
   }
 
   var error = capturedError.error;
-  var suppressLogging = error && error.suppressReactErrorLogging;
-  if (suppressLogging) {
-    return;
-  }
-
   {
     var componentName = capturedError.componentName,
       componentStack = capturedError.componentStack,
@@ -10981,6 +11946,26 @@ function logCapturedError(capturedError) {
       errorBoundaryFound = capturedError.errorBoundaryFound,
       willRetry = capturedError.willRetry;
 
+    // Browsers support silencing uncaught errors by calling
+    // `preventDefault()` in window `error` handler.
+    // We record this information as an expando on the error.
+
+    if (error != null && error._suppressLogging) {
+      if (errorBoundaryFound && willRetry) {
+        // The error is recoverable and was silenced.
+        // Ignore it and don't print the stack addendum.
+        // This is handy for testing error boundaries without noise.
+        return;
+      }
+      // The error is fatal. Since the silencing might have
+      // been accidental, we'll surface it anyway.
+      // However, the browser would have silenced the original error
+      // so we'll print it first, and then print the stack addendum.
+      console.error(error);
+      // For a more detailed description of this block, see:
+      // https://github.com/facebook/react/pull/13384
+    }
+
     var componentNameMessage = componentName
       ? "The above error occurred in the <" + componentName + "> component:"
       : "The above error occurred in one of your React components:";
@@ -11019,9 +12004,7 @@ function logCapturedError(capturedError) {
   }
 }
 
-var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
-var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
-var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
+var emptyObject$1 = {};
 
 var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
 {
@@ -11032,11 +12015,11 @@ function logError(boundary, errorInfo) {
   var source = errorInfo.source;
   var stack = errorInfo.stack;
   if (stack === null && source !== null) {
-    stack = getStackAddendumByWorkInProgressFiber(source);
+    stack = getStackByFiberInDevAndProd(source);
   }
 
   var capturedError = {
-    componentName: source !== null ? getComponentName(source) : null,
+    componentName: source !== null ? getComponentName(source.type) : null,
     componentStack: stack !== null ? stack : "",
     error: errorInfo.value,
     errorBoundary: null,
@@ -11047,7 +12030,7 @@ function logError(boundary, errorInfo) {
 
   if (boundary !== null && boundary.tag === ClassComponent) {
     capturedError.errorBoundary = boundary.stateNode;
-    capturedError.errorBoundaryName = getComponentName(boundary);
+    capturedError.errorBoundaryName = getComponentName(boundary.type);
     capturedError.errorBoundaryFound = true;
     capturedError.willRetry = true;
   }
@@ -11055,49 +12038,50 @@ function logError(boundary, errorInfo) {
   try {
     logCapturedError(capturedError);
   } catch (e) {
-    // Prevent cycle if logCapturedError() throws.
-    // A cycle may still occur if logCapturedError renders a component that throws.
-    var suppressLogging = e && e.suppressReactErrorLogging;
-    if (!suppressLogging) {
-      console.error(e);
-    }
+    // This method must not throw, or React internal state will get messed up.
+    // If console.error is overridden, or logCapturedError() shows a dialog that throws,
+    // we want to report this error outside of the normal stack as a last resort.
+    // https://github.com/facebook/react/issues/13188
+    setTimeout(function() {
+      throw e;
+    });
   }
 }
 
-var callComponentWillUnmountWithTimer = function(current, instance) {
-  startPhaseTimer(current, "componentWillUnmount");
-  instance.props = current.memoizedProps;
-  instance.state = current.memoizedState;
+var callComponentWillUnmountWithTimer = function(current$$1, instance) {
+  startPhaseTimer(current$$1, "componentWillUnmount");
+  instance.props = current$$1.memoizedProps;
+  instance.state = current$$1.memoizedState;
   instance.componentWillUnmount();
   stopPhaseTimer();
 };
 
 // Capture errors so they don't interrupt unmounting.
-function safelyCallComponentWillUnmount(current, instance) {
+function safelyCallComponentWillUnmount(current$$1, instance) {
   {
-    invokeGuardedCallback$3(
+    invokeGuardedCallback(
       null,
       callComponentWillUnmountWithTimer,
       null,
-      current,
+      current$$1,
       instance
     );
-    if (hasCaughtError$1()) {
-      var unmountError = clearCaughtError$1();
-      captureCommitPhaseError(current, unmountError);
+    if (hasCaughtError()) {
+      var unmountError = clearCaughtError();
+      captureCommitPhaseError(current$$1, unmountError);
     }
   }
 }
 
-function safelyDetachRef(current) {
-  var ref = current.ref;
+function safelyDetachRef(current$$1) {
+  var ref = current$$1.ref;
   if (ref !== null) {
     if (typeof ref === "function") {
       {
-        invokeGuardedCallback$3(null, ref, null, null);
-        if (hasCaughtError$1()) {
-          var refError = clearCaughtError$1();
-          captureCommitPhaseError(current, refError);
+        invokeGuardedCallback(null, ref, null, null);
+        if (hasCaughtError()) {
+          var refError = clearCaughtError();
+          captureCommitPhaseError(current$$1, refError);
         }
       }
     } else {
@@ -11106,13 +12090,14 @@ function safelyDetachRef(current) {
   }
 }
 
-function commitBeforeMutationLifeCycles(current, finishedWork) {
+function commitBeforeMutationLifeCycles(current$$1, finishedWork) {
   switch (finishedWork.tag) {
-    case ClassComponent: {
+    case ClassComponent:
+    case ClassComponentLazy: {
       if (finishedWork.effectTag & Snapshot) {
-        if (current !== null) {
-          var prevProps = current.memoizedProps;
-          var prevState = current.memoizedState;
+        if (current$$1 !== null) {
+          var prevProps = current$$1.memoizedProps;
+          var prevState = current$$1.memoizedState;
           startPhaseTimer(finishedWork, "getSnapshotBeforeUpdate");
           var instance = finishedWork.stateNode;
           instance.props = finishedWork.memoizedProps;
@@ -11122,11 +12107,11 @@ function commitBeforeMutationLifeCycles(current, finishedWork) {
             var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
             if (snapshot === undefined && !didWarnSet.has(finishedWork.type)) {
               didWarnSet.add(finishedWork.type);
-              warning(
+              warningWithoutStack$1(
                 false,
                 "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
                   "must be returned. You have returned undefined.",
-                getComponentName(finishedWork)
+                getComponentName(finishedWork.type)
               );
             }
           }
@@ -11154,24 +12139,24 @@ function commitBeforeMutationLifeCycles(current, finishedWork) {
 
 function commitLifeCycles(
   finishedRoot,
-  current,
+  current$$1,
   finishedWork,
-  currentTime,
   committedExpirationTime
 ) {
   switch (finishedWork.tag) {
-    case ClassComponent: {
+    case ClassComponent:
+    case ClassComponentLazy: {
       var instance = finishedWork.stateNode;
       if (finishedWork.effectTag & Update) {
-        if (current === null) {
+        if (current$$1 === null) {
           startPhaseTimer(finishedWork, "componentDidMount");
           instance.props = finishedWork.memoizedProps;
           instance.state = finishedWork.memoizedState;
           instance.componentDidMount();
           stopPhaseTimer();
         } else {
-          var prevProps = current.memoizedProps;
-          var prevState = current.memoizedState;
+          var prevProps = current$$1.memoizedProps;
+          var prevState = current$$1.memoizedState;
           startPhaseTimer(finishedWork, "componentDidUpdate");
           instance.props = finishedWork.memoizedProps;
           instance.state = finishedWork.memoizedState;
@@ -11206,6 +12191,7 @@ function commitLifeCycles(
               _instance = getPublicInstance(finishedWork.child.stateNode);
               break;
             case ClassComponent:
+            case ClassComponentLazy:
               _instance = finishedWork.child.stateNode;
               break;
           }
@@ -11226,7 +12212,7 @@ function commitLifeCycles(
       // (eg DOM renderer may schedule auto-focus for inputs and form controls).
       // These effects should only be committed when components are first mounted,
       // aka when there is no current/alternate.
-      if (current === null && finishedWork.effectTag & Update) {
+      if (current$$1 === null && finishedWork.effectTag & Update) {
         var type = finishedWork.type;
         var props = finishedWork.memoizedProps;
         commitMount(_instance2, type, props, finishedWork);
@@ -11243,11 +12229,47 @@ function commitLifeCycles(
       return;
     }
     case Profiler: {
-      // We have no life-cycles associated with Profiler.
+      if (enableProfilerTimer) {
+        var onRender = finishedWork.memoizedProps.onRender;
+
+        if (enableSchedulerTracing) {
+          onRender(
+            finishedWork.memoizedProps.id,
+            current$$1 === null ? "mount" : "update",
+            finishedWork.actualDuration,
+            finishedWork.treeBaseDuration,
+            finishedWork.actualStartTime,
+            getCommitTime(),
+            finishedRoot.memoizedInteractions
+          );
+        } else {
+          onRender(
+            finishedWork.memoizedProps.id,
+            current$$1 === null ? "mount" : "update",
+            finishedWork.actualDuration,
+            finishedWork.treeBaseDuration,
+            finishedWork.actualStartTime,
+            getCommitTime()
+          );
+        }
+      }
       return;
     }
-    case TimeoutComponent: {
-      // We have no life-cycles associated with Timeouts.
+    case SuspenseComponent: {
+      if ((finishedWork.mode & StrictMode) === NoEffect) {
+        // In loose mode, a placeholder times out by scheduling a synchronous
+        // update in the commit phase. Use `updateQueue` field to signal that
+        // the Timeout needs to switch to the placeholder. We don't need an
+        // entire queue. Any non-null value works.
+        // $FlowFixMe - Intentionally using a value other than an UpdateQueue.
+        finishedWork.updateQueue = emptyObject$1;
+        scheduleWork(finishedWork, Sync);
+      } else {
+        // In strict mode, the Update effect is used to record the time at
+        // which the placeholder timed out.
+        var currentTime = requestCurrentTime();
+        finishedWork.stateNode = { timedOutAt: currentTime };
+      }
       return;
     }
     default: {
@@ -11277,12 +12299,12 @@ function commitAttachRef(finishedWork) {
     } else {
       {
         if (!ref.hasOwnProperty("current")) {
-          warning(
+          warningWithoutStack$1(
             false,
             "Unexpected ref object provided for %s. " +
               "Use either a ref-setter function or React.createRef().%s",
-            getComponentName(finishedWork),
-            getStackAddendumByWorkInProgressFiber(finishedWork)
+            getComponentName(finishedWork.type),
+            getStackByFiberInDevAndProd(finishedWork)
           );
         }
       }
@@ -11292,8 +12314,8 @@ function commitAttachRef(finishedWork) {
   }
 }
 
-function commitDetachRef(current) {
-  var currentRef = current.ref;
+function commitDetachRef(current$$1) {
+  var currentRef = current$$1.ref;
   if (currentRef !== null) {
     if (typeof currentRef === "function") {
       currentRef(null);
@@ -11306,22 +12328,21 @@ function commitDetachRef(current) {
 // User-originating errors (lifecycles and refs) should not interrupt
 // deletion, so don't let them throw. Host-originating errors should
 // interrupt deletion, so it's okay
-function commitUnmount(current) {
-  if (typeof onCommitUnmount === "function") {
-    onCommitUnmount(current);
-  }
+function commitUnmount(current$$1) {
+  onCommitUnmount(current$$1);
 
-  switch (current.tag) {
-    case ClassComponent: {
-      safelyDetachRef(current);
-      var instance = current.stateNode;
+  switch (current$$1.tag) {
+    case ClassComponent:
+    case ClassComponentLazy: {
+      safelyDetachRef(current$$1);
+      var instance = current$$1.stateNode;
       if (typeof instance.componentWillUnmount === "function") {
-        safelyCallComponentWillUnmount(current, instance);
+        safelyCallComponentWillUnmount(current$$1, instance);
       }
       return;
     }
     case HostComponent: {
-      safelyDetachRef(current);
+      safelyDetachRef(current$$1);
       return;
     }
     case HostPortal: {
@@ -11329,9 +12350,9 @@ function commitUnmount(current) {
       // We are also not using this parent because
       // the portal will get pushed immediately.
       if (supportsMutation) {
-        unmountHostComponents(current);
+        unmountHostComponents(current$$1);
       } else if (supportsPersistence) {
-        emptyPortalContainer(current);
+        emptyPortalContainer(current$$1);
       }
       return;
     }
@@ -11372,26 +12393,26 @@ function commitNestedUnmounts(root) {
   }
 }
 
-function detachFiber(current) {
+function detachFiber(current$$1) {
   // Cut off the return pointers to disconnect it from the tree. Ideally, we
   // should clear the child pointer of the parent alternate to let this
   // get GC:ed but we don't know which for sure which parent is the current
   // one so we'll settle for GC:ing the subtree of this child. This child
   // itself will be GC:ed when the parent updates the next time.
-  current.return = null;
-  current.child = null;
-  if (current.alternate) {
-    current.alternate.child = null;
-    current.alternate.return = null;
+  current$$1.return = null;
+  current$$1.child = null;
+  if (current$$1.alternate) {
+    current$$1.alternate.child = null;
+    current$$1.alternate.return = null;
   }
 }
 
-function emptyPortalContainer(current) {
+function emptyPortalContainer(current$$1) {
   if (!supportsPersistence) {
     return;
   }
 
-  var portal = current.stateNode;
+  var portal = current$$1.stateNode;
   var containerInfo = portal.containerInfo;
 
   var emptyChildSet = createContainerChildSet(containerInfo);
@@ -11403,7 +12424,8 @@ function commitContainer(finishedWork) {
   }
 
   switch (finishedWork.tag) {
-    case ClassComponent: {
+    case ClassComponent:
+    case ClassComponentLazy: {
       return;
     }
     case HostComponent: {
@@ -11501,8 +12523,11 @@ function commitPlacement(finishedWork) {
 
   // Recursively insert all host nodes into the parent.
   var parentFiber = getHostParentFiber(finishedWork);
+
+  // Note: these two variables *must* always be updated together.
   var parent = void 0;
   var isContainer = void 0;
+
   switch (parentFiber.tag) {
     case HostComponent:
       parent = parentFiber.stateNode;
@@ -11572,13 +12597,15 @@ function commitPlacement(finishedWork) {
   }
 }
 
-function unmountHostComponents(current) {
-  // We only have the top Fiber that was inserted but we need recurse down its
-  var node = current;
+function unmountHostComponents(current$$1) {
+  // We only have the top Fiber that was deleted but we need recurse down its
+  var node = current$$1;
 
   // Each iteration, currentParent is populated with node's host parent if not
   // currentParentIsValid.
   var currentParentIsValid = false;
+
+  // Note: these two variables *must* always be updated together.
   var currentParent = void 0;
   var currentParentIsContainer = void 0;
 
@@ -11624,6 +12651,7 @@ function unmountHostComponents(current) {
       // When we go into a portal, it becomes the parent to remove from.
       // We will reassign it back when we pop the portal on the way up.
       currentParent = node.stateNode.containerInfo;
+      currentParentIsContainer = true;
       // Visit children because portals might contain host components.
       if (node.child !== null) {
         node.child.return = node;
@@ -11639,11 +12667,11 @@ function unmountHostComponents(current) {
         continue;
       }
     }
-    if (node === current) {
+    if (node === current$$1) {
       return;
     }
     while (node.sibling === null) {
-      if (node.return === null || node.return === current) {
+      if (node.return === null || node.return === current$$1) {
         return;
       }
       node = node.return;
@@ -11658,26 +12686,27 @@ function unmountHostComponents(current) {
   }
 }
 
-function commitDeletion(current) {
+function commitDeletion(current$$1) {
   if (supportsMutation) {
     // Recursively delete all host nodes from the parent.
     // Detach refs and call componentWillUnmount() on the whole subtree.
-    unmountHostComponents(current);
+    unmountHostComponents(current$$1);
   } else {
     // Detach refs and call componentWillUnmount() on the whole subtree.
-    commitNestedUnmounts(current);
+    commitNestedUnmounts(current$$1);
   }
-  detachFiber(current);
+  detachFiber(current$$1);
 }
 
-function commitWork(current, finishedWork) {
+function commitWork(current$$1, finishedWork) {
   if (!supportsMutation) {
     commitContainer(finishedWork);
     return;
   }
 
   switch (finishedWork.tag) {
-    case ClassComponent: {
+    case ClassComponent:
+    case ClassComponentLazy: {
       return;
     }
     case HostComponent: {
@@ -11688,7 +12717,8 @@ function commitWork(current, finishedWork) {
         // For hydration we reuse the update path but we treat the oldProps
         // as the newProps. The updatePayload will contain the real change in
         // this case.
-        var oldProps = current !== null ? current.memoizedProps : newProps;
+        var oldProps =
+          current$$1 !== null ? current$$1.memoizedProps : newProps;
         var type = finishedWork.type;
         // TODO: Type the updateQueue to be specific to host components.
         var updatePayload = finishedWork.updateQueue;
@@ -11717,7 +12747,7 @@ function commitWork(current, finishedWork) {
       // For hydration we reuse the update path but we treat the oldProps
       // as the newProps. The updatePayload will contain the real change in
       // this case.
-      var oldText = current !== null ? current.memoizedProps : newText;
+      var oldText = current$$1 !== null ? current$$1.memoizedProps : newText;
       commitTextUpdate(textInstance, oldText, newText);
       return;
     }
@@ -11725,20 +12755,9 @@ function commitWork(current, finishedWork) {
       return;
     }
     case Profiler: {
-      if (enableProfilerTimer) {
-        var onRender = finishedWork.memoizedProps.onRender;
-        onRender(
-          finishedWork.memoizedProps.id,
-          current === null ? "mount" : "update",
-          finishedWork.actualDuration,
-          finishedWork.treeBaseTime,
-          finishedWork.actualStartTime,
-          getCommitTime()
-        );
-      }
       return;
     }
-    case TimeoutComponent: {
+    case SuspenseComponent: {
       return;
     }
     default: {
@@ -11751,11 +12770,15 @@ function commitWork(current, finishedWork) {
   }
 }
 
-function commitResetTextContent(current) {
+function commitResetTextContent(current$$1) {
   if (!supportsMutation) {
     return;
   }
-  resetTextContent(current.stateNode);
+  resetTextContent(current$$1.stateNode);
+}
+
+function NoopComponent() {
+  return null;
 }
 
 function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
@@ -11776,28 +12799,22 @@ function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
 function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   var update = createUpdate(expirationTime);
   update.tag = CaptureUpdate;
-  var getDerivedStateFromCatch = fiber.type.getDerivedStateFromCatch;
-  if (
-    enableGetDerivedStateFromCatch &&
-    typeof getDerivedStateFromCatch === "function"
-  ) {
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if (typeof getDerivedStateFromError === "function") {
     var error = errorInfo.value;
     update.payload = function() {
-      return getDerivedStateFromCatch(error);
+      return getDerivedStateFromError(error);
     };
   }
 
   var inst = fiber.stateNode;
   if (inst !== null && typeof inst.componentDidCatch === "function") {
     update.callback = function callback() {
-      if (
-        !enableGetDerivedStateFromCatch ||
-        getDerivedStateFromCatch !== "function"
-      ) {
+      if (typeof getDerivedStateFromError !== "function") {
         // To preserve the preexisting retry behavior of error boundaries,
         // we keep track of which ones already failed during this batch.
         // This gets reset before we yield back to the browser.
-        // TODO: Warn in strict mode if getDerivedStateFromCatch is
+        // TODO: Warn in strict mode if getDerivedStateFromError is
         // not defined.
         markLegacyErrorBoundaryAsFailed(this);
       }
@@ -11807,28 +12824,32 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
       this.componentDidCatch(error, {
         componentStack: stack !== null ? stack : ""
       });
+      {
+        if (typeof getDerivedStateFromError !== "function") {
+          // If componentDidCatch is the only error boundary method defined,
+          // then it needs to call setState to recover from errors.
+          // If no state update is scheduled then the boundary will swallow the error.
+          !(fiber.expirationTime === Sync)
+            ? warningWithoutStack$1(
+                false,
+                "%s: Error boundaries should implement getDerivedStateFromError(). " +
+                  "In that method, return a state update to display an error message or fallback UI.",
+                getComponentName(fiber.type) || "Unknown"
+              )
+            : void 0;
+        }
+      }
     };
   }
   return update;
 }
 
-function schedulePing(finishedWork) {
-  // Once the promise resolves, we should try rendering the non-
-  // placeholder state again.
-  var currentTime = recalculateCurrentTime();
-  var expirationTime = computeExpirationForFiber(currentTime, finishedWork);
-  var recoveryUpdate = createUpdate(expirationTime);
-  enqueueUpdate(finishedWork, recoveryUpdate, expirationTime);
-  scheduleWork(finishedWork, expirationTime);
-}
-
 function throwException(
   root,
   returnFiber,
   sourceFiber,
   value,
-  renderExpirationTime,
-  currentTimeMs
+  renderExpirationTime
 ) {
   // The source fiber did not complete.
   sourceFiber.effectTag |= Incomplete;
@@ -11836,7 +12857,6 @@ function throwException(
   sourceFiber.firstEffect = sourceFiber.lastEffect = null;
 
   if (
-    enableSuspense &&
     value !== null &&
     typeof value === "object" &&
     typeof value.then === "function"
@@ -11844,111 +12864,181 @@ function throwException(
     // This is a thenable.
     var thenable = value;
 
-    // TODO: Should use the earliest known expiration time
-    var expirationTimeMs = expirationTimeToMs(renderExpirationTime);
-    var startTimeMs = expirationTimeMs - 5000;
-    var elapsedMs = currentTimeMs - startTimeMs;
-    if (elapsedMs < 0) {
-      elapsedMs = 0;
-    }
-    var remainingTimeMs = expirationTimeMs - currentTimeMs;
-
-    // Find the earliest timeout of all the timeouts in the ancestor path.
-    // TODO: Alternatively, we could store the earliest timeout on the context
-    // stack, rather than searching on every suspend.
+    // Find the earliest timeout threshold of all the placeholders in the
+    // ancestor path. We could avoid this traversal by storing the thresholds on
+    // the stack, but we choose not to because we only hit this path if we're
+    // IO-bound (i.e. if something suspends). Whereas the stack is used even in
+    // the non-IO- bound case.
     var _workInProgress = returnFiber;
     var earliestTimeoutMs = -1;
-    searchForEarliestTimeout: do {
-      if (_workInProgress.tag === TimeoutComponent) {
+    var startTimeMs = -1;
+    do {
+      if (_workInProgress.tag === SuspenseComponent) {
         var current = _workInProgress.alternate;
-        if (current !== null && current.memoizedState === true) {
-          // A parent Timeout already committed in a placeholder state. We
-          // need to handle this promise immediately. In other words, we
-          // should never suspend inside a tree that already expired.
-          earliestTimeoutMs = 0;
-          break searchForEarliestTimeout;
+        if (
+          current !== null &&
+          current.memoizedState === true &&
+          current.stateNode !== null
+        ) {
+          // Reached a placeholder that already timed out. Each timed out
+          // placeholder acts as the root of a new suspense boundary.
+
+          // Use the time at which the placeholder timed out as the start time
+          // for the current render.
+          var timedOutAt = current.stateNode.timedOutAt;
+          startTimeMs = expirationTimeToMs(timedOutAt);
+
+          // Do not search any further.
+          break;
         }
-        var timeoutPropMs = _workInProgress.pendingProps.ms;
+        var timeoutPropMs = _workInProgress.pendingProps.maxDuration;
         if (typeof timeoutPropMs === "number") {
           if (timeoutPropMs <= 0) {
             earliestTimeoutMs = 0;
-            break searchForEarliestTimeout;
           } else if (
             earliestTimeoutMs === -1 ||
             timeoutPropMs < earliestTimeoutMs
           ) {
             earliestTimeoutMs = timeoutPropMs;
           }
-        } else if (earliestTimeoutMs === -1) {
-          earliestTimeoutMs = remainingTimeMs;
         }
       }
       _workInProgress = _workInProgress.return;
     } while (_workInProgress !== null);
 
-    // Compute the remaining time until the timeout.
-    var msUntilTimeout = earliestTimeoutMs - elapsedMs;
+    // Schedule the nearest Suspense to re-render the timed out view.
+    _workInProgress = returnFiber;
+    do {
+      if (_workInProgress.tag === SuspenseComponent) {
+        var didTimeout = _workInProgress.memoizedState;
+        if (!didTimeout) {
+          // Found the nearest boundary.
+
+          // If the boundary is not in concurrent mode, we should not suspend, and
+          // likewise, when the promise resolves, we should ping synchronously.
+          var pingTime =
+            (_workInProgress.mode & ConcurrentMode) === NoEffect
+              ? Sync
+              : renderExpirationTime;
+
+          // Attach a listener to the promise to "ping" the root and retry.
+          var onResolveOrReject = retrySuspendedRoot.bind(
+            null,
+            root,
+            _workInProgress,
+            pingTime
+          );
+          if (enableSchedulerTracing) {
+            onResolveOrReject = tracing.unstable_wrap(onResolveOrReject);
+          }
+          thenable.then(onResolveOrReject, onResolveOrReject);
+
+          // If the boundary is outside of strict mode, we should *not* suspend
+          // the commit. Pretend as if the suspended component rendered null and
+          // keep rendering. In the commit phase, we'll schedule a subsequent
+          // synchronous update to re-render the Suspense.
+          //
+          // Note: It doesn't matter whether the component that suspended was
+          // inside a strict mode tree. If the Suspense is outside of it, we
+          // should *not* suspend the commit.
+          if ((_workInProgress.mode & StrictMode) === NoEffect) {
+            _workInProgress.effectTag |= Update;
+
+            // Unmount the source fiber's children
+            var nextChildren = null;
+            reconcileChildren(
+              sourceFiber.alternate,
+              sourceFiber,
+              nextChildren,
+              renderExpirationTime
+            );
+            sourceFiber.effectTag &= ~Incomplete;
+            if (sourceFiber.tag === IndeterminateComponent) {
+              // Let's just assume it's a function component. This fiber will
+              // be unmounted in the immediate next commit, anyway.
+              sourceFiber.tag = FunctionComponent;
+            }
+
+            if (
+              sourceFiber.tag === ClassComponent ||
+              sourceFiber.tag === ClassComponentLazy
+            ) {
+              // We're going to commit this fiber even though it didn't
+              // complete. But we shouldn't call any lifecycle methods or
+              // callbacks. Remove all lifecycle effect tags.
+              sourceFiber.effectTag &= ~LifecycleEffectMask;
+              if (sourceFiber.alternate === null) {
+                // We're about to mount a class component that doesn't have an
+                // instance. Turn this into a dummy function component instead,
+                // to prevent type errors. This is a bit weird but it's an edge
+                // case and we're about to synchronously delete this
+                // component, anyway.
+                sourceFiber.tag = FunctionComponent;
+                sourceFiber.type = NoopComponent;
+              }
+            }
 
-    if (renderExpirationTime === Never || msUntilTimeout > 0) {
-      // There's still time remaining.
-      markTimeout(root, thenable, msUntilTimeout, renderExpirationTime);
-      var onResolveOrReject = function() {
-        retrySuspendedRoot(root, renderExpirationTime);
-      };
-      thenable.then(onResolveOrReject, onResolveOrReject);
-      return;
-    } else {
-      // No time remaining. Need to fallback to placeholder.
-      // Find the nearest timeout that can be retried.
-      _workInProgress = returnFiber;
-      do {
-        switch (_workInProgress.tag) {
-          case HostRoot: {
-            // The root expired, but no fallback was provided. Throw a
-            // helpful error.
-            var message =
-              renderExpirationTime === Sync
-                ? "A synchronous update was suspended, but no fallback UI " +
-                  "was provided."
-                : "An update was suspended for longer than the timeout, " +
-                  "but no fallback UI was provided.";
-            value = new Error(message);
-            break;
+            // Exit without suspending.
+            return;
           }
-          case TimeoutComponent: {
-            if ((_workInProgress.effectTag & DidCapture) === NoEffect) {
-              _workInProgress.effectTag |= ShouldCapture;
-              var _onResolveOrReject = schedulePing.bind(null, _workInProgress);
-              thenable.then(_onResolveOrReject, _onResolveOrReject);
-              return;
+
+          // Confirmed that the boundary is in a strict mode tree. Continue with
+          // the normal suspend path.
+
+          var absoluteTimeoutMs = void 0;
+          if (earliestTimeoutMs === -1) {
+            // If no explicit threshold is given, default to an abitrarily large
+            // value. The actual size doesn't matter because the threshold for the
+            // whole tree will be clamped to the expiration time.
+            absoluteTimeoutMs = maxSigned31BitInt;
+          } else {
+            if (startTimeMs === -1) {
+              // This suspend happened outside of any already timed-out
+              // placeholders. We don't know exactly when the update was scheduled,
+              // but we can infer an approximate start time from the expiration
+              // time. First, find the earliest uncommitted expiration time in the
+              // tree, including work that is suspended. Then subtract the offset
+              // used to compute an async update's expiration time. This will cause
+              // high priority (interactive) work to expire earlier than necessary,
+              // but we can account for this by adjusting for the Just Noticeable
+              // Difference.
+              var earliestExpirationTime = findEarliestOutstandingPriorityLevel(
+                root,
+                renderExpirationTime
+              );
+              var earliestExpirationTimeMs = expirationTimeToMs(
+                earliestExpirationTime
+              );
+              startTimeMs = earliestExpirationTimeMs - LOW_PRIORITY_EXPIRATION;
             }
-            // Already captured during this render. Continue to the next
-            // Timeout ancestor.
-            break;
+            absoluteTimeoutMs = startTimeMs + earliestTimeoutMs;
           }
+
+          // Mark the earliest timeout in the suspended fiber's ancestor path.
+          // After completing the root, we'll take the largest of all the
+          // suspended fiber's timeouts and use it to compute a timeout for the
+          // whole tree.
+          renderDidSuspend(root, absoluteTimeoutMs, renderExpirationTime);
+
+          _workInProgress.effectTag |= ShouldCapture;
+          _workInProgress.expirationTime = renderExpirationTime;
+          return;
         }
-        _workInProgress = _workInProgress.return;
-      } while (_workInProgress !== null);
-    }
-  } else {
-    // This is an error.
-    markError(root);
-    if (
-      // Retry (at the same priority) one more time before handling the error.
-      // The retry will flush synchronously. (Unless we're already rendering
-      // synchronously, in which case move to the next check.)
-      (!root.didError && renderExpirationTime !== Sync) ||
-      // There's lower priority work. If so, it may have the effect of fixing
-      // the exception that was just thrown.
-      hasLowerPriorityWork(root, renderExpirationTime)
-    ) {
-      return;
-    }
+        // This boundary already captured during this render. Continue to the
+        // next boundary.
+      }
+      _workInProgress = _workInProgress.return;
+    } while (_workInProgress !== null);
+    // No boundary was found. Fallthrough to error mode.
+    value = new Error(
+      "An update was suspended, but no placeholder UI was provided."
+    );
   }
 
   // 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 = createCapturedValue(value, sourceFiber);
   var workInProgress = returnFiber;
   do {
@@ -11956,35 +13046,37 @@ function throwException(
       case HostRoot: {
         var _errorInfo = value;
         workInProgress.effectTag |= ShouldCapture;
+        workInProgress.expirationTime = renderExpirationTime;
         var update = createRootErrorUpdate(
           workInProgress,
           _errorInfo,
           renderExpirationTime
         );
-        enqueueCapturedUpdate(workInProgress, update, renderExpirationTime);
+        enqueueCapturedUpdate(workInProgress, update);
         return;
       }
       case ClassComponent:
+      case ClassComponentLazy:
         // Capture and retry
         var errorInfo = value;
         var ctor = workInProgress.type;
         var instance = workInProgress.stateNode;
         if (
           (workInProgress.effectTag & DidCapture) === NoEffect &&
-          ((typeof ctor.getDerivedStateFromCatch === "function" &&
-            enableGetDerivedStateFromCatch) ||
+          (typeof ctor.getDerivedStateFromError === "function" ||
             (instance !== null &&
               typeof instance.componentDidCatch === "function" &&
               !isAlreadyFailedLegacyErrorBoundary(instance)))
         ) {
           workInProgress.effectTag |= ShouldCapture;
+          workInProgress.expirationTime = renderExpirationTime;
           // Schedule the error boundary to re-render using updated state
           var _update = createClassErrorUpdate(
             workInProgress,
             errorInfo,
             renderExpirationTime
           );
-          enqueueCapturedUpdate(workInProgress, _update, renderExpirationTime);
+          enqueueCapturedUpdate(workInProgress, _update);
           return;
         }
         break;
@@ -11996,15 +13088,12 @@ function throwException(
 }
 
 function unwindWork(workInProgress, renderExpirationTime) {
-  if (enableProfilerTimer) {
-    if (workInProgress.mode & ProfileMode) {
-      recordElapsedActualRenderTime(workInProgress);
-    }
-  }
-
   switch (workInProgress.tag) {
     case ClassComponent: {
-      popContextProvider(workInProgress);
+      var Component = workInProgress.type;
+      if (isContextProvider(Component)) {
+        popContext(workInProgress);
+      }
       var effectTag = workInProgress.effectTag;
       if (effectTag & ShouldCapture) {
         workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
@@ -12012,9 +13101,11 @@ function unwindWork(workInProgress, renderExpirationTime) {
       }
       return null;
     }
-    case HostRoot: {
-      popHostContainer(workInProgress);
-      popTopLevelContextObject(workInProgress);
+    case ClassComponentLazy: {
+      var _Component = workInProgress.type._reactResult;
+      if (isContextProvider(_Component)) {
+        popContext(workInProgress);
+      }
       var _effectTag = workInProgress.effectTag;
       if (_effectTag & ShouldCapture) {
         workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
@@ -12022,14 +13113,26 @@ function unwindWork(workInProgress, renderExpirationTime) {
       }
       return null;
     }
+    case HostRoot: {
+      popHostContainer(workInProgress);
+      popTopLevelContextObject(workInProgress);
+      var _effectTag2 = workInProgress.effectTag;
+      invariant(
+        (_effectTag2 & DidCapture) === NoEffect,
+        "The root failed to unmount after an error. This is likely a bug in " +
+          "React. Please file an issue."
+      );
+      workInProgress.effectTag = (_effectTag2 & ~ShouldCapture) | DidCapture;
+      return workInProgress;
+    }
     case HostComponent: {
       popHostContext(workInProgress);
       return null;
     }
-    case TimeoutComponent: {
-      var _effectTag2 = workInProgress.effectTag;
-      if (_effectTag2 & ShouldCapture) {
-        workInProgress.effectTag = (_effectTag2 & ~ShouldCapture) | DidCapture;
+    case SuspenseComponent: {
+      var _effectTag3 = workInProgress.effectTag;
+      if (_effectTag3 & ShouldCapture) {
+        workInProgress.effectTag = (_effectTag3 & ~ShouldCapture) | DidCapture;
         return workInProgress;
       }
       return null;
@@ -12046,17 +13149,20 @@ function unwindWork(workInProgress, renderExpirationTime) {
 }
 
 function unwindInterruptedWork(interruptedWork) {
-  if (enableProfilerTimer) {
-    if (interruptedWork.mode & ProfileMode) {
-      // Resume in case we're picking up on work that was paused.
-      resumeActualRenderTimerIfPaused();
-      recordElapsedActualRenderTime(interruptedWork);
-    }
-  }
-
   switch (interruptedWork.tag) {
     case ClassComponent: {
-      popContextProvider(interruptedWork);
+      var childContextTypes = interruptedWork.type.childContextTypes;
+      if (childContextTypes !== null && childContextTypes !== undefined) {
+        popContext(interruptedWork);
+      }
+      break;
+    }
+    case ClassComponentLazy: {
+      var _childContextTypes =
+        interruptedWork.type._reactResult.childContextTypes;
+      if (_childContextTypes !== null && _childContextTypes !== undefined) {
+        popContext(interruptedWork);
+      }
       break;
     }
     case HostRoot: {
@@ -12079,15 +13185,30 @@ function unwindInterruptedWork(interruptedWork) {
   }
 }
 
-var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
-var hasCaughtError = ReactErrorUtils.hasCaughtError;
-var clearCaughtError = ReactErrorUtils.clearCaughtError;
+var Dispatcher = {
+  readContext: readContext
+};
+
+var ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner;
 
 var didWarnAboutStateTransition = void 0;
 var didWarnSetStateChildContext = void 0;
 var warnAboutUpdateOnUnmounted = void 0;
 var warnAboutInvalidUpdates = void 0;
 
+if (enableSchedulerTracing) {
+  // Provide explicit error message when production+profiling bundle of e.g. react-dom
+  // is used with production (non-profiling) bundle of schedule/tracing
+  invariant(
+    tracing.__interactionsRef != null &&
+      tracing.__interactionsRef.current != null,
+    "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) " +
+      "without also replacing the `schedule/tracing` module with `schedule/tracing-profiling`. " +
+      "Your bundler might have a setting for aliasing both modules. " +
+      "Learn more at http://fb.me/react-profiling"
+  );
+}
+
 {
   didWarnAboutStateTransition = false;
   didWarnSetStateChildContext = false;
@@ -12096,28 +13217,28 @@ var warnAboutInvalidUpdates = void 0;
   warnAboutUpdateOnUnmounted = function(fiber) {
     // We show the whole stack but dedupe on the top component's name because
     // the problematic code almost always lies inside that component.
-    var componentName = getComponentName(fiber) || "ReactClass";
+    var componentName = getComponentName(fiber.type) || "ReactClass";
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
-    warning(
+    warningWithoutStack$1(
       false,
       "Can't call setState (or forceUpdate) on an unmounted component. This " +
         "is a no-op, but it indicates a memory leak in your application. To " +
         "fix, cancel all subscriptions and asynchronous tasks in the " +
         "componentWillUnmount method.%s",
-      getStackAddendumByWorkInProgressFiber(fiber)
+      getStackByFiberInDevAndProd(fiber)
     );
     didWarnStateUpdateForUnmountedComponent[componentName] = true;
   };
 
   warnAboutInvalidUpdates = function(instance) {
-    switch (ReactDebugCurrentFiber.phase) {
+    switch (phase) {
       case "getChildContext":
         if (didWarnSetStateChildContext) {
           return;
         }
-        warning(
+        warningWithoutStack$1(
           false,
           "setState(...): Cannot call setState() inside getChildContext()"
         );
@@ -12127,12 +13248,10 @@ var warnAboutInvalidUpdates = void 0;
         if (didWarnAboutStateTransition) {
           return;
         }
-        warning(
+        warningWithoutStack$1(
           false,
           "Cannot update during an existing state transition (such as within " +
-            "`render` or another component's constructor). Render methods should " +
-            "be a pure function of props and state; constructor side-effects are " +
-            "an anti-pattern, but can be moved to `componentWillMount`."
+            "`render`). Render methods should be a pure function of props and state."
         );
         didWarnAboutStateTransition = true;
         break;
@@ -12140,14 +13259,6 @@ var warnAboutInvalidUpdates = void 0;
   };
 }
 
-// Represents the current time in ms.
-var originalStartTimeMs = now();
-var mostRecentCurrentTime = msToExpirationTime(0);
-var mostRecentCurrentTimeMs = originalStartTimeMs;
-
-// Used to ensure computeUniqueAsyncExpiration is monotonically increases.
-var lastUniqueAsyncExpiration = 0;
-
 // Represents the expiration time that incoming updates should use. (If this
 // is NoWork, use the default strategy: async updates in async mode, sync
 // updates in sync mode.)
@@ -12160,7 +13271,7 @@ var nextUnitOfWork = null;
 var nextRoot = null;
 // The time at which we're currently rendering work.
 var nextRenderExpirationTime = NoWork;
-var nextLatestTimeoutMs = -1;
+var nextLatestAbsoluteTimeoutMs = -1;
 var nextRenderDidError = false;
 
 // The next fiber with an effect that we're currently committing.
@@ -12197,7 +13308,7 @@ if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     // Restore the original state of the work-in-progress
     if (stashedWorkInProgressProperties === null) {
       // This should never happen. Don't throw because this code is DEV-only.
-      warning(
+      warningWithoutStack$1(
         false,
         "Could not replay rendering after an error. This is likely a bug in React. " +
           "Please file an issue."
@@ -12217,9 +13328,20 @@ if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
       case HostComponent:
         popHostContext(failedUnitOfWork);
         break;
-      case ClassComponent:
-        popContextProvider(failedUnitOfWork);
+      case ClassComponent: {
+        var Component = failedUnitOfWork.type;
+        if (isContextProvider(Component)) {
+          popContext(failedUnitOfWork);
+        }
+        break;
+      }
+      case ClassComponentLazy: {
+        var _Component = getResultFromResolvedThenable(failedUnitOfWork.type);
+        if (isContextProvider(_Component)) {
+          popContext(failedUnitOfWork);
+        }
         break;
+      }
       case HostPortal:
         popHostContainer(failedUnitOfWork);
         break;
@@ -12230,19 +13352,22 @@ if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     // Replay the begin phase.
     isReplayingFailedUnitOfWork = true;
     originalReplayError = thrownValue;
-    invokeGuardedCallback$2(null, workLoop, null, isYieldy);
+    invokeGuardedCallback(null, workLoop, null, isYieldy);
     isReplayingFailedUnitOfWork = false;
     originalReplayError = null;
     if (hasCaughtError()) {
-      clearCaughtError();
-
-      if (enableProfilerTimer) {
-        if (failedUnitOfWork.mode & ProfileMode) {
-          recordElapsedActualRenderTime(failedUnitOfWork);
+      var replayError = clearCaughtError();
+      if (replayError != null && thrownValue != null) {
+        try {
+          // Reading the expando property is intentionally
+          // inside `try` because it might be a getter or Proxy.
+          if (replayError._suppressLogging) {
+            // Also suppress logging for the original error.
+            thrownValue._suppressLogging = true;
+          }
+        } catch (inner) {
+          // Ignore.
         }
-
-        // Stop "base" render timer again (after the re-thrown error).
-        stopBaseRenderTimerIfRunning();
       }
     } else {
       // If the begin phase did not fail the second time, set this pointer
@@ -12271,7 +13396,7 @@ function resetStack() {
 
   nextRoot = null;
   nextRenderExpirationTime = NoWork;
-  nextLatestTimeoutMs = -1;
+  nextLatestAbsoluteTimeoutMs = -1;
   nextRenderDidError = false;
   nextUnitOfWork = null;
 }
@@ -12279,7 +13404,7 @@ function resetStack() {
 function commitAllHostEffects() {
   while (nextEffect !== null) {
     {
-      ReactDebugCurrentFiber.setCurrentFiber(nextEffect);
+      setCurrentFiber(nextEffect);
     }
     recordEffect();
 
@@ -12290,9 +13415,9 @@ function commitAllHostEffects() {
     }
 
     if (effectTag & Ref) {
-      var current = nextEffect.alternate;
-      if (current !== null) {
-        commitDetachRef(current);
+      var current$$1 = nextEffect.alternate;
+      if (current$$1 !== null) {
+        commitDetachRef(current$$1);
       }
     }
 
@@ -12338,53 +13463,52 @@ function commitAllHostEffects() {
   }
 
   {
-    ReactDebugCurrentFiber.resetCurrentFiber();
+    resetCurrentFiber();
   }
 }
 
 function commitBeforeMutationLifecycles() {
   while (nextEffect !== null) {
-    var effectTag = nextEffect.effectTag;
+    {
+      setCurrentFiber(nextEffect);
+    }
 
+    var effectTag = nextEffect.effectTag;
     if (effectTag & Snapshot) {
       recordEffect();
-      var current = nextEffect.alternate;
-      commitBeforeMutationLifeCycles(current, nextEffect);
+      var current$$1 = nextEffect.alternate;
+      commitBeforeMutationLifeCycles(current$$1, nextEffect);
     }
 
     // Don't cleanup effects yet;
     // This will be done by commitAllLifeCycles()
     nextEffect = nextEffect.nextEffect;
   }
+
+  {
+    resetCurrentFiber();
+  }
 }
 
-function commitAllLifeCycles(
-  finishedRoot,
-  currentTime,
-  committedExpirationTime
-) {
+function commitAllLifeCycles(finishedRoot, committedExpirationTime) {
   {
     ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings();
+    ReactStrictModeWarnings.flushLegacyContextWarning();
 
     if (warnAboutDeprecatedLifecycles) {
       ReactStrictModeWarnings.flushPendingDeprecationWarnings();
     }
-
-    if (warnAboutLegacyContextAPI) {
-      ReactStrictModeWarnings.flushLegacyContextWarning();
-    }
   }
   while (nextEffect !== null) {
     var effectTag = nextEffect.effectTag;
 
     if (effectTag & (Update | Callback)) {
       recordEffect();
-      var current = nextEffect.alternate;
+      var current$$1 = nextEffect.alternate;
       commitLifeCycles(
         finishedRoot,
-        current,
+        current$$1,
         nextEffect,
-        currentTime,
         committedExpirationTime
       );
     }
@@ -12443,12 +13567,26 @@ function commitRoot(root, finishedWork) {
   // Update the pending priority levels to account for the work that we are
   // about to commit. This needs to happen before calling the lifecycles, since
   // they may schedule additional updates.
-  var earliestRemainingTime = finishedWork.expirationTime;
-  var currentTime = recalculateCurrentTime();
-  markCommittedPriorityLevels(root, currentTime, earliestRemainingTime);
+  var updateExpirationTimeBeforeCommit = finishedWork.expirationTime;
+  var childExpirationTimeBeforeCommit = finishedWork.childExpirationTime;
+  var earliestRemainingTimeBeforeCommit =
+    updateExpirationTimeBeforeCommit === NoWork ||
+    (childExpirationTimeBeforeCommit !== NoWork &&
+      childExpirationTimeBeforeCommit < updateExpirationTimeBeforeCommit)
+      ? childExpirationTimeBeforeCommit
+      : updateExpirationTimeBeforeCommit;
+  markCommittedPriorityLevels(root, earliestRemainingTimeBeforeCommit);
+
+  var prevInteractions = null;
+  if (enableSchedulerTracing) {
+    // Restore any pending interactions at this point,
+    // So that cascading work triggered during the render phase will be accounted for.
+    prevInteractions = tracing.__interactionsRef.current;
+    tracing.__interactionsRef.current = root.memoizedInteractions;
+  }
 
   // Reset this to null before calling lifecycles
-  ReactCurrentOwner.current = null;
+  ReactCurrentOwner$2.current = null;
 
   var firstEffect = void 0;
   if (finishedWork.effectTag > PerformedWork) {
@@ -12476,7 +13614,7 @@ function commitRoot(root, finishedWork) {
     var didError = false;
     var error = void 0;
     {
-      invokeGuardedCallback$2(null, commitBeforeMutationLifecycles, null);
+      invokeGuardedCallback(null, commitBeforeMutationLifecycles, null);
       if (hasCaughtError()) {
         didError = true;
         error = clearCaughtError();
@@ -12512,7 +13650,7 @@ function commitRoot(root, finishedWork) {
     var _didError = false;
     var _error = void 0;
     {
-      invokeGuardedCallback$2(null, commitAllHostEffects, null);
+      invokeGuardedCallback(null, commitAllHostEffects, null);
       if (hasCaughtError()) {
         _didError = true;
         _error = clearCaughtError();
@@ -12551,12 +13689,11 @@ function commitRoot(root, finishedWork) {
     var _didError2 = false;
     var _error2 = void 0;
     {
-      invokeGuardedCallback$2(
+      invokeGuardedCallback(
         null,
         commitAllLifeCycles,
         null,
         root,
-        currentTime,
         committedExpirationTime
       );
       if (hasCaughtError()) {
@@ -12577,86 +13714,168 @@ function commitRoot(root, finishedWork) {
     }
   }
 
-  if (enableProfilerTimer) {
-    {
-      checkActualRenderTimeStackEmpty();
-    }
-    resetActualRenderTimer();
-  }
-
   isCommitting$1 = false;
   isWorking = false;
   stopCommitLifeCyclesTimer();
   stopCommitTimer();
-  if (typeof onCommitRoot === "function") {
-    onCommitRoot(finishedWork.stateNode);
-  }
+  onCommitRoot(finishedWork.stateNode);
   if (true && ReactFiberInstrumentation_1.debugTool) {
     ReactFiberInstrumentation_1.debugTool.onCommitWork(finishedWork);
   }
 
-  var expirationTime = root.expirationTime;
-  if (expirationTime === NoWork) {
+  var updateExpirationTimeAfterCommit = finishedWork.expirationTime;
+  var childExpirationTimeAfterCommit = finishedWork.childExpirationTime;
+  var earliestRemainingTimeAfterCommit =
+    updateExpirationTimeAfterCommit === NoWork ||
+    (childExpirationTimeAfterCommit !== NoWork &&
+      childExpirationTimeAfterCommit < updateExpirationTimeAfterCommit)
+      ? childExpirationTimeAfterCommit
+      : updateExpirationTimeAfterCommit;
+  if (earliestRemainingTimeAfterCommit === NoWork) {
     // If there's no remaining work, we can clear the set of already failed
     // error boundaries.
     legacyErrorBoundariesThatAlreadyFailed = null;
   }
-  onCommit(root, expirationTime);
+  onCommit(root, earliestRemainingTimeAfterCommit);
+
+  if (enableSchedulerTracing) {
+    tracing.__interactionsRef.current = prevInteractions;
+
+    var subscriber = void 0;
+
+    try {
+      subscriber = tracing.__subscriberRef.current;
+      if (subscriber !== null && root.memoizedInteractions.size > 0) {
+        var threadID = computeThreadID(
+          committedExpirationTime,
+          root.interactionThreadID
+        );
+        subscriber.onWorkStopped(root.memoizedInteractions, threadID);
+      }
+    } catch (error) {
+      // It's not safe for commitRoot() to throw.
+      // Store the error for now and we'll re-throw in finishRendering().
+      if (!hasUnhandledError) {
+        hasUnhandledError = true;
+        unhandledError = error;
+      }
+    } finally {
+      // Clear completed interactions from the pending Map.
+      // Unless the render was suspended or cascading work was scheduled,
+      // In which case– leave pending interactions until the subsequent render.
+      var pendingInteractionMap = root.pendingInteractionMap;
+      pendingInteractionMap.forEach(function(
+        scheduledInteractions,
+        scheduledExpirationTime
+      ) {
+        // Only decrement the pending interaction count if we're done.
+        // If there's still work at the current priority,
+        // That indicates that we are waiting for suspense data.
+        if (
+          earliestRemainingTimeAfterCommit === NoWork ||
+          scheduledExpirationTime < earliestRemainingTimeAfterCommit
+        ) {
+          pendingInteractionMap.delete(scheduledExpirationTime);
+
+          scheduledInteractions.forEach(function(interaction) {
+            interaction.__count--;
+
+            if (subscriber !== null && interaction.__count === 0) {
+              try {
+                subscriber.onInteractionScheduledWorkCompleted(interaction);
+              } catch (error) {
+                // It's not safe for commitRoot() to throw.
+                // Store the error for now and we'll re-throw in finishRendering().
+                if (!hasUnhandledError) {
+                  hasUnhandledError = true;
+                  unhandledError = error;
+                }
+              }
+            }
+          });
+        }
+      });
+    }
+  }
 }
 
-function resetExpirationTime(workInProgress, renderTime) {
-  if (renderTime !== Never && workInProgress.expirationTime === Never) {
+function resetChildExpirationTime(workInProgress, renderTime) {
+  if (renderTime !== Never && workInProgress.childExpirationTime === Never) {
     // The children of this component are hidden. Don't bubble their
     // expiration times.
     return;
   }
 
-  // Check for pending updates.
-  var newExpirationTime = NoWork;
-  switch (workInProgress.tag) {
-    case HostRoot:
-    case ClassComponent: {
-      var updateQueue = workInProgress.updateQueue;
-      if (updateQueue !== null) {
-        newExpirationTime = updateQueue.expirationTime;
-      }
-    }
-  }
-
-  // TODO: Calls need to visit stateNode
+  var newChildExpirationTime = NoWork;
 
   // Bubble up the earliest expiration time.
-  // (And "base" render timers if that feature flag is enabled)
   if (enableProfilerTimer && workInProgress.mode & ProfileMode) {
-    var treeBaseTime = workInProgress.selfBaseTime;
+    // We're in profiling mode.
+    // Let's use this same traversal to update the render durations.
+    var actualDuration = workInProgress.actualDuration;
+    var treeBaseDuration = workInProgress.selfBaseDuration;
+
+    // When a fiber is cloned, its actualDuration is reset to 0.
+    // This value will only be updated if work is done on the fiber (i.e. it doesn't bailout).
+    // When work is done, it should bubble to the parent's actualDuration.
+    // If the fiber has not been cloned though, (meaning no work was done),
+    // Then this value will reflect the amount of time spent working on a previous render.
+    // In that case it should not bubble.
+    // We determine whether it was cloned by comparing the child pointer.
+    var shouldBubbleActualDurations =
+      workInProgress.alternate === null ||
+      workInProgress.child !== workInProgress.alternate.child;
+
     var child = workInProgress.child;
     while (child !== null) {
-      treeBaseTime += child.treeBaseTime;
+      var childUpdateExpirationTime = child.expirationTime;
+      var childChildExpirationTime = child.childExpirationTime;
+      if (
+        newChildExpirationTime === NoWork ||
+        (childUpdateExpirationTime !== NoWork &&
+          childUpdateExpirationTime < newChildExpirationTime)
+      ) {
+        newChildExpirationTime = childUpdateExpirationTime;
+      }
       if (
-        child.expirationTime !== NoWork &&
-        (newExpirationTime === NoWork ||
-          newExpirationTime > child.expirationTime)
+        newChildExpirationTime === NoWork ||
+        (childChildExpirationTime !== NoWork &&
+          childChildExpirationTime < newChildExpirationTime)
       ) {
-        newExpirationTime = child.expirationTime;
+        newChildExpirationTime = childChildExpirationTime;
       }
+      if (shouldBubbleActualDurations) {
+        actualDuration += child.actualDuration;
+      }
+      treeBaseDuration += child.treeBaseDuration;
       child = child.sibling;
     }
-    workInProgress.treeBaseTime = treeBaseTime;
+    workInProgress.actualDuration = actualDuration;
+    workInProgress.treeBaseDuration = treeBaseDuration;
   } else {
     var _child = workInProgress.child;
     while (_child !== null) {
+      var _childUpdateExpirationTime = _child.expirationTime;
+      var _childChildExpirationTime = _child.childExpirationTime;
+      if (
+        newChildExpirationTime === NoWork ||
+        (_childUpdateExpirationTime !== NoWork &&
+          _childUpdateExpirationTime < newChildExpirationTime)
+      ) {
+        newChildExpirationTime = _childUpdateExpirationTime;
+      }
       if (
-        _child.expirationTime !== NoWork &&
-        (newExpirationTime === NoWork ||
-          newExpirationTime > _child.expirationTime)
+        newChildExpirationTime === NoWork ||
+        (_childChildExpirationTime !== NoWork &&
+          _childChildExpirationTime < newChildExpirationTime)
       ) {
-        newExpirationTime = _child.expirationTime;
+        newChildExpirationTime = _childChildExpirationTime;
       }
       _child = _child.sibling;
     }
   }
 
-  workInProgress.expirationTime = newExpirationTime;
+  workInProgress.childExpirationTime = newChildExpirationTime;
 }
 
 function completeUnitOfWork(workInProgress) {
@@ -12668,9 +13887,9 @@ function completeUnitOfWork(workInProgress) {
     // Ideally nothing should rely on this, but relying on it here
     // means that we don't need an additional field on the work in
     // progress.
-    var current = workInProgress.alternate;
+    var current$$1 = workInProgress.alternate;
     {
-      ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
+      setCurrentFiber(workInProgress);
     }
 
     var returnFiber = workInProgress.return;
@@ -12678,25 +13897,32 @@ function completeUnitOfWork(workInProgress) {
 
     if ((workInProgress.effectTag & Incomplete) === NoEffect) {
       // This fiber completed.
-      var next = completeWork(
-        current,
-        workInProgress,
-        nextRenderExpirationTime
-      );
-      stopWorkTimer(workInProgress);
-      resetExpirationTime(workInProgress, nextRenderExpirationTime);
-      {
-        ReactDebugCurrentFiber.resetCurrentFiber();
-      }
+      if (enableProfilerTimer) {
+        if (workInProgress.mode & ProfileMode) {
+          startProfilerTimer(workInProgress);
+        }
 
-      if (next !== null) {
-        stopWorkTimer(workInProgress);
-        if (true && ReactFiberInstrumentation_1.debugTool) {
-          ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
+        nextUnitOfWork = completeWork(
+          current$$1,
+          workInProgress,
+          nextRenderExpirationTime
+        );
+
+        if (workInProgress.mode & ProfileMode) {
+          // Update render duration assuming we didn't error.
+          stopProfilerTimerIfRunningAndRecordDelta(workInProgress, false);
         }
-        // If completing this work spawned new work, do that next. We'll come
-        // back here again.
-        return next;
+      } else {
+        nextUnitOfWork = completeWork(
+          current$$1,
+          workInProgress,
+          nextRenderExpirationTime
+        );
+      }
+      stopWorkTimer(workInProgress);
+      resetChildExpirationTime(workInProgress, nextRenderExpirationTime);
+      {
+        resetCurrentFiber();
       }
 
       if (
@@ -12752,10 +13978,15 @@ function completeUnitOfWork(workInProgress) {
         return null;
       }
     } else {
+      if (workInProgress.mode & ProfileMode) {
+        // Record the render duration for the fiber that errored.
+        stopProfilerTimerIfRunningAndRecordDelta(workInProgress, false);
+      }
+
       // This fiber did not complete because something threw. Pop values off
       // the stack without entering the complete phase. If this is a boundary,
       // capture values if possible.
-      var _next = unwindWork(workInProgress, nextRenderExpirationTime);
+      var next = unwindWork(workInProgress, nextRenderExpirationTime);
       // Because this fiber did not complete, don't reset its expiration time.
       if (workInProgress.effectTag & DidCapture) {
         // Restarting an error boundary
@@ -12765,20 +13996,34 @@ function completeUnitOfWork(workInProgress) {
       }
 
       {
-        ReactDebugCurrentFiber.resetCurrentFiber();
+        resetCurrentFiber();
       }
 
-      if (_next !== null) {
+      if (next !== null) {
         stopWorkTimer(workInProgress);
         if (true && ReactFiberInstrumentation_1.debugTool) {
           ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
         }
+
+        if (enableProfilerTimer) {
+          // Include the time spent working on failed children before continuing.
+          if (next.mode & ProfileMode) {
+            var actualDuration = next.actualDuration;
+            var child = next.child;
+            while (child !== null) {
+              actualDuration += child.actualDuration;
+              child = child.sibling;
+            }
+            next.actualDuration = actualDuration;
+          }
+        }
+
         // If completing this work spawned new work, do that next. We'll come
         // back here again.
         // Since we're restarting, remove anything that is not a host effect
         // from the effect tag.
-        _next.effectTag &= HostEffectMask;
-        return _next;
+        next.effectTag &= HostEffectMask;
+        return next;
       }
 
       if (returnFiber !== null) {
@@ -12815,12 +14060,12 @@ function performUnitOfWork(workInProgress) {
   // Ideally nothing should rely on this, but relying on it here
   // means that we don't need an additional field on the work in
   // progress.
-  var current = workInProgress.alternate;
+  var current$$1 = workInProgress.alternate;
 
   // See if beginning this work spawns more work.
   startWorkTimer(workInProgress);
   {
-    ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
+    setCurrentFiber(workInProgress);
   }
 
   if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
@@ -12833,22 +14078,21 @@ function performUnitOfWork(workInProgress) {
   var next = void 0;
   if (enableProfilerTimer) {
     if (workInProgress.mode & ProfileMode) {
-      startBaseRenderTimer();
+      startProfilerTimer(workInProgress);
     }
 
-    next = beginWork(current, workInProgress, nextRenderExpirationTime);
+    next = beginWork(current$$1, workInProgress, nextRenderExpirationTime);
 
     if (workInProgress.mode & ProfileMode) {
-      // Update "base" time if the render wasn't bailed out on.
-      recordElapsedBaseRenderTimeIfRunning(workInProgress);
-      stopBaseRenderTimerIfRunning();
+      // Record the render duration assuming we didn't bailout (or error).
+      stopProfilerTimerIfRunningAndRecordDelta(workInProgress, true);
     }
   } else {
-    next = beginWork(current, workInProgress, nextRenderExpirationTime);
+    next = beginWork(current$$1, workInProgress, nextRenderExpirationTime);
   }
 
   {
-    ReactDebugCurrentFiber.resetCurrentFiber();
+    resetCurrentFiber();
     if (isReplayingFailedUnitOfWork) {
       // Currently replaying a failed unit of work. This should be unreachable,
       // because the render phase is meant to be idempotent, and it should
@@ -12866,7 +14110,7 @@ function performUnitOfWork(workInProgress) {
     next = completeUnitOfWork(workInProgress);
   }
 
-  ReactCurrentOwner.current = null;
+  ReactCurrentOwner$2.current = null;
 
   return next;
 }
@@ -12882,22 +14126,17 @@ function workLoop(isYieldy) {
     while (nextUnitOfWork !== null && !shouldYield()) {
       nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
     }
-
-    if (enableProfilerTimer) {
-      // If we didn't finish, pause the "actual" render timer.
-      // We'll restart it when we resume work.
-      pauseActualRenderTimerIfRunning();
-    }
   }
 }
 
-function renderRoot(root, isYieldy) {
+function renderRoot(root, isYieldy, isExpired) {
   invariant(
     !isWorking,
     "renderRoot was called recursively. This error is likely caused " +
       "by a bug in React. Please file an issue."
   );
   isWorking = true;
+  ReactCurrentOwner$2.currentDispatcher = Dispatcher;
 
   var expirationTime = root.nextExpirationTimeToWorkOn;
 
@@ -12912,14 +14151,63 @@ function renderRoot(root, isYieldy) {
     resetStack();
     nextRoot = root;
     nextRenderExpirationTime = expirationTime;
-    nextLatestTimeoutMs = -1;
-    nextRenderDidError = false;
     nextUnitOfWork = createWorkInProgress(
       nextRoot.current,
       null,
       nextRenderExpirationTime
     );
     root.pendingCommitExpirationTime = NoWork;
+
+    if (enableSchedulerTracing) {
+      // Determine which interactions this batch of work currently includes,
+      // So that we can accurately attribute time spent working on it,
+      var interactions = new Set();
+      root.pendingInteractionMap.forEach(function(
+        scheduledInteractions,
+        scheduledExpirationTime
+      ) {
+        if (scheduledExpirationTime <= expirationTime) {
+          scheduledInteractions.forEach(function(interaction) {
+            return interactions.add(interaction);
+          });
+        }
+      });
+
+      // Store the current set of interactions on the FiberRoot for a few reasons:
+      // We can re-use it in hot functions like renderRoot() without having to recalculate it.
+      // We will also use it in commitWork() to pass to any Profiler onRender() hooks.
+      // This also provides DevTools with a way to access it when the onCommitRoot() hook is called.
+      root.memoizedInteractions = interactions;
+
+      if (interactions.size > 0) {
+        var subscriber = tracing.__subscriberRef.current;
+        if (subscriber !== null) {
+          var threadID = computeThreadID(
+            expirationTime,
+            root.interactionThreadID
+          );
+          try {
+            subscriber.onWorkStarted(interactions, threadID);
+          } catch (error) {
+            // Work thrown by an interaction tracing subscriber should be rethrown,
+            // But only once it's safe (to avoid leaveing the scheduler in an invalid state).
+            // Store the error for now and we'll re-throw in finishRendering().
+            if (!hasUnhandledError) {
+              hasUnhandledError = true;
+              unhandledError = error;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  var prevInteractions = null;
+  if (enableSchedulerTracing) {
+    // We're about to start new traced work.
+    // Restore pending interactions so cascading work triggered during the render phase will be accounted for.
+    prevInteractions = tracing.__interactionsRef.current;
+    tracing.__interactionsRef.current = root.memoizedInteractions;
   }
 
   var didFatal = false;
@@ -12930,11 +14218,6 @@ function renderRoot(root, isYieldy) {
     try {
       workLoop(isYieldy);
     } catch (thrownValue) {
-      if (enableProfilerTimer) {
-        // Stop "base" render timer in the event of an error.
-        stopBaseRenderTimerIfRunning();
-      }
-
       if (nextUnitOfWork === null) {
         // This is a fatal error.
         didFatal = true;
@@ -12972,70 +14255,158 @@ function renderRoot(root, isYieldy) {
           // for now.
           didFatal = true;
           onUncaughtError(thrownValue);
-          break;
+        } else {
+          throwException(
+            root,
+            returnFiber,
+            sourceFiber,
+            thrownValue,
+            nextRenderExpirationTime
+          );
+          nextUnitOfWork = completeUnitOfWork(sourceFiber);
+          continue;
         }
-        throwException(
-          root,
-          returnFiber,
-          sourceFiber,
-          thrownValue,
-          nextRenderExpirationTime,
-          mostRecentCurrentTimeMs
-        );
-        nextUnitOfWork = completeUnitOfWork(sourceFiber);
       }
     }
     break;
   } while (true);
 
+  if (enableSchedulerTracing) {
+    // Traced work is done for now; restore the previous interactions.
+    tracing.__interactionsRef.current = prevInteractions;
+  }
+
   // We're done performing work. Time to clean up.
   isWorking = false;
+  ReactCurrentOwner$2.currentDispatcher = null;
+  resetContextDependences();
 
   // Yield back to main thread.
   if (didFatal) {
-    var didCompleteRoot = false;
-    stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+    var _didCompleteRoot = false;
+    stopWorkLoopTimer(interruptedBy, _didCompleteRoot);
     interruptedBy = null;
     // There was a fatal error.
     {
       resetStackAfterFatalErrorInDev();
     }
+    // `nextRoot` points to the in-progress root. A non-null value indicates
+    // that we're in the middle of an async render. Set it to null to indicate
+    // there's no more work to be done in the current batch.
+    nextRoot = null;
     onFatal(root);
-  } else if (nextUnitOfWork === null) {
-    // We reached the root.
-    var rootWorkInProgress = root.current.alternate;
-    invariant(
-      rootWorkInProgress !== null,
-      "Finished root should have a work-in-progress. This error is likely " +
-        "caused by a bug in React. Please file an issue."
-    );
-    if ((rootWorkInProgress.effectTag & Incomplete) === NoEffect) {
-      var _didCompleteRoot = true;
-      stopWorkLoopTimer(interruptedBy, _didCompleteRoot);
-      interruptedBy = null;
-      // The root successfully completed.
-      onComplete(root, rootWorkInProgress, expirationTime);
-    } else {
-      // The root did not complete.
-      var _didCompleteRoot2 = false;
-      stopWorkLoopTimer(interruptedBy, _didCompleteRoot2);
-      interruptedBy = null;
-      markSuspendedPriorityLevel(root, expirationTime, nextRenderDidError);
+    return;
+  }
+
+  if (nextUnitOfWork !== null) {
+    // There's still remaining async work in this tree, but we ran out of time
+    // in the current frame. Yield back to the renderer. Unless we're
+    // interrupted by a higher priority update, we'll continue later from where
+    // we left off.
+    var _didCompleteRoot2 = false;
+    stopWorkLoopTimer(interruptedBy, _didCompleteRoot2);
+    interruptedBy = null;
+    onYield(root);
+    return;
+  }
+
+  // We completed the whole tree.
+  var didCompleteRoot = true;
+  stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+  var rootWorkInProgress = root.current.alternate;
+  invariant(
+    rootWorkInProgress !== null,
+    "Finished root should have a work-in-progress. This error is likely " +
+      "caused by a bug in React. Please file an issue."
+  );
+
+  // `nextRoot` points to the in-progress root. A non-null value indicates
+  // that we're in the middle of an async render. Set it to null to indicate
+  // there's no more work to be done in the current batch.
+  nextRoot = null;
+  interruptedBy = null;
+
+  if (nextRenderDidError) {
+    // There was an error
+    if (hasLowerPriorityWork(root, expirationTime)) {
+      // There's lower priority work. If so, it may have the effect of fixing
+      // the exception that was just thrown. Exit without committing. This is
+      // similar to a suspend, but without a timeout because we're not waiting
+      // for a promise to resolve. React will restart at the lower
+      // priority level.
+      markSuspendedPriorityLevel(root, expirationTime);
       var suspendedExpirationTime = expirationTime;
-      var newExpirationTime = root.expirationTime;
+      var rootExpirationTime = root.expirationTime;
+      onSuspend(
+        root,
+        rootWorkInProgress,
+        suspendedExpirationTime,
+        rootExpirationTime,
+        -1 // Indicates no timeout
+      );
+      return;
+    } else if (
+      // There's no lower priority work, but we're rendering asynchronously.
+      // Synchronsouly attempt to render the same level one more time. This is
+      // similar to a suspend, but without a timeout because we're not waiting
+      // for a promise to resolve.
+      !root.didError &&
+      !isExpired
+    ) {
+      root.didError = true;
+      var _suspendedExpirationTime = (root.nextExpirationTimeToWorkOn = expirationTime);
+      var _rootExpirationTime = (root.expirationTime = Sync);
       onSuspend(
         root,
-        suspendedExpirationTime,
-        newExpirationTime,
-        nextLatestTimeoutMs
+        rootWorkInProgress,
+        _suspendedExpirationTime,
+        _rootExpirationTime,
+        -1 // Indicates no timeout
       );
+      return;
     }
-  } else {
-    var _didCompleteRoot3 = false;
-    stopWorkLoopTimer(interruptedBy, _didCompleteRoot3);
-    interruptedBy = null;
-    onYield(root);
   }
+
+  if (!isExpired && nextLatestAbsoluteTimeoutMs !== -1) {
+    // The tree was suspended.
+    var _suspendedExpirationTime2 = expirationTime;
+    markSuspendedPriorityLevel(root, _suspendedExpirationTime2);
+
+    // Find the earliest uncommitted expiration time in the tree, including
+    // work that is suspended. The timeout threshold cannot be longer than
+    // the overall expiration.
+    var earliestExpirationTime = findEarliestOutstandingPriorityLevel(
+      root,
+      expirationTime
+    );
+    var earliestExpirationTimeMs = expirationTimeToMs(earliestExpirationTime);
+    if (earliestExpirationTimeMs < nextLatestAbsoluteTimeoutMs) {
+      nextLatestAbsoluteTimeoutMs = earliestExpirationTimeMs;
+    }
+
+    // Subtract the current time from the absolute timeout to get the number
+    // of milliseconds until the timeout. In other words, convert an absolute
+    // timestamp to a relative time. This is the value that is passed
+    // to `setTimeout`.
+    var currentTimeMs = expirationTimeToMs(requestCurrentTime());
+    var msUntilTimeout = nextLatestAbsoluteTimeoutMs - currentTimeMs;
+    msUntilTimeout = msUntilTimeout < 0 ? 0 : msUntilTimeout;
+
+    // TODO: Account for the Just Noticeable Difference
+
+    var _rootExpirationTime2 = root.expirationTime;
+    onSuspend(
+      root,
+      rootWorkInProgress,
+      _suspendedExpirationTime2,
+      _rootExpirationTime2,
+      msUntilTimeout
+    );
+    return;
+  }
+
+  // Ready to commit.
+  onComplete(root, rootWorkInProgress, expirationTime);
 }
 
 function dispatch(sourceFiber, value, expirationTime) {
@@ -13048,16 +14419,17 @@ function dispatch(sourceFiber, value, expirationTime) {
   while (fiber !== null) {
     switch (fiber.tag) {
       case ClassComponent:
+      case ClassComponentLazy:
         var ctor = fiber.type;
         var instance = fiber.stateNode;
         if (
-          typeof ctor.getDerivedStateFromCatch === "function" ||
+          typeof ctor.getDerivedStateFromError === "function" ||
           (typeof instance.componentDidCatch === "function" &&
             !isAlreadyFailedLegacyErrorBoundary(instance))
         ) {
           var errorInfo = createCapturedValue(value, sourceFiber);
           var update = createClassErrorUpdate(fiber, errorInfo, expirationTime);
-          enqueueUpdate(fiber, update, expirationTime);
+          enqueueUpdate(fiber, update);
           scheduleWork(fiber, expirationTime);
           return;
         }
@@ -13065,7 +14437,7 @@ function dispatch(sourceFiber, value, expirationTime) {
       case HostRoot: {
         var _errorInfo = createCapturedValue(value, sourceFiber);
         var _update = createRootErrorUpdate(fiber, _errorInfo, expirationTime);
-        enqueueUpdate(fiber, _update, expirationTime);
+        enqueueUpdate(fiber, _update);
         scheduleWork(fiber, expirationTime);
         return;
       }
@@ -13083,7 +14455,7 @@ function dispatch(sourceFiber, value, expirationTime) {
       _errorInfo2,
       expirationTime
     );
-    enqueueUpdate(rootFiber, _update2, expirationTime);
+    enqueueUpdate(rootFiber, _update2);
     scheduleWork(rootFiber, expirationTime);
   }
 }
@@ -13092,45 +14464,9 @@ function captureCommitPhaseError(fiber, error) {
   return dispatch(fiber, error, Sync);
 }
 
-function computeAsyncExpiration(currentTime) {
-  // Given the current clock time, returns an expiration time. We use rounding
-  // to batch like updates together.
-  // Should complete within ~5000ms. 5250ms max.
-  var expirationMs = 5000;
-  var bucketSizeMs = 250;
-  return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
-}
-
-function computeInteractiveExpiration(currentTime) {
-  var expirationMs = void 0;
-  // We intentionally set a higher expiration time for interactive updates in
-  // dev than in production.
-  // If the main thread is being blocked so long that you hit the expiration,
-  // it's a problem that could be solved with better scheduling.
-  // People will be more likely to notice this and fix it with the long
-  // expiration time in development.
-  // In production we opt for better UX at the risk of masking scheduling
-  // problems, by expiring fast.
-  {
-    // Should complete within ~500ms. 600ms max.
-    expirationMs = 500;
-  }
-  var bucketSizeMs = 100;
-  return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
-}
-
-// Creates a unique async expiration time.
-function computeUniqueAsyncExpiration() {
-  var currentTime = recalculateCurrentTime();
-  var result = computeAsyncExpiration(currentTime);
-  if (result <= lastUniqueAsyncExpiration) {
-    // Since we assume the current time monotonically increases, we only hit
-    // this branch when computeUniqueAsyncExpiration is fired multiple times
-    // within a 200ms window (or whatever the async bucket size is).
-    result = lastUniqueAsyncExpiration + 1;
-  }
-  lastUniqueAsyncExpiration = result;
-  return lastUniqueAsyncExpiration;
+function computeThreadID(expirationTime, interactionThreadID) {
+  // Interaction threads are unique per root and expiration time.
+  return expirationTime * 1000 + interactionThreadID;
 }
 
 function computeExpirationForFiber(currentTime, fiber) {
@@ -13151,7 +14487,7 @@ function computeExpirationForFiber(currentTime, fiber) {
   } else {
     // No explicit expiration context was set, and we're not currently
     // performing work. Calculate a new expiration time.
-    if (fiber.mode & AsyncMode) {
+    if (fiber.mode & ConcurrentMode) {
       if (isBatchingInteractiveUpdates) {
         // This is an interactive update
         expirationTime = computeInteractiveExpiration(currentTime);
@@ -13159,6 +14495,11 @@ function computeExpirationForFiber(currentTime, fiber) {
         // This is an async update
         expirationTime = computeAsyncExpiration(currentTime);
       }
+      // If we're in the middle of rendering a tree, do not update at the same
+      // expiration time that is already rendering.
+      if (nextRoot !== null && expirationTime === nextRenderExpirationTime) {
+        expirationTime += 1;
+      }
     } else {
       // This is a sync update
       expirationTime = Sync;
@@ -13168,133 +14509,208 @@ function computeExpirationForFiber(currentTime, fiber) {
     // This is an interactive update. Keep track of the lowest pending
     // interactive expiration time. This allows us to synchronously flush
     // all interactive updates when needed.
-    if (
-      lowestPendingInteractiveExpirationTime === NoWork ||
-      expirationTime > lowestPendingInteractiveExpirationTime
-    ) {
-      lowestPendingInteractiveExpirationTime = expirationTime;
+    if (expirationTime > lowestPriorityPendingInteractiveExpirationTime) {
+      lowestPriorityPendingInteractiveExpirationTime = expirationTime;
     }
   }
   return expirationTime;
 }
 
-function markTimeout(root, thenable, timeoutMs, suspendedTime) {
+function renderDidSuspend(root, absoluteTimeoutMs, suspendedTime) {
   // Schedule the timeout.
-  if (timeoutMs >= 0 && nextLatestTimeoutMs < timeoutMs) {
-    nextLatestTimeoutMs = timeoutMs;
+  if (
+    absoluteTimeoutMs >= 0 &&
+    nextLatestAbsoluteTimeoutMs < absoluteTimeoutMs
+  ) {
+    nextLatestAbsoluteTimeoutMs = absoluteTimeoutMs;
   }
 }
 
-function markError(root) {
+function renderDidError() {
   nextRenderDidError = true;
 }
 
-function retrySuspendedRoot(root, suspendedTime) {
-  markPingedPriorityLevel(root, suspendedTime);
-  var retryTime = root.expirationTime;
-  if (retryTime !== NoWork) {
-    requestWork(root, retryTime);
+function retrySuspendedRoot(root, fiber, suspendedTime) {
+  var retryTime = void 0;
+
+  if (isPriorityLevelSuspended(root, suspendedTime)) {
+    // Ping at the original level
+    retryTime = suspendedTime;
+
+    markPingedPriorityLevel(root, retryTime);
+  } else {
+    // Suspense already timed out. Compute a new expiration time
+    var currentTime = requestCurrentTime();
+    retryTime = computeExpirationForFiber(currentTime, fiber);
+    markPendingPriorityLevel(root, retryTime);
+  }
+
+  // TODO: If the placeholder fiber has already rendered the primary children
+  // without suspending (that is, all of the promises have already resolved),
+  // we should not trigger another update here. One case this happens is when
+  // we are in sync mode and a single promise is thrown both on initial render
+  // and on update; we attach two .then(retrySuspendedRoot) callbacks and each
+  // one performs Sync work, rerendering the Suspense.
+
+  if ((fiber.mode & ConcurrentMode) !== NoContext) {
+    if (root === nextRoot && nextRenderExpirationTime === suspendedTime) {
+      // Received a ping at the same priority level at which we're currently
+      // rendering. Restart from the root.
+      nextRoot = null;
+    }
+  }
+
+  scheduleWorkToRoot(fiber, retryTime);
+  var rootExpirationTime = root.expirationTime;
+  if (rootExpirationTime !== NoWork) {
+    requestWork(root, rootExpirationTime);
   }
 }
 
-function scheduleWork(fiber, expirationTime) {
+function scheduleWorkToRoot(fiber, expirationTime) {
   recordScheduleUpdate();
 
   {
-    if (fiber.tag === ClassComponent) {
+    if (fiber.tag === ClassComponent || fiber.tag === ClassComponentLazy) {
       var instance = fiber.stateNode;
       warnAboutInvalidUpdates(instance);
     }
   }
 
-  var node = fiber;
-  while (node !== null) {
-    // Walk the parent path to the root and update each node's
-    // expiration time.
-    if (
-      node.expirationTime === NoWork ||
-      node.expirationTime > expirationTime
-    ) {
-      node.expirationTime = expirationTime;
-    }
-    if (node.alternate !== null) {
+  // Update the source fiber's expiration time
+  if (
+    fiber.expirationTime === NoWork ||
+    fiber.expirationTime > expirationTime
+  ) {
+    fiber.expirationTime = expirationTime;
+  }
+  var alternate = fiber.alternate;
+  if (
+    alternate !== null &&
+    (alternate.expirationTime === NoWork ||
+      alternate.expirationTime > expirationTime)
+  ) {
+    alternate.expirationTime = expirationTime;
+  }
+  // Walk the parent path to the root and update the child expiration time.
+  var node = fiber.return;
+  var root = null;
+  if (node === null && fiber.tag === HostRoot) {
+    root = fiber.stateNode;
+  } else {
+    while (node !== null) {
+      alternate = node.alternate;
       if (
-        node.alternate.expirationTime === NoWork ||
-        node.alternate.expirationTime > expirationTime
+        node.childExpirationTime === NoWork ||
+        node.childExpirationTime > expirationTime
       ) {
-        node.alternate.expirationTime = expirationTime;
-      }
-    }
-    if (node.return === null) {
-      if (node.tag === HostRoot) {
-        var root = node.stateNode;
-        if (
-          !isWorking &&
-          nextRenderExpirationTime !== NoWork &&
-          expirationTime < nextRenderExpirationTime
-        ) {
-          // This is an interruption. (Used for performance tracking.)
-          interruptedBy = fiber;
-          resetStack();
-        }
-        markPendingPriorityLevel(root, expirationTime);
+        node.childExpirationTime = expirationTime;
         if (
-          // If we're in the render phase, we don't need to schedule this root
-          // for an update, because we'll do it before we exit...
-          !isWorking ||
-          isCommitting$1 ||
-          // ...unless this is a different root than the one we're rendering.
-          nextRoot !== root
+          alternate !== null &&
+          (alternate.childExpirationTime === NoWork ||
+            alternate.childExpirationTime > expirationTime)
         ) {
-          var rootExpirationTime = root.expirationTime;
-          requestWork(root, rootExpirationTime);
+          alternate.childExpirationTime = expirationTime;
         }
-        if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
-          invariant(
-            false,
-            "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."
-          );
-        }
-      } else {
-        {
-          if (fiber.tag === ClassComponent) {
-            warnAboutUpdateOnUnmounted(fiber);
+      } else if (
+        alternate !== null &&
+        (alternate.childExpirationTime === NoWork ||
+          alternate.childExpirationTime > expirationTime)
+      ) {
+        alternate.childExpirationTime = expirationTime;
+      }
+      if (node.return === null && node.tag === HostRoot) {
+        root = node.stateNode;
+        break;
+      }
+      node = node.return;
+    }
+  }
+
+  if (root === null) {
+    if (
+      true &&
+      (fiber.tag === ClassComponent || fiber.tag === ClassComponentLazy)
+    ) {
+      warnAboutUpdateOnUnmounted(fiber);
+    }
+    return null;
+  }
+
+  if (enableSchedulerTracing) {
+    var interactions = tracing.__interactionsRef.current;
+    if (interactions.size > 0) {
+      var pendingInteractionMap = root.pendingInteractionMap;
+      var pendingInteractions = pendingInteractionMap.get(expirationTime);
+      if (pendingInteractions != null) {
+        interactions.forEach(function(interaction) {
+          if (!pendingInteractions.has(interaction)) {
+            // Update the pending async work count for previously unscheduled interaction.
+            interaction.__count++;
           }
-        }
-        return;
+
+          pendingInteractions.add(interaction);
+        });
+      } else {
+        pendingInteractionMap.set(expirationTime, new Set(interactions));
+
+        // Update the pending async work count for the current interactions.
+        interactions.forEach(function(interaction) {
+          interaction.__count++;
+        });
+      }
+
+      var subscriber = tracing.__subscriberRef.current;
+      if (subscriber !== null) {
+        var threadID = computeThreadID(
+          expirationTime,
+          root.interactionThreadID
+        );
+        subscriber.onWorkScheduled(interactions, threadID);
       }
     }
-    node = node.return;
   }
-}
 
-function recalculateCurrentTime() {
-  // Subtract initial time so it fits inside 32bits
-  mostRecentCurrentTimeMs = now() - originalStartTimeMs;
-  mostRecentCurrentTime = msToExpirationTime(mostRecentCurrentTimeMs);
-  return mostRecentCurrentTime;
+  return root;
 }
 
-function deferredUpdates(fn) {
-  var previousExpirationContext = expirationContext;
-  var currentTime = recalculateCurrentTime();
-  expirationContext = computeAsyncExpiration(currentTime);
-  try {
-    return fn();
-  } finally {
-    expirationContext = previousExpirationContext;
+function scheduleWork(fiber, expirationTime) {
+  var root = scheduleWorkToRoot(fiber, expirationTime);
+  if (root === null) {
+    return;
   }
-}
-function syncUpdates(fn, a, b, c, d) {
-  var previousExpirationContext = expirationContext;
-  expirationContext = Sync;
-  try {
-    return fn(a, b, c, d);
-  } finally {
-    expirationContext = previousExpirationContext;
+
+  if (
+    !isWorking &&
+    nextRenderExpirationTime !== NoWork &&
+    expirationTime < nextRenderExpirationTime
+  ) {
+    // This is an interruption. (Used for performance tracking.)
+    interruptedBy = fiber;
+    resetStack();
+  }
+  markPendingPriorityLevel(root, expirationTime);
+  if (
+    // If we're in the render phase, we don't need to schedule this root
+    // for an update, because we'll do it before we exit...
+    !isWorking ||
+    isCommitting$1 ||
+    // ...unless this is a different root than the one we're rendering.
+    nextRoot !== root
+  ) {
+    var rootExpirationTime = root.expirationTime;
+    requestWork(root, rootExpirationTime);
+  }
+  if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
+    // Reset this back to zero so subsequent updates don't throw.
+    nestedUpdateCount = 0;
+    invariant(
+      false,
+      "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."
+    );
   }
 }
 
@@ -13310,7 +14726,7 @@ var callbackID = void 0;
 var isRendering = false;
 var nextFlushedRoot = null;
 var nextFlushedExpirationTime = NoWork;
-var lowestPendingInteractiveExpirationTime = NoWork;
+var lowestPriorityPendingInteractiveExpirationTime = NoWork;
 var deadlineDidExpire = false;
 var hasUnhandledError = false;
 var unhandledError = null;
@@ -13322,13 +14738,23 @@ var isBatchingInteractiveUpdates = false;
 
 var completedBatches = null;
 
+var originalStartTimeMs = now();
+var currentRendererTime = msToExpirationTime(originalStartTimeMs);
+var currentSchedulerTime = currentRendererTime;
+
 // Use these to prevent an infinite loop of nested updates
-var NESTED_UPDATE_LIMIT = 1000;
+var NESTED_UPDATE_LIMIT = 50;
 var nestedUpdateCount = 0;
+var lastCommittedRootDuringThisBatch = null;
 
 var timeHeuristicForUnitOfWork = 1;
 
-function scheduleCallbackWithExpirationTime(expirationTime) {
+function recomputeCurrentRendererTime() {
+  var currentTimeMs = now() - originalStartTimeMs;
+  currentRendererTime = msToExpirationTime(currentTimeMs);
+}
+
+function scheduleCallbackWithExpirationTime(root, expirationTime) {
   if (callbackExpirationTime !== NoWork) {
     // A callback is already scheduled. Check its expiration time (timeout).
     if (expirationTime > callbackExpirationTime) {
@@ -13366,30 +14792,96 @@ function onComplete(root, finishedWork, expirationTime) {
   root.finishedWork = finishedWork;
 }
 
-function onSuspend(root, suspendedExpirationTime, expirationTime, timeoutMs) {
-  if (timeoutMs >= 0) {
-    var suspendedRoot = root;
-    setTimeout(function() {
-      retrySuspendedRoot(suspendedRoot, suspendedExpirationTime);
-    }, timeoutMs);
+function onSuspend(
+  root,
+  finishedWork,
+  suspendedExpirationTime,
+  rootExpirationTime,
+  msUntilTimeout
+) {
+  root.expirationTime = rootExpirationTime;
+  if (msUntilTimeout === 0 && !shouldYield()) {
+    // Don't wait an additional tick. Commit the tree immediately.
+    root.pendingCommitExpirationTime = suspendedExpirationTime;
+    root.finishedWork = finishedWork;
+  } else if (msUntilTimeout > 0) {
+    // Wait `msUntilTimeout` milliseconds before committing.
+    root.timeoutHandle = scheduleTimeout(
+      onTimeout.bind(null, root, finishedWork, suspendedExpirationTime),
+      msUntilTimeout
+    );
   }
-  root.expirationTime = expirationTime;
 }
 
 function onYield(root) {
   root.finishedWork = null;
 }
 
+function onTimeout(root, finishedWork, suspendedExpirationTime) {
+  // The root timed out. Commit it.
+  root.pendingCommitExpirationTime = suspendedExpirationTime;
+  root.finishedWork = finishedWork;
+  // Read the current time before entering the commit phase. We can be
+  // certain this won't cause tearing related to batching of event updates
+  // because we're at the top of a timer event.
+  recomputeCurrentRendererTime();
+  currentSchedulerTime = currentRendererTime;
+  flushRoot(root, suspendedExpirationTime);
+}
+
 function onCommit(root, expirationTime) {
   root.expirationTime = expirationTime;
   root.finishedWork = null;
 }
 
+function requestCurrentTime() {
+  // requestCurrentTime is called by the scheduler to compute an expiration
+  // time.
+  //
+  // Expiration times are computed by adding to the current time (the start
+  // time). However, if two updates are scheduled within the same event, we
+  // should treat their start times as simultaneous, even if the actual clock
+  // time has advanced between the first and second call.
+
+  // In other words, because expiration times determine how updates are batched,
+  // we want all updates of like priority that occur within the same event to
+  // receive the same expiration time. Otherwise we get tearing.
+  //
+  // We keep track of two separate times: the current "renderer" time and the
+  // current "scheduler" time. The renderer time can be updated whenever; it
+  // only exists to minimize the calls performance.now.
+  //
+  // But the scheduler time can only be updated if there's no pending work, or
+  // if we know for certain that we're not in the middle of an event.
+
+  if (isRendering) {
+    // We're already rendering. Return the most recently read time.
+    return currentSchedulerTime;
+  }
+  // Check if there's pending work.
+  findHighestPriorityRoot();
+  if (
+    nextFlushedExpirationTime === NoWork ||
+    nextFlushedExpirationTime === Never
+  ) {
+    // If there's no pending work, or if the pending work is offscreen, we can
+    // read the current time without risk of tearing.
+    recomputeCurrentRendererTime();
+    currentSchedulerTime = currentRendererTime;
+    return currentSchedulerTime;
+  }
+  // There's already pending work. We might be in the middle of a browser
+  // event. If we were to read the current time, it could cause multiple updates
+  // within the same event to receive different expiration times, leading to
+  // tearing. Return the last read time. During the next idle callback, the
+  // time will be updated.
+  return currentSchedulerTime;
+}
+
 // requestWork is called by the scheduler whenever a root receives an update.
 // It's up to the renderer to call renderRoot at some point in the future.
 function requestWork(root, expirationTime) {
   addRootToSchedule(root, expirationTime);
-
   if (isRendering) {
     // Prevent reentrancy. Remaining work will be scheduled at the end of
     // the currently rendering batch.
@@ -13403,7 +14895,7 @@ function requestWork(root, expirationTime) {
       // flush it now.
       nextFlushedRoot = root;
       nextFlushedExpirationTime = Sync;
-      performWorkOnRoot(root, Sync, false);
+      performWorkOnRoot(root, Sync, true);
     }
     return;
   }
@@ -13412,7 +14904,7 @@ function requestWork(root, expirationTime) {
   if (expirationTime === Sync) {
     performSyncWork();
   } else {
-    scheduleCallbackWithExpirationTime(expirationTime);
+    scheduleCallbackWithExpirationTime(root, expirationTime);
   }
 }
 
@@ -13496,30 +14988,38 @@ function findHighestPriorityRoot() {
         if (root === lastScheduledRoot) {
           break;
         }
+        if (highestPriorityWork === Sync) {
+          // Sync is highest priority by definition so
+          // we can stop searching.
+          break;
+        }
         previousScheduledRoot = root;
         root = root.nextScheduledRoot;
       }
     }
   }
 
-  // If the next root is the same as the previous root, this is a nested
-  // update. To prevent an infinite loop, increment the nested update count.
-  var previousFlushedRoot = nextFlushedRoot;
-  if (
-    previousFlushedRoot !== null &&
-    previousFlushedRoot === highestPriorityRoot &&
-    highestPriorityWork === Sync
-  ) {
-    nestedUpdateCount++;
-  } else {
-    // Reset whenever we switch roots.
-    nestedUpdateCount = 0;
-  }
   nextFlushedRoot = highestPriorityRoot;
   nextFlushedExpirationTime = highestPriorityWork;
 }
 
 function performAsyncWork(dl) {
+  if (dl.didTimeout) {
+    // The callback timed out. That means at least one update has expired.
+    // Iterate through the root schedule. If they contain expired work, set
+    // the next render expiration time to the current time. This has the effect
+    // of flushing all expired work in a single batch, instead of flushing each
+    // level one at a time.
+    if (firstScheduledRoot !== null) {
+      recomputeCurrentRendererTime();
+      var root = firstScheduledRoot;
+      do {
+        didExpireAtExpirationTime(root, currentRendererTime);
+        // The root schedule is circular, so this is never null.
+        root = root.nextScheduledRoot;
+      } while (root !== firstScheduledRoot);
+    }
+  }
   performWork(NoWork, dl);
 }
 
@@ -13530,32 +15030,35 @@ function performSyncWork() {
 function performWork(minExpirationTime, dl) {
   deadline = dl;
 
-  // Keep working on roots until there's no more work, or until the we reach
+  // Keep working on roots until there's no more work, or until we reach
   // the deadline.
   findHighestPriorityRoot();
 
-  if (enableProfilerTimer) {
-    resumeActualRenderTimerIfPaused();
-  }
+  if (deadline !== null) {
+    recomputeCurrentRendererTime();
+    currentSchedulerTime = currentRendererTime;
 
-  if (enableUserTimingAPI && deadline !== null) {
-    var didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-    var timeout = expirationTimeToMs(nextFlushedExpirationTime);
-    stopRequestCallbackTimer(didExpire, timeout);
-  }
+    if (enableUserTimingAPI) {
+      var didExpire = nextFlushedExpirationTime < currentRendererTime;
+      var timeout = expirationTimeToMs(nextFlushedExpirationTime);
+      stopRequestCallbackTimer(didExpire, timeout);
+    }
 
-  if (deadline !== null) {
     while (
       nextFlushedRoot !== null &&
       nextFlushedExpirationTime !== NoWork &&
       (minExpirationTime === NoWork ||
         minExpirationTime >= nextFlushedExpirationTime) &&
-      (!deadlineDidExpire ||
-        recalculateCurrentTime() >= nextFlushedExpirationTime)
+      (!deadlineDidExpire || currentRendererTime >= nextFlushedExpirationTime)
     ) {
-      recalculateCurrentTime();
-      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, true);
+      performWorkOnRoot(
+        nextFlushedRoot,
+        nextFlushedExpirationTime,
+        currentRendererTime >= nextFlushedExpirationTime
+      );
       findHighestPriorityRoot();
+      recomputeCurrentRendererTime();
+      currentSchedulerTime = currentRendererTime;
     }
   } else {
     while (
@@ -13564,7 +15067,7 @@ function performWork(minExpirationTime, dl) {
       (minExpirationTime === NoWork ||
         minExpirationTime >= nextFlushedExpirationTime)
     ) {
-      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, false);
+      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, true);
       findHighestPriorityRoot();
     }
   }
@@ -13579,7 +15082,10 @@ function performWork(minExpirationTime, dl) {
   }
   // If there's work left over, schedule a new callback.
   if (nextFlushedExpirationTime !== NoWork) {
-    scheduleCallbackWithExpirationTime(nextFlushedExpirationTime);
+    scheduleCallbackWithExpirationTime(
+      nextFlushedRoot,
+      nextFlushedExpirationTime
+    );
   }
 
   // Clean-up.
@@ -13600,14 +15106,14 @@ function flushRoot(root, expirationTime) {
   // including the given time.
   nextFlushedRoot = root;
   nextFlushedExpirationTime = expirationTime;
-  performWorkOnRoot(root, expirationTime, false);
+  performWorkOnRoot(root, expirationTime, true);
   // Flush any sync work that was scheduled by lifecycles
   performSyncWork();
-  finishRendering();
 }
 
 function finishRendering() {
   nestedUpdateCount = 0;
+  lastCommittedRootDuringThisBatch = null;
 
   if (completedBatches !== null) {
     var batches = completedBatches;
@@ -13633,7 +15139,7 @@ function finishRendering() {
   }
 }
 
-function performWorkOnRoot(root, expirationTime, isYieldy) {
+function performWorkOnRoot(root, expirationTime, isExpired) {
   invariant(
     !isRendering,
     "performWorkOnRoot was called recursively. This error is likely caused " +
@@ -13643,15 +15149,28 @@ function performWorkOnRoot(root, expirationTime, isYieldy) {
   isRendering = true;
 
   // Check if this is async work or sync/expired work.
-  if (!isYieldy) {
+  if (deadline === null || isExpired) {
     // Flush work without yielding.
+    // TODO: Non-yieldy work does not necessarily imply expired work. A renderer
+    // may want to perform some work without yielding, but also without
+    // requiring the root to complete (by triggering placeholders).
+
     var finishedWork = root.finishedWork;
     if (finishedWork !== null) {
       // This root is already complete. We can commit it.
       completeRoot$1(root, finishedWork, expirationTime);
     } else {
       root.finishedWork = null;
-      renderRoot(root, false);
+      // If this root previously suspended, clear its existing timeout, since
+      // we're about to try rendering again.
+      var timeoutHandle = root.timeoutHandle;
+      if (timeoutHandle !== noTimeout) {
+        root.timeoutHandle = noTimeout;
+        // $FlowFixMe Complains noTimeout is not a TimeoutID, despite the check above
+        cancelTimeout(timeoutHandle);
+      }
+      var isYieldy = false;
+      renderRoot(root, isYieldy, isExpired);
       finishedWork = root.finishedWork;
       if (finishedWork !== null) {
         // We've completed the root. Commit it.
@@ -13666,7 +15185,16 @@ function performWorkOnRoot(root, expirationTime, isYieldy) {
       completeRoot$1(root, _finishedWork, expirationTime);
     } else {
       root.finishedWork = null;
-      renderRoot(root, true);
+      // If this root previously suspended, clear its existing timeout, since
+      // we're about to try rendering again.
+      var _timeoutHandle = root.timeoutHandle;
+      if (_timeoutHandle !== noTimeout) {
+        root.timeoutHandle = noTimeout;
+        // $FlowFixMe Complains noTimeout is not a TimeoutID, despite the check above
+        cancelTimeout(_timeoutHandle);
+      }
+      var _isYieldy = true;
+      renderRoot(root, _isYieldy, isExpired);
       _finishedWork = root.finishedWork;
       if (_finishedWork !== null) {
         // We've completed the root. Check the deadline one more time
@@ -13678,12 +15206,6 @@ function performWorkOnRoot(root, expirationTime, isYieldy) {
           // There's no time left. Mark this root as complete. We'll come
           // back and commit it later.
           root.finishedWork = _finishedWork;
-
-          if (enableProfilerTimer) {
-            // If we didn't finish, pause the "actual" render timer.
-            // We'll restart it when we resume work.
-            pauseActualRenderTimerIfRunning();
-          }
         }
       }
     }
@@ -13712,16 +15234,31 @@ function completeRoot$1(root, finishedWork, expirationTime) {
 
   // Commit the root.
   root.finishedWork = null;
+
+  // Check if this is a nested update (a sync update scheduled during the
+  // commit phase).
+  if (root === lastCommittedRootDuringThisBatch) {
+    // If the next root is the same as the previous root, this is a nested
+    // update. To prevent an infinite loop, increment the nested update count.
+    nestedUpdateCount++;
+  } else {
+    // Reset whenever we switch roots.
+    lastCommittedRootDuringThisBatch = root;
+    nestedUpdateCount = 0;
+  }
   commitRoot(root, finishedWork);
 }
 
 // When working on async work, the reconciler asks the renderer if it should
 // yield execution. For DOM, we implement this with requestIdleCallback.
 function shouldYield() {
-  if (deadline === null || deadlineDidExpire) {
-    return false;
+  if (deadlineDidExpire) {
+    return true;
   }
-  if (deadline.timeRemaining() > timeHeuristicForUnitOfWork) {
+  if (
+    deadline === null ||
+    deadline.timeRemaining() > timeHeuristicForUnitOfWork
+  ) {
     // Disregard deadline.didTimeout. Only expired work should be flushed
     // during a timeout. This path is only hit for non-expired work.
     return false;
@@ -13760,38 +15297,6 @@ function batchedUpdates$1(fn, a) {
   }
 }
 
-// TODO: Batching should be implemented at the renderer level, not inside
-// the reconciler.
-function unbatchedUpdates(fn, a) {
-  if (isBatchingUpdates && !isUnbatchingUpdates) {
-    isUnbatchingUpdates = true;
-    try {
-      return fn(a);
-    } finally {
-      isUnbatchingUpdates = false;
-    }
-  }
-  return fn(a);
-}
-
-// TODO: Batching should be implemented at the renderer level, not within
-// the reconciler.
-function flushSync(fn, a) {
-  invariant(
-    !isRendering,
-    "flushSync was called from inside a lifecycle method. It cannot be " +
-      "called when React is already rendering."
-  );
-  var previousIsBatchingUpdates = isBatchingUpdates;
-  isBatchingUpdates = true;
-  try {
-    return syncUpdates(fn, a);
-  } finally {
-    isBatchingUpdates = previousIsBatchingUpdates;
-    performSyncWork();
-  }
-}
-
 function interactiveUpdates$1(fn, a, b) {
   if (isBatchingInteractiveUpdates) {
     return fn(a, b);
@@ -13803,11 +15308,11 @@ function interactiveUpdates$1(fn, a, b) {
   if (
     !isBatchingUpdates &&
     !isRendering &&
-    lowestPendingInteractiveExpirationTime !== NoWork
+    lowestPriorityPendingInteractiveExpirationTime !== NoWork
   ) {
     // Synchronously flush pending interactive updates.
-    performWork(lowestPendingInteractiveExpirationTime, null);
-    lowestPendingInteractiveExpirationTime = NoWork;
+    performWork(lowestPriorityPendingInteractiveExpirationTime, null);
+    lowestPriorityPendingInteractiveExpirationTime = NoWork;
   }
   var previousIsBatchingInteractiveUpdates = isBatchingInteractiveUpdates;
   var previousIsBatchingUpdates = isBatchingUpdates;
@@ -13825,23 +15330,13 @@ function interactiveUpdates$1(fn, a, b) {
 }
 
 function flushInteractiveUpdates$1() {
-  if (!isRendering && lowestPendingInteractiveExpirationTime !== NoWork) {
+  if (
+    !isRendering &&
+    lowestPriorityPendingInteractiveExpirationTime !== NoWork
+  ) {
     // Synchronously flush pending interactive updates.
-    performWork(lowestPendingInteractiveExpirationTime, null);
-    lowestPendingInteractiveExpirationTime = NoWork;
-  }
-}
-
-function flushControlled(fn) {
-  var previousIsBatchingUpdates = isBatchingUpdates;
-  isBatchingUpdates = true;
-  try {
-    syncUpdates(fn);
-  } finally {
-    isBatchingUpdates = previousIsBatchingUpdates;
-    if (!isBatchingUpdates && !isRendering) {
-      performWork(Sync, null);
-    }
+    performWork(lowestPriorityPendingInteractiveExpirationTime, null);
+    lowestPriorityPendingInteractiveExpirationTime = NoWork;
   }
 }
 
@@ -13849,38 +15344,47 @@ function flushControlled(fn) {
 // Might add PROFILE later.
 
 var didWarnAboutNestedUpdates = void 0;
+var didWarnAboutFindNodeInStrictMode = void 0;
 
 {
   didWarnAboutNestedUpdates = false;
+  didWarnAboutFindNodeInStrictMode = {};
 }
 
 function getContextForSubtree(parentComponent) {
   if (!parentComponent) {
-    return emptyObject;
+    return emptyContextObject;
   }
 
   var fiber = get$1(parentComponent);
   var parentContext = findCurrentUnmaskedContext(fiber);
-  return isContextProvider(fiber)
-    ? processChildContext(fiber, parentContext)
-    : parentContext;
+
+  if (fiber.tag === ClassComponent) {
+    var Component = fiber.type;
+    if (isContextProvider(Component)) {
+      return processChildContext(fiber, Component, parentContext);
+    }
+  } else if (fiber.tag === ClassComponentLazy) {
+    var _Component = getResultFromResolvedThenable(fiber.type);
+    if (isContextProvider(_Component)) {
+      return processChildContext(fiber, _Component, parentContext);
+    }
+  }
+
+  return parentContext;
 }
 
-function scheduleRootUpdate(current, element, expirationTime, callback) {
+function scheduleRootUpdate(current$$1, element, expirationTime, callback) {
   {
-    if (
-      ReactDebugCurrentFiber.phase === "render" &&
-      ReactDebugCurrentFiber.current !== null &&
-      !didWarnAboutNestedUpdates
-    ) {
+    if (phase === "render" && current !== null && !didWarnAboutNestedUpdates) {
       didWarnAboutNestedUpdates = true;
-      warning(
+      warningWithoutStack$1(
         false,
         "Render methods should be a pure function of props and state; " +
           "triggering nested component updates from render is not allowed. " +
           "If necessary, trigger nested updates in componentDidUpdate.\n\n" +
           "Check the render method of %s.",
-        getComponentName(ReactDebugCurrentFiber.current) || "Unknown"
+        getComponentName(current.type) || "Unknown"
       );
     }
   }
@@ -13893,7 +15397,7 @@ function scheduleRootUpdate(current, element, expirationTime, callback) {
   callback = callback === undefined ? null : callback;
   if (callback !== null) {
     !(typeof callback === "function")
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "render(...): Expected the last optional `callback` argument to be a " +
             "function. Instead received: %s.",
@@ -13902,9 +15406,9 @@ function scheduleRootUpdate(current, element, expirationTime, callback) {
       : void 0;
     update.callback = callback;
   }
-  enqueueUpdate(current, update, expirationTime);
+  enqueueUpdate(current$$1, update);
 
-  scheduleWork(current, expirationTime);
+  scheduleWork(current$$1, expirationTime);
   return expirationTime;
 }
 
@@ -13916,11 +15420,11 @@ function updateContainerAtExpirationTime(
   callback
 ) {
   // TODO: If this is a nested container, this won't be the root.
-  var current = container.current;
+  var current$$1 = container.current;
 
   {
     if (ReactFiberInstrumentation_1.debugTool) {
-      if (current.alternate === null) {
+      if (current$$1.alternate === null) {
         ReactFiberInstrumentation_1.debugTool.onMountContainer(container);
       } else if (element === null) {
         ReactFiberInstrumentation_1.debugTool.onUnmountContainer(container);
@@ -13937,7 +15441,7 @@ function updateContainerAtExpirationTime(
     container.pendingContext = context;
   }
 
-  return scheduleRootUpdate(current, element, expirationTime, callback);
+  return scheduleRootUpdate(current$$1, element, expirationTime, callback);
 }
 
 function findHostInstance$1(component) {
@@ -13960,14 +15464,72 @@ function findHostInstance$1(component) {
   return hostFiber.stateNode;
 }
 
-function createContainer(containerInfo, isAsync, hydrate) {
-  return createFiberRoot(containerInfo, isAsync, hydrate);
+function findHostInstanceWithWarning$1(component, methodName) {
+  {
+    var fiber = get$1(component);
+    if (fiber === undefined) {
+      if (typeof component.render === "function") {
+        invariant(false, "Unable to find node on an unmounted component.");
+      } else {
+        invariant(
+          false,
+          "Argument appears to not be a ReactComponent. Keys: %s",
+          Object.keys(component)
+        );
+      }
+    }
+    var hostFiber = findCurrentHostFiber(fiber);
+    if (hostFiber === null) {
+      return null;
+    }
+    if (hostFiber.mode & StrictMode) {
+      var componentName = getComponentName(fiber.type) || "Component";
+      if (!didWarnAboutFindNodeInStrictMode[componentName]) {
+        didWarnAboutFindNodeInStrictMode[componentName] = true;
+        if (fiber.mode & StrictMode) {
+          warningWithoutStack$1(
+            false,
+            "%s is deprecated in StrictMode. " +
+              "%s was passed an instance of %s which is inside StrictMode. " +
+              "Instead, add a ref directly to the element you want to reference." +
+              "\n%s" +
+              "\n\nLearn more about using refs safely here:" +
+              "\nhttps://fb.me/react-strict-mode-find-node",
+            methodName,
+            methodName,
+            componentName,
+            getStackByFiberInDevAndProd(hostFiber)
+          );
+        } else {
+          warningWithoutStack$1(
+            false,
+            "%s is deprecated in StrictMode. " +
+              "%s was passed an instance of %s which renders StrictMode children. " +
+              "Instead, add a ref directly to the element you want to reference." +
+              "\n%s" +
+              "\n\nLearn more about using refs safely here:" +
+              "\nhttps://fb.me/react-strict-mode-find-node",
+            methodName,
+            methodName,
+            componentName,
+            getStackByFiberInDevAndProd(hostFiber)
+          );
+        }
+      }
+    }
+    return hostFiber.stateNode;
+  }
+  return findHostInstance$1(component);
+}
+
+function createContainer(containerInfo, isConcurrent, hydrate) {
+  return createFiberRoot(containerInfo, isConcurrent, hydrate);
 }
 
 function updateContainer(element, container, parentComponent, callback) {
-  var current = container.current;
-  var currentTime = recalculateCurrentTime();
-  var expirationTime = computeExpirationForFiber(currentTime, current);
+  var current$$1 = container.current;
+  var currentTime = requestCurrentTime();
+  var expirationTime = computeExpirationForFiber(currentTime, current$$1);
   return updateContainerAtExpirationTime(
     element,
     container,
@@ -13990,14 +15552,6 @@ function getPublicRootInstance(container) {
   }
 }
 
-function findHostInstanceWithNoPortals(fiber) {
-  var hostFiber = findCurrentHostFiberWithNoPortals(fiber);
-  if (hostFiber === null) {
-    return null;
-  }
-  return hostFiber.stateNode;
-}
-
 function injectIntoDevTools(devToolsConfig) {
   var findFiberByHostInstance = devToolsConfig.findFiberByHostInstance;
 
@@ -14024,27 +15578,6 @@ function injectIntoDevTools(devToolsConfig) {
 // This file intentionally does *not* have the Flow annotation.
 // Don't add it. See `./inline-typed.js` for an explanation.
 
-var ReactFabricRenderer = Object.freeze({
-  updateContainerAtExpirationTime: updateContainerAtExpirationTime,
-  createContainer: createContainer,
-  updateContainer: updateContainer,
-  flushRoot: flushRoot,
-  requestWork: requestWork,
-  computeUniqueAsyncExpiration: computeUniqueAsyncExpiration,
-  batchedUpdates: batchedUpdates$1,
-  unbatchedUpdates: unbatchedUpdates,
-  deferredUpdates: deferredUpdates,
-  syncUpdates: syncUpdates,
-  interactiveUpdates: interactiveUpdates$1,
-  flushInteractiveUpdates: flushInteractiveUpdates$1,
-  flushControlled: flushControlled,
-  flushSync: flushSync,
-  getPublicRootInstance: getPublicRootInstance,
-  findHostInstance: findHostInstance$1,
-  findHostInstanceWithNoPortals: findHostInstanceWithNoPortals,
-  injectIntoDevTools: injectIntoDevTools
-});
-
 function createPortal(
   children,
   containerInfo,
@@ -14066,7 +15599,7 @@ function createPortal(
 
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.4.1";
+var ReactVersion = "16.6.0-alpha.8af6728";
 
 // Modules provided by RN:
 var NativeMethodsMixin = function(findNodeHandle, findHostInstance) {
@@ -14106,7 +15639,7 @@ var NativeMethodsMixin = function(findNodeHandle, findHostInstance) {
     measure: function(callback) {
       UIManager.measure(
         findNodeHandle(this),
-        mountSafeCallback(this, callback)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
     },
 
@@ -14128,7 +15661,7 @@ var NativeMethodsMixin = function(findNodeHandle, findHostInstance) {
     measureInWindow: function(callback) {
       UIManager.measureInWindow(
         findNodeHandle(this),
-        mountSafeCallback(this, callback)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
     },
 
@@ -14148,8 +15681,8 @@ var NativeMethodsMixin = function(findNodeHandle, findHostInstance) {
       UIManager.measureLayout(
         findNodeHandle(this),
         relativeToNativeNode,
-        mountSafeCallback(this, onFail),
-        mountSafeCallback(this, onSuccess)
+        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
       );
     },
 
@@ -14358,7 +15891,7 @@ var ReactNativeComponent = function(findNodeHandle, findHostInstance) {
     ReactNativeComponent.prototype.measure = function measure(callback) {
       UIManager.measure(
         findNodeHandle(this),
-        mountSafeCallback(this, callback)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
     };
 
@@ -14381,7 +15914,7 @@ var ReactNativeComponent = function(findNodeHandle, findHostInstance) {
     ) {
       UIManager.measureInWindow(
         findNodeHandle(this),
-        mountSafeCallback(this, callback)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
     };
 
@@ -14400,8 +15933,8 @@ var ReactNativeComponent = function(findNodeHandle, findHostInstance) {
       UIManager.measureLayout(
         findNodeHandle(this),
         relativeToNativeNode,
-        mountSafeCallback(this, onFail),
-        mountSafeCallback(this, onSuccess)
+        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
       );
     };
 
@@ -14468,6 +16001,11 @@ function getInstanceFromTag(tag) {
 }
 
 // Module provided by RN:
+var emptyObject$2 = {};
+{
+  Object.freeze(emptyObject$2);
+}
+
 var getInspectorDataForViewTag = void 0;
 
 {
@@ -14498,9 +16036,9 @@ var getInspectorDataForViewTag = void 0;
   var getHostProps = function(fiber) {
     var host = findCurrentHostFiber(fiber);
     if (host) {
-      return host.memoizedProps || emptyObject;
+      return host.memoizedProps || emptyObject$2;
     }
-    return emptyObject;
+    return emptyObject$2;
   };
 
   var getHostNode = function(fiber, findNodeHandle) {
@@ -14522,7 +16060,7 @@ var getInspectorDataForViewTag = void 0;
   var createHierarchy = function(fiberHierarchy) {
     return fiberHierarchy.map(function(fiber) {
       return {
-        name: getComponentName(fiber),
+        name: getComponentName(fiber.type),
         getInspectorData: function(findNodeHandle) {
           return {
             measure: function(callback) {
@@ -14546,7 +16084,7 @@ var getInspectorDataForViewTag = void 0;
     if (!closestInstance) {
       return {
         hierarchy: [],
-        props: emptyObject,
+        props: emptyObject$2,
         selection: null,
         source: null
       };
@@ -14569,21 +16107,23 @@ var getInspectorDataForViewTag = void 0;
   };
 }
 
+var ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 var findHostInstance = findHostInstance$1;
+var findHostInstanceWithWarning = findHostInstanceWithWarning$1;
 
 function findNodeHandle(componentOrHandle) {
   {
     var owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
       !owner.stateNode._warnedAboutRefsInRender
-        ? warning(
+        ? warningWithoutStack$1(
             false,
             "%s is accessing findNodeHandle inside its render(). " +
               "render() should be a pure function of props and state. It should " +
               "never access something that requires stale data from the previous " +
               "render, such as refs. Move this logic to componentDidMount and " +
               "componentDidUpdate instead.",
-            getComponentName(owner) || "A component"
+            getComponentName(owner.type) || "A component"
           )
         : void 0;
 
@@ -14603,7 +16143,14 @@ function findNodeHandle(componentOrHandle) {
   if (componentOrHandle.canonical && componentOrHandle.canonical._nativeTag) {
     return componentOrHandle.canonical._nativeTag;
   }
-  var hostInstance = findHostInstance(componentOrHandle);
+  var hostInstance = void 0;
+  {
+    hostInstance = findHostInstanceWithWarning(
+      componentOrHandle,
+      "findNodeHandle"
+    );
+  }
+
   if (hostInstance == null) {
     return hostInstance;
   }
@@ -14616,7 +16163,11 @@ function findNodeHandle(componentOrHandle) {
   return hostInstance._nativeTag;
 }
 
-injection$2.injectRenderer(ReactFabricRenderer);
+setBatchingImplementation(
+  batchedUpdates$1,
+  interactiveUpdates$1,
+  flushInteractiveUpdates$1
+);
 
 var roots = new Map();
 
@@ -14676,7 +16227,7 @@ var ReactFabric$3 = (ReactFabric$2 && ReactFabric) || ReactFabric$2;
 
 // TODO: decide on the top-level export form.
 // This is hacky but makes it work with both Rollup and Jest.
-var fabric = ReactFabric$3.default ? ReactFabric$3.default : ReactFabric$3;
+var fabric = ReactFabric$3.default || ReactFabric$3;
 
 module.exports = fabric;
 
diff --git a/Libraries/Renderer/oss/ReactFabric-prod.js b/Libraries/Renderer/oss/ReactFabric-prod.js
index b64b8908f410a8..9bd0a470b98875 100644
--- a/Libraries/Renderer/oss/ReactFabric-prod.js
+++ b/Libraries/Renderer/oss/ReactFabric-prod.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,78 +12,82 @@
 
 "use strict";
 require("InitializeCore");
-var invariant = require("fbjs/lib/invariant"),
-  ReactNativeViewConfigRegistry = require("ReactNativeViewConfigRegistry"),
+var ReactNativeViewConfigRegistry = require("ReactNativeViewConfigRegistry"),
   UIManager = require("UIManager"),
   React = require("react"),
-  emptyObject = require("fbjs/lib/emptyObject"),
   deepDiffer = require("deepDiffer"),
   flattenStyle = require("flattenStyle"),
   TextInputState = require("TextInputState"),
-  FabricUIManager = require("FabricUIManager"),
-  ExceptionsManager = require("ExceptionsManager");
-function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
-  this._hasCaughtError = !1;
-  this._caughtError = null;
+  FabricUIManager = require("FabricUIManager");
+var ExceptionsManager = require("ExceptionsManager");
+function invariant(condition, format, a, b, c, d, e, f) {
+  if (!condition) {
+    condition = void 0;
+    if (void 0 === format)
+      condition = Error(
+        "Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings."
+      );
+    else {
+      var args = [a, b, c, d, e, f],
+        argIndex = 0;
+      condition = Error(
+        format.replace(/%s/g, function() {
+          return args[argIndex++];
+        })
+      );
+      condition.name = "Invariant Violation";
+    }
+    condition.framesToPop = 1;
+    throw condition;
+  }
+}
+function invokeGuardedCallbackImpl(name, func, context, a, b, c, d, e, f) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
   try {
     func.apply(context, funcArgs);
   } catch (error) {
-    (this._caughtError = error), (this._hasCaughtError = !0);
+    this.onError(error);
   }
 }
-var ReactErrorUtils = {
-  _caughtError: null,
-  _hasCaughtError: !1,
-  _rethrowError: null,
-  _hasRethrowError: !1,
-  invokeGuardedCallback: function(name, func, context, a, b, c, d, e, f) {
-    invokeGuardedCallback.apply(ReactErrorUtils, arguments);
-  },
-  invokeGuardedCallbackAndCatchFirstError: function(
-    name,
-    func,
-    context,
-    a,
-    b,
-    c,
-    d,
-    e,
-    f
-  ) {
-    ReactErrorUtils.invokeGuardedCallback.apply(this, arguments);
-    if (ReactErrorUtils.hasCaughtError()) {
-      var error = ReactErrorUtils.clearCaughtError();
-      ReactErrorUtils._hasRethrowError ||
-        ((ReactErrorUtils._hasRethrowError = !0),
-        (ReactErrorUtils._rethrowError = error));
-    }
-  },
-  rethrowCaughtError: function() {
-    return rethrowCaughtError.apply(ReactErrorUtils, arguments);
-  },
-  hasCaughtError: function() {
-    return ReactErrorUtils._hasCaughtError;
-  },
-  clearCaughtError: function() {
-    if (ReactErrorUtils._hasCaughtError) {
-      var error = ReactErrorUtils._caughtError;
-      ReactErrorUtils._caughtError = null;
-      ReactErrorUtils._hasCaughtError = !1;
-      return error;
+var hasError = !1,
+  caughtError = null,
+  hasRethrowError = !1,
+  rethrowError = null,
+  reporter = {
+    onError: function(error) {
+      hasError = !0;
+      caughtError = error;
     }
-    invariant(
-      !1,
-      "clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue."
-    );
-  }
-};
-function rethrowCaughtError() {
-  if (ReactErrorUtils._hasRethrowError) {
-    var error = ReactErrorUtils._rethrowError;
-    ReactErrorUtils._rethrowError = null;
-    ReactErrorUtils._hasRethrowError = !1;
-    throw error;
+  };
+function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
+  hasError = !1;
+  caughtError = null;
+  invokeGuardedCallbackImpl.apply(reporter, arguments);
+}
+function invokeGuardedCallbackAndCatchFirstError(
+  name,
+  func,
+  context,
+  a,
+  b,
+  c,
+  d,
+  e,
+  f
+) {
+  invokeGuardedCallback.apply(this, arguments);
+  if (hasError) {
+    if (hasError) {
+      var error = caughtError;
+      hasError = !1;
+      caughtError = null;
+    } else
+      invariant(
+        !1,
+        "clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue."
+      ),
+        (error = void 0);
+    hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
 var eventPluginOrder = null,
@@ -165,12 +169,7 @@ var plugins = [],
 function executeDispatch(event, simulated, listener, inst) {
   simulated = event.type || "unknown-event";
   event.currentTarget = getNodeFromInstance(inst);
-  ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
-    simulated,
-    listener,
-    void 0,
-    event
-  );
+  invokeGuardedCallbackAndCatchFirstError(simulated, listener, void 0, event);
   event.currentTarget = null;
 }
 function executeDirectDispatch(event) {
@@ -294,7 +293,7 @@ function getListener(inst, registrationName) {
 }
 function getParent(inst) {
   do inst = inst.return;
-  while (inst && 5 !== inst.tag);
+  while (inst && 7 !== inst.tag);
   return inst ? inst : null;
 }
 function traverseTwoPhase(inst, fn, arg) {
@@ -347,9 +346,6 @@ function accumulateDirectDispatchesSingle(event) {
     }
   }
 }
-var shouldBeReleasedProperties = "dispatchConfig _targetInst nativeEvent isDefaultPrevented isPropagationStopped _dispatchListeners _dispatchInstances".split(
-  " "
-);
 function functionThatReturnsTrue() {
   return !0;
 }
@@ -407,12 +403,9 @@ Object.assign(SyntheticEvent.prototype, {
     var Interface = this.constructor.Interface,
       propName;
     for (propName in Interface) this[propName] = null;
-    for (
-      Interface = 0;
-      Interface < shouldBeReleasedProperties.length;
-      Interface++
-    )
-      this[shouldBeReleasedProperties[Interface]] = null;
+    this.nativeEvent = this._targetInst = this.dispatchConfig = null;
+    this.isPropagationStopped = this.isDefaultPrevented = functionThatReturnsFalse;
+    this._dispatchInstances = this._dispatchListeners = null;
   }
 });
 SyntheticEvent.Interface = {
@@ -458,7 +451,7 @@ function getPooledEvent(dispatchConfig, targetInst, nativeEvent, nativeInst) {
 function releasePooledEvent(event) {
   invariant(
     event instanceof this,
-    "Trying to release an event instance  into a pool of a different type."
+    "Trying to release an event instance into a pool of a different type."
   );
   event.destructor();
   10 > this.eventPool.length && this.eventPool.push(event);
@@ -615,7 +608,9 @@ function accumulate(current, next) {
     ? next
     : Array.isArray(current)
       ? current.concat(next)
-      : Array.isArray(next) ? [current].concat(next) : [current, next];
+      : Array.isArray(next)
+        ? [current].concat(next)
+        : [current, next];
 }
 var responderInst = null,
   trackedTouchCount = 0;
@@ -881,7 +876,9 @@ var eventTypes$1 = {
           ? eventTypes$1.responderStart
           : targetInst
             ? eventTypes$1.responderMove
-            : depthA ? eventTypes$1.responderEnd : null)
+            : depthA
+              ? eventTypes$1.responderEnd
+              : null)
       )
         (JSCompiler_temp$jscomp$0 = ResponderSyntheticEvent.getPooled(
           JSCompiler_temp$jscomp$0,
@@ -935,7 +932,9 @@ var eventTypes$1 = {
       if (
         (topLevelType = JSCompiler_temp$jscomp$0
           ? eventTypes$1.responderTerminate
-          : topLevelType ? eventTypes$1.responderRelease : null)
+          : topLevelType
+            ? eventTypes$1.responderRelease
+            : null)
       )
         (nativeEvent = ResponderSyntheticEvent.getPooled(
           topLevelType,
@@ -1001,22 +1000,15 @@ injection.injectEventPluginsByName({
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;
 }
-var Injected$jscomp$inline_574 = {
-  getClosestInstanceFromNode: getInstanceFromInstance,
-  getInstanceFromNode: getInstanceFromInstance,
-  getNodeFromInstance: function(inst) {
-    inst = inst.stateNode.canonical._nativeTag;
-    invariant(inst, "All native instances should have a tag.");
-    return inst;
-  },
-  getFiberCurrentPropsFromNode: function(inst) {
-    return inst.canonical.currentProps;
-  }
+getFiberCurrentPropsFromNode = function(inst) {
+  return inst.canonical.currentProps;
+};
+getInstanceFromNode = getInstanceFromInstance;
+getNodeFromInstance = function(inst) {
+  inst = inst.stateNode.canonical._nativeTag;
+  invariant(inst, "All native instances should have a tag.");
+  return inst;
 };
-getFiberCurrentPropsFromNode =
-  Injected$jscomp$inline_574.getFiberCurrentPropsFromNode;
-getInstanceFromNode = Injected$jscomp$inline_574.getInstanceFromNode;
-getNodeFromInstance = Injected$jscomp$inline_574.getNodeFromInstance;
 ResponderEventPlugin.injection.injectGlobalResponderHandler({
   onChange: function(from, to, blockNativeResponder) {
     null !== to
@@ -1027,8 +1019,8 @@ ResponderEventPlugin.injection.injectGlobalResponderHandler({
       : UIManager.clearJSResponder();
   }
 });
-var ReactCurrentOwner =
-    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,
+var ReactSharedInternals =
+    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
   hasSymbol = "function" === typeof Symbol && Symbol.for,
   REACT_ELEMENT_TYPE = hasSymbol ? Symbol.for("react.element") : 60103,
   REACT_PORTAL_TYPE = hasSymbol ? Symbol.for("react.portal") : 60106,
@@ -1037,48 +1029,62 @@ var ReactCurrentOwner =
   REACT_PROFILER_TYPE = hasSymbol ? Symbol.for("react.profiler") : 60114,
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol.for("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol.for("react.context") : 60110,
-  REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol.for("react.async_mode") : 60111,
+  REACT_CONCURRENT_MODE_TYPE = hasSymbol
+    ? Symbol.for("react.concurrent_mode")
+    : 60111,
   REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for("react.forward_ref") : 60112,
-  REACT_TIMEOUT_TYPE = hasSymbol ? Symbol.for("react.timeout") : 60113,
+  REACT_SUSPENSE_TYPE = hasSymbol ? Symbol.for("react.suspense") : 60113,
+  REACT_PURE_TYPE = hasSymbol ? Symbol.for("react.pure") : 60115,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
-  if (null === maybeIterable || "undefined" === typeof maybeIterable)
-    return null;
+  if (null === maybeIterable || "object" !== typeof maybeIterable) return null;
   maybeIterable =
     (MAYBE_ITERATOR_SYMBOL && maybeIterable[MAYBE_ITERATOR_SYMBOL]) ||
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(fiber) {
-  var type = fiber.type;
-  if ("function" === typeof type) return type.displayName || type.name;
+function getWrappedName(outerType, innerType, wrapperName) {
+  innerType = innerType.displayName || innerType.name || "";
+  return (
+    outerType.displayName ||
+    ("" !== innerType ? wrapperName + "(" + innerType + ")" : wrapperName)
+  );
+}
+function getComponentName(type) {
+  if (null == type) return null;
+  if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
   switch (type) {
-    case REACT_ASYNC_MODE_TYPE:
-      return "AsyncMode";
-    case REACT_CONTEXT_TYPE:
-      return "Context.Consumer";
+    case REACT_CONCURRENT_MODE_TYPE:
+      return "ConcurrentMode";
     case REACT_FRAGMENT_TYPE:
-      return "ReactFragment";
+      return "Fragment";
     case REACT_PORTAL_TYPE:
-      return "ReactPortal";
+      return "Portal";
     case REACT_PROFILER_TYPE:
-      return "Profiler(" + fiber.pendingProps.id + ")";
-    case REACT_PROVIDER_TYPE:
-      return "Context.Provider";
+      return "Profiler";
     case REACT_STRICT_MODE_TYPE:
       return "StrictMode";
-    case REACT_TIMEOUT_TYPE:
-      return "Timeout";
+    case REACT_SUSPENSE_TYPE:
+      return "Suspense";
   }
-  if ("object" === typeof type && null !== type)
+  if ("object" === typeof type) {
     switch (type.$$typeof) {
+      case REACT_CONTEXT_TYPE:
+        return "Context.Consumer";
+      case REACT_PROVIDER_TYPE:
+        return "Context.Provider";
       case REACT_FORWARD_REF_TYPE:
-        return (
-          (fiber = type.render.displayName || type.render.name || ""),
-          "" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef"
-        );
+        return getWrappedName(type, type.render, "ForwardRef");
+      case REACT_PURE_TYPE:
+        return getWrappedName(type, type.render, "Pure");
     }
+    if (
+      "function" === typeof type.then &&
+      (type = 1 === type._reactStatus ? type._reactResult : null)
+    )
+      return getComponentName(type);
+  }
   return null;
 }
 function isFiberMountedImpl(fiber) {
@@ -1089,7 +1095,7 @@ function isFiberMountedImpl(fiber) {
     for (; node.return; )
       if (((node = node.return), 0 !== (node.effectTag & 2))) return 1;
   }
-  return 3 === node.tag ? 2 : 3;
+  return 5 === node.tag ? 2 : 3;
 }
 function assertIsMounted(fiber) {
   invariant(
@@ -1165,14 +1171,14 @@ function findCurrentFiberUsingSlowPath(fiber) {
       "Return fibers should always be each others' alternates. This error is likely caused by a bug in React. Please file an issue."
     );
   }
-  invariant(3 === a.tag, "Unable to find node on an unmounted component.");
+  invariant(5 === a.tag, "Unable to find node on an unmounted component.");
   return a.stateNode.current === a ? fiber : alternate;
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
   if (!parent) return null;
   for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
+    if (7 === node.tag || 8 === node.tag) return node;
     if (node.child) (node.child.return = node), (node = node.child);
     else {
       if (node === parent) break;
@@ -1186,40 +1192,16 @@ function findCurrentHostFiber(parent) {
   }
   return null;
 }
-function findCurrentHostFiberWithNoPortals(parent) {
-  parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child && 4 !== node.tag)
-      (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
-}
-function mountSafeCallback(context, callback) {
+function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   return function() {
-    if (callback) {
-      if ("boolean" === typeof context.__isMounted) {
-        if (!context.__isMounted) return;
-      } else if (
-        "function" === typeof context.isMounted &&
-        !context.isMounted()
-      )
-        return;
+    if (
+      callback &&
+      ("boolean" !== typeof context.__isMounted || context.__isMounted)
+    )
       return callback.apply(context, arguments);
-    }
   };
 }
-var emptyObject$1 = {},
+var emptyObject = {},
   removedKeys = null,
   removedKeyCount = 0;
 function restoreDeletedValuesInNestedArray(
@@ -1237,23 +1219,23 @@ function restoreDeletedValuesInNestedArray(
   else if (node && 0 < removedKeyCount)
     for (i in removedKeys)
       if (removedKeys[i]) {
-        var _nextProp = node[i];
-        if (void 0 !== _nextProp) {
+        var nextProp = node[i];
+        if (void 0 !== nextProp) {
           var attributeConfig = validAttributes[i];
           if (attributeConfig) {
-            "function" === typeof _nextProp && (_nextProp = !0);
-            "undefined" === typeof _nextProp && (_nextProp = null);
+            "function" === typeof nextProp && (nextProp = !0);
+            "undefined" === typeof nextProp && (nextProp = null);
             if ("object" !== typeof attributeConfig)
-              updatePayload[i] = _nextProp;
+              updatePayload[i] = nextProp;
             else if (
               "function" === typeof attributeConfig.diff ||
               "function" === typeof attributeConfig.process
             )
-              (_nextProp =
+              (nextProp =
                 "function" === typeof attributeConfig.process
-                  ? attributeConfig.process(_nextProp)
-                  : _nextProp),
-                (updatePayload[i] = _nextProp);
+                  ? attributeConfig.process(nextProp)
+                  : nextProp),
+                (updatePayload[i] = nextProp);
             removedKeys[i] = !1;
             removedKeyCount--;
           }
@@ -1319,7 +1301,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!Array.isArray(nextProp))
     return diffProperties(
       updatePayload,
-      emptyObject$1,
+      emptyObject,
       nextProp,
       validAttributes
     );
@@ -1337,7 +1319,7 @@ function clearNestedProperty(updatePayload, prevProp, validAttributes) {
     return diffProperties(
       updatePayload,
       prevProp,
-      emptyObject$1,
+      emptyObject,
       validAttributes
     );
   for (var i = 0; i < prevProp.length; i++)
@@ -1464,27 +1446,27 @@ var restoreTarget = null,
 function restoreStateOfTarget(target) {
   if ((target = getInstanceFromNode(target))) {
     invariant(
-      null,
-      "Fiber needs to be injected to handle a fiber target for controlled events. This error is likely caused by a bug in React. Please file an issue."
+      !1,
+      "setRestoreImplementation() needs to be called to handle a target for controlled events. This error is likely caused by a bug in React. Please file an issue."
     );
     var props = getFiberCurrentPropsFromNode(target.stateNode);
-    null.restoreControlledState(target.stateNode, target.type, props);
+    null(target.stateNode, target.type, props);
   }
 }
-function _batchedUpdates(fn, bookkeeping) {
+function _batchedUpdatesImpl(fn, bookkeeping) {
   return fn(bookkeeping);
 }
-function _flushInteractiveUpdates() {}
+function _flushInteractiveUpdatesImpl() {}
 var isBatching = !1;
 function batchedUpdates(fn, bookkeeping) {
   if (isBatching) return fn(bookkeeping);
   isBatching = !0;
   try {
-    return _batchedUpdates(fn, bookkeeping);
+    return _batchedUpdatesImpl(fn, bookkeeping);
   } finally {
     if (((isBatching = !1), null !== restoreTarget || null !== restoreQueue))
       if (
-        (_flushInteractiveUpdates(),
+        (_flushInteractiveUpdatesImpl(),
         restoreTarget &&
           ((bookkeeping = restoreTarget),
           (fn = restoreQueue),
@@ -1514,13 +1496,19 @@ function dispatchEvent(target, topLevelType, nativeEvent) {
     null !== events && (eventQueue = accumulateInto(eventQueue, events));
     events = eventQueue;
     eventQueue = null;
-    events &&
+    if (
+      events &&
       (forEachAccumulated(events, executeDispatchesAndReleaseTopLevel),
       invariant(
         !eventQueue,
         "processEventQueue(): Additional events were enqueued while processing an event queue. Support for this has not yet been implemented."
       ),
-      ReactErrorUtils.rethrowCaughtError());
+      hasRethrowError)
+    )
+      throw ((events = rethrowError),
+      (hasRethrowError = !1),
+      (rethrowError = null),
+      events);
   });
 }
 function shim$1() {
@@ -1547,12 +1535,15 @@ var ReactFabricHostComponent = (function() {
     TextInputState.focusTextInput(this._nativeTag);
   };
   ReactFabricHostComponent.prototype.measure = function(callback) {
-    UIManager.measure(this._nativeTag, mountSafeCallback(this, callback));
+    UIManager.measure(
+      this._nativeTag,
+      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
+    );
   };
   ReactFabricHostComponent.prototype.measureInWindow = function(callback) {
     UIManager.measureInWindow(
       this._nativeTag,
-      mountSafeCallback(this, callback)
+      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
     );
   };
   ReactFabricHostComponent.prototype.measureLayout = function(
@@ -1563,14 +1554,14 @@ var ReactFabricHostComponent = (function() {
     UIManager.measureLayout(
       this._nativeTag,
       relativeToNativeNode,
-      mountSafeCallback(this, onFail),
-      mountSafeCallback(this, onSuccess)
+      mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+      mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
     );
   };
   ReactFabricHostComponent.prototype.setNativeProps = function(nativeProps) {
     nativeProps = diffProperties(
       null,
-      emptyObject$1,
+      emptyObject,
       nativeProps,
       this.viewConfig.validAttributes
     );
@@ -1605,30 +1596,37 @@ function createTextInstance(
     )
   };
 }
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
+var scheduleTimeout = setTimeout,
+  cancelTimeout = clearTimeout,
+  BEFORE_SLASH_RE = /^(.*)[\\\/]/;
+function getStackByFiberInDevAndProd(workInProgress) {
   var info = "";
   do {
     a: switch (workInProgress.tag) {
+      case 4:
       case 0:
       case 1:
       case 2:
-      case 5:
+      case 3:
+      case 7:
+      case 10:
         var owner = workInProgress._debugOwner,
-          source = workInProgress._debugSource;
-        var JSCompiler_inline_result = getComponentName(workInProgress);
-        var ownerName = null;
-        owner && (ownerName = getComponentName(owner));
-        owner = source;
-        JSCompiler_inline_result =
-          "\n    in " +
-          (JSCompiler_inline_result || "Unknown") +
-          (owner
-            ? " (at " +
-              owner.fileName.replace(/^.*[\\\/]/, "") +
+          source = workInProgress._debugSource,
+          name = getComponentName(workInProgress.type);
+        var JSCompiler_inline_result = null;
+        owner && (JSCompiler_inline_result = getComponentName(owner.type));
+        owner = name;
+        name = "";
+        source
+          ? (name =
+              " (at " +
+              source.fileName.replace(BEFORE_SLASH_RE, "") +
               ":" +
-              owner.lineNumber +
-              ")"
-            : ownerName ? " (created by " + ownerName + ")" : "");
+              source.lineNumber +
+              ")")
+          : JSCompiler_inline_result &&
+            (name = " (created by " + JSCompiler_inline_result + ")");
+        JSCompiler_inline_result = "\n    in " + (owner || "Unknown") + name;
         break a;
       default:
         JSCompiler_inline_result = "";
@@ -1641,9 +1639,6 @@ function getStackAddendumByWorkInProgressFiber(workInProgress) {
 new Set();
 var valueStack = [],
   index = -1;
-function createCursor(defaultValue) {
-  return { current: defaultValue };
-}
 function pop(cursor) {
   0 > index ||
     ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
@@ -1653,17 +1648,13 @@ function push(cursor, value) {
   valueStack[index] = cursor.current;
   cursor.current = value;
 }
-var contextStackCursor = createCursor(emptyObject),
-  didPerformWorkStackCursor = createCursor(!1),
-  previousContext = emptyObject;
-function getUnmaskedContext(workInProgress) {
-  return isContextProvider(workInProgress)
-    ? previousContext
-    : contextStackCursor.current;
-}
+var emptyContextObject = {},
+  contextStackCursor = { current: emptyContextObject },
+  didPerformWorkStackCursor = { current: !1 },
+  previousContext = emptyContextObject;
 function getMaskedContext(workInProgress, unmaskedContext) {
   var contextTypes = workInProgress.type.contextTypes;
-  if (!contextTypes) return emptyObject;
+  if (!contextTypes) return emptyContextObject;
   var instance = workInProgress.stateNode;
   if (
     instance &&
@@ -1679,12 +1670,13 @@ function getMaskedContext(workInProgress, unmaskedContext) {
     (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
   return context;
 }
-function isContextProvider(fiber) {
-  return 2 === fiber.tag && null != fiber.type.childContextTypes;
+function isContextProvider(type) {
+  type = type.childContextTypes;
+  return null !== type && void 0 !== type;
 }
-function popContextProvider(fiber) {
-  isContextProvider(fiber) &&
-    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+function popContext(fiber) {
+  pop(didPerformWorkStackCursor, fiber);
+  pop(contextStackCursor, fiber);
 }
 function popTopLevelContextObject(fiber) {
   pop(didPerformWorkStackCursor, fiber);
@@ -1692,32 +1684,31 @@ function popTopLevelContextObject(fiber) {
 }
 function pushTopLevelContextObject(fiber, context, didChange) {
   invariant(
-    contextStackCursor.current === emptyObject,
+    contextStackCursor.current === emptyContextObject,
     "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
   );
   push(contextStackCursor, context, fiber);
   push(didPerformWorkStackCursor, didChange, fiber);
 }
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode,
-    childContextTypes = fiber.type.childContextTypes;
+function processChildContext(fiber, type, parentContext) {
+  var instance = fiber.stateNode;
+  fiber = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
     invariant(
-      contextKey in childContextTypes,
+      contextKey in fiber,
       '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
+      getComponentName(type) || "Unknown",
       contextKey
     );
   return Object.assign({}, parentContext, instance);
 }
 function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) return !1;
   var instance = workInProgress.stateNode;
   instance =
     (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
+    emptyContextObject;
   previousContext = contextStackCursor.current;
   push(contextStackCursor, instance, workInProgress);
   push(
@@ -1727,21 +1718,45 @@ function pushContextProvider(workInProgress) {
   );
   return !0;
 }
-function invalidateContextProvider(workInProgress, didChange) {
+function invalidateContextProvider(workInProgress, type, didChange) {
   var instance = workInProgress.stateNode;
   invariant(
     instance,
     "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
   );
-  if (didChange) {
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    push(contextStackCursor, mergedContext, workInProgress);
-  } else pop(didPerformWorkStackCursor, workInProgress);
+  didChange
+    ? ((type = processChildContext(workInProgress, type, previousContext)),
+      (instance.__reactInternalMemoizedMergedChildContext = type),
+      pop(didPerformWorkStackCursor, workInProgress),
+      pop(contextStackCursor, workInProgress),
+      push(contextStackCursor, type, workInProgress))
+    : pop(didPerformWorkStackCursor, workInProgress);
   push(didPerformWorkStackCursor, didChange, workInProgress);
 }
+var onCommitFiberRoot = null,
+  onCommitFiberUnmount = null;
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {}
+  };
+}
+function injectInternals(internals) {
+  if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) return !1;
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled || !hook.supportsFiber) return !0;
+  try {
+    var rendererID = hook.inject(internals);
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {}
+  return !0;
+}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -1749,14 +1764,28 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.index = 0;
   this.ref = null;
   this.pendingProps = pendingProps;
-  this.memoizedState = this.updateQueue = this.memoizedProps = null;
+  this.firstContextDependency = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
   this.effectTag = 0;
   this.lastEffect = this.firstEffect = this.nextEffect = null;
-  this.expirationTime = 0;
+  this.childExpirationTime = this.expirationTime = 0;
   this.alternate = null;
 }
-function createWorkInProgress(current, pendingProps, expirationTime) {
+function shouldConstruct(Component) {
+  Component = Component.prototype;
+  return !(!Component || !Component.isReactComponent);
+}
+function resolveLazyComponentTag(fiber, Component) {
+  if ("function" === typeof Component)
+    return shouldConstruct(Component) ? 3 : 1;
+  if (void 0 !== Component && null !== Component) {
+    fiber = Component.$$typeof;
+    if (fiber === REACT_FORWARD_REF_TYPE) return 14;
+    if (fiber === REACT_PURE_TYPE) return 18;
+  }
+  return 4;
+}
+function createWorkInProgress(current, pendingProps) {
   var workInProgress = current.alternate;
   null === workInProgress
     ? ((workInProgress = new FiberNode(
@@ -1774,11 +1803,13 @@ function createWorkInProgress(current, pendingProps, expirationTime) {
       (workInProgress.nextEffect = null),
       (workInProgress.firstEffect = null),
       (workInProgress.lastEffect = null));
-  workInProgress.expirationTime = expirationTime;
+  workInProgress.childExpirationTime = current.childExpirationTime;
+  workInProgress.expirationTime = current.expirationTime;
   workInProgress.child = current.child;
   workInProgress.memoizedProps = current.memoizedProps;
   workInProgress.memoizedState = current.memoizedState;
   workInProgress.updateQueue = current.updateQueue;
+  workInProgress.firstContextDependency = current.firstContextDependency;
   workInProgress.sibling = current.sibling;
   workInProgress.index = current.index;
   workInProgress.ref = current.ref;
@@ -1788,11 +1819,11 @@ function createFiberFromElement(element, mode, expirationTime) {
   var type = element.type,
     key = element.key;
   element = element.props;
-  if ("function" === typeof type)
-    var fiberTag = type.prototype && type.prototype.isReactComponent ? 2 : 0;
-  else if ("string" === typeof type) fiberTag = 5;
+  var fiberTag = void 0;
+  if ("function" === typeof type) fiberTag = shouldConstruct(type) ? 2 : 4;
+  else if ("string" === typeof type) fiberTag = 7;
   else
-    switch (type) {
+    a: switch (type) {
       case REACT_FRAGMENT_TYPE:
         return createFiberFromFragment(
           element.children,
@@ -1800,12 +1831,12 @@ function createFiberFromElement(element, mode, expirationTime) {
           expirationTime,
           key
         );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = 11;
+      case REACT_CONCURRENT_MODE_TYPE:
+        fiberTag = 10;
         mode |= 3;
         break;
       case REACT_STRICT_MODE_TYPE:
-        fiberTag = 11;
+        fiberTag = 10;
         mode |= 2;
         break;
       case REACT_PROFILER_TYPE:
@@ -1815,34 +1846,36 @@ function createFiberFromElement(element, mode, expirationTime) {
           (type.expirationTime = expirationTime),
           type
         );
-      case REACT_TIMEOUT_TYPE:
+      case REACT_SUSPENSE_TYPE:
         fiberTag = 16;
-        mode |= 2;
         break;
       default:
-        a: {
-          switch ("object" === typeof type && null !== type
-            ? type.$$typeof
-            : null) {
+        if ("object" === typeof type && null !== type)
+          switch (type.$$typeof) {
             case REACT_PROVIDER_TYPE:
-              fiberTag = 13;
+              fiberTag = 12;
               break a;
             case REACT_CONTEXT_TYPE:
-              fiberTag = 12;
+              fiberTag = 11;
               break a;
             case REACT_FORWARD_REF_TYPE:
-              fiberTag = 14;
+              fiberTag = 13;
+              break a;
+            case REACT_PURE_TYPE:
+              fiberTag = 17;
               break a;
             default:
-              invariant(
-                !1,
-                "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",
-                null == type ? type : typeof type,
-                ""
-              );
+              if ("function" === typeof type.then) {
+                fiberTag = 4;
+                break a;
+              }
           }
-          fiberTag = void 0;
-        }
+        invariant(
+          !1,
+          "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",
+          null == type ? type : typeof type,
+          ""
+        );
     }
   mode = new FiberNode(fiberTag, element, key, mode);
   mode.type = type;
@@ -1850,18 +1883,18 @@ function createFiberFromElement(element, mode, expirationTime) {
   return mode;
 }
 function createFiberFromFragment(elements, mode, expirationTime, key) {
-  elements = new FiberNode(10, elements, key, mode);
+  elements = new FiberNode(9, elements, key, mode);
   elements.expirationTime = expirationTime;
   return elements;
 }
 function createFiberFromText(content, mode, expirationTime) {
-  content = new FiberNode(6, content, null, mode);
+  content = new FiberNode(8, content, null, mode);
   content.expirationTime = expirationTime;
   return content;
 }
 function createFiberFromPortal(portal, mode, expirationTime) {
   mode = new FiberNode(
-    4,
+    6,
     null !== portal.children ? portal.children : [],
     portal.key,
     mode
@@ -1874,60 +1907,6 @@ function createFiberFromPortal(portal, mode, expirationTime) {
   };
   return mode;
 }
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
-  containerInfo = {
-    current: isAsync,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    earliestPendingTime: 0,
-    latestPendingTime: 0,
-    earliestSuspendedTime: 0,
-    latestSuspendedTime: 0,
-    latestPingedTime: 0,
-    didError: !1,
-    pendingCommitExpirationTime: 0,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    nextExpirationTimeToWorkOn: 0,
-    expirationTime: 0,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
-  return (isAsync.stateNode = containerInfo);
-}
-var onCommitFiberRoot = null,
-  onCommitFiberUnmount = null;
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {}
-  };
-}
-function injectInternals(internals) {
-  if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) return !1;
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled || !hook.supportsFiber) return !0;
-  try {
-    var rendererID = hook.inject(internals);
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {}
-  return !0;
-}
-function onCommitRoot(root) {
-  "function" === typeof onCommitFiberRoot && onCommitFiberRoot(root);
-}
-function onCommitUnmount(fiber) {
-  "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
-}
 function markPendingPriorityLevel(root, expirationTime) {
   root.didError = !1;
   var earliestPendingTime = root.earliestPendingTime;
@@ -1937,30 +1916,67 @@ function markPendingPriorityLevel(root, expirationTime) {
       ? (root.earliestPendingTime = expirationTime)
       : root.latestPendingTime < expirationTime &&
         (root.latestPendingTime = expirationTime);
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(expirationTime, root);
+}
+function markSuspendedPriorityLevel(root, suspendedTime) {
+  root.didError = !1;
+  var latestPingedTime = root.latestPingedTime;
+  0 !== latestPingedTime &&
+    latestPingedTime <= suspendedTime &&
+    (root.latestPingedTime = 0);
+  latestPingedTime = root.earliestPendingTime;
+  var latestPendingTime = root.latestPendingTime;
+  latestPingedTime === suspendedTime
+    ? (root.earliestPendingTime =
+        latestPendingTime === suspendedTime
+          ? (root.latestPendingTime = 0)
+          : latestPendingTime)
+    : latestPendingTime === suspendedTime &&
+      (root.latestPendingTime = latestPingedTime);
+  latestPingedTime = root.earliestSuspendedTime;
+  latestPendingTime = root.latestSuspendedTime;
+  0 === latestPingedTime
+    ? (root.earliestSuspendedTime = root.latestSuspendedTime = suspendedTime)
+    : latestPingedTime > suspendedTime
+      ? (root.earliestSuspendedTime = suspendedTime)
+      : latestPendingTime < suspendedTime &&
+        (root.latestSuspendedTime = suspendedTime);
+  findNextExpirationTimeToWorkOn(suspendedTime, root);
+}
+function findEarliestOutstandingPriorityLevel(root, renderExpirationTime) {
+  var earliestPendingTime = root.earliestPendingTime;
+  root = root.earliestSuspendedTime;
+  if (
+    0 === renderExpirationTime ||
+    (0 !== earliestPendingTime && earliestPendingTime < renderExpirationTime)
+  )
+    renderExpirationTime = earliestPendingTime;
+  if (0 === renderExpirationTime || (0 !== root && root < renderExpirationTime))
+    renderExpirationTime = root;
+  return renderExpirationTime;
 }
-function findNextPendingPriorityLevel(root) {
+function findNextExpirationTimeToWorkOn(completedExpirationTime, root) {
   var earliestSuspendedTime = root.earliestSuspendedTime,
-    earliestPendingTime = root.earliestPendingTime;
-  if (0 === earliestSuspendedTime)
-    var nextExpirationTimeToWorkOn = (earliestSuspendedTime = earliestPendingTime);
-  else
-    0 !== earliestPendingTime
-      ? ((nextExpirationTimeToWorkOn = earliestPendingTime),
-        (earliestSuspendedTime =
-          earliestSuspendedTime < earliestPendingTime
-            ? earliestSuspendedTime
-            : earliestPendingTime))
-      : (nextExpirationTimeToWorkOn = earliestSuspendedTime =
-          root.latestPingedTime);
-  root.didError && (earliestSuspendedTime = 1);
-  root.nextExpirationTimeToWorkOn = nextExpirationTimeToWorkOn;
-  root.expirationTime = earliestSuspendedTime;
+    latestSuspendedTime = root.latestSuspendedTime,
+    earliestPendingTime = root.earliestPendingTime,
+    latestPingedTime = root.latestPingedTime;
+  earliestPendingTime =
+    0 !== earliestPendingTime ? earliestPendingTime : latestPingedTime;
+  0 === earliestPendingTime &&
+    (0 === completedExpirationTime ||
+      latestSuspendedTime > completedExpirationTime) &&
+    (earliestPendingTime = latestSuspendedTime);
+  completedExpirationTime = earliestPendingTime;
+  0 !== completedExpirationTime &&
+    0 !== earliestSuspendedTime &&
+    earliestSuspendedTime < completedExpirationTime &&
+    (completedExpirationTime = earliestSuspendedTime);
+  root.nextExpirationTimeToWorkOn = earliestPendingTime;
+  root.expirationTime = completedExpirationTime;
 }
 var hasForceUpdate = !1;
 function createUpdateQueue(baseState) {
   return {
-    expirationTime: 0,
     baseState: baseState,
     firstUpdate: null,
     lastUpdate: null,
@@ -1974,7 +1990,6 @@ function createUpdateQueue(baseState) {
 }
 function cloneUpdateQueue(currentQueue) {
   return {
-    expirationTime: currentQueue.expirationTime,
     baseState: currentQueue.baseState,
     firstUpdate: currentQueue.firstUpdate,
     lastUpdate: currentQueue.lastUpdate,
@@ -1996,14 +2011,12 @@ function createUpdate(expirationTime) {
     nextEffect: null
   };
 }
-function appendUpdateToQueue(queue, update, expirationTime) {
+function appendUpdateToQueue(queue, update) {
   null === queue.lastUpdate
     ? (queue.firstUpdate = queue.lastUpdate = update)
     : ((queue.lastUpdate.next = update), (queue.lastUpdate = update));
-  if (0 === queue.expirationTime || queue.expirationTime > expirationTime)
-    queue.expirationTime = expirationTime;
 }
-function enqueueUpdate(fiber, update, expirationTime) {
+function enqueueUpdate(fiber, update) {
   var alternate = fiber.alternate;
   if (null === alternate) {
     var queue1 = fiber.updateQueue;
@@ -2025,14 +2038,13 @@ function enqueueUpdate(fiber, update, expirationTime) {
         : null === queue2 &&
           (queue2 = alternate.updateQueue = cloneUpdateQueue(queue1));
   null === queue2 || queue1 === queue2
-    ? appendUpdateToQueue(queue1, update, expirationTime)
+    ? appendUpdateToQueue(queue1, update)
     : null === queue1.lastUpdate || null === queue2.lastUpdate
-      ? (appendUpdateToQueue(queue1, update, expirationTime),
-        appendUpdateToQueue(queue2, update, expirationTime))
-      : (appendUpdateToQueue(queue1, update, expirationTime),
-        (queue2.lastUpdate = update));
+      ? (appendUpdateToQueue(queue1, update),
+        appendUpdateToQueue(queue2, update))
+      : (appendUpdateToQueue(queue1, update), (queue2.lastUpdate = update));
 }
-function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
+function enqueueCapturedUpdate(workInProgress, update) {
   var workInProgressQueue = workInProgress.updateQueue;
   workInProgressQueue =
     null === workInProgressQueue
@@ -2044,11 +2056,6 @@ function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
     ? (workInProgressQueue.firstCapturedUpdate = workInProgressQueue.lastCapturedUpdate = update)
     : ((workInProgressQueue.lastCapturedUpdate.next = update),
       (workInProgressQueue.lastCapturedUpdate = update));
-  if (
-    0 === workInProgressQueue.expirationTime ||
-    workInProgressQueue.expirationTime > renderExpirationTime
-  )
-    workInProgressQueue.expirationTime = renderExpirationTime;
 }
 function ensureWorkInProgressQueueIsAClone(workInProgress, queue) {
   var current = workInProgress.alternate;
@@ -2096,95 +2103,83 @@ function processUpdateQueue(
   renderExpirationTime
 ) {
   hasForceUpdate = !1;
-  if (
-    !(0 === queue.expirationTime || queue.expirationTime > renderExpirationTime)
-  ) {
-    queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
-    for (
-      var newBaseState = queue.baseState,
-        newFirstUpdate = null,
-        newExpirationTime = 0,
-        update = queue.firstUpdate,
-        resultState = newBaseState;
-      null !== update;
+  queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
+  for (
+    var newBaseState = queue.baseState,
+      newFirstUpdate = null,
+      newExpirationTime = 0,
+      update = queue.firstUpdate,
+      resultState = newBaseState;
+    null !== update;
 
-    ) {
-      var updateExpirationTime = update.expirationTime;
-      if (updateExpirationTime > renderExpirationTime) {
-        if (
-          (null === newFirstUpdate &&
-            ((newFirstUpdate = update), (newBaseState = resultState)),
-          0 === newExpirationTime || newExpirationTime > updateExpirationTime)
-        )
-          newExpirationTime = updateExpirationTime;
-      } else
-        (resultState = getStateFromUpdate(
-          workInProgress,
-          queue,
-          update,
-          resultState,
-          props,
-          instance
-        )),
-          null !== update.callback &&
-            ((workInProgress.effectTag |= 32),
-            (update.nextEffect = null),
-            null === queue.lastEffect
-              ? (queue.firstEffect = queue.lastEffect = update)
-              : ((queue.lastEffect.nextEffect = update),
-                (queue.lastEffect = update)));
-      update = update.next;
-    }
-    updateExpirationTime = null;
-    for (update = queue.firstCapturedUpdate; null !== update; ) {
-      var _updateExpirationTime = update.expirationTime;
-      if (_updateExpirationTime > renderExpirationTime) {
-        if (
-          (null === updateExpirationTime &&
-            ((updateExpirationTime = update),
-            null === newFirstUpdate && (newBaseState = resultState)),
-          0 === newExpirationTime || newExpirationTime > _updateExpirationTime)
-        )
-          newExpirationTime = _updateExpirationTime;
-      } else
-        (resultState = getStateFromUpdate(
-          workInProgress,
-          queue,
-          update,
-          resultState,
-          props,
-          instance
-        )),
-          null !== update.callback &&
-            ((workInProgress.effectTag |= 32),
-            (update.nextEffect = null),
-            null === queue.lastCapturedEffect
-              ? (queue.firstCapturedEffect = queue.lastCapturedEffect = update)
-              : ((queue.lastCapturedEffect.nextEffect = update),
-                (queue.lastCapturedEffect = update)));
-      update = update.next;
-    }
-    null === newFirstUpdate && (queue.lastUpdate = null);
-    null === updateExpirationTime
-      ? (queue.lastCapturedUpdate = null)
-      : (workInProgress.effectTag |= 32);
-    null === newFirstUpdate &&
-      null === updateExpirationTime &&
-      (newBaseState = resultState);
-    queue.baseState = newBaseState;
-    queue.firstUpdate = newFirstUpdate;
-    queue.firstCapturedUpdate = updateExpirationTime;
-    queue.expirationTime = newExpirationTime;
-    workInProgress.memoizedState = resultState;
+  ) {
+    var updateExpirationTime = update.expirationTime;
+    if (updateExpirationTime > renderExpirationTime) {
+      if (
+        (null === newFirstUpdate &&
+          ((newFirstUpdate = update), (newBaseState = resultState)),
+        0 === newExpirationTime || newExpirationTime > updateExpirationTime)
+      )
+        newExpirationTime = updateExpirationTime;
+    } else
+      (resultState = getStateFromUpdate(
+        workInProgress,
+        queue,
+        update,
+        resultState,
+        props,
+        instance
+      )),
+        null !== update.callback &&
+          ((workInProgress.effectTag |= 32),
+          (update.nextEffect = null),
+          null === queue.lastEffect
+            ? (queue.firstEffect = queue.lastEffect = update)
+            : ((queue.lastEffect.nextEffect = update),
+              (queue.lastEffect = update)));
+    update = update.next;
   }
-}
-function callCallback(callback, context) {
-  invariant(
-    "function" === typeof callback,
-    "Invalid argument passed as callback. Expected a function. Instead received: %s",
-    callback
-  );
-  callback.call(context);
+  updateExpirationTime = null;
+  for (update = queue.firstCapturedUpdate; null !== update; ) {
+    var _updateExpirationTime = update.expirationTime;
+    if (_updateExpirationTime > renderExpirationTime) {
+      if (
+        (null === updateExpirationTime &&
+          ((updateExpirationTime = update),
+          null === newFirstUpdate && (newBaseState = resultState)),
+        0 === newExpirationTime || newExpirationTime > _updateExpirationTime)
+      )
+        newExpirationTime = _updateExpirationTime;
+    } else
+      (resultState = getStateFromUpdate(
+        workInProgress,
+        queue,
+        update,
+        resultState,
+        props,
+        instance
+      )),
+        null !== update.callback &&
+          ((workInProgress.effectTag |= 32),
+          (update.nextEffect = null),
+          null === queue.lastCapturedEffect
+            ? (queue.firstCapturedEffect = queue.lastCapturedEffect = update)
+            : ((queue.lastCapturedEffect.nextEffect = update),
+              (queue.lastCapturedEffect = update)));
+    update = update.next;
+  }
+  null === newFirstUpdate && (queue.lastUpdate = null);
+  null === updateExpirationTime
+    ? (queue.lastCapturedUpdate = null)
+    : (workInProgress.effectTag |= 32);
+  null === newFirstUpdate &&
+    null === updateExpirationTime &&
+    (newBaseState = resultState);
+  queue.baseState = newBaseState;
+  queue.firstUpdate = newFirstUpdate;
+  queue.firstCapturedUpdate = updateExpirationTime;
+  workInProgress.expirationTime = newExpirationTime;
+  workInProgress.memoizedState = resultState;
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
   null !== finishedQueue.firstCapturedUpdate &&
@@ -2192,60 +2187,76 @@ function commitUpdateQueue(finishedWork, finishedQueue, instance) {
       ((finishedQueue.lastUpdate.next = finishedQueue.firstCapturedUpdate),
       (finishedQueue.lastUpdate = finishedQueue.lastCapturedUpdate)),
     (finishedQueue.firstCapturedUpdate = finishedQueue.lastCapturedUpdate = null));
-  finishedWork = finishedQueue.firstEffect;
-  for (
-    finishedQueue.firstEffect = finishedQueue.lastEffect = null;
-    null !== finishedWork;
-
-  ) {
-    var _callback3 = finishedWork.callback;
-    null !== _callback3 &&
-      ((finishedWork.callback = null), callCallback(_callback3, instance));
-    finishedWork = finishedWork.nextEffect;
+  commitUpdateEffects(finishedQueue.firstEffect, instance);
+  finishedQueue.firstEffect = finishedQueue.lastEffect = null;
+  commitUpdateEffects(finishedQueue.firstCapturedEffect, instance);
+  finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
+}
+function commitUpdateEffects(effect, instance) {
+  for (; null !== effect; ) {
+    var _callback3 = effect.callback;
+    if (null !== _callback3) {
+      effect.callback = null;
+      var context = instance;
+      invariant(
+        "function" === typeof _callback3,
+        "Invalid argument passed as callback. Expected a function. Instead received: %s",
+        _callback3
+      );
+      _callback3.call(context);
+    }
+    effect = effect.nextEffect;
   }
-  finishedWork = finishedQueue.firstCapturedEffect;
-  for (
-    finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
-    null !== finishedWork;
-
-  )
-    (finishedQueue = finishedWork.callback),
-      null !== finishedQueue &&
-        ((finishedWork.callback = null), callCallback(finishedQueue, instance)),
-      (finishedWork = finishedWork.nextEffect);
 }
 function createCapturedValue(value, source) {
   return {
     value: value,
     source: source,
-    stack: getStackAddendumByWorkInProgressFiber(source)
+    stack: getStackByFiberInDevAndProd(source)
   };
 }
-var providerCursor = createCursor(null),
-  valueCursor = createCursor(null),
-  changedBitsCursor = createCursor(0);
-function pushProvider(providerFiber) {
+var valueCursor = { current: null },
+  currentlyRenderingFiber = null,
+  lastContextDependency = null,
+  lastContextWithAllBitsObserved = null;
+function pushProvider(providerFiber, nextValue) {
   var context = providerFiber.type._context;
-  push(changedBitsCursor, context._changedBits2, providerFiber);
   push(valueCursor, context._currentValue2, providerFiber);
-  push(providerCursor, providerFiber, providerFiber);
-  context._currentValue2 = providerFiber.pendingProps.value;
-  context._changedBits2 = providerFiber.stateNode;
+  context._currentValue2 = nextValue;
 }
 function popProvider(providerFiber) {
-  var changedBits = changedBitsCursor.current,
-    currentValue = valueCursor.current;
-  pop(providerCursor, providerFiber);
+  var currentValue = valueCursor.current;
   pop(valueCursor, providerFiber);
-  pop(changedBitsCursor, providerFiber);
-  providerFiber = providerFiber.type._context;
-  providerFiber._currentValue2 = currentValue;
-  providerFiber._changedBits2 = changedBits;
+  providerFiber.type._context._currentValue2 = currentValue;
+}
+function prepareToReadContext(workInProgress) {
+  currentlyRenderingFiber = workInProgress;
+  lastContextWithAllBitsObserved = lastContextDependency = null;
+  workInProgress.firstContextDependency = null;
+}
+function readContext(context, observedBits) {
+  if (
+    lastContextWithAllBitsObserved !== context &&
+    !1 !== observedBits &&
+    0 !== observedBits
+  ) {
+    if ("number" !== typeof observedBits || 1073741823 === observedBits)
+      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
+    observedBits = { context: context, observedBits: observedBits, next: null };
+    null === lastContextDependency
+      ? (invariant(
+          null !== currentlyRenderingFiber,
+          "Context.unstable_read(): Context can only be read while React is rendering, e.g. inside the render method or getDerivedStateFromProps."
+        ),
+        (currentlyRenderingFiber.firstContextDependency = lastContextDependency = observedBits))
+      : (lastContextDependency = lastContextDependency.next = observedBits);
+  }
+  return context._currentValue2;
 }
 var NO_CONTEXT = {},
-  contextStackCursor$1 = createCursor(NO_CONTEXT),
-  contextFiberStackCursor = createCursor(NO_CONTEXT),
-  rootInstanceStackCursor = createCursor(NO_CONTEXT);
+  contextStackCursor$1 = { current: NO_CONTEXT },
+  contextFiberStackCursor = { current: NO_CONTEXT },
+  rootInstanceStackCursor = { current: NO_CONTEXT };
 function requiredContext(c) {
   invariant(
     c !== NO_CONTEXT,
@@ -2265,6 +2276,24 @@ function popHostContainer(fiber) {
   pop(contextFiberStackCursor, fiber);
   pop(rootInstanceStackCursor, fiber);
 }
+function pushHostContext(fiber) {
+  requiredContext(rootInstanceStackCursor.current);
+  var context = requiredContext(contextStackCursor$1.current);
+  var nextContext = fiber.type;
+  nextContext =
+    "AndroidTextInput" === nextContext ||
+    "RCTMultilineTextInputView" === nextContext ||
+    "RCTSinglelineTextInputView" === nextContext ||
+    "RCTText" === nextContext ||
+    "RCTVirtualText" === nextContext;
+  nextContext =
+    context.isInAParentText !== nextContext
+      ? { isInAParentText: nextContext }
+      : context;
+  context !== nextContext &&
+    (push(contextFiberStackCursor, fiber, fiber),
+    push(contextStackCursor$1, nextContext, fiber));
+}
 function popHostContext(fiber) {
   contextFiberStackCursor.current === fiber &&
     (pop(contextStackCursor$1, fiber), pop(contextFiberStackCursor, fiber));
@@ -2293,22 +2322,24 @@ function shallowEqual(objA, objB) {
       return !1;
   return !0;
 }
+var emptyRefsObject = new React.Component().refs;
 function applyDerivedStateFromProps(
   workInProgress,
+  ctor,
   getDerivedStateFromProps,
   nextProps
 ) {
-  var prevState = workInProgress.memoizedState;
-  getDerivedStateFromProps = getDerivedStateFromProps(nextProps, prevState);
-  prevState =
+  ctor = workInProgress.memoizedState;
+  getDerivedStateFromProps = getDerivedStateFromProps(nextProps, ctor);
+  getDerivedStateFromProps =
     null === getDerivedStateFromProps || void 0 === getDerivedStateFromProps
-      ? prevState
-      : Object.assign({}, prevState, getDerivedStateFromProps);
-  workInProgress.memoizedState = prevState;
-  workInProgress = workInProgress.updateQueue;
-  null !== workInProgress &&
+      ? ctor
+      : Object.assign({}, ctor, getDerivedStateFromProps);
+  workInProgress.memoizedState = getDerivedStateFromProps;
+  nextProps = workInProgress.updateQueue;
+  null !== nextProps &&
     0 === workInProgress.expirationTime &&
-    (workInProgress.baseState = prevState);
+    (nextProps.baseState = getDerivedStateFromProps);
 }
 var classComponentUpdater = {
   isMounted: function(component) {
@@ -2318,49 +2349,49 @@ var classComponentUpdater = {
   },
   enqueueSetState: function(inst, payload, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.tag = 1;
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   }
 };
 function checkShouldComponentUpdate(
   workInProgress,
+  ctor,
   oldProps,
   newProps,
   oldState,
   newState,
-  newContext
+  nextContext
 ) {
-  var instance = workInProgress.stateNode;
-  workInProgress = workInProgress.type;
-  return "function" === typeof instance.shouldComponentUpdate
-    ? instance.shouldComponentUpdate(newProps, newState, newContext)
-    : workInProgress.prototype && workInProgress.prototype.isPureReactComponent
+  workInProgress = workInProgress.stateNode;
+  return "function" === typeof workInProgress.shouldComponentUpdate
+    ? workInProgress.shouldComponentUpdate(newProps, newState, nextContext)
+    : ctor.prototype && ctor.prototype.isPureReactComponent
       ? !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
       : !0;
 }
@@ -2368,38 +2399,46 @@ function callComponentWillReceiveProps(
   workInProgress,
   instance,
   newProps,
-  newContext
+  nextContext
 ) {
   workInProgress = instance.state;
   "function" === typeof instance.componentWillReceiveProps &&
-    instance.componentWillReceiveProps(newProps, newContext);
+    instance.componentWillReceiveProps(newProps, nextContext);
   "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
-    instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    instance.UNSAFE_componentWillReceiveProps(newProps, nextContext);
   instance.state !== workInProgress &&
     classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
 }
-function mountClassInstance(workInProgress, renderExpirationTime) {
-  var ctor = workInProgress.type,
-    instance = workInProgress.stateNode,
-    props = workInProgress.pendingProps,
-    unmaskedContext = getUnmaskedContext(workInProgress);
-  instance.props = props;
+function mountClassInstance(
+  workInProgress,
+  ctor,
+  newProps,
+  renderExpirationTime
+) {
+  var instance = workInProgress.stateNode;
+  instance.props = newProps;
   instance.state = workInProgress.memoizedState;
-  instance.refs = emptyObject;
-  instance.context = getMaskedContext(workInProgress, unmaskedContext);
-  unmaskedContext = workInProgress.updateQueue;
-  null !== unmaskedContext &&
+  instance.refs = emptyRefsObject;
+  var contextType = ctor.contextType;
+  "object" === typeof contextType && null !== contextType
+    ? (instance.context = contextType.unstable_read())
+    : ((contextType = isContextProvider(ctor)
+        ? previousContext
+        : contextStackCursor.current),
+      (instance.context = getMaskedContext(workInProgress, contextType)));
+  contextType = workInProgress.updateQueue;
+  null !== contextType &&
     (processUpdateQueue(
       workInProgress,
-      unmaskedContext,
-      props,
+      contextType,
+      newProps,
       instance,
       renderExpirationTime
     ),
     (instance.state = workInProgress.memoizedState));
-  unmaskedContext = workInProgress.type.getDerivedStateFromProps;
-  "function" === typeof unmaskedContext &&
-    (applyDerivedStateFromProps(workInProgress, unmaskedContext, props),
+  contextType = ctor.getDerivedStateFromProps;
+  "function" === typeof contextType &&
+    (applyDerivedStateFromProps(workInProgress, ctor, contextType, newProps),
     (instance.state = workInProgress.memoizedState));
   "function" === typeof ctor.getDerivedStateFromProps ||
     "function" === typeof instance.getSnapshotBeforeUpdate ||
@@ -2412,12 +2451,12 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
       instance.UNSAFE_componentWillMount(),
     ctor !== instance.state &&
       classComponentUpdater.enqueueReplaceState(instance, instance.state, null),
-    (unmaskedContext = workInProgress.updateQueue),
-    null !== unmaskedContext &&
+    (contextType = workInProgress.updateQueue),
+    null !== contextType &&
       (processUpdateQueue(
         workInProgress,
-        unmaskedContext,
-        props,
+        contextType,
+        newProps,
         instance,
         renderExpirationTime
       ),
@@ -2425,8 +2464,8 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.effectTag |= 4);
 }
-var isArray$1 = Array.isArray;
-function coerceRef(returnFiber, current, element) {
+var isArray = Array.isArray;
+function coerceRef(returnFiber, current$$1, element) {
   returnFiber = element.ref;
   if (
     null !== returnFiber &&
@@ -2438,8 +2477,8 @@ function coerceRef(returnFiber, current, element) {
       var inst = void 0;
       element &&
         (invariant(
-          2 === element.tag,
-          "Stateless function components cannot have refs."
+          2 === element.tag || 3 === element.tag,
+          "Function components cannot have refs."
         ),
         (inst = element.stateNode));
       invariant(
@@ -2449,26 +2488,27 @@ function coerceRef(returnFiber, current, element) {
       );
       var stringRef = "" + returnFiber;
       if (
-        null !== current &&
-        null !== current.ref &&
-        "function" === typeof current.ref &&
-        current.ref._stringRef === stringRef
+        null !== current$$1 &&
+        null !== current$$1.ref &&
+        "function" === typeof current$$1.ref &&
+        current$$1.ref._stringRef === stringRef
       )
-        return current.ref;
-      current = function(value) {
-        var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
+        return current$$1.ref;
+      current$$1 = function(value) {
+        var refs = inst.refs;
+        refs === emptyRefsObject && (refs = inst.refs = {});
         null === value ? delete refs[stringRef] : (refs[stringRef] = value);
       };
-      current._stringRef = stringRef;
-      return current;
+      current$$1._stringRef = stringRef;
+      return current$$1;
     }
     invariant(
       "string" === typeof returnFiber,
-      "Expected ref to be a function or a string."
+      "Expected ref to be a function, a string, an object returned by React.createRef(), or null."
     );
     invariant(
       element._owner,
-      "Element ref was specified as a string (%s) but no owner was set. This could happen for one of the following reasons:\n1. You may be adding a ref to a functional component\n2. You may be adding a ref to a component that was not created inside a component's render method\n3. You have multiple copies of React loaded\nSee https://fb.me/react-refs-must-have-owner for more information.",
+      "Element ref was specified as a string (%s) but no owner was set. This could happen for one of the following reasons:\n1. You may be adding a ref to a function component\n2. You may be adding a ref to a component that was not created inside a component's render method\n3. You have multiple copies of React loaded\nSee https://fb.me/react-refs-must-have-owner for more information.",
       returnFiber
     );
   }
@@ -2538,26 +2578,31 @@ function ChildReconciler(shouldTrackSideEffects) {
       (newFiber.effectTag = 2);
     return newFiber;
   }
-  function updateTextNode(returnFiber, current, textContent, expirationTime) {
-    if (null === current || 6 !== current.tag)
+  function updateTextNode(
+    returnFiber,
+    current$$1,
+    textContent,
+    expirationTime
+  ) {
+    if (null === current$$1 || 8 !== current$$1.tag)
       return (
-        (current = createFiberFromText(
+        (current$$1 = createFiberFromText(
           textContent,
           returnFiber.mode,
           expirationTime
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, textContent, expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, textContent, expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
-  function updateElement(returnFiber, current, element, expirationTime) {
-    if (null !== current && current.type === element.type)
+  function updateElement(returnFiber, current$$1, element, expirationTime) {
+    if (null !== current$$1 && current$$1.type === element.type)
       return (
-        (expirationTime = useFiber(current, element.props, expirationTime)),
-        (expirationTime.ref = coerceRef(returnFiber, current, element)),
+        (expirationTime = useFiber(current$$1, element.props, expirationTime)),
+        (expirationTime.ref = coerceRef(returnFiber, current$$1, element)),
         (expirationTime.return = returnFiber),
         expirationTime
       );
@@ -2566,45 +2611,51 @@ function ChildReconciler(shouldTrackSideEffects) {
       returnFiber.mode,
       expirationTime
     );
-    expirationTime.ref = coerceRef(returnFiber, current, element);
+    expirationTime.ref = coerceRef(returnFiber, current$$1, element);
     expirationTime.return = returnFiber;
     return expirationTime;
   }
-  function updatePortal(returnFiber, current, portal, expirationTime) {
+  function updatePortal(returnFiber, current$$1, portal, expirationTime) {
     if (
-      null === current ||
-      4 !== current.tag ||
-      current.stateNode.containerInfo !== portal.containerInfo ||
-      current.stateNode.implementation !== portal.implementation
+      null === current$$1 ||
+      6 !== current$$1.tag ||
+      current$$1.stateNode.containerInfo !== portal.containerInfo ||
+      current$$1.stateNode.implementation !== portal.implementation
     )
       return (
-        (current = createFiberFromPortal(
+        (current$$1 = createFiberFromPortal(
           portal,
           returnFiber.mode,
           expirationTime
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, portal.children || [], expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, portal.children || [], expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
-  function updateFragment(returnFiber, current, fragment, expirationTime, key) {
-    if (null === current || 10 !== current.tag)
+  function updateFragment(
+    returnFiber,
+    current$$1,
+    fragment,
+    expirationTime,
+    key
+  ) {
+    if (null === current$$1 || 9 !== current$$1.tag)
       return (
-        (current = createFiberFromFragment(
+        (current$$1 = createFiberFromFragment(
           fragment,
           returnFiber.mode,
           expirationTime,
           key
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, fragment, expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, fragment, expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
   function createChild(returnFiber, newChild, expirationTime) {
     if ("string" === typeof newChild || "number" === typeof newChild)
@@ -2641,7 +2692,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2681,7 +2732,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ? updatePortal(returnFiber, oldFiber, newChild, expirationTime)
             : null;
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(
@@ -2749,7 +2800,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             )
           );
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(
@@ -2966,7 +3017,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ) {
               if (isUnkeyedTopLevelFragment.key === isObject)
                 if (
-                  10 === isUnkeyedTopLevelFragment.tag
+                  9 === isUnkeyedTopLevelFragment.tag
                     ? newChild.type === REACT_FRAGMENT_TYPE
                     : isUnkeyedTopLevelFragment.type === newChild.type
                 ) {
@@ -3031,7 +3082,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ) {
               if (currentFirstChild.key === isUnkeyedTopLevelFragment)
                 if (
-                  4 === currentFirstChild.tag &&
+                  6 === currentFirstChild.tag &&
                   currentFirstChild.stateNode.containerInfo ===
                     newChild.containerInfo &&
                   currentFirstChild.stateNode.implementation ===
@@ -3069,7 +3120,7 @@ function ChildReconciler(shouldTrackSideEffects) {
     if ("string" === typeof newChild || "number" === typeof newChild)
       return (
         (newChild = "" + newChild),
-        null !== currentFirstChild && 6 === currentFirstChild.tag
+        null !== currentFirstChild && 8 === currentFirstChild.tag
           ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
             (currentFirstChild = useFiber(
               currentFirstChild,
@@ -3088,7 +3139,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             (returnFiber = currentFirstChild)),
         placeSingleChild(returnFiber)
       );
-    if (isArray$1(newChild))
+    if (isArray(newChild))
       return reconcileChildrenArray(
         returnFiber,
         currentFirstChild,
@@ -3106,7 +3157,8 @@ function ChildReconciler(shouldTrackSideEffects) {
     if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
       switch (returnFiber.tag) {
         case 2:
-        case 1:
+        case 3:
+        case 0:
           (expirationTime = returnFiber.type),
             invariant(
               !1,
@@ -3124,12 +3176,12 @@ var reconcileChildFibers = ChildReconciler(!0),
   isHydrating = !1;
 function tryHydrate(fiber, nextInstance) {
   switch (fiber.tag) {
-    case 5:
+    case 7:
       return (
         (nextInstance = shim$1(nextInstance, fiber.type, fiber.pendingProps)),
         null !== nextInstance ? ((fiber.stateNode = nextInstance), !0) : !1
       );
-    case 6:
+    case 8:
       return (
         (nextInstance = shim$1(nextInstance, fiber.pendingProps)),
         null !== nextInstance ? ((fiber.stateNode = nextInstance), !0) : !1
@@ -3152,7 +3204,7 @@ function tryToClaimNextHydratableInstance(fiber$jscomp$0) {
           return;
         }
         var returnFiber = hydrationParentFiber,
-          fiber = new FiberNode(5, null, null, 0);
+          fiber = new FiberNode(7, null, null, 0);
         fiber.type = "DELETED";
         fiber.stateNode = firstAttemptedInstance;
         fiber.return = returnFiber;
@@ -3170,22 +3222,47 @@ function tryToClaimNextHydratableInstance(fiber$jscomp$0) {
         (hydrationParentFiber = fiber$jscomp$0);
   }
 }
-function reconcileChildren(current, workInProgress, nextChildren) {
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    workInProgress.expirationTime
-  );
+function readLazyComponentType(thenable) {
+  switch (thenable._reactStatus) {
+    case 1:
+      return thenable._reactResult;
+    case 2:
+      throw thenable._reactResult;
+    case 0:
+      throw thenable;
+    default:
+      throw ((thenable._reactStatus = 0),
+      thenable.then(
+        function(resolvedValue) {
+          if (0 === thenable._reactStatus) {
+            thenable._reactStatus = 1;
+            if ("object" === typeof resolvedValue && null !== resolvedValue) {
+              var defaultExport = resolvedValue.default;
+              resolvedValue =
+                void 0 !== defaultExport && null !== defaultExport
+                  ? defaultExport
+                  : resolvedValue;
+            }
+            thenable._reactResult = resolvedValue;
+          }
+        },
+        function(error) {
+          0 === thenable._reactStatus &&
+            ((thenable._reactStatus = 2), (thenable._reactResult = error));
+        }
+      ),
+      thenable);
+  }
 }
-function reconcileChildrenAtExpirationTime(
-  current,
+var ReactCurrentOwner$3 = ReactSharedInternals.ReactCurrentOwner;
+function reconcileChildren(
+  current$$1,
   workInProgress,
   nextChildren,
   renderExpirationTime
 ) {
   workInProgress.child =
-    null === current
+    null === current$$1
       ? mountChildFibers(
           workInProgress,
           null,
@@ -3194,54 +3271,393 @@ function reconcileChildrenAtExpirationTime(
         )
       : reconcileChildFibers(
           workInProgress,
-          current.child,
+          current$$1.child,
           nextChildren,
           renderExpirationTime
         );
 }
-function markRef(current, workInProgress) {
+function updateForwardRef(
+  current$$1,
+  workInProgress,
+  type,
+  nextProps,
+  renderExpirationTime
+) {
+  type = type.render;
   var ref = workInProgress.ref;
   if (
-    (null === current && null !== ref) ||
-    (null !== current && current.ref !== ref)
+    !didPerformWorkStackCursor.current &&
+    workInProgress.memoizedProps === nextProps &&
+    ref === (null !== current$$1 ? current$$1.ref : null)
   )
-    workInProgress.effectTag |= 128;
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
+  type = type(nextProps, ref);
+  reconcileChildren(current$$1, workInProgress, type, renderExpirationTime);
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
 }
-function finishClassComponent(
-  current,
+function updatePureComponent(
+  current$$1,
   workInProgress,
-  shouldUpdate,
-  hasContext,
+  Component,
+  nextProps,
+  updateExpirationTime,
   renderExpirationTime
 ) {
-  markRef(current, workInProgress);
-  var didCaptureError = 0 !== (workInProgress.effectTag & 64);
-  if (!shouldUpdate && !didCaptureError)
-    return (
-      hasContext && invalidateContextProvider(workInProgress, !1),
-      bailoutOnAlreadyFinishedWork(current, workInProgress)
-    );
-  shouldUpdate = workInProgress.stateNode;
-  ReactCurrentOwner.current = workInProgress;
-  var nextChildren = didCaptureError ? null : shouldUpdate.render();
-  workInProgress.effectTag |= 1;
-  didCaptureError &&
-    (reconcileChildrenAtExpirationTime(
-      current,
+  var render = Component.render,
+    ref = workInProgress.ref;
+  if (
+    null !== current$$1 &&
+    (0 === updateExpirationTime ||
+      updateExpirationTime > renderExpirationTime) &&
+    ((updateExpirationTime = current$$1.memoizedProps),
+    (Component = Component.compare),
+    (Component = null !== Component ? Component : shallowEqual),
+    workInProgress.ref === current$$1.ref &&
+      Component(updateExpirationTime, nextProps))
+  )
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
       workInProgress,
-      null,
       renderExpirationTime
-    ),
-    (workInProgress.child = null));
-  reconcileChildrenAtExpirationTime(
-    current,
+    );
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  render = render(nextProps, ref);
+  workInProgress.effectTag |= 1;
+  reconcileChildren(current$$1, workInProgress, render, renderExpirationTime);
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
+}
+function markRef(current$$1, workInProgress) {
+  var ref = workInProgress.ref;
+  if (
+    (null === current$$1 && null !== ref) ||
+    (null !== current$$1 && current$$1.ref !== ref)
+  )
+    workInProgress.effectTag |= 128;
+}
+function updateFunctionComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
+  var unmaskedContext = isContextProvider(Component)
+    ? previousContext
+    : contextStackCursor.current;
+  unmaskedContext = getMaskedContext(workInProgress, unmaskedContext);
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  Component = Component(nextProps, unmaskedContext);
+  workInProgress.effectTag |= 1;
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    Component,
+    renderExpirationTime
+  );
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
+}
+function updateClassComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
+  if (isContextProvider(Component)) {
+    var hasContext = !0;
+    pushContextProvider(workInProgress);
+  } else hasContext = !1;
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  if (null === current$$1)
+    if (null === workInProgress.stateNode) {
+      var isLegacyContextConsumer = !1,
+        unmaskedContext = emptyContextObject;
+      var context = Component.contextType;
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((unmaskedContext = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (isLegacyContextConsumer = Component.contextTypes),
+          (context = (isLegacyContextConsumer =
+            null !== isLegacyContextConsumer &&
+            void 0 !== isLegacyContextConsumer)
+            ? getMaskedContext(workInProgress, unmaskedContext)
+            : emptyContextObject));
+      var instance = new Component(nextProps, context);
+      workInProgress.memoizedState =
+        null !== instance.state && void 0 !== instance.state
+          ? instance.state
+          : null;
+      instance.updater = classComponentUpdater;
+      workInProgress.stateNode = instance;
+      instance._reactInternalFiber = workInProgress;
+      isLegacyContextConsumer &&
+        ((isLegacyContextConsumer = workInProgress.stateNode),
+        (isLegacyContextConsumer.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
+        (isLegacyContextConsumer.__reactInternalMemoizedMaskedChildContext = context));
+      mountClassInstance(
+        workInProgress,
+        Component,
+        nextProps,
+        renderExpirationTime
+      );
+      nextProps = !0;
+    } else {
+      unmaskedContext = workInProgress.stateNode;
+      isLegacyContextConsumer = workInProgress.memoizedProps;
+      unmaskedContext.props = isLegacyContextConsumer;
+      var oldContext = unmaskedContext.context;
+      context = Component.contextType;
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((context = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (context = getMaskedContext(workInProgress, context)));
+      var getDerivedStateFromProps = Component.getDerivedStateFromProps;
+      (instance =
+        "function" === typeof getDerivedStateFromProps ||
+        "function" === typeof unmaskedContext.getSnapshotBeforeUpdate) ||
+        ("function" !==
+          typeof unmaskedContext.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof unmaskedContext.componentWillReceiveProps) ||
+        ((isLegacyContextConsumer !== nextProps || oldContext !== context) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            unmaskedContext,
+            nextProps,
+            context
+          ));
+      hasForceUpdate = !1;
+      var oldState = workInProgress.memoizedState;
+      oldContext = unmaskedContext.state = oldState;
+      var updateQueue = workInProgress.updateQueue;
+      null !== updateQueue &&
+        (processUpdateQueue(
+          workInProgress,
+          updateQueue,
+          nextProps,
+          unmaskedContext,
+          renderExpirationTime
+        ),
+        (oldContext = workInProgress.memoizedState));
+      isLegacyContextConsumer !== nextProps ||
+      oldState !== oldContext ||
+      didPerformWorkStackCursor.current ||
+      hasForceUpdate
+        ? ("function" === typeof getDerivedStateFromProps &&
+            (applyDerivedStateFromProps(
+              workInProgress,
+              Component,
+              getDerivedStateFromProps,
+              nextProps
+            ),
+            (oldContext = workInProgress.memoizedState)),
+          (isLegacyContextConsumer =
+            hasForceUpdate ||
+            checkShouldComponentUpdate(
+              workInProgress,
+              Component,
+              isLegacyContextConsumer,
+              nextProps,
+              oldState,
+              oldContext,
+              context
+            ))
+            ? (instance ||
+                ("function" !==
+                  typeof unmaskedContext.UNSAFE_componentWillMount &&
+                  "function" !== typeof unmaskedContext.componentWillMount) ||
+                ("function" === typeof unmaskedContext.componentWillMount &&
+                  unmaskedContext.componentWillMount(),
+                "function" ===
+                  typeof unmaskedContext.UNSAFE_componentWillMount &&
+                  unmaskedContext.UNSAFE_componentWillMount()),
+              "function" === typeof unmaskedContext.componentDidMount &&
+                (workInProgress.effectTag |= 4))
+            : ("function" === typeof unmaskedContext.componentDidMount &&
+                (workInProgress.effectTag |= 4),
+              (workInProgress.memoizedProps = nextProps),
+              (workInProgress.memoizedState = oldContext)),
+          (unmaskedContext.props = nextProps),
+          (unmaskedContext.state = oldContext),
+          (unmaskedContext.context = context),
+          (nextProps = isLegacyContextConsumer))
+        : ("function" === typeof unmaskedContext.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          (nextProps = !1));
+    }
+  else
+    (unmaskedContext = workInProgress.stateNode),
+      (isLegacyContextConsumer = workInProgress.memoizedProps),
+      (unmaskedContext.props = isLegacyContextConsumer),
+      (oldContext = unmaskedContext.context),
+      (context = Component.contextType),
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((context = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (context = getMaskedContext(workInProgress, context))),
+      (getDerivedStateFromProps = Component.getDerivedStateFromProps),
+      (instance =
+        "function" === typeof getDerivedStateFromProps ||
+        "function" === typeof unmaskedContext.getSnapshotBeforeUpdate) ||
+        ("function" !==
+          typeof unmaskedContext.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof unmaskedContext.componentWillReceiveProps) ||
+        ((isLegacyContextConsumer !== nextProps || oldContext !== context) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            unmaskedContext,
+            nextProps,
+            context
+          )),
+      (hasForceUpdate = !1),
+      (oldContext = workInProgress.memoizedState),
+      (oldState = unmaskedContext.state = oldContext),
+      (updateQueue = workInProgress.updateQueue),
+      null !== updateQueue &&
+        (processUpdateQueue(
+          workInProgress,
+          updateQueue,
+          nextProps,
+          unmaskedContext,
+          renderExpirationTime
+        ),
+        (oldState = workInProgress.memoizedState)),
+      isLegacyContextConsumer !== nextProps ||
+      oldContext !== oldState ||
+      didPerformWorkStackCursor.current ||
+      hasForceUpdate
+        ? ("function" === typeof getDerivedStateFromProps &&
+            (applyDerivedStateFromProps(
+              workInProgress,
+              Component,
+              getDerivedStateFromProps,
+              nextProps
+            ),
+            (oldState = workInProgress.memoizedState)),
+          (getDerivedStateFromProps =
+            hasForceUpdate ||
+            checkShouldComponentUpdate(
+              workInProgress,
+              Component,
+              isLegacyContextConsumer,
+              nextProps,
+              oldContext,
+              oldState,
+              context
+            ))
+            ? (instance ||
+                ("function" !==
+                  typeof unmaskedContext.UNSAFE_componentWillUpdate &&
+                  "function" !== typeof unmaskedContext.componentWillUpdate) ||
+                ("function" === typeof unmaskedContext.componentWillUpdate &&
+                  unmaskedContext.componentWillUpdate(
+                    nextProps,
+                    oldState,
+                    context
+                  ),
+                "function" ===
+                  typeof unmaskedContext.UNSAFE_componentWillUpdate &&
+                  unmaskedContext.UNSAFE_componentWillUpdate(
+                    nextProps,
+                    oldState,
+                    context
+                  )),
+              "function" === typeof unmaskedContext.componentDidUpdate &&
+                (workInProgress.effectTag |= 4),
+              "function" === typeof unmaskedContext.getSnapshotBeforeUpdate &&
+                (workInProgress.effectTag |= 256))
+            : ("function" !== typeof unmaskedContext.componentDidUpdate ||
+                (isLegacyContextConsumer === current$$1.memoizedProps &&
+                  oldContext === current$$1.memoizedState) ||
+                (workInProgress.effectTag |= 4),
+              "function" !== typeof unmaskedContext.getSnapshotBeforeUpdate ||
+                (isLegacyContextConsumer === current$$1.memoizedProps &&
+                  oldContext === current$$1.memoizedState) ||
+                (workInProgress.effectTag |= 256),
+              (workInProgress.memoizedProps = nextProps),
+              (workInProgress.memoizedState = oldState)),
+          (unmaskedContext.props = nextProps),
+          (unmaskedContext.state = oldState),
+          (unmaskedContext.context = context),
+          (nextProps = getDerivedStateFromProps))
+        : ("function" !== typeof unmaskedContext.componentDidUpdate ||
+            (isLegacyContextConsumer === current$$1.memoizedProps &&
+              oldContext === current$$1.memoizedState) ||
+            (workInProgress.effectTag |= 4),
+          "function" !== typeof unmaskedContext.getSnapshotBeforeUpdate ||
+            (isLegacyContextConsumer === current$$1.memoizedProps &&
+              oldContext === current$$1.memoizedState) ||
+            (workInProgress.effectTag |= 256),
+          (nextProps = !1));
+  return finishClassComponent(
+    current$$1,
     workInProgress,
-    nextChildren,
+    Component,
+    nextProps,
+    hasContext,
     renderExpirationTime
   );
+}
+function finishClassComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  shouldUpdate,
+  hasContext,
+  renderExpirationTime
+) {
+  markRef(current$$1, workInProgress);
+  var didCaptureError = 0 !== (workInProgress.effectTag & 64);
+  if (!shouldUpdate && !didCaptureError)
+    return (
+      hasContext && invalidateContextProvider(workInProgress, Component, !1),
+      bailoutOnAlreadyFinishedWork(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      )
+    );
+  shouldUpdate = workInProgress.stateNode;
+  ReactCurrentOwner$3.current = workInProgress;
+  var nextChildren =
+    didCaptureError && "function" !== typeof Component.getDerivedStateFromError
+      ? null
+      : shouldUpdate.render();
+  workInProgress.effectTag |= 1;
+  null !== current$$1 && didCaptureError
+    ? ((workInProgress.child = reconcileChildFibers(
+        workInProgress,
+        current$$1.child,
+        null,
+        renderExpirationTime
+      )),
+      (workInProgress.child = reconcileChildFibers(
+        workInProgress,
+        null,
+        nextChildren,
+        renderExpirationTime
+      )))
+    : reconcileChildren(
+        current$$1,
+        workInProgress,
+        nextChildren,
+        renderExpirationTime
+      );
   workInProgress.memoizedState = shouldUpdate.state;
   workInProgress.memoizedProps = shouldUpdate.props;
-  hasContext && invalidateContextProvider(workInProgress, !0);
+  hasContext && invalidateContextProvider(workInProgress, Component, !0);
   return workInProgress.child;
 }
 function pushHostRootContext(workInProgress) {
@@ -3256,625 +3672,606 @@ function pushHostRootContext(workInProgress) {
       pushTopLevelContextObject(workInProgress, root.context, !1);
   pushHostContainer(workInProgress, root.containerInfo);
 }
-function propagateContextChange(
+function resolveDefaultProps(Component, baseProps) {
+  if (Component && Component.defaultProps) {
+    baseProps = Object.assign({}, baseProps);
+    Component = Component.defaultProps;
+    for (var propName in Component)
+      void 0 === baseProps[propName] &&
+        (baseProps[propName] = Component[propName]);
+  }
+  return baseProps;
+}
+function bailoutOnAlreadyFinishedWork(
+  current$$1,
   workInProgress,
-  context,
-  changedBits,
   renderExpirationTime
 ) {
-  var fiber = workInProgress.child;
-  null !== fiber && (fiber.return = workInProgress);
-  for (; null !== fiber; ) {
-    switch (fiber.tag) {
-      case 12:
-        var nextFiber = fiber.stateNode | 0;
-        if (fiber.type === context && 0 !== (nextFiber & changedBits)) {
-          for (nextFiber = fiber; null !== nextFiber; ) {
-            var alternate = nextFiber.alternate;
-            if (
-              0 === nextFiber.expirationTime ||
-              nextFiber.expirationTime > renderExpirationTime
-            )
-              (nextFiber.expirationTime = renderExpirationTime),
-                null !== alternate &&
-                  (0 === alternate.expirationTime ||
-                    alternate.expirationTime > renderExpirationTime) &&
-                  (alternate.expirationTime = renderExpirationTime);
-            else if (
-              null !== alternate &&
-              (0 === alternate.expirationTime ||
-                alternate.expirationTime > renderExpirationTime)
-            )
-              alternate.expirationTime = renderExpirationTime;
-            else break;
-            nextFiber = nextFiber.return;
-          }
-          nextFiber = null;
-        } else nextFiber = fiber.child;
-        break;
-      case 13:
-        nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
-        break;
-      default:
-        nextFiber = fiber.child;
-    }
-    if (null !== nextFiber) nextFiber.return = fiber;
-    else
-      for (nextFiber = fiber; null !== nextFiber; ) {
-        if (nextFiber === workInProgress) {
-          nextFiber = null;
-          break;
-        }
-        fiber = nextFiber.sibling;
-        if (null !== fiber) {
-          fiber.return = nextFiber.return;
-          nextFiber = fiber;
-          break;
-        }
-        nextFiber = nextFiber.return;
-      }
-    fiber = nextFiber;
-  }
-}
-function updateContextProvider(current, workInProgress, renderExpirationTime) {
-  var context = workInProgress.type._context,
-    newProps = workInProgress.pendingProps,
-    oldProps = workInProgress.memoizedProps,
-    canBailOnProps = !0;
-  if (didPerformWorkStackCursor.current) canBailOnProps = !1;
-  else if (oldProps === newProps)
-    return (
-      (workInProgress.stateNode = 0),
-      pushProvider(workInProgress),
-      bailoutOnAlreadyFinishedWork(current, workInProgress)
-    );
-  var newValue = newProps.value;
-  workInProgress.memoizedProps = newProps;
-  if (null === oldProps) newValue = 1073741823;
-  else if (oldProps.value === newProps.value) {
-    if (oldProps.children === newProps.children && canBailOnProps)
-      return (
-        (workInProgress.stateNode = 0),
-        pushProvider(workInProgress),
-        bailoutOnAlreadyFinishedWork(current, workInProgress)
-      );
-    newValue = 0;
-  } else {
-    var oldValue = oldProps.value;
-    if (
-      (oldValue === newValue &&
-        (0 !== oldValue || 1 / oldValue === 1 / newValue)) ||
-      (oldValue !== oldValue && newValue !== newValue)
-    ) {
-      if (oldProps.children === newProps.children && canBailOnProps)
-        return (
-          (workInProgress.stateNode = 0),
-          pushProvider(workInProgress),
-          bailoutOnAlreadyFinishedWork(current, workInProgress)
-        );
-      newValue = 0;
-    } else if (
-      ((newValue =
-        "function" === typeof context._calculateChangedBits
-          ? context._calculateChangedBits(oldValue, newValue)
-          : 1073741823),
-      (newValue |= 0),
-      0 === newValue)
-    ) {
-      if (oldProps.children === newProps.children && canBailOnProps)
-        return (
-          (workInProgress.stateNode = 0),
-          pushProvider(workInProgress),
-          bailoutOnAlreadyFinishedWork(current, workInProgress)
-        );
-    } else
-      propagateContextChange(
-        workInProgress,
-        context,
-        newValue,
-        renderExpirationTime
-      );
-  }
-  workInProgress.stateNode = newValue;
-  pushProvider(workInProgress);
-  reconcileChildren(current, workInProgress, newProps.children);
-  return workInProgress.child;
-}
-function bailoutOnAlreadyFinishedWork(current, workInProgress) {
+  null !== current$$1 &&
+    (workInProgress.firstContextDependency = current$$1.firstContextDependency);
+  var childExpirationTime = workInProgress.childExpirationTime;
+  if (0 === childExpirationTime || childExpirationTime > renderExpirationTime)
+    return null;
   invariant(
-    null === current || workInProgress.child === current.child,
+    null === current$$1 || workInProgress.child === current$$1.child,
     "Resuming work not yet implemented."
   );
   if (null !== workInProgress.child) {
-    current = workInProgress.child;
-    var newChild = createWorkInProgress(
-      current,
-      current.pendingProps,
-      current.expirationTime
+    current$$1 = workInProgress.child;
+    renderExpirationTime = createWorkInProgress(
+      current$$1,
+      current$$1.pendingProps,
+      current$$1.expirationTime
     );
-    workInProgress.child = newChild;
-    for (newChild.return = workInProgress; null !== current.sibling; )
-      (current = current.sibling),
-        (newChild = newChild.sibling = createWorkInProgress(
-          current,
-          current.pendingProps,
-          current.expirationTime
+    workInProgress.child = renderExpirationTime;
+    for (
+      renderExpirationTime.return = workInProgress;
+      null !== current$$1.sibling;
+
+    )
+      (current$$1 = current$$1.sibling),
+        (renderExpirationTime = renderExpirationTime.sibling = createWorkInProgress(
+          current$$1,
+          current$$1.pendingProps,
+          current$$1.expirationTime
         )),
-        (newChild.return = workInProgress);
-    newChild.sibling = null;
+        (renderExpirationTime.return = workInProgress);
+    renderExpirationTime.sibling = null;
   }
   return workInProgress.child;
 }
-function beginWork(current, workInProgress, renderExpirationTime) {
+function beginWork(current$$1, workInProgress, renderExpirationTime) {
+  var updateExpirationTime = workInProgress.expirationTime;
   if (
-    0 === workInProgress.expirationTime ||
-    workInProgress.expirationTime > renderExpirationTime
+    null !== current$$1 &&
+    current$$1.memoizedProps === workInProgress.pendingProps &&
+    !didPerformWorkStackCursor.current &&
+    (0 === updateExpirationTime || updateExpirationTime > renderExpirationTime)
   ) {
     switch (workInProgress.tag) {
-      case 3:
+      case 5:
         pushHostRootContext(workInProgress);
         break;
+      case 7:
+        pushHostContext(workInProgress);
+        break;
       case 2:
-        pushContextProvider(workInProgress);
+        isContextProvider(workInProgress.type) &&
+          pushContextProvider(workInProgress);
         break;
-      case 4:
+      case 3:
+        isContextProvider(workInProgress.type._reactResult) &&
+          pushContextProvider(workInProgress);
+        break;
+      case 6:
         pushHostContainer(
           workInProgress,
           workInProgress.stateNode.containerInfo
         );
         break;
-      case 13:
-        pushProvider(workInProgress);
+      case 12:
+        pushProvider(workInProgress, workInProgress.memoizedProps.value);
     }
-    return null;
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
   }
+  workInProgress.expirationTime = 0;
   switch (workInProgress.tag) {
-    case 0:
+    case 4:
+      var Component = workInProgress.type;
       invariant(
-        null === current,
+        null === current$$1,
         "An indeterminate component should never have mounted. This error is likely caused by a bug in React. Please file an issue."
       );
-      var fn = workInProgress.type,
-        props = workInProgress.pendingProps,
-        unmaskedContext = getUnmaskedContext(workInProgress);
-      unmaskedContext = getMaskedContext(workInProgress, unmaskedContext);
-      fn = fn(props, unmaskedContext);
-      workInProgress.effectTag |= 1;
-      "object" === typeof fn &&
-      null !== fn &&
-      "function" === typeof fn.render &&
-      void 0 === fn.$$typeof
-        ? ((unmaskedContext = workInProgress.type),
-          (workInProgress.tag = 2),
-          (workInProgress.memoizedState =
-            null !== fn.state && void 0 !== fn.state ? fn.state : null),
-          (unmaskedContext = unmaskedContext.getDerivedStateFromProps),
-          "function" === typeof unmaskedContext &&
-            applyDerivedStateFromProps(workInProgress, unmaskedContext, props),
-          (props = pushContextProvider(workInProgress)),
-          (fn.updater = classComponentUpdater),
-          (workInProgress.stateNode = fn),
-          (fn._reactInternalFiber = workInProgress),
-          mountClassInstance(workInProgress, renderExpirationTime),
-          (current = finishClassComponent(
-            current,
+      var props = workInProgress.pendingProps;
+      if (
+        "object" === typeof Component &&
+        null !== Component &&
+        "function" === typeof Component.then
+      ) {
+        Component = readLazyComponentType(Component);
+        var resolvedTag = (workInProgress.tag = resolveLazyComponentTag(
             workInProgress,
-            !0,
-            props,
-            renderExpirationTime
-          )))
-        : ((workInProgress.tag = 1),
-          reconcileChildren(current, workInProgress, fn),
-          (workInProgress.memoizedProps = props),
-          (current = workInProgress.child));
-      return current;
-    case 1:
-      return (
-        (props = workInProgress.type),
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime
-          ? ((fn = getUnmaskedContext(workInProgress)),
-            (fn = getMaskedContext(workInProgress, fn)),
-            (props = props(renderExpirationTime, fn)),
-            (workInProgress.effectTag |= 1),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
-      );
-    case 2:
-      props = pushContextProvider(workInProgress);
-      if (null === current)
-        if (null === workInProgress.stateNode) {
-          var props$jscomp$0 = workInProgress.pendingProps,
-            ctor = workInProgress.type;
-          fn = getUnmaskedContext(workInProgress);
-          var needsContext =
-            2 === workInProgress.tag &&
-            null != workInProgress.type.contextTypes;
-          unmaskedContext = needsContext
-            ? getMaskedContext(workInProgress, fn)
-            : emptyObject;
-          props$jscomp$0 = new ctor(props$jscomp$0, unmaskedContext);
-          workInProgress.memoizedState =
-            null !== props$jscomp$0.state && void 0 !== props$jscomp$0.state
-              ? props$jscomp$0.state
-              : null;
-          props$jscomp$0.updater = classComponentUpdater;
-          workInProgress.stateNode = props$jscomp$0;
-          props$jscomp$0._reactInternalFiber = workInProgress;
-          needsContext &&
-            ((needsContext = workInProgress.stateNode),
-            (needsContext.__reactInternalMemoizedUnmaskedChildContext = fn),
-            (needsContext.__reactInternalMemoizedMaskedChildContext = unmaskedContext));
-          mountClassInstance(workInProgress, renderExpirationTime);
-          fn = !0;
-        } else {
-          ctor = workInProgress.type;
-          fn = workInProgress.stateNode;
-          needsContext = workInProgress.memoizedProps;
-          unmaskedContext = workInProgress.pendingProps;
-          fn.props = needsContext;
-          var oldContext = fn.context;
-          props$jscomp$0 = getUnmaskedContext(workInProgress);
-          props$jscomp$0 = getMaskedContext(workInProgress, props$jscomp$0);
-          var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
-          (ctor =
-            "function" === typeof getDerivedStateFromProps ||
-            "function" === typeof fn.getSnapshotBeforeUpdate) ||
-            ("function" !== typeof fn.UNSAFE_componentWillReceiveProps &&
-              "function" !== typeof fn.componentWillReceiveProps) ||
-            ((needsContext !== unmaskedContext ||
-              oldContext !== props$jscomp$0) &&
-              callComponentWillReceiveProps(
-                workInProgress,
-                fn,
-                unmaskedContext,
-                props$jscomp$0
-              ));
-          hasForceUpdate = !1;
-          var oldState = workInProgress.memoizedState;
-          oldContext = fn.state = oldState;
-          var updateQueue = workInProgress.updateQueue;
-          null !== updateQueue &&
-            (processUpdateQueue(
+            Component
+          )),
+          resolvedProps = resolveDefaultProps(Component, props),
+          child = void 0;
+        switch (resolvedTag) {
+          case 1:
+            child = updateFunctionComponent(
+              current$$1,
               workInProgress,
-              updateQueue,
-              unmaskedContext,
-              fn,
+              Component,
+              resolvedProps,
               renderExpirationTime
-            ),
-            (oldContext = workInProgress.memoizedState));
-          needsContext !== unmaskedContext ||
-          oldState !== oldContext ||
-          didPerformWorkStackCursor.current ||
-          hasForceUpdate
-            ? ("function" === typeof getDerivedStateFromProps &&
-                (applyDerivedStateFromProps(
-                  workInProgress,
-                  getDerivedStateFromProps,
-                  unmaskedContext
-                ),
-                (oldContext = workInProgress.memoizedState)),
-              (needsContext =
-                hasForceUpdate ||
-                checkShouldComponentUpdate(
-                  workInProgress,
-                  needsContext,
-                  unmaskedContext,
-                  oldState,
-                  oldContext,
-                  props$jscomp$0
-                ))
-                ? (ctor ||
-                    ("function" !== typeof fn.UNSAFE_componentWillMount &&
-                      "function" !== typeof fn.componentWillMount) ||
-                    ("function" === typeof fn.componentWillMount &&
-                      fn.componentWillMount(),
-                    "function" === typeof fn.UNSAFE_componentWillMount &&
-                      fn.UNSAFE_componentWillMount()),
-                  "function" === typeof fn.componentDidMount &&
-                    (workInProgress.effectTag |= 4))
-                : ("function" === typeof fn.componentDidMount &&
-                    (workInProgress.effectTag |= 4),
-                  (workInProgress.memoizedProps = unmaskedContext),
-                  (workInProgress.memoizedState = oldContext)),
-              (fn.props = unmaskedContext),
-              (fn.state = oldContext),
-              (fn.context = props$jscomp$0),
-              (fn = needsContext))
-            : ("function" === typeof fn.componentDidMount &&
-                (workInProgress.effectTag |= 4),
-              (fn = !1));
-        }
-      else
-        (ctor = workInProgress.type),
-          (fn = workInProgress.stateNode),
-          (unmaskedContext = workInProgress.memoizedProps),
-          (needsContext = workInProgress.pendingProps),
-          (fn.props = unmaskedContext),
-          (oldContext = fn.context),
-          (props$jscomp$0 = getUnmaskedContext(workInProgress)),
-          (props$jscomp$0 = getMaskedContext(workInProgress, props$jscomp$0)),
-          (getDerivedStateFromProps = ctor.getDerivedStateFromProps),
-          (ctor =
-            "function" === typeof getDerivedStateFromProps ||
-            "function" === typeof fn.getSnapshotBeforeUpdate) ||
-            ("function" !== typeof fn.UNSAFE_componentWillReceiveProps &&
-              "function" !== typeof fn.componentWillReceiveProps) ||
-            ((unmaskedContext !== needsContext ||
-              oldContext !== props$jscomp$0) &&
-              callComponentWillReceiveProps(
-                workInProgress,
-                fn,
-                needsContext,
-                props$jscomp$0
-              )),
-          (hasForceUpdate = !1),
-          (oldContext = workInProgress.memoizedState),
-          (oldState = fn.state = oldContext),
-          (updateQueue = workInProgress.updateQueue),
-          null !== updateQueue &&
-            (processUpdateQueue(
+            );
+            break;
+          case 3:
+            child = updateClassComponent(
+              current$$1,
               workInProgress,
-              updateQueue,
-              needsContext,
-              fn,
+              Component,
+              resolvedProps,
               renderExpirationTime
-            ),
-            (oldState = workInProgress.memoizedState)),
-          unmaskedContext !== needsContext ||
-          oldContext !== oldState ||
-          didPerformWorkStackCursor.current ||
-          hasForceUpdate
-            ? ("function" === typeof getDerivedStateFromProps &&
-                (applyDerivedStateFromProps(
+            );
+            break;
+          case 14:
+            child = updateForwardRef(
+              current$$1,
+              workInProgress,
+              Component,
+              resolvedProps,
+              renderExpirationTime
+            );
+            break;
+          case 18:
+            child = updatePureComponent(
+              current$$1,
+              workInProgress,
+              Component,
+              resolvedProps,
+              updateExpirationTime,
+              renderExpirationTime
+            );
+            break;
+          default:
+            invariant(
+              !1,
+              "Element type is invalid. Received a promise that resolves to: %s. Promise elements must resolve to a class or function.",
+              Component
+            );
+        }
+        workInProgress.memoizedProps = props;
+        workInProgress = child;
+      } else
+        (updateExpirationTime = getMaskedContext(
+          workInProgress,
+          contextStackCursor.current
+        )),
+          prepareToReadContext(workInProgress, renderExpirationTime),
+          (updateExpirationTime = Component(props, updateExpirationTime)),
+          (workInProgress.effectTag |= 1),
+          "object" === typeof updateExpirationTime &&
+          null !== updateExpirationTime &&
+          "function" === typeof updateExpirationTime.render &&
+          void 0 === updateExpirationTime.$$typeof
+            ? ((workInProgress.tag = 2),
+              isContextProvider(Component)
+                ? ((resolvedTag = !0), pushContextProvider(workInProgress))
+                : (resolvedTag = !1),
+              (workInProgress.memoizedState =
+                null !== updateExpirationTime.state &&
+                void 0 !== updateExpirationTime.state
+                  ? updateExpirationTime.state
+                  : null),
+              (resolvedProps = Component.getDerivedStateFromProps),
+              "function" === typeof resolvedProps &&
+                applyDerivedStateFromProps(
                   workInProgress,
-                  getDerivedStateFromProps,
-                  needsContext
+                  Component,
+                  resolvedProps,
+                  props
                 ),
-                (oldState = workInProgress.memoizedState)),
-              (getDerivedStateFromProps =
-                hasForceUpdate ||
-                checkShouldComponentUpdate(
-                  workInProgress,
-                  unmaskedContext,
-                  needsContext,
-                  oldContext,
-                  oldState,
-                  props$jscomp$0
-                ))
-                ? (ctor ||
-                    ("function" !== typeof fn.UNSAFE_componentWillUpdate &&
-                      "function" !== typeof fn.componentWillUpdate) ||
-                    ("function" === typeof fn.componentWillUpdate &&
-                      fn.componentWillUpdate(
-                        needsContext,
-                        oldState,
-                        props$jscomp$0
-                      ),
-                    "function" === typeof fn.UNSAFE_componentWillUpdate &&
-                      fn.UNSAFE_componentWillUpdate(
-                        needsContext,
-                        oldState,
-                        props$jscomp$0
-                      )),
-                  "function" === typeof fn.componentDidUpdate &&
-                    (workInProgress.effectTag |= 4),
-                  "function" === typeof fn.getSnapshotBeforeUpdate &&
-                    (workInProgress.effectTag |= 256))
-                : ("function" !== typeof fn.componentDidUpdate ||
-                    (unmaskedContext === current.memoizedProps &&
-                      oldContext === current.memoizedState) ||
-                    (workInProgress.effectTag |= 4),
-                  "function" !== typeof fn.getSnapshotBeforeUpdate ||
-                    (unmaskedContext === current.memoizedProps &&
-                      oldContext === current.memoizedState) ||
-                    (workInProgress.effectTag |= 256),
-                  (workInProgress.memoizedProps = needsContext),
-                  (workInProgress.memoizedState = oldState)),
-              (fn.props = needsContext),
-              (fn.state = oldState),
-              (fn.context = props$jscomp$0),
-              (fn = getDerivedStateFromProps))
-            : ("function" !== typeof fn.componentDidUpdate ||
-                (unmaskedContext === current.memoizedProps &&
-                  oldContext === current.memoizedState) ||
-                (workInProgress.effectTag |= 4),
-              "function" !== typeof fn.getSnapshotBeforeUpdate ||
-                (unmaskedContext === current.memoizedProps &&
-                  oldContext === current.memoizedState) ||
-                (workInProgress.effectTag |= 256),
-              (fn = !1));
-      return finishClassComponent(
-        current,
+              (updateExpirationTime.updater = classComponentUpdater),
+              (workInProgress.stateNode = updateExpirationTime),
+              (updateExpirationTime._reactInternalFiber = workInProgress),
+              mountClassInstance(
+                workInProgress,
+                Component,
+                props,
+                renderExpirationTime
+              ),
+              (workInProgress = finishClassComponent(
+                current$$1,
+                workInProgress,
+                Component,
+                !0,
+                resolvedTag,
+                renderExpirationTime
+              )))
+            : ((workInProgress.tag = 0),
+              reconcileChildren(
+                current$$1,
+                workInProgress,
+                updateExpirationTime,
+                renderExpirationTime
+              ),
+              (workInProgress.memoizedProps = props),
+              (workInProgress = workInProgress.child));
+      return workInProgress;
+    case 0:
+      return updateFunctionComponent(
+        current$$1,
         workInProgress,
-        fn,
-        props,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        renderExpirationTime
+      );
+    case 1:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateFunctionComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
+    case 2:
+      return updateClassComponent(
+        current$$1,
+        workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
         renderExpirationTime
       );
     case 3:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateClassComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
+    case 5:
       return (
         pushHostRootContext(workInProgress),
-        (props = workInProgress.updateQueue),
-        null !== props
-          ? ((fn = workInProgress.memoizedState),
-            (fn = null !== fn ? fn.element : null),
-            processUpdateQueue(
+        (Component = workInProgress.updateQueue),
+        invariant(
+          null !== Component,
+          "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
+        ),
+        (props = workInProgress.memoizedState),
+        (props = null !== props ? props.element : null),
+        processUpdateQueue(
+          workInProgress,
+          Component,
+          workInProgress.pendingProps,
+          null,
+          renderExpirationTime
+        ),
+        (Component = workInProgress.memoizedState.element),
+        Component === props
+          ? (workInProgress = bailoutOnAlreadyFinishedWork(
+              current$$1,
               workInProgress,
-              props,
-              workInProgress.pendingProps,
-              null,
+              renderExpirationTime
+            ))
+          : (reconcileChildren(
+              current$$1,
+              workInProgress,
+              Component,
               renderExpirationTime
             ),
-            (renderExpirationTime = workInProgress.memoizedState.element),
-            renderExpirationTime === fn
-              ? (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))
-              : (reconcileChildren(
-                  current,
-                  workInProgress,
-                  renderExpirationTime
-                ),
-                (current = workInProgress.child)))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+            (workInProgress = workInProgress.child)),
+        workInProgress
       );
-    case 5:
+    case 7:
       return (
-        requiredContext(rootInstanceStackCursor.current),
-        (renderExpirationTime = requiredContext(contextStackCursor$1.current)),
-        (props = workInProgress.type),
-        (props =
-          "AndroidTextInput" === props ||
-          "RCTMultilineTextInputView" === props ||
-          "RCTSinglelineTextInputView" === props ||
-          "RCTText" === props ||
-          "RCTVirtualText" === props),
-        (props =
-          renderExpirationTime.isInAParentText !== props
-            ? { isInAParentText: props }
-            : renderExpirationTime),
-        renderExpirationTime !== props &&
-          (push(contextFiberStackCursor, workInProgress, workInProgress),
-          push(contextStackCursor$1, props, workInProgress)),
-        null === current && tryToClaimNextHydratableInstance(workInProgress),
-        (props = workInProgress.memoizedProps),
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current || props !== renderExpirationTime
-          ? ((props = renderExpirationTime.children),
-            markRef(current, workInProgress),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        pushHostContext(workInProgress),
+        null === current$$1 && tryToClaimNextHydratableInstance(workInProgress),
+        (Component = workInProgress.pendingProps),
+        (props = Component.children),
+        markRef(current$$1, workInProgress),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        (workInProgress = workInProgress.child),
+        workInProgress
       );
-    case 6:
+    case 8:
       return (
-        null === current && tryToClaimNextHydratableInstance(workInProgress),
+        null === current$$1 && tryToClaimNextHydratableInstance(workInProgress),
         (workInProgress.memoizedProps = workInProgress.pendingProps),
         null
       );
     case 16:
-      return null;
-    case 4:
+      return (
+        (Component = workInProgress.pendingProps),
+        (props = 0 === (workInProgress.effectTag & 64)),
+        null !== current$$1 && null !== workInProgress.updateQueue
+          ? ((workInProgress.updateQueue = null), (props = !0))
+          : (props = !props),
+        0 !== (workInProgress.mode & 2) &&
+          (props
+            ? (workInProgress.effectTag |= 4)
+            : (workInProgress.stateNode = null)),
+        (updateExpirationTime = Component.children),
+        (updateExpirationTime =
+          "function" === typeof updateExpirationTime
+            ? updateExpirationTime(props)
+            : props
+              ? Component.fallback
+              : updateExpirationTime),
+        null !== current$$1 && props !== workInProgress.memoizedState
+          ? ((workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              current$$1.child,
+              null,
+              renderExpirationTime
+            )),
+            (workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              null,
+              updateExpirationTime,
+              renderExpirationTime
+            )))
+          : reconcileChildren(
+              current$$1,
+              workInProgress,
+              updateExpirationTime,
+              renderExpirationTime
+            ),
+        (workInProgress.memoizedProps = Component),
+        (workInProgress.memoizedState = props),
+        workInProgress.child
+      );
+    case 6:
       return (
         pushHostContainer(
           workInProgress,
           workInProgress.stateNode.containerInfo
         ),
-        (props = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== props
-          ? (null === current
-              ? (workInProgress.child = reconcileChildFibers(
-                  workInProgress,
-                  null,
-                  props,
-                  renderExpirationTime
-                ))
-              : reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = props),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps),
+        null === current$$1
+          ? (workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              null,
+              Component,
+              renderExpirationTime
+            ))
+          : reconcileChildren(
+              current$$1,
+              workInProgress,
+              Component,
+              renderExpirationTime
+            ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
+      );
+    case 13:
+      return updateForwardRef(
+        current$$1,
+        workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        renderExpirationTime
       );
     case 14:
       return (
-        (props = workInProgress.type.render),
-        (renderExpirationTime = workInProgress.pendingProps),
-        (fn = workInProgress.ref),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime ||
-        fn !== (null !== current ? current.ref : null)
-          ? ((props = props(renderExpirationTime, fn)),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateForwardRef(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
       );
-    case 10:
+    case 9:
       return (
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime
-          ? (reconcileChildren(current, workInProgress, renderExpirationTime),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
-    case 11:
+    case 10:
       return (
-        (renderExpirationTime = workInProgress.pendingProps.children),
-        didPerformWorkStackCursor.current ||
-        (null !== renderExpirationTime &&
-          workInProgress.memoizedProps !== renderExpirationTime)
-          ? (reconcileChildren(current, workInProgress, renderExpirationTime),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps.children),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
     case 15:
       return (
-        (renderExpirationTime = workInProgress.pendingProps),
-        workInProgress.memoizedProps === renderExpirationTime
-          ? (current = bailoutOnAlreadyFinishedWork(current, workInProgress))
-          : (reconcileChildren(
-              current,
-              workInProgress,
-              renderExpirationTime.children
-            ),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child)),
-        current
+        (Component = workInProgress.pendingProps),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component.children,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
-    case 13:
-      return updateContextProvider(
-        current,
+    case 12:
+      a: {
+        Component = workInProgress.type._context;
+        props = workInProgress.pendingProps;
+        resolvedTag = workInProgress.memoizedProps;
+        updateExpirationTime = props.value;
+        workInProgress.memoizedProps = props;
+        pushProvider(workInProgress, updateExpirationTime);
+        if (null !== resolvedTag)
+          if (
+            ((resolvedProps = resolvedTag.value),
+            (updateExpirationTime =
+              (resolvedProps === updateExpirationTime &&
+                (0 !== resolvedProps ||
+                  1 / resolvedProps === 1 / updateExpirationTime)) ||
+              (resolvedProps !== resolvedProps &&
+                updateExpirationTime !== updateExpirationTime)
+                ? 0
+                : ("function" === typeof Component._calculateChangedBits
+                    ? Component._calculateChangedBits(
+                        resolvedProps,
+                        updateExpirationTime
+                      )
+                    : 1073741823) | 0),
+            0 === updateExpirationTime)
+          ) {
+            if (
+              resolvedTag.children === props.children &&
+              !didPerformWorkStackCursor.current
+            ) {
+              workInProgress = bailoutOnAlreadyFinishedWork(
+                current$$1,
+                workInProgress,
+                renderExpirationTime
+              );
+              break a;
+            }
+          } else
+            for (
+              resolvedTag = workInProgress.child,
+                null !== resolvedTag && (resolvedTag.return = workInProgress);
+              null !== resolvedTag;
+
+            ) {
+              resolvedProps = resolvedTag.firstContextDependency;
+              if (null !== resolvedProps) {
+                do {
+                  if (
+                    resolvedProps.context === Component &&
+                    0 !== (resolvedProps.observedBits & updateExpirationTime)
+                  ) {
+                    if (2 === resolvedTag.tag || 3 === resolvedTag.tag)
+                      (child = createUpdate(renderExpirationTime)),
+                        (child.tag = 2),
+                        enqueueUpdate(resolvedTag, child);
+                    if (
+                      0 === resolvedTag.expirationTime ||
+                      resolvedTag.expirationTime > renderExpirationTime
+                    )
+                      resolvedTag.expirationTime = renderExpirationTime;
+                    child = resolvedTag.alternate;
+                    null !== child &&
+                      (0 === child.expirationTime ||
+                        child.expirationTime > renderExpirationTime) &&
+                      (child.expirationTime = renderExpirationTime);
+                    for (var node = resolvedTag.return; null !== node; ) {
+                      child = node.alternate;
+                      if (
+                        0 === node.childExpirationTime ||
+                        node.childExpirationTime > renderExpirationTime
+                      )
+                        (node.childExpirationTime = renderExpirationTime),
+                          null !== child &&
+                            (0 === child.childExpirationTime ||
+                              child.childExpirationTime >
+                                renderExpirationTime) &&
+                            (child.childExpirationTime = renderExpirationTime);
+                      else if (
+                        null !== child &&
+                        (0 === child.childExpirationTime ||
+                          child.childExpirationTime > renderExpirationTime)
+                      )
+                        child.childExpirationTime = renderExpirationTime;
+                      else break;
+                      node = node.return;
+                    }
+                  }
+                  child = resolvedTag.child;
+                  resolvedProps = resolvedProps.next;
+                } while (null !== resolvedProps);
+              } else
+                child =
+                  12 === resolvedTag.tag
+                    ? resolvedTag.type === workInProgress.type
+                      ? null
+                      : resolvedTag.child
+                    : resolvedTag.child;
+              if (null !== child) child.return = resolvedTag;
+              else
+                for (child = resolvedTag; null !== child; ) {
+                  if (child === workInProgress) {
+                    child = null;
+                    break;
+                  }
+                  resolvedTag = child.sibling;
+                  if (null !== resolvedTag) {
+                    resolvedTag.return = child.return;
+                    child = resolvedTag;
+                    break;
+                  }
+                  child = child.return;
+                }
+              resolvedTag = child;
+            }
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props.children,
+          renderExpirationTime
+        );
+        workInProgress = workInProgress.child;
+      }
+      return workInProgress;
+    case 11:
+      return (
+        (updateExpirationTime = workInProgress.type),
+        (Component = workInProgress.pendingProps),
+        (props = Component.children),
+        prepareToReadContext(workInProgress, renderExpirationTime),
+        (updateExpirationTime = readContext(
+          updateExpirationTime,
+          Component.unstable_observedBits
+        )),
+        (props = props(updateExpirationTime)),
+        (workInProgress.effectTag |= 1),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
+      );
+    case 17:
+      return updatePureComponent(
+        current$$1,
         workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        updateExpirationTime,
         renderExpirationTime
       );
-    case 12:
-      a: if (
-        ((fn = workInProgress.type),
-        (unmaskedContext = workInProgress.pendingProps),
-        (needsContext = workInProgress.memoizedProps),
-        (props = fn._currentValue2),
-        (props$jscomp$0 = fn._changedBits2),
-        didPerformWorkStackCursor.current ||
-          0 !== props$jscomp$0 ||
-          needsContext !== unmaskedContext)
-      ) {
-        workInProgress.memoizedProps = unmaskedContext;
-        ctor = unmaskedContext.unstable_observedBits;
-        if (void 0 === ctor || null === ctor) ctor = 1073741823;
-        workInProgress.stateNode = ctor;
-        if (0 !== (props$jscomp$0 & ctor))
-          propagateContextChange(
-            workInProgress,
-            fn,
-            props$jscomp$0,
-            renderExpirationTime
-          );
-        else if (needsContext === unmaskedContext) {
-          current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-          break a;
-        }
-        renderExpirationTime = unmaskedContext.children;
-        renderExpirationTime = renderExpirationTime(props);
-        workInProgress.effectTag |= 1;
-        reconcileChildren(current, workInProgress, renderExpirationTime);
-        current = workInProgress.child;
-      } else current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-      return current;
+    case 18:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updatePureComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          updateExpirationTime,
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
     default:
       invariant(
         !1,
@@ -3884,9 +4281,9 @@ function beginWork(current, workInProgress, renderExpirationTime) {
 }
 function appendAllChildren(parent, workInProgress) {
   for (var node = workInProgress.child; null !== node; ) {
-    if (5 === node.tag || 6 === node.tag)
+    if (7 === node.tag || 8 === node.tag)
       FabricUIManager.appendChild(parent.node, node.stateNode.node);
-    else if (4 !== node.tag && null !== node.child) {
+    else if (6 !== node.tag && null !== node.child) {
       node.child.return = node;
       node = node.child;
       continue;
@@ -3909,9 +4306,9 @@ updateHostContainer = function(workInProgress) {
     var container = portalOrRoot.containerInfo,
       newChildSet = FabricUIManager.createChildSet(container);
     a: for (var node = workInProgress.child; null !== node; ) {
-      if (5 === node.tag || 6 === node.tag)
+      if (7 === node.tag || 8 === node.tag)
         FabricUIManager.appendChildToSet(newChildSet, node.stateNode.node);
-      else if (4 !== node.tag && null !== node.child) {
+      else if (6 !== node.tag && null !== node.child) {
         node.child.return = node;
         node = node.child;
         continue;
@@ -3929,35 +4326,48 @@ updateHostContainer = function(workInProgress) {
     FabricUIManager.completeRoot(container, newChildSet);
   }
 };
-updateHostComponent$1 = function(current, workInProgress, updatePayload) {
-  var childrenUnchanged = null === workInProgress.firstEffect;
-  current = current.stateNode;
-  if (childrenUnchanged && null === updatePayload)
-    workInProgress.stateNode = current;
+updateHostComponent$1 = function(current, workInProgress, type, newProps) {
+  type = current.stateNode;
+  var oldProps = current.memoizedProps;
+  if ((current = null === workInProgress.firstEffect) && oldProps === newProps)
+    workInProgress.stateNode = type;
   else {
-    var node = current.node;
-    updatePayload = {
-      node: childrenUnchanged
-        ? null !== updatePayload
-          ? FabricUIManager.cloneNodeWithNewProps(
-              node,
-              updatePayload,
-              workInProgress
-            )
-          : FabricUIManager.cloneNode(node, workInProgress)
-        : null !== updatePayload
-          ? FabricUIManager.cloneNodeWithNewChildrenAndProps(
-              node,
-              updatePayload,
-              workInProgress
-            )
-          : FabricUIManager.cloneNodeWithNewChildren(node, workInProgress),
-      canonical: current.canonical
-    };
-    workInProgress.stateNode = updatePayload;
-    childrenUnchanged
-      ? (workInProgress.effectTag |= 4)
-      : appendAllChildren(updatePayload, workInProgress);
+    var recyclableInstance = workInProgress.stateNode;
+    requiredContext(contextStackCursor$1.current);
+    var updatePayload = null;
+    oldProps !== newProps &&
+      ((oldProps = diffProperties(
+        null,
+        oldProps,
+        newProps,
+        recyclableInstance.canonical.viewConfig.validAttributes
+      )),
+      (recyclableInstance.canonical.currentProps = newProps),
+      (updatePayload = oldProps));
+    current && null === updatePayload
+      ? (workInProgress.stateNode = type)
+      : ((newProps = updatePayload),
+        (recyclableInstance = type.node),
+        (type = {
+          node: current
+            ? null !== newProps
+              ? FabricUIManager.cloneNodeWithNewProps(
+                  recyclableInstance,
+                  newProps
+                )
+              : FabricUIManager.cloneNode(recyclableInstance)
+            : null !== newProps
+              ? FabricUIManager.cloneNodeWithNewChildrenAndProps(
+                  recyclableInstance,
+                  newProps
+                )
+              : FabricUIManager.cloneNodeWithNewChildren(recyclableInstance),
+          canonical: type.canonical
+        }),
+        (workInProgress.stateNode = type),
+        current
+          ? (workInProgress.effectTag |= 4)
+          : appendAllChildren(type, workInProgress));
   }
 };
 updateHostText$1 = function(current, workInProgress, oldText, newText) {
@@ -3972,202 +4382,77 @@ updateHostText$1 = function(current, workInProgress, oldText, newText) {
     )),
     (workInProgress.effectTag |= 4));
 };
-function completeWork(current, workInProgress) {
-  var newProps = workInProgress.pendingProps;
-  switch (workInProgress.tag) {
-    case 1:
-      return null;
-    case 2:
-      return popContextProvider(workInProgress), null;
-    case 3:
-      popHostContainer(workInProgress);
-      popTopLevelContextObject(workInProgress);
-      newProps = workInProgress.stateNode;
-      newProps.pendingContext &&
-        ((newProps.context = newProps.pendingContext),
-        (newProps.pendingContext = null));
-      if (null === current || null === current.child)
-        workInProgress.effectTag &= -3;
-      updateHostContainer(workInProgress);
-      return null;
-    case 5:
-      popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-          rootInstanceStackCursor.current
-        ),
-        type = workInProgress.type;
-      if (null !== current && null != workInProgress.stateNode) {
-        var oldProps = current.memoizedProps,
-          instance = workInProgress.stateNode,
-          currentHostContext = requiredContext(contextStackCursor$1.current),
-          updatePayload = diffProperties(
-            null,
-            oldProps,
-            newProps,
-            instance.canonical.viewConfig.validAttributes
-          );
-        instance.canonical.currentProps = newProps;
-        updateHostComponent$1(
-          current,
-          workInProgress,
-          updatePayload,
-          type,
-          oldProps,
-          newProps,
-          rootContainerInstance,
-          currentHostContext
-        );
-        current.ref !== workInProgress.ref && (workInProgress.effectTag |= 128);
-      } else {
-        if (!newProps)
-          return (
-            invariant(
-              null !== workInProgress.stateNode,
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            null
-          );
-        instance = requiredContext(contextStackCursor$1.current);
-        current = nextReactTag;
-        nextReactTag += 2;
-        oldProps = ReactNativeViewConfigRegistry.get(type);
-        invariant(
-          "RCTView" !== type || !instance.isInAParentText,
-          "Nesting of <View> within <Text> is not currently supported."
-        );
-        type = diffProperties(
-          null,
-          emptyObject$1,
-          newProps,
-          oldProps.validAttributes
-        );
-        rootContainerInstance = FabricUIManager.createNode(
-          current,
-          oldProps.uiViewClassName,
-          rootContainerInstance,
-          type,
-          workInProgress
-        );
-        newProps = new ReactFabricHostComponent(current, oldProps, newProps);
-        newProps = { node: rootContainerInstance, canonical: newProps };
-        appendAllChildren(newProps, workInProgress);
-        workInProgress.stateNode = newProps;
-        null !== workInProgress.ref && (workInProgress.effectTag |= 128);
-      }
-      return null;
-    case 6:
-      if (current && null != workInProgress.stateNode)
-        updateHostText$1(
-          current,
-          workInProgress,
-          current.memoizedProps,
-          newProps
-        );
-      else {
-        if ("string" !== typeof newProps)
-          return (
-            invariant(
-              null !== workInProgress.stateNode,
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            null
-          );
-        rootContainerInstance = requiredContext(
-          rootInstanceStackCursor.current
-        );
-        type = requiredContext(contextStackCursor$1.current);
-        workInProgress.stateNode = createTextInstance(
-          newProps,
-          rootContainerInstance,
-          type,
-          workInProgress
-        );
-      }
-      return null;
-    case 14:
-      return null;
-    case 16:
-      return null;
-    case 10:
-      return null;
-    case 11:
-      return null;
-    case 15:
-      return null;
-    case 4:
-      return (
-        popHostContainer(workInProgress),
-        updateHostContainer(workInProgress),
-        null
-      );
-    case 13:
-      return popProvider(workInProgress), null;
-    case 12:
-      return null;
-    case 0:
-      invariant(
-        !1,
-        "An indeterminate component should have become determinate before completing. This error is likely caused by a bug in React. Please file an issue."
-      );
-    default:
-      invariant(
-        !1,
-        "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
-      );
-  }
+function logCapturedError(capturedError) {
+  var componentStack = capturedError.componentStack,
+    error = capturedError.error;
+  if (error instanceof Error) {
+    capturedError = error.message;
+    var name = error.name;
+    try {
+      error.message =
+        (capturedError ? name + ": " + capturedError : name) +
+        "\n\nThis error is located at:" +
+        componentStack;
+    } catch (e) {}
+  } else
+    error =
+      "string" === typeof error
+        ? Error(error + "\n\nThis error is located at:" + componentStack)
+        : Error("Unspecified error at:" + componentStack);
+  ExceptionsManager.handleException(error, !1);
 }
+var emptyObject$1 = {};
 function logError(boundary, errorInfo) {
   var source = errorInfo.source,
     stack = errorInfo.stack;
   null === stack &&
     null !== source &&
-    (stack = getStackAddendumByWorkInProgressFiber(source));
-  null !== source && getComponentName(source);
-  source = null !== stack ? stack : "";
-  errorInfo = errorInfo.value;
-  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
+    (stack = getStackByFiberInDevAndProd(source));
+  errorInfo = {
+    componentName: null !== source ? getComponentName(source.type) : null,
+    componentStack: null !== stack ? stack : "",
+    error: errorInfo.value,
+    errorBoundary: null,
+    errorBoundaryName: null,
+    errorBoundaryFound: !1,
+    willRetry: !1
+  };
+  null !== boundary &&
+    2 === boundary.tag &&
+    ((errorInfo.errorBoundary = boundary.stateNode),
+    (errorInfo.errorBoundaryName = getComponentName(boundary.type)),
+    (errorInfo.errorBoundaryFound = !0),
+    (errorInfo.willRetry = !0));
   try {
-    if (errorInfo instanceof Error) {
-      var message = errorInfo.message,
-        name = errorInfo.name;
-      var errorToHandle = errorInfo;
-      try {
-        errorToHandle.message =
-          (message ? name + ": " + message : name) +
-          "\n\nThis error is located at:" +
-          source;
-      } catch (e) {}
-    } else
-      errorToHandle =
-        "string" === typeof errorInfo
-          ? Error(errorInfo + "\n\nThis error is located at:" + source)
-          : Error("Unspecified error at:" + source);
-    ExceptionsManager.handleException(errorToHandle, !1);
+    logCapturedError(errorInfo);
   } catch (e) {
-    (e && e.suppressReactErrorLogging) || console.error(e);
+    setTimeout(function() {
+      throw e;
+    });
   }
 }
-function safelyDetachRef(current) {
-  var ref = current.ref;
+function safelyDetachRef(current$$1) {
+  var ref = current$$1.ref;
   if (null !== ref)
     if ("function" === typeof ref)
       try {
         ref(null);
       } catch (refError) {
-        captureCommitPhaseError(current, refError);
+        captureCommitPhaseError(current$$1, refError);
       }
     else ref.current = null;
 }
-function commitWork(current, finishedWork) {
+function commitWork(current$$1, finishedWork) {
   switch (finishedWork.tag) {
     case 2:
+    case 3:
       break;
-    case 5:
+    case 7:
       break;
-    case 6:
+    case 8:
       break;
-    case 3:
-    case 4:
+    case 5:
+    case 6:
       break;
     default:
       invariant(
@@ -4176,6 +4461,9 @@ function commitWork(current, finishedWork) {
       );
   }
 }
+function NoopComponent() {
+  return null;
+}
 function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime = createUpdate(expirationTime);
   expirationTime.tag = 3;
@@ -4190,13 +4478,21 @@ function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
 function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime = createUpdate(expirationTime);
   expirationTime.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error$jscomp$0 = errorInfo.value;
+    expirationTime.payload = function() {
+      return getDerivedStateFromError(error$jscomp$0);
+    };
+  }
   var inst = fiber.stateNode;
   null !== inst &&
     "function" === typeof inst.componentDidCatch &&
     (expirationTime.callback = function() {
-      null === legacyErrorBoundariesThatAlreadyFailed
-        ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-        : legacyErrorBoundariesThatAlreadyFailed.add(this);
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this));
       var error = errorInfo.value,
         stack = errorInfo.stack;
       logError(fiber, errorInfo);
@@ -4209,7 +4505,7 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
 function unwindWork(workInProgress) {
   switch (workInProgress.tag) {
     case 2:
-      popContextProvider(workInProgress);
+      isContextProvider(workInProgress.type) && popContext(workInProgress);
       var effectTag = workInProgress.effectTag;
       return effectTag & 1024
         ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4217,8 +4513,8 @@ function unwindWork(workInProgress) {
         : null;
     case 3:
       return (
-        popHostContainer(workInProgress),
-        popTopLevelContextObject(workInProgress),
+        isContextProvider(workInProgress.type._reactResult) &&
+          popContext(workInProgress),
         (effectTag = workInProgress.effectTag),
         effectTag & 1024
           ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4226,6 +4522,18 @@ function unwindWork(workInProgress) {
           : null
       );
     case 5:
+      return (
+        popHostContainer(workInProgress),
+        popTopLevelContextObject(workInProgress),
+        (effectTag = workInProgress.effectTag),
+        invariant(
+          0 === (effectTag & 64),
+          "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
+        ),
+        (workInProgress.effectTag = (effectTag & -1025) | 64),
+        workInProgress
+      );
+    case 7:
       return popHostContext(workInProgress), null;
     case 16:
       return (
@@ -4235,24 +4543,21 @@ function unwindWork(workInProgress) {
             workInProgress)
           : null
       );
-    case 4:
+    case 6:
       return popHostContainer(workInProgress), null;
-    case 13:
+    case 12:
       return popProvider(workInProgress), null;
     default:
       return null;
   }
 }
-var originalStartTimeMs = now$1(),
-  mostRecentCurrentTime = 2,
-  mostRecentCurrentTimeMs = originalStartTimeMs,
-  lastUniqueAsyncExpiration = 0,
-  expirationContext = 0,
+var Dispatcher = { readContext: readContext },
+  ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
   isWorking = !1,
   nextUnitOfWork = null,
   nextRoot = null,
   nextRenderExpirationTime = 0,
-  nextLatestTimeoutMs = -1,
+  nextLatestAbsoluteTimeoutMs = -1,
   nextRenderDidError = !1,
   nextEffect = null,
   isCommitting$1 = !1,
@@ -4267,91 +4572,229 @@ function resetStack() {
       var interruptedWork$jscomp$0 = interruptedWork;
       switch (interruptedWork$jscomp$0.tag) {
         case 2:
-          popContextProvider(interruptedWork$jscomp$0);
+          var childContextTypes =
+            interruptedWork$jscomp$0.type.childContextTypes;
+          null !== childContextTypes &&
+            void 0 !== childContextTypes &&
+            popContext(interruptedWork$jscomp$0);
           break;
         case 3:
+          childContextTypes =
+            interruptedWork$jscomp$0.type._reactResult.childContextTypes;
+          null !== childContextTypes &&
+            void 0 !== childContextTypes &&
+            popContext(interruptedWork$jscomp$0);
+          break;
+        case 5:
           popHostContainer(interruptedWork$jscomp$0);
           popTopLevelContextObject(interruptedWork$jscomp$0);
           break;
-        case 5:
+        case 7:
           popHostContext(interruptedWork$jscomp$0);
           break;
-        case 4:
+        case 6:
           popHostContainer(interruptedWork$jscomp$0);
           break;
-        case 13:
+        case 12:
           popProvider(interruptedWork$jscomp$0);
       }
       interruptedWork = interruptedWork.return;
     }
   nextRoot = null;
   nextRenderExpirationTime = 0;
-  nextLatestTimeoutMs = -1;
+  nextLatestAbsoluteTimeoutMs = -1;
   nextRenderDidError = !1;
   nextUnitOfWork = null;
 }
-function completeUnitOfWork(workInProgress$jscomp$0) {
+function completeUnitOfWork(workInProgress) {
   for (;;) {
-    var current = workInProgress$jscomp$0.alternate,
-      returnFiber = workInProgress$jscomp$0.return,
-      siblingFiber = workInProgress$jscomp$0.sibling;
-    if (0 === (workInProgress$jscomp$0.effectTag & 512)) {
-      current = completeWork(
-        current,
-        workInProgress$jscomp$0,
-        nextRenderExpirationTime
-      );
-      var workInProgress = workInProgress$jscomp$0;
+    var current$$1 = workInProgress.alternate,
+      returnFiber = workInProgress.return,
+      siblingFiber = workInProgress.sibling;
+    if (0 === (workInProgress.effectTag & 512)) {
+      var current = current$$1;
+      current$$1 = workInProgress;
+      var instance = current$$1.pendingProps;
+      switch (current$$1.tag) {
+        case 0:
+        case 1:
+          break;
+        case 2:
+          isContextProvider(current$$1.type) && popContext(current$$1);
+          break;
+        case 3:
+          isContextProvider(current$$1.type._reactResult) &&
+            popContext(current$$1);
+          break;
+        case 5:
+          popHostContainer(current$$1);
+          popTopLevelContextObject(current$$1);
+          instance = current$$1.stateNode;
+          instance.pendingContext &&
+            ((instance.context = instance.pendingContext),
+            (instance.pendingContext = null));
+          if (null === current || null === current.child)
+            current$$1.effectTag &= -3;
+          updateHostContainer(current$$1);
+          break;
+        case 7:
+          popHostContext(current$$1);
+          var rootContainerInstance = requiredContext(
+              rootInstanceStackCursor.current
+            ),
+            type = current$$1.type;
+          if (null !== current && null != current$$1.stateNode)
+            updateHostComponent$1(
+              current,
+              current$$1,
+              type,
+              instance,
+              rootContainerInstance
+            ),
+              current.ref !== current$$1.ref && (current$$1.effectTag |= 128);
+          else if (instance) {
+            var currentHostContext = requiredContext(
+                contextStackCursor$1.current
+              ),
+              internalInstanceHandle = current$$1;
+            current = nextReactTag;
+            nextReactTag += 2;
+            var viewConfig = ReactNativeViewConfigRegistry.get(type);
+            invariant(
+              "RCTView" !== type || !currentHostContext.isInAParentText,
+              "Nesting of <View> within <Text> is not currently supported."
+            );
+            type = diffProperties(
+              null,
+              emptyObject,
+              instance,
+              viewConfig.validAttributes
+            );
+            rootContainerInstance = FabricUIManager.createNode(
+              current,
+              viewConfig.uiViewClassName,
+              rootContainerInstance,
+              type,
+              internalInstanceHandle
+            );
+            instance = new ReactFabricHostComponent(
+              current,
+              viewConfig,
+              instance
+            );
+            instance = { node: rootContainerInstance, canonical: instance };
+            appendAllChildren(instance, current$$1);
+            current$$1.stateNode = instance;
+            null !== current$$1.ref && (current$$1.effectTag |= 128);
+          } else
+            invariant(
+              null !== current$$1.stateNode,
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          break;
+        case 8:
+          current && null != current$$1.stateNode
+            ? updateHostText$1(
+                current,
+                current$$1,
+                current.memoizedProps,
+                instance
+              )
+            : ("string" !== typeof instance &&
+                invariant(
+                  null !== current$$1.stateNode,
+                  "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+                ),
+              (rootContainerInstance = requiredContext(
+                rootInstanceStackCursor.current
+              )),
+              (current = requiredContext(contextStackCursor$1.current)),
+              (current$$1.stateNode = createTextInstance(
+                instance,
+                rootContainerInstance,
+                current,
+                current$$1
+              )));
+          break;
+        case 13:
+        case 14:
+          break;
+        case 16:
+          break;
+        case 9:
+          break;
+        case 10:
+          break;
+        case 15:
+          break;
+        case 6:
+          popHostContainer(current$$1);
+          updateHostContainer(current$$1);
+          break;
+        case 12:
+          popProvider(current$$1);
+          break;
+        case 11:
+          break;
+        case 17:
+        case 18:
+          break;
+        case 4:
+          invariant(
+            !1,
+            "An indeterminate component should have become determinate before completing. This error is likely caused by a bug in React. Please file an issue."
+          );
+        default:
+          invariant(
+            !1,
+            "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
+          );
+      }
+      nextUnitOfWork = null;
+      current$$1 = workInProgress;
       if (
         1073741823 === nextRenderExpirationTime ||
-        1073741823 !== workInProgress.expirationTime
+        1073741823 !== current$$1.childExpirationTime
       ) {
-        var newExpirationTime = 0;
-        switch (workInProgress.tag) {
-          case 3:
-          case 2:
-            var updateQueue = workInProgress.updateQueue;
-            null !== updateQueue &&
-              (newExpirationTime = updateQueue.expirationTime);
+        instance = 0;
+        for (
+          rootContainerInstance = current$$1.child;
+          null !== rootContainerInstance;
+
+        ) {
+          current = rootContainerInstance.expirationTime;
+          viewConfig = rootContainerInstance.childExpirationTime;
+          if (0 === instance || (0 !== current && current < instance))
+            instance = current;
+          if (0 === instance || (0 !== viewConfig && viewConfig < instance))
+            instance = viewConfig;
+          rootContainerInstance = rootContainerInstance.sibling;
         }
-        for (updateQueue = workInProgress.child; null !== updateQueue; )
-          0 !== updateQueue.expirationTime &&
-            (0 === newExpirationTime ||
-              newExpirationTime > updateQueue.expirationTime) &&
-            (newExpirationTime = updateQueue.expirationTime),
-            (updateQueue = updateQueue.sibling);
-        workInProgress.expirationTime = newExpirationTime;
+        current$$1.childExpirationTime = instance;
       }
-      if (null !== current) return current;
       null !== returnFiber &&
         0 === (returnFiber.effectTag & 512) &&
         (null === returnFiber.firstEffect &&
-          (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
-        null !== workInProgress$jscomp$0.lastEffect &&
+          (returnFiber.firstEffect = workInProgress.firstEffect),
+        null !== workInProgress.lastEffect &&
           (null !== returnFiber.lastEffect &&
-            (returnFiber.lastEffect.nextEffect =
-              workInProgress$jscomp$0.firstEffect),
-          (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
-        1 < workInProgress$jscomp$0.effectTag &&
+            (returnFiber.lastEffect.nextEffect = workInProgress.firstEffect),
+          (returnFiber.lastEffect = workInProgress.lastEffect)),
+        1 < workInProgress.effectTag &&
           (null !== returnFiber.lastEffect
-            ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
-            : (returnFiber.firstEffect = workInProgress$jscomp$0),
-          (returnFiber.lastEffect = workInProgress$jscomp$0)));
+            ? (returnFiber.lastEffect.nextEffect = workInProgress)
+            : (returnFiber.firstEffect = workInProgress),
+          (returnFiber.lastEffect = workInProgress)));
     } else {
-      workInProgress$jscomp$0 = unwindWork(
-        workInProgress$jscomp$0,
-        nextRenderExpirationTime
-      );
-      if (null !== workInProgress$jscomp$0)
-        return (
-          (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
-        );
+      workInProgress = unwindWork(workInProgress, nextRenderExpirationTime);
+      if (null !== workInProgress)
+        return (workInProgress.effectTag &= 511), workInProgress;
       null !== returnFiber &&
         ((returnFiber.firstEffect = returnFiber.lastEffect = null),
         (returnFiber.effectTag |= 512));
     }
     if (null !== siblingFiber) return siblingFiber;
-    if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+    if (null !== returnFiber) workInProgress = returnFiber;
     else break;
   }
   return null;
@@ -4363,15 +4806,16 @@ function performUnitOfWork(workInProgress) {
     nextRenderExpirationTime
   );
   null === next && (next = completeUnitOfWork(workInProgress));
-  ReactCurrentOwner.current = null;
+  ReactCurrentOwner$2.current = null;
   return next;
 }
-function renderRoot(root$jscomp$0, isYieldy) {
+function renderRoot(root$jscomp$0, isYieldy, isExpired) {
   invariant(
     !isWorking,
     "renderRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
   );
   isWorking = !0;
+  ReactCurrentOwner$2.currentDispatcher = Dispatcher;
   var expirationTime = root$jscomp$0.nextExpirationTimeToWorkOn;
   if (
     expirationTime !== nextRenderExpirationTime ||
@@ -4381,8 +4825,6 @@ function renderRoot(root$jscomp$0, isYieldy) {
     resetStack(),
       (nextRoot = root$jscomp$0),
       (nextRenderExpirationTime = expirationTime),
-      (nextLatestTimeoutMs = -1),
-      (nextRenderDidError = !1),
       (nextUnitOfWork = createWorkInProgress(
         nextRoot.current,
         null,
@@ -4406,110 +4848,216 @@ function renderRoot(root$jscomp$0, isYieldy) {
           null !== nextUnitOfWork,
           "Failed to replay rendering after an error. This is likely caused by a bug in React. Please file an issue with a reproducing case to help us find it."
         );
-        isYieldy = nextUnitOfWork;
-        var returnFiber = isYieldy.return;
-        if (null === returnFiber) {
-          didFatal = !0;
-          onUncaughtError(thrownValue);
-          break;
-        }
-        a: {
-          var root = root$jscomp$0,
-            returnFiber$jscomp$0 = returnFiber,
-            sourceFiber = isYieldy,
-            value = thrownValue;
-          returnFiber = nextRenderExpirationTime;
-          sourceFiber.effectTag |= 512;
-          sourceFiber.firstEffect = sourceFiber.lastEffect = null;
-          nextRenderDidError = !0;
-          if (
-            (root.didError || 1 === returnFiber) &&
-            (returnFiber === root.latestPendingTime ||
-              returnFiber === root.latestSuspendedTime)
-          ) {
-            value = createCapturedValue(value, sourceFiber);
+        var sourceFiber = nextUnitOfWork,
+          returnFiber = sourceFiber.return;
+        if (null === returnFiber) (didFatal = !0), onUncaughtError(thrownValue);
+        else {
+          a: {
+            var root = root$jscomp$0,
+              returnFiber$jscomp$0 = returnFiber,
+              sourceFiber$jscomp$0 = sourceFiber,
+              value = thrownValue;
+            returnFiber = nextRenderExpirationTime;
+            sourceFiber$jscomp$0.effectTag |= 512;
+            sourceFiber$jscomp$0.firstEffect = sourceFiber$jscomp$0.lastEffect = null;
+            if (
+              null !== value &&
+              "object" === typeof value &&
+              "function" === typeof value.then
+            ) {
+              var thenable = value;
+              value = returnFiber$jscomp$0;
+              var earliestTimeoutMs = -1,
+                startTimeMs = -1;
+              do {
+                if (16 === value.tag) {
+                  var current = value.alternate;
+                  if (
+                    null !== current &&
+                    !0 === current.memoizedState &&
+                    null !== current.stateNode
+                  ) {
+                    startTimeMs = 10 * (current.stateNode.timedOutAt - 2);
+                    break;
+                  }
+                  current = value.pendingProps.maxDuration;
+                  if ("number" === typeof current)
+                    if (0 >= current) earliestTimeoutMs = 0;
+                    else if (
+                      -1 === earliestTimeoutMs ||
+                      current < earliestTimeoutMs
+                    )
+                      earliestTimeoutMs = current;
+                }
+                value = value.return;
+              } while (null !== value);
+              value = returnFiber$jscomp$0;
+              do {
+                if (16 === value.tag && !value.memoizedState) {
+                  returnFiber$jscomp$0 = retrySuspendedRoot.bind(
+                    null,
+                    root,
+                    value,
+                    0 === (value.mode & 1) ? 1 : returnFiber
+                  );
+                  thenable.then(returnFiber$jscomp$0, returnFiber$jscomp$0);
+                  if (0 === (value.mode & 2)) {
+                    value.effectTag |= 4;
+                    reconcileChildren(
+                      sourceFiber$jscomp$0.alternate,
+                      sourceFiber$jscomp$0,
+                      null,
+                      returnFiber
+                    );
+                    sourceFiber$jscomp$0.effectTag &= -513;
+                    4 === sourceFiber$jscomp$0.tag &&
+                      (sourceFiber$jscomp$0.tag = 0);
+                    if (
+                      2 === sourceFiber$jscomp$0.tag ||
+                      3 === sourceFiber$jscomp$0.tag
+                    )
+                      (sourceFiber$jscomp$0.effectTag &= -421),
+                        null === sourceFiber$jscomp$0.alternate &&
+                          ((sourceFiber$jscomp$0.tag = 0),
+                          (sourceFiber$jscomp$0.type = NoopComponent));
+                    break a;
+                  }
+                  -1 === earliestTimeoutMs
+                    ? (root = 1073741823)
+                    : (-1 === startTimeMs &&
+                        (startTimeMs =
+                          10 *
+                            (findEarliestOutstandingPriorityLevel(
+                              root,
+                              returnFiber
+                            ) -
+                              2) -
+                          5e3),
+                      (root = startTimeMs + earliestTimeoutMs));
+                  0 <= root &&
+                    nextLatestAbsoluteTimeoutMs < root &&
+                    (nextLatestAbsoluteTimeoutMs = root);
+                  value.effectTag |= 1024;
+                  value.expirationTime = returnFiber;
+                  break a;
+                }
+                value = value.return;
+              } while (null !== value);
+              value = Error(
+                "An update was suspended, but no placeholder UI was provided."
+              );
+            }
+            nextRenderDidError = !0;
+            value = createCapturedValue(value, sourceFiber$jscomp$0);
             root = returnFiber$jscomp$0;
             do {
               switch (root.tag) {
-                case 3:
+                case 5:
+                  sourceFiber$jscomp$0 = value;
                   root.effectTag |= 1024;
-                  value = createRootErrorUpdate(root, value, returnFiber);
-                  enqueueCapturedUpdate(root, value, returnFiber);
+                  root.expirationTime = returnFiber;
+                  returnFiber = createRootErrorUpdate(
+                    root,
+                    sourceFiber$jscomp$0,
+                    returnFiber
+                  );
+                  enqueueCapturedUpdate(root, returnFiber);
                   break a;
                 case 2:
+                case 3:
                   if (
-                    ((returnFiber$jscomp$0 = value),
-                    (sourceFiber = root.stateNode),
+                    ((sourceFiber$jscomp$0 = value),
+                    (returnFiber$jscomp$0 = root.type),
+                    (thenable = root.stateNode),
                     0 === (root.effectTag & 64) &&
-                      null !== sourceFiber &&
-                      "function" === typeof sourceFiber.componentDidCatch &&
-                      (null === legacyErrorBoundariesThatAlreadyFailed ||
-                        !legacyErrorBoundariesThatAlreadyFailed.has(
-                          sourceFiber
-                        )))
+                      ("function" ===
+                        typeof returnFiber$jscomp$0.getDerivedStateFromError ||
+                        (null !== thenable &&
+                          "function" === typeof thenable.componentDidCatch &&
+                          (null === legacyErrorBoundariesThatAlreadyFailed ||
+                            !legacyErrorBoundariesThatAlreadyFailed.has(
+                              thenable
+                            )))))
                   ) {
                     root.effectTag |= 1024;
-                    value = createClassErrorUpdate(
+                    root.expirationTime = returnFiber;
+                    returnFiber = createClassErrorUpdate(
                       root,
-                      returnFiber$jscomp$0,
+                      sourceFiber$jscomp$0,
                       returnFiber
                     );
-                    enqueueCapturedUpdate(root, value, returnFiber);
+                    enqueueCapturedUpdate(root, returnFiber);
                     break a;
                   }
               }
               root = root.return;
             } while (null !== root);
           }
+          nextUnitOfWork = completeUnitOfWork(sourceFiber);
+          continue;
         }
-        nextUnitOfWork = completeUnitOfWork(isYieldy);
       }
     }
     break;
   } while (1);
   isWorking = !1;
-  didFatal
-    ? (root$jscomp$0.finishedWork = null)
-    : null === nextUnitOfWork
-      ? ((didFatal = root$jscomp$0.current.alternate),
-        invariant(
-          null !== didFatal,
-          "Finished root should have a work-in-progress. This error is likely caused by a bug in React. Please file an issue."
-        ),
-        0 === (didFatal.effectTag & 512)
-          ? ((root$jscomp$0.pendingCommitExpirationTime = expirationTime),
-            (root$jscomp$0.finishedWork = didFatal))
-          : (!nextRenderDidError ||
-            (expirationTime !== root$jscomp$0.latestPendingTime &&
-              expirationTime !== root$jscomp$0.latestSuspendedTime)
-              ? ((didFatal = root$jscomp$0.earliestPendingTime),
-                (isYieldy = root$jscomp$0.latestPendingTime),
-                didFatal === expirationTime
-                  ? (root$jscomp$0.earliestPendingTime =
-                      isYieldy === expirationTime
-                        ? (root$jscomp$0.latestPendingTime = 0)
-                        : isYieldy)
-                  : isYieldy === expirationTime &&
-                    (root$jscomp$0.latestPendingTime = didFatal),
-                (didFatal = root$jscomp$0.latestSuspendedTime),
-                didFatal === expirationTime &&
-                  (root$jscomp$0.latestPingedTime = 0),
-                (isYieldy = root$jscomp$0.earliestSuspendedTime),
-                0 === isYieldy
-                  ? (root$jscomp$0.earliestSuspendedTime = root$jscomp$0.latestSuspendedTime = expirationTime)
-                  : isYieldy > expirationTime
-                    ? (root$jscomp$0.earliestSuspendedTime = expirationTime)
-                    : didFatal < expirationTime &&
-                      (root$jscomp$0.latestSuspendedTime = expirationTime))
-              : (root$jscomp$0.didError = !0),
-            findNextPendingPriorityLevel(root$jscomp$0),
-            onSuspend(
-              root$jscomp$0,
-              expirationTime,
-              root$jscomp$0.expirationTime,
-              nextLatestTimeoutMs
-            )))
-      : (root$jscomp$0.finishedWork = null);
+  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = ReactCurrentOwner$2.currentDispatcher = null;
+  if (didFatal) (nextRoot = null), (root$jscomp$0.finishedWork = null);
+  else if (null !== nextUnitOfWork) root$jscomp$0.finishedWork = null;
+  else {
+    isYieldy = root$jscomp$0.current.alternate;
+    invariant(
+      null !== isYieldy,
+      "Finished root should have a work-in-progress. This error is likely caused by a bug in React. Please file an issue."
+    );
+    nextRoot = null;
+    if (nextRenderDidError) {
+      didFatal = root$jscomp$0.latestPendingTime;
+      sourceFiber = root$jscomp$0.latestSuspendedTime;
+      returnFiber = root$jscomp$0.latestPingedTime;
+      if (
+        (0 !== didFatal && didFatal > expirationTime) ||
+        (0 !== sourceFiber && sourceFiber > expirationTime) ||
+        (0 !== returnFiber && returnFiber > expirationTime)
+      ) {
+        markSuspendedPriorityLevel(root$jscomp$0, expirationTime);
+        onSuspend(
+          root$jscomp$0,
+          isYieldy,
+          expirationTime,
+          root$jscomp$0.expirationTime,
+          -1
+        );
+        return;
+      }
+      if (!root$jscomp$0.didError && !isExpired) {
+        root$jscomp$0.didError = !0;
+        expirationTime = root$jscomp$0.nextExpirationTimeToWorkOn = expirationTime;
+        isExpired = root$jscomp$0.expirationTime = 1;
+        onSuspend(root$jscomp$0, isYieldy, expirationTime, isExpired, -1);
+        return;
+      }
+    }
+    isExpired || -1 === nextLatestAbsoluteTimeoutMs
+      ? ((root$jscomp$0.pendingCommitExpirationTime = expirationTime),
+        (root$jscomp$0.finishedWork = isYieldy))
+      : (markSuspendedPriorityLevel(root$jscomp$0, expirationTime),
+        (isExpired =
+          10 *
+          (findEarliestOutstandingPriorityLevel(root$jscomp$0, expirationTime) -
+            2)),
+        isExpired < nextLatestAbsoluteTimeoutMs &&
+          (nextLatestAbsoluteTimeoutMs = isExpired),
+        (isExpired = 10 * (requestCurrentTime() - 2)),
+        (isExpired = nextLatestAbsoluteTimeoutMs - isExpired),
+        onSuspend(
+          root$jscomp$0,
+          isYieldy,
+          expirationTime,
+          root$jscomp$0.expirationTime,
+          0 > isExpired ? 0 : isExpired
+        ));
+  }
 }
 function captureCommitPhaseError(fiber, error) {
   var JSCompiler_inline_result;
@@ -4525,101 +5073,135 @@ function captureCommitPhaseError(fiber, error) {
     ) {
       switch (JSCompiler_inline_result.tag) {
         case 2:
+        case 3:
           var instance = JSCompiler_inline_result.stateNode;
           if (
             "function" ===
-              typeof JSCompiler_inline_result.type.getDerivedStateFromCatch ||
+              typeof JSCompiler_inline_result.type.getDerivedStateFromError ||
             ("function" === typeof instance.componentDidCatch &&
               (null === legacyErrorBoundariesThatAlreadyFailed ||
                 !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
           ) {
             fiber = createCapturedValue(error, fiber);
             fiber = createClassErrorUpdate(JSCompiler_inline_result, fiber, 1);
-            enqueueUpdate(JSCompiler_inline_result, fiber, 1);
+            enqueueUpdate(JSCompiler_inline_result, fiber);
             scheduleWork(JSCompiler_inline_result, 1);
             JSCompiler_inline_result = void 0;
             break a;
           }
           break;
-        case 3:
+        case 5:
           fiber = createCapturedValue(error, fiber);
           fiber = createRootErrorUpdate(JSCompiler_inline_result, fiber, 1);
-          enqueueUpdate(JSCompiler_inline_result, fiber, 1);
+          enqueueUpdate(JSCompiler_inline_result, fiber);
           scheduleWork(JSCompiler_inline_result, 1);
           JSCompiler_inline_result = void 0;
           break a;
       }
       JSCompiler_inline_result = JSCompiler_inline_result.return;
     }
-    3 === fiber.tag &&
+    5 === fiber.tag &&
       ((JSCompiler_inline_result = createCapturedValue(error, fiber)),
       (JSCompiler_inline_result = createRootErrorUpdate(
         fiber,
         JSCompiler_inline_result,
         1
       )),
-      enqueueUpdate(fiber, JSCompiler_inline_result, 1),
+      enqueueUpdate(fiber, JSCompiler_inline_result),
       scheduleWork(fiber, 1));
     JSCompiler_inline_result = void 0;
   }
   return JSCompiler_inline_result;
 }
 function computeExpirationForFiber(currentTime, fiber) {
-  currentTime =
-    0 !== expirationContext
-      ? expirationContext
-      : isWorking
-        ? isCommitting$1 ? 1 : nextRenderExpirationTime
-        : fiber.mode & 1
-          ? isBatchingInteractiveUpdates
-            ? 2 + 10 * ((((currentTime - 2 + 15) / 10) | 0) + 1)
-            : 2 + 25 * ((((currentTime - 2 + 500) / 25) | 0) + 1)
-          : 1;
+  isWorking
+    ? (currentTime = isCommitting$1 ? 1 : nextRenderExpirationTime)
+    : fiber.mode & 1
+      ? ((currentTime = isBatchingInteractiveUpdates
+          ? 2 + 10 * ((((currentTime - 2 + 15) / 10) | 0) + 1)
+          : 2 + 25 * ((((currentTime - 2 + 500) / 25) | 0) + 1)),
+        null !== nextRoot &&
+          currentTime === nextRenderExpirationTime &&
+          (currentTime += 1))
+      : (currentTime = 1);
   isBatchingInteractiveUpdates &&
-    (0 === lowestPendingInteractiveExpirationTime ||
-      currentTime > lowestPendingInteractiveExpirationTime) &&
-    (lowestPendingInteractiveExpirationTime = currentTime);
+    currentTime > lowestPriorityPendingInteractiveExpirationTime &&
+    (lowestPriorityPendingInteractiveExpirationTime = currentTime);
   return currentTime;
 }
-function scheduleWork(fiber, expirationTime) {
-  for (; null !== fiber; ) {
-    if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
-      fiber.expirationTime = expirationTime;
-    null !== fiber.alternate &&
-      (0 === fiber.alternate.expirationTime ||
-        fiber.alternate.expirationTime > expirationTime) &&
-      (fiber.alternate.expirationTime = expirationTime);
-    if (null === fiber.return)
-      if (3 === fiber.tag) {
-        var root = fiber.stateNode;
-        !isWorking &&
-          0 !== nextRenderExpirationTime &&
-          expirationTime < nextRenderExpirationTime &&
-          resetStack();
-        markPendingPriorityLevel(root, expirationTime);
-        (isWorking && !isCommitting$1 && nextRoot === root) ||
-          requestWork(root, root.expirationTime);
-        nestedUpdateCount > NESTED_UPDATE_LIMIT &&
-          invariant(
-            !1,
-            "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."
-          );
-      } else break;
-    fiber = fiber.return;
-  }
-}
-function recalculateCurrentTime() {
-  mostRecentCurrentTimeMs = now$1() - originalStartTimeMs;
-  return (mostRecentCurrentTime = ((mostRecentCurrentTimeMs / 10) | 0) + 2);
+function retrySuspendedRoot(root, fiber, suspendedTime) {
+  var retryTime = root.earliestSuspendedTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
+  if (
+    0 !== retryTime &&
+    suspendedTime >= retryTime &&
+    suspendedTime <= latestSuspendedTime
+  ) {
+    latestSuspendedTime = retryTime = suspendedTime;
+    root.didError = !1;
+    var latestPingedTime = root.latestPingedTime;
+    if (0 === latestPingedTime || latestPingedTime < latestSuspendedTime)
+      root.latestPingedTime = latestSuspendedTime;
+    findNextExpirationTimeToWorkOn(latestSuspendedTime, root);
+  } else
+    (retryTime = requestCurrentTime()),
+      (retryTime = computeExpirationForFiber(retryTime, fiber)),
+      markPendingPriorityLevel(root, retryTime);
+  0 !== (fiber.mode & 1) &&
+    root === nextRoot &&
+    nextRenderExpirationTime === suspendedTime &&
+    (nextRoot = null);
+  scheduleWorkToRoot(fiber, retryTime);
+  fiber = root.expirationTime;
+  0 !== fiber && requestWork(root, fiber);
+}
+function scheduleWorkToRoot(fiber, expirationTime) {
+  if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
+    fiber.expirationTime = expirationTime;
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    (0 === alternate.expirationTime ||
+      alternate.expirationTime > expirationTime) &&
+    (alternate.expirationTime = expirationTime);
+  var node = fiber.return,
+    root = null;
+  if (null === node && 5 === fiber.tag) root = fiber.stateNode;
+  else
+    for (; null !== node; ) {
+      alternate = node.alternate;
+      if (
+        0 === node.childExpirationTime ||
+        node.childExpirationTime > expirationTime
+      )
+        node.childExpirationTime = expirationTime;
+      null !== alternate &&
+        (0 === alternate.childExpirationTime ||
+          alternate.childExpirationTime > expirationTime) &&
+        (alternate.childExpirationTime = expirationTime);
+      if (null === node.return && 5 === node.tag) {
+        root = node.stateNode;
+        break;
+      }
+      node = node.return;
+    }
+  return null === root ? null : root;
 }
-function syncUpdates(fn, a, b, c, d) {
-  var previousExpirationContext = expirationContext;
-  expirationContext = 1;
-  try {
-    return fn(a, b, c, d);
-  } finally {
-    expirationContext = previousExpirationContext;
-  }
+function scheduleWork(fiber, expirationTime) {
+  fiber = scheduleWorkToRoot(fiber, expirationTime);
+  null !== fiber &&
+    (!isWorking &&
+      0 !== nextRenderExpirationTime &&
+      expirationTime < nextRenderExpirationTime &&
+      resetStack(),
+    markPendingPriorityLevel(fiber, expirationTime),
+    (isWorking && !isCommitting$1 && nextRoot === fiber) ||
+      requestWork(fiber, fiber.expirationTime),
+    nestedUpdateCount > NESTED_UPDATE_LIMIT &&
+      ((nestedUpdateCount = 0),
+      invariant(
+        !1,
+        "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 firstScheduledRoot = null,
   lastScheduledRoot = null,
@@ -4628,7 +5210,7 @@ var firstScheduledRoot = null,
   isRendering = !1,
   nextFlushedRoot = null,
   nextFlushedExpirationTime = 0,
-  lowestPendingInteractiveExpirationTime = 0,
+  lowestPriorityPendingInteractiveExpirationTime = 0,
   deadlineDidExpire = !1,
   hasUnhandledError = !1,
   unhandledError = null,
@@ -4637,38 +5219,68 @@ var firstScheduledRoot = null,
   isUnbatchingUpdates = !1,
   isBatchingInteractiveUpdates = !1,
   completedBatches = null,
-  NESTED_UPDATE_LIMIT = 1e3,
+  originalStartTimeMs = now$1(),
+  currentRendererTime = ((originalStartTimeMs / 10) | 0) + 2,
+  currentSchedulerTime = currentRendererTime,
+  NESTED_UPDATE_LIMIT = 50,
   nestedUpdateCount = 0,
+  lastCommittedRootDuringThisBatch = null,
   timeHeuristicForUnitOfWork = 1;
-function scheduleCallbackWithExpirationTime(expirationTime) {
+function recomputeCurrentRendererTime() {
+  currentRendererTime = (((now$1() - originalStartTimeMs) / 10) | 0) + 2;
+}
+function scheduleCallbackWithExpirationTime(root, expirationTime) {
   if (0 !== callbackExpirationTime) {
     if (expirationTime > callbackExpirationTime) return;
-    if (null !== callbackID) {
-      var callbackID$jscomp$0 = callbackID;
-      scheduledCallback = null;
-      clearTimeout(callbackID$jscomp$0);
-    }
+    null !== callbackID &&
+      ((root = callbackID), (scheduledCallback = null), clearTimeout(root));
   }
   callbackExpirationTime = expirationTime;
   now$1();
   scheduledCallback = performAsyncWork;
   callbackID = setTimeout(setTimeoutCallback, 1);
 }
-function onSuspend(root, suspendedExpirationTime, expirationTime, timeoutMs) {
-  0 <= timeoutMs &&
-    setTimeout(function() {
-      var latestSuspendedTime = root.latestSuspendedTime;
-      0 !== latestSuspendedTime &&
-        latestSuspendedTime <= suspendedExpirationTime &&
-        ((latestSuspendedTime = root.latestPingedTime),
-        0 === latestSuspendedTime ||
-          latestSuspendedTime < suspendedExpirationTime) &&
-        (root.latestPingedTime = suspendedExpirationTime);
-      findNextPendingPriorityLevel(root);
-      latestSuspendedTime = root.expirationTime;
-      0 !== latestSuspendedTime && requestWork(root, latestSuspendedTime);
-    }, timeoutMs);
-  root.expirationTime = expirationTime;
+function onSuspend(
+  root,
+  finishedWork,
+  suspendedExpirationTime,
+  rootExpirationTime,
+  msUntilTimeout
+) {
+  root.expirationTime = rootExpirationTime;
+  0 !== msUntilTimeout || shouldYield()
+    ? 0 < msUntilTimeout &&
+      (root.timeoutHandle = scheduleTimeout(
+        onTimeout.bind(null, root, finishedWork, suspendedExpirationTime),
+        msUntilTimeout
+      ))
+    : ((root.pendingCommitExpirationTime = suspendedExpirationTime),
+      (root.finishedWork = finishedWork));
+}
+function onTimeout(root, finishedWork, suspendedExpirationTime) {
+  root.pendingCommitExpirationTime = suspendedExpirationTime;
+  root.finishedWork = finishedWork;
+  recomputeCurrentRendererTime();
+  currentSchedulerTime = currentRendererTime;
+  invariant(
+    !isRendering,
+    "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
+  );
+  nextFlushedRoot = root;
+  nextFlushedExpirationTime = suspendedExpirationTime;
+  performWorkOnRoot(root, suspendedExpirationTime, !0);
+  performWork(1, null);
+}
+function requestCurrentTime() {
+  if (isRendering) return currentSchedulerTime;
+  findHighestPriorityRoot();
+  if (
+    0 === nextFlushedExpirationTime ||
+    1073741823 === nextFlushedExpirationTime
+  )
+    recomputeCurrentRendererTime(),
+      (currentSchedulerTime = currentRendererTime);
+  return currentSchedulerTime;
 }
 function requestWork(root, expirationTime) {
   if (null === root.nextScheduledRoot)
@@ -4691,10 +5303,10 @@ function requestWork(root, expirationTime) {
       ? isUnbatchingUpdates &&
         ((nextFlushedRoot = root),
         (nextFlushedExpirationTime = 1),
-        performWorkOnRoot(root, 1, !1))
+        performWorkOnRoot(root, 1, !0))
       : 1 === expirationTime
         ? performWork(1, null)
-        : scheduleCallbackWithExpirationTime(expirationTime));
+        : scheduleCallbackWithExpirationTime(root, expirationTime));
 }
 function findHighestPriorityRoot() {
   var highestPriorityWork = 0,
@@ -4736,20 +5348,26 @@ function findHighestPriorityRoot() {
           (highestPriorityWork = remainingExpirationTime),
             (highestPriorityRoot = root);
         if (root === lastScheduledRoot) break;
+        if (1 === highestPriorityWork) break;
         previousScheduledRoot = root;
         root = root.nextScheduledRoot;
       }
     }
-  previousScheduledRoot = nextFlushedRoot;
-  null !== previousScheduledRoot &&
-  previousScheduledRoot === highestPriorityRoot &&
-  1 === highestPriorityWork
-    ? nestedUpdateCount++
-    : (nestedUpdateCount = 0);
   nextFlushedRoot = highestPriorityRoot;
   nextFlushedExpirationTime = highestPriorityWork;
 }
 function performAsyncWork(dl) {
+  if (dl.didTimeout && null !== firstScheduledRoot) {
+    recomputeCurrentRendererTime();
+    var root = firstScheduledRoot;
+    do {
+      var expirationTime = root.expirationTime;
+      0 !== expirationTime &&
+        currentRendererTime >= expirationTime &&
+        (root.nextExpirationTimeToWorkOn = currentRendererTime);
+      root = root.nextScheduledRoot;
+    } while (root !== firstScheduledRoot);
+  }
   performWork(0, dl);
 }
 function performWork(minExpirationTime, dl) {
@@ -4757,18 +5375,23 @@ function performWork(minExpirationTime, dl) {
   findHighestPriorityRoot();
   if (null !== deadline)
     for (
-      ;
+      recomputeCurrentRendererTime(),
+        currentSchedulerTime = currentRendererTime;
       null !== nextFlushedRoot &&
       0 !== nextFlushedExpirationTime &&
       (0 === minExpirationTime ||
         minExpirationTime >= nextFlushedExpirationTime) &&
-      (!deadlineDidExpire ||
-        recalculateCurrentTime() >= nextFlushedExpirationTime);
+      (!deadlineDidExpire || currentRendererTime >= nextFlushedExpirationTime);
 
     )
-      recalculateCurrentTime(),
-        performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !0),
-        findHighestPriorityRoot();
+      performWorkOnRoot(
+        nextFlushedRoot,
+        nextFlushedExpirationTime,
+        currentRendererTime >= nextFlushedExpirationTime
+      ),
+        findHighestPriorityRoot(),
+        recomputeCurrentRendererTime(),
+        (currentSchedulerTime = currentRendererTime);
   else
     for (
       ;
@@ -4778,22 +5401,25 @@ function performWork(minExpirationTime, dl) {
         minExpirationTime >= nextFlushedExpirationTime);
 
     )
-      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !1),
+      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !0),
         findHighestPriorityRoot();
   null !== deadline && ((callbackExpirationTime = 0), (callbackID = null));
   0 !== nextFlushedExpirationTime &&
-    scheduleCallbackWithExpirationTime(nextFlushedExpirationTime);
+    scheduleCallbackWithExpirationTime(
+      nextFlushedRoot,
+      nextFlushedExpirationTime
+    );
   deadline = null;
   deadlineDidExpire = !1;
-  finishRendering();
-}
-function finishRendering() {
   nestedUpdateCount = 0;
-  if (null !== completedBatches) {
-    var batches = completedBatches;
-    completedBatches = null;
-    for (var i = 0; i < batches.length; i++) {
-      var batch = batches[i];
+  lastCommittedRootDuringThisBatch = null;
+  if (null !== completedBatches)
+    for (
+      minExpirationTime = completedBatches, completedBatches = null, dl = 0;
+      dl < minExpirationTime.length;
+      dl++
+    ) {
+      var batch = minExpirationTime[dl];
       try {
         batch._onComplete();
       } catch (error) {
@@ -4801,37 +5427,44 @@ function finishRendering() {
           ((hasUnhandledError = !0), (unhandledError = error));
       }
     }
-  }
   if (hasUnhandledError)
-    throw ((batches = unhandledError),
+    throw ((minExpirationTime = unhandledError),
     (unhandledError = null),
     (hasUnhandledError = !1),
-    batches);
+    minExpirationTime);
 }
-function performWorkOnRoot(root, expirationTime, isYieldy) {
+function performWorkOnRoot(root, expirationTime, isExpired) {
   invariant(
     !isRendering,
     "performWorkOnRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
   );
   isRendering = !0;
-  isYieldy
-    ? ((isYieldy = root.finishedWork),
-      null !== isYieldy
-        ? completeRoot$1(root, isYieldy, expirationTime)
+  if (null === deadline || isExpired) {
+    var finishedWork = root.finishedWork;
+    null !== finishedWork
+      ? completeRoot$1(root, finishedWork, expirationTime)
+      : ((root.finishedWork = null),
+        (finishedWork = root.timeoutHandle),
+        -1 !== finishedWork &&
+          ((root.timeoutHandle = -1), cancelTimeout(finishedWork)),
+        renderRoot(root, !1, isExpired),
+        (finishedWork = root.finishedWork),
+        null !== finishedWork &&
+          completeRoot$1(root, finishedWork, expirationTime));
+  } else
+    (finishedWork = root.finishedWork),
+      null !== finishedWork
+        ? completeRoot$1(root, finishedWork, expirationTime)
         : ((root.finishedWork = null),
-          renderRoot(root, !0),
-          (isYieldy = root.finishedWork),
-          null !== isYieldy &&
+          (finishedWork = root.timeoutHandle),
+          -1 !== finishedWork &&
+            ((root.timeoutHandle = -1), cancelTimeout(finishedWork)),
+          renderRoot(root, !0, isExpired),
+          (finishedWork = root.finishedWork),
+          null !== finishedWork &&
             (shouldYield()
-              ? (root.finishedWork = isYieldy)
-              : completeRoot$1(root, isYieldy, expirationTime))))
-    : ((isYieldy = root.finishedWork),
-      null !== isYieldy
-        ? completeRoot$1(root, isYieldy, expirationTime)
-        : ((root.finishedWork = null),
-          renderRoot(root, !1),
-          (isYieldy = root.finishedWork),
-          null !== isYieldy && completeRoot$1(root, isYieldy, expirationTime)));
+              ? (root.finishedWork = finishedWork)
+              : completeRoot$1(root, finishedWork, expirationTime)));
   isRendering = !1;
 }
 function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
@@ -4849,6 +5482,9 @@ function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
     return;
   }
   root.finishedWork = null;
+  root === lastCommittedRootDuringThisBatch
+    ? nestedUpdateCount++
+    : ((lastCommittedRootDuringThisBatch = root), (nestedUpdateCount = 0));
   isCommitting$1 = isWorking = !0;
   invariant(
     root.current !== finishedWork$jscomp$0,
@@ -4861,34 +5497,39 @@ function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
   );
   root.pendingCommitExpirationTime = 0;
   firstBatch = finishedWork$jscomp$0.expirationTime;
-  recalculateCurrentTime();
+  var childExpirationTimeBeforeCommit =
+    finishedWork$jscomp$0.childExpirationTime;
+  firstBatch =
+    0 === firstBatch ||
+    (0 !== childExpirationTimeBeforeCommit &&
+      childExpirationTimeBeforeCommit < firstBatch)
+      ? childExpirationTimeBeforeCommit
+      : firstBatch;
   root.didError = !1;
-  if (0 === firstBatch)
-    (root.earliestPendingTime = 0),
+  0 === firstBatch
+    ? ((root.earliestPendingTime = 0),
       (root.latestPendingTime = 0),
       (root.earliestSuspendedTime = 0),
       (root.latestSuspendedTime = 0),
-      (root.latestPingedTime = 0);
-  else {
-    var latestPendingTime = root.latestPendingTime;
-    0 !== latestPendingTime &&
-      (latestPendingTime < firstBatch
-        ? (root.earliestPendingTime = root.latestPendingTime = 0)
-        : root.earliestPendingTime < firstBatch &&
-          (root.earliestPendingTime = root.latestPendingTime));
-    latestPendingTime = root.earliestSuspendedTime;
-    0 === latestPendingTime
-      ? markPendingPriorityLevel(root, firstBatch)
-      : firstBatch > root.latestSuspendedTime
-        ? ((root.earliestSuspendedTime = 0),
-          (root.latestSuspendedTime = 0),
-          (root.latestPingedTime = 0),
-          markPendingPriorityLevel(root, firstBatch))
-        : firstBatch < latestPendingTime &&
-          markPendingPriorityLevel(root, firstBatch);
-  }
-  findNextPendingPriorityLevel(root);
-  ReactCurrentOwner.current = null;
+      (root.latestPingedTime = 0))
+    : ((childExpirationTimeBeforeCommit = root.latestPendingTime),
+      0 !== childExpirationTimeBeforeCommit &&
+        (childExpirationTimeBeforeCommit < firstBatch
+          ? (root.earliestPendingTime = root.latestPendingTime = 0)
+          : root.earliestPendingTime < firstBatch &&
+            (root.earliestPendingTime = root.latestPendingTime)),
+      (childExpirationTimeBeforeCommit = root.earliestSuspendedTime),
+      0 === childExpirationTimeBeforeCommit
+        ? markPendingPriorityLevel(root, firstBatch)
+        : firstBatch > root.latestSuspendedTime
+          ? ((root.earliestSuspendedTime = 0),
+            (root.latestSuspendedTime = 0),
+            (root.latestPingedTime = 0),
+            markPendingPriorityLevel(root, firstBatch))
+          : firstBatch < childExpirationTimeBeforeCommit &&
+            markPendingPriorityLevel(root, firstBatch));
+  findNextExpirationTimeToWorkOn(0, root);
+  ReactCurrentOwner$2.current = null;
   1 < finishedWork$jscomp$0.effectTag
     ? null !== finishedWork$jscomp$0.lastEffect
       ? ((finishedWork$jscomp$0.lastEffect.nextEffect = finishedWork$jscomp$0),
@@ -4896,46 +5537,49 @@ function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
       : (firstBatch = finishedWork$jscomp$0)
     : (firstBatch = finishedWork$jscomp$0.firstEffect);
   for (nextEffect = firstBatch; null !== nextEffect; ) {
-    latestPendingTime = !1;
+    childExpirationTimeBeforeCommit = !1;
     var error = void 0;
     try {
       for (; null !== nextEffect; ) {
         if (nextEffect.effectTag & 256) {
-          var current = nextEffect.alternate,
-            finishedWork = nextEffect;
-          switch (finishedWork.tag) {
-            case 2:
-              if (finishedWork.effectTag & 256 && null !== current) {
-                var prevProps = current.memoizedProps,
-                  prevState = current.memoizedState,
-                  instance = finishedWork.stateNode;
-                instance.props = finishedWork.memoizedProps;
-                instance.state = finishedWork.memoizedState;
-                var snapshot = instance.getSnapshotBeforeUpdate(
-                  prevProps,
-                  prevState
+          var current$$1 = nextEffect.alternate;
+          a: {
+            var finishedWork = nextEffect;
+            switch (finishedWork.tag) {
+              case 2:
+              case 3:
+                if (finishedWork.effectTag & 256 && null !== current$$1) {
+                  var prevProps = current$$1.memoizedProps,
+                    prevState = current$$1.memoizedState,
+                    instance = finishedWork.stateNode;
+                  instance.props = finishedWork.memoizedProps;
+                  instance.state = finishedWork.memoizedState;
+                  var snapshot = instance.getSnapshotBeforeUpdate(
+                    prevProps,
+                    prevState
+                  );
+                  instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+                }
+                break a;
+              case 5:
+              case 7:
+              case 8:
+              case 6:
+                break a;
+              default:
+                invariant(
+                  !1,
+                  "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
                 );
-                instance.__reactInternalSnapshotBeforeUpdate = snapshot;
-              }
-              break;
-            case 3:
-            case 5:
-            case 6:
-            case 4:
-              break;
-            default:
-              invariant(
-                !1,
-                "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-              );
+            }
           }
         }
         nextEffect = nextEffect.nextEffect;
       }
     } catch (e) {
-      (latestPendingTime = !0), (error = e);
+      (childExpirationTimeBeforeCommit = !0), (error = e);
     }
-    latestPendingTime &&
+    childExpirationTimeBeforeCommit &&
       (invariant(
         null !== nextEffect,
         "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
@@ -4944,15 +5588,15 @@ function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
       null !== nextEffect && (nextEffect = nextEffect.nextEffect));
   }
   for (nextEffect = firstBatch; null !== nextEffect; ) {
-    current = !1;
+    current$$1 = !1;
     prevProps = void 0;
     try {
       for (; null !== nextEffect; ) {
         var effectTag = nextEffect.effectTag;
         if (effectTag & 128) {
-          var current$jscomp$0 = nextEffect.alternate;
-          if (null !== current$jscomp$0) {
-            var currentRef = current$jscomp$0.ref;
+          var current$$1$jscomp$0 = nextEffect.alternate;
+          if (null !== current$$1$jscomp$0) {
+            var currentRef = current$$1$jscomp$0.ref;
             null !== currentRef &&
               ("function" === typeof currentRef
                 ? currentRef(null)
@@ -4973,32 +5617,37 @@ function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
           case 8:
             prevState = nextEffect;
             a: for (snapshot = instance = prevState; ; ) {
-              latestPendingTime = snapshot;
-              "function" === typeof onCommitUnmount &&
-                onCommitUnmount(latestPendingTime);
-              switch (latestPendingTime.tag) {
+              childExpirationTimeBeforeCommit = snapshot;
+              "function" === typeof onCommitFiberUnmount &&
+                onCommitFiberUnmount(childExpirationTimeBeforeCommit);
+              switch (childExpirationTimeBeforeCommit.tag) {
                 case 2:
-                  safelyDetachRef(latestPendingTime);
-                  var instance$jscomp$0 = latestPendingTime.stateNode;
+                case 3:
+                  safelyDetachRef(childExpirationTimeBeforeCommit);
+                  var instance$jscomp$0 =
+                    childExpirationTimeBeforeCommit.stateNode;
                   if (
                     "function" === typeof instance$jscomp$0.componentWillUnmount
                   )
                     try {
                       (instance$jscomp$0.props =
-                        latestPendingTime.memoizedProps),
+                        childExpirationTimeBeforeCommit.memoizedProps),
                         (instance$jscomp$0.state =
-                          latestPendingTime.memoizedState),
+                          childExpirationTimeBeforeCommit.memoizedState),
                         instance$jscomp$0.componentWillUnmount();
                     } catch (unmountError) {
-                      captureCommitPhaseError(latestPendingTime, unmountError);
+                      captureCommitPhaseError(
+                        childExpirationTimeBeforeCommit,
+                        unmountError
+                      );
                     }
                   break;
-                case 5:
-                  safelyDetachRef(latestPendingTime);
+                case 7:
+                  safelyDetachRef(childExpirationTimeBeforeCommit);
                   break;
-                case 4:
+                case 6:
                   FabricUIManager.createChildSet(
-                    latestPendingTime.stateNode.containerInfo
+                    childExpirationTimeBeforeCommit.stateNode.containerInfo
                   );
               }
               if (null !== snapshot.child)
@@ -5023,9 +5672,9 @@ function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
         nextEffect = nextEffect.nextEffect;
       }
     } catch (e) {
-      (current = !0), (prevProps = e);
+      (current$$1 = !0), (prevProps = e);
     }
-    current &&
+    current$$1 &&
       (invariant(
         null !== nextEffect,
         "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
@@ -5036,25 +5685,26 @@ function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
   root.current = finishedWork$jscomp$0;
   for (nextEffect = firstBatch; null !== nextEffect; ) {
     effectTag = !1;
-    current$jscomp$0 = void 0;
+    current$$1$jscomp$0 = void 0;
     try {
       for (currentRef = expirationTime; null !== nextEffect; ) {
         var effectTag$jscomp$0 = nextEffect.effectTag;
         if (effectTag$jscomp$0 & 36) {
-          var current$jscomp$1 = nextEffect.alternate;
+          var current$$1$jscomp$1 = nextEffect.alternate;
           instance$jscomp$0 = nextEffect;
           firstBatch = currentRef;
           switch (instance$jscomp$0.tag) {
             case 2:
+            case 3:
               var instance$jscomp$1 = instance$jscomp$0.stateNode;
               if (instance$jscomp$0.effectTag & 4)
-                if (null === current$jscomp$1)
+                if (null === current$$1$jscomp$1)
                   (instance$jscomp$1.props = instance$jscomp$0.memoizedProps),
                     (instance$jscomp$1.state = instance$jscomp$0.memoizedState),
                     instance$jscomp$1.componentDidMount();
                 else {
-                  var prevProps$jscomp$0 = current$jscomp$1.memoizedProps,
-                    prevState$jscomp$0 = current$jscomp$1.memoizedState;
+                  var prevProps$jscomp$0 = current$$1$jscomp$1.memoizedProps,
+                    prevState$jscomp$0 = current$$1$jscomp$1.memoizedState;
                   instance$jscomp$1.props = instance$jscomp$0.memoizedProps;
                   instance$jscomp$1.state = instance$jscomp$0.memoizedState;
                   instance$jscomp$1.componentDidUpdate(
@@ -5074,41 +5724,49 @@ function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
                   firstBatch
                 ));
               break;
-            case 3:
+            case 5:
               var _updateQueue = instance$jscomp$0.updateQueue;
               if (null !== _updateQueue) {
-                current = null;
+                current$$1 = null;
                 if (null !== instance$jscomp$0.child)
                   switch (instance$jscomp$0.child.tag) {
-                    case 5:
-                      current = instance$jscomp$0.child.stateNode.canonical;
+                    case 7:
+                      current$$1 = instance$jscomp$0.child.stateNode.canonical;
                       break;
                     case 2:
-                      current = instance$jscomp$0.child.stateNode;
+                    case 3:
+                      current$$1 = instance$jscomp$0.child.stateNode;
                   }
                 commitUpdateQueue(
                   instance$jscomp$0,
                   _updateQueue,
-                  current,
+                  current$$1,
                   firstBatch
                 );
               }
               break;
-            case 5:
-              null === current$jscomp$1 &&
+            case 7:
+              null === current$$1$jscomp$1 &&
                 instance$jscomp$0.effectTag & 4 &&
                 invariant(
                   !1,
                   "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
                 );
               break;
-            case 6:
+            case 8:
               break;
-            case 4:
+            case 6:
               break;
             case 15:
               break;
             case 16:
+              if (0 === (instance$jscomp$0.mode & 2))
+                (instance$jscomp$0.updateQueue = emptyObject$1),
+                  scheduleWork(instance$jscomp$0, 1);
+              else {
+                var currentTime = requestCurrentTime();
+                instance$jscomp$0.stateNode = { timedOutAt: currentTime };
+              }
               break;
             default:
               invariant(
@@ -5118,20 +5776,19 @@ function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
           }
         }
         if (effectTag$jscomp$0 & 128) {
-          instance$jscomp$0 = void 0;
           var ref = nextEffect.ref;
           if (null !== ref) {
             var instance$jscomp$2 = nextEffect.stateNode;
             switch (nextEffect.tag) {
-              case 5:
-                instance$jscomp$0 = instance$jscomp$2.canonical;
+              case 7:
+                var instanceToUse = instance$jscomp$2.canonical;
                 break;
               default:
-                instance$jscomp$0 = instance$jscomp$2;
+                instanceToUse = instance$jscomp$2;
             }
             "function" === typeof ref
-              ? ref(instance$jscomp$0)
-              : (ref.current = instance$jscomp$0);
+              ? ref(instanceToUse)
+              : (ref.current = instanceToUse);
           }
         }
         var next = nextEffect.nextEffect;
@@ -5139,31 +5796,37 @@ function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
         nextEffect = next;
       }
     } catch (e) {
-      (effectTag = !0), (current$jscomp$0 = e);
+      (effectTag = !0), (current$$1$jscomp$0 = e);
     }
     effectTag &&
       (invariant(
         null !== nextEffect,
         "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
       ),
-      captureCommitPhaseError(nextEffect, current$jscomp$0),
+      captureCommitPhaseError(nextEffect, current$$1$jscomp$0),
       null !== nextEffect && (nextEffect = nextEffect.nextEffect));
   }
   isWorking = isCommitting$1 = !1;
-  "function" === typeof onCommitRoot &&
-    onCommitRoot(finishedWork$jscomp$0.stateNode);
-  finishedWork$jscomp$0 = root.expirationTime;
+  "function" === typeof onCommitFiberRoot &&
+    onCommitFiberRoot(finishedWork$jscomp$0.stateNode);
+  effectTag$jscomp$0 = finishedWork$jscomp$0.expirationTime;
+  finishedWork$jscomp$0 = finishedWork$jscomp$0.childExpirationTime;
+  finishedWork$jscomp$0 =
+    0 === effectTag$jscomp$0 ||
+    (0 !== finishedWork$jscomp$0 && finishedWork$jscomp$0 < effectTag$jscomp$0)
+      ? finishedWork$jscomp$0
+      : effectTag$jscomp$0;
   0 === finishedWork$jscomp$0 &&
     (legacyErrorBoundariesThatAlreadyFailed = null);
   root.expirationTime = finishedWork$jscomp$0;
   root.finishedWork = null;
 }
 function shouldYield() {
-  return null === deadline ||
-    deadlineDidExpire ||
-    deadline.timeRemaining() > timeHeuristicForUnitOfWork
-    ? !1
-    : (deadlineDidExpire = !0);
+  return deadlineDidExpire
+    ? !0
+    : null === deadline || deadline.timeRemaining() > timeHeuristicForUnitOfWork
+      ? !1
+      : (deadlineDidExpire = !0);
 }
 function onUncaughtError(error) {
   invariant(
@@ -5173,51 +5836,54 @@ function onUncaughtError(error) {
   nextFlushedRoot.expirationTime = 0;
   hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
 }
-function updateContainerAtExpirationTime(
-  element,
-  container,
-  parentComponent,
-  expirationTime,
-  callback
-) {
-  var current = container.current;
-  if (parentComponent) {
-    parentComponent = parentComponent._reactInternalFiber;
-    var parentContext;
-    b: {
-      invariant(
-        2 === isFiberMountedImpl(parentComponent) && 2 === parentComponent.tag,
-        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-      );
-      for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
-        if (isContextProvider(parentContext)) {
-          parentContext =
-            parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
-          break b;
-        }
-        parentContext = parentContext.return;
-        invariant(
-          parentContext,
-          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-        );
+function getContextForSubtree(parentComponent) {
+  if (!parentComponent) return emptyContextObject;
+  parentComponent = parentComponent._reactInternalFiber;
+  a: {
+    invariant(
+      2 === isFiberMountedImpl(parentComponent) &&
+        (2 === parentComponent.tag || 3 === parentComponent.tag),
+      "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+    );
+    var parentContext = parentComponent;
+    do {
+      switch (parentContext.tag) {
+        case 5:
+          parentContext = parentContext.stateNode.context;
+          break a;
+        case 2:
+          if (isContextProvider(parentContext.type)) {
+            parentContext =
+              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
+            break a;
+          }
+          break;
+        case 3:
+          if (isContextProvider(parentContext.type._reactResult)) {
+            parentContext =
+              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
+            break a;
+          }
       }
-      parentContext = parentContext.stateNode.context;
-    }
-    parentComponent = isContextProvider(parentComponent)
-      ? processChildContext(parentComponent, parentContext)
-      : parentContext;
-  } else parentComponent = emptyObject;
-  null === container.context
-    ? (container.context = parentComponent)
-    : (container.pendingContext = parentComponent);
-  container = callback;
-  callback = createUpdate(expirationTime);
-  callback.payload = { element: element };
-  container = void 0 === container ? null : container;
-  null !== container && (callback.callback = container);
-  enqueueUpdate(current, callback, expirationTime);
-  scheduleWork(current, expirationTime);
-  return expirationTime;
+      parentContext = parentContext.return;
+    } while (null !== parentContext);
+    invariant(
+      !1,
+      "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+    );
+    parentContext = void 0;
+  }
+  if (2 === parentComponent.tag) {
+    var Component = parentComponent.type;
+    if (isContextProvider(Component))
+      return processChildContext(parentComponent, Component, parentContext);
+  } else if (
+    3 === parentComponent.tag &&
+    ((Component = parentComponent.type._reactResult),
+    isContextProvider(Component))
+  )
+    return processChildContext(parentComponent, Component, parentContext);
+  return parentContext;
 }
 function findHostInstance$1(component) {
   var fiber = component._reactInternalFiber;
@@ -5233,158 +5899,23 @@ function findHostInstance$1(component) {
   return null === component ? null : component.stateNode;
 }
 function updateContainer(element, container, parentComponent, callback) {
-  var current = container.current,
-    currentTime = recalculateCurrentTime();
-  current = computeExpirationForFiber(currentTime, current);
-  return updateContainerAtExpirationTime(
-    element,
-    container,
-    parentComponent,
-    current,
-    callback
-  );
-}
-function getPublicRootInstance(container) {
-  container = container.current;
-  if (!container.child) return null;
-  switch (container.child.tag) {
-    case 5:
-      return container.child.stateNode.canonical;
-    default:
-      return container.child.stateNode;
-  }
-}
-function injectIntoDevTools(devToolsConfig) {
-  var findFiberByHostInstance = devToolsConfig.findFiberByHostInstance;
-  return injectInternals(
-    Object.assign({}, devToolsConfig, {
-      findHostInstanceByFiber: function(fiber) {
-        fiber = findCurrentHostFiber(fiber);
-        return null === fiber ? null : fiber.stateNode;
-      },
-      findFiberByHostInstance: function(instance) {
-        return findFiberByHostInstance
-          ? findFiberByHostInstance(instance)
-          : null;
-      }
-    })
-  );
+  var current$$1 = container.current,
+    currentTime = requestCurrentTime();
+  current$$1 = computeExpirationForFiber(currentTime, current$$1);
+  currentTime = container.current;
+  parentComponent = getContextForSubtree(parentComponent);
+  null === container.context
+    ? (container.context = parentComponent)
+    : (container.pendingContext = parentComponent);
+  container = callback;
+  callback = createUpdate(current$$1);
+  callback.payload = { element: element };
+  container = void 0 === container ? null : container;
+  null !== container && (callback.callback = container);
+  enqueueUpdate(currentTime, callback);
+  scheduleWork(currentTime, current$$1);
+  return current$$1;
 }
-var ReactFabricRenderer = {
-  updateContainerAtExpirationTime: updateContainerAtExpirationTime,
-  createContainer: function(containerInfo, isAsync, hydrate) {
-    return createFiberRoot(containerInfo, isAsync, hydrate);
-  },
-  updateContainer: updateContainer,
-  flushRoot: function(root, expirationTime) {
-    invariant(
-      !isRendering,
-      "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
-    );
-    nextFlushedRoot = root;
-    nextFlushedExpirationTime = expirationTime;
-    performWorkOnRoot(root, expirationTime, !1);
-    performWork(1, null);
-    finishRendering();
-  },
-  requestWork: requestWork,
-  computeUniqueAsyncExpiration: function() {
-    var result =
-      2 + 25 * ((((recalculateCurrentTime() - 2 + 500) / 25) | 0) + 1);
-    result <= lastUniqueAsyncExpiration &&
-      (result = lastUniqueAsyncExpiration + 1);
-    return (lastUniqueAsyncExpiration = result);
-  },
-  batchedUpdates: function(fn, a) {
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      return fn(a);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates) ||
-        isRendering ||
-        performWork(1, null);
-    }
-  },
-  unbatchedUpdates: function(fn, a) {
-    if (isBatchingUpdates && !isUnbatchingUpdates) {
-      isUnbatchingUpdates = !0;
-      try {
-        return fn(a);
-      } finally {
-        isUnbatchingUpdates = !1;
-      }
-    }
-    return fn(a);
-  },
-  deferredUpdates: function(fn) {
-    var previousExpirationContext = expirationContext;
-    expirationContext =
-      2 + 25 * ((((recalculateCurrentTime() - 2 + 500) / 25) | 0) + 1);
-    try {
-      return fn();
-    } finally {
-      expirationContext = previousExpirationContext;
-    }
-  },
-  syncUpdates: syncUpdates,
-  interactiveUpdates: function(fn, a, b) {
-    if (isBatchingInteractiveUpdates) return fn(a, b);
-    isBatchingUpdates ||
-      isRendering ||
-      0 === lowestPendingInteractiveExpirationTime ||
-      (performWork(lowestPendingInteractiveExpirationTime, null),
-      (lowestPendingInteractiveExpirationTime = 0));
-    var previousIsBatchingInteractiveUpdates = isBatchingInteractiveUpdates,
-      previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = isBatchingInteractiveUpdates = !0;
-    try {
-      return fn(a, b);
-    } finally {
-      (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
-        (isBatchingUpdates = previousIsBatchingUpdates) ||
-          isRendering ||
-          performWork(1, null);
-    }
-  },
-  flushInteractiveUpdates: function() {
-    isRendering ||
-      0 === lowestPendingInteractiveExpirationTime ||
-      (performWork(lowestPendingInteractiveExpirationTime, null),
-      (lowestPendingInteractiveExpirationTime = 0));
-  },
-  flushControlled: function(fn) {
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      syncUpdates(fn);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates) ||
-        isRendering ||
-        performWork(1, null);
-    }
-  },
-  flushSync: function(fn, a) {
-    invariant(
-      !isRendering,
-      "flushSync was called from inside a lifecycle method. It cannot be called when React is already rendering."
-    );
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      return syncUpdates(fn, a);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates), performWork(1, null);
-    }
-  },
-  getPublicRootInstance: getPublicRootInstance,
-  findHostInstance: findHostInstance$1,
-  findHostInstanceWithNoPortals: function(fiber) {
-    fiber = findCurrentHostFiberWithNoPortals(fiber);
-    return null === fiber ? null : fiber.stateNode;
-  },
-  injectIntoDevTools: injectIntoDevTools
-};
 function createPortal(children, containerInfo, implementation) {
   var key =
     3 < arguments.length && void 0 !== arguments[3] ? arguments[3] : null;
@@ -5432,8 +5963,23 @@ function findNodeHandle(componentOrHandle) {
       ? componentOrHandle.canonical._nativeTag
       : componentOrHandle._nativeTag;
 }
-_batchedUpdates = ReactFabricRenderer.batchedUpdates;
-_flushInteractiveUpdates = ReactFabricRenderer.flushInteractiveUpdates;
+_batchedUpdatesImpl = function(fn, a) {
+  var previousIsBatchingUpdates = isBatchingUpdates;
+  isBatchingUpdates = !0;
+  try {
+    return fn(a);
+  } finally {
+    (isBatchingUpdates = previousIsBatchingUpdates) ||
+      isRendering ||
+      performWork(1, null);
+  }
+};
+_flushInteractiveUpdatesImpl = function() {
+  isRendering ||
+    0 === lowestPriorityPendingInteractiveExpirationTime ||
+    (performWork(lowestPriorityPendingInteractiveExpirationTime, null),
+    (lowestPriorityPendingInteractiveExpirationTime = 0));
+};
 var roots = new Map(),
   ReactFabric = {
     NativeComponent: (function(findNodeHandle, findHostInstance) {
@@ -5461,13 +6007,13 @@ var roots = new Map(),
         ReactNativeComponent.prototype.measure = function(callback) {
           UIManager.measure(
             findNodeHandle(this),
-            mountSafeCallback(this, callback)
+            mountSafeCallback_NOT_REALLY_SAFE(this, callback)
           );
         };
         ReactNativeComponent.prototype.measureInWindow = function(callback) {
           UIManager.measureInWindow(
             findNodeHandle(this),
-            mountSafeCallback(this, callback)
+            mountSafeCallback_NOT_REALLY_SAFE(this, callback)
           );
         };
         ReactNativeComponent.prototype.measureLayout = function(
@@ -5478,8 +6024,8 @@ var roots = new Map(),
           UIManager.measureLayout(
             findNodeHandle(this),
             relativeToNativeNode,
-            mountSafeCallback(this, onFail),
-            mountSafeCallback(this, onSuccess)
+            mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+            mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
           );
         };
         ReactNativeComponent.prototype.setNativeProps = function(nativeProps) {
@@ -5492,7 +6038,7 @@ var roots = new Map(),
               maybeInstance.viewConfig || maybeInstance.canonical.viewConfig;
             nativeProps = diffProperties(
               null,
-              emptyObject$1,
+              emptyObject,
               nativeProps,
               viewConfig.validAttributes
             );
@@ -5510,11 +6056,43 @@ var roots = new Map(),
     findNodeHandle: findNodeHandle,
     render: function(element, containerTag, callback) {
       var root = roots.get(containerTag);
-      root ||
-        ((root = createFiberRoot(containerTag, !1, !1)),
-        roots.set(containerTag, root));
+      if (!root) {
+        root = new FiberNode(5, null, null, 0);
+        var root$jscomp$0 = {
+          current: root,
+          containerInfo: containerTag,
+          pendingChildren: null,
+          earliestPendingTime: 0,
+          latestPendingTime: 0,
+          earliestSuspendedTime: 0,
+          latestSuspendedTime: 0,
+          latestPingedTime: 0,
+          didError: !1,
+          pendingCommitExpirationTime: 0,
+          finishedWork: null,
+          timeoutHandle: -1,
+          context: null,
+          pendingContext: null,
+          hydrate: !1,
+          nextExpirationTimeToWorkOn: 0,
+          expirationTime: 0,
+          firstBatch: null,
+          nextScheduledRoot: null
+        };
+        root = root.stateNode = root$jscomp$0;
+        roots.set(containerTag, root);
+      }
       updateContainer(element, root, null, callback);
-      return getPublicRootInstance(root);
+      a: if (((element = root.current), element.child))
+        switch (element.child.tag) {
+          case 7:
+            element = element.child.stateNode.canonical;
+            break a;
+          default:
+            element = element.child.stateNode;
+        }
+      else element = null;
+      return element;
     },
     unmountComponentAtNode: function(containerTag) {
       var root = roots.get(containerTag);
@@ -5537,21 +6115,21 @@ var roots = new Map(),
           measure: function(callback) {
             UIManager.measure(
               findNodeHandle(this),
-              mountSafeCallback(this, callback)
+              mountSafeCallback_NOT_REALLY_SAFE(this, callback)
             );
           },
           measureInWindow: function(callback) {
             UIManager.measureInWindow(
               findNodeHandle(this),
-              mountSafeCallback(this, callback)
+              mountSafeCallback_NOT_REALLY_SAFE(this, callback)
             );
           },
           measureLayout: function(relativeToNativeNode, onSuccess, onFail) {
             UIManager.measureLayout(
               findNodeHandle(this),
               relativeToNativeNode,
-              mountSafeCallback(this, onFail),
-              mountSafeCallback(this, onSuccess)
+              mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+              mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
             );
           },
           setNativeProps: function(nativeProps) {
@@ -5563,7 +6141,7 @@ var roots = new Map(),
               var viewConfig = maybeInstance.viewConfig;
               nativeProps = diffProperties(
                 null,
-                emptyObject$1,
+                emptyObject,
                 nativeProps,
                 viewConfig.validAttributes
               );
@@ -5585,13 +6163,28 @@ var roots = new Map(),
       })(findNodeHandle, findHostInstance$1)
     }
   };
-injectIntoDevTools({
+(function(devToolsConfig) {
+  var findFiberByHostInstance = devToolsConfig.findFiberByHostInstance;
+  return injectInternals(
+    Object.assign({}, devToolsConfig, {
+      findHostInstanceByFiber: function(fiber) {
+        fiber = findCurrentHostFiber(fiber);
+        return null === fiber ? null : fiber.stateNode;
+      },
+      findFiberByHostInstance: function(instance) {
+        return findFiberByHostInstance
+          ? findFiberByHostInstance(instance)
+          : null;
+      }
+    })
+  );
+})({
   findFiberByHostInstance: getInstanceFromInstance,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.4.1",
+  version: "16.6.0-alpha.8af6728",
   rendererPackageName: "react-native-renderer"
 });
 var ReactFabric$2 = { default: ReactFabric },
   ReactFabric$3 = (ReactFabric$2 && ReactFabric) || ReactFabric$2;
-module.exports = ReactFabric$3.default ? ReactFabric$3.default : ReactFabric$3;
+module.exports = ReactFabric$3.default || ReactFabric$3;
diff --git a/Libraries/Renderer/oss/ReactFabric-profiling.js b/Libraries/Renderer/oss/ReactFabric-profiling.js
index f1962978797bc2..0ca23993737641 100644
--- a/Libraries/Renderer/oss/ReactFabric-profiling.js
+++ b/Libraries/Renderer/oss/ReactFabric-profiling.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,78 +12,83 @@
 
 "use strict";
 require("InitializeCore");
-var invariant = require("fbjs/lib/invariant"),
-  ReactNativeViewConfigRegistry = require("ReactNativeViewConfigRegistry"),
+var ReactNativeViewConfigRegistry = require("ReactNativeViewConfigRegistry"),
   UIManager = require("UIManager"),
   React = require("react"),
-  emptyObject = require("fbjs/lib/emptyObject"),
   deepDiffer = require("deepDiffer"),
   flattenStyle = require("flattenStyle"),
   TextInputState = require("TextInputState"),
   FabricUIManager = require("FabricUIManager"),
+  tracing = require("scheduler/tracing"),
   ExceptionsManager = require("ExceptionsManager");
-function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
-  this._hasCaughtError = !1;
-  this._caughtError = null;
+function invariant(condition, format, a, b, c, d, e, f) {
+  if (!condition) {
+    condition = void 0;
+    if (void 0 === format)
+      condition = Error(
+        "Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings."
+      );
+    else {
+      var args = [a, b, c, d, e, f],
+        argIndex = 0;
+      condition = Error(
+        format.replace(/%s/g, function() {
+          return args[argIndex++];
+        })
+      );
+      condition.name = "Invariant Violation";
+    }
+    condition.framesToPop = 1;
+    throw condition;
+  }
+}
+function invokeGuardedCallbackImpl(name, func, context, a, b, c, d, e, f) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
   try {
     func.apply(context, funcArgs);
   } catch (error) {
-    (this._caughtError = error), (this._hasCaughtError = !0);
+    this.onError(error);
   }
 }
-var ReactErrorUtils = {
-  _caughtError: null,
-  _hasCaughtError: !1,
-  _rethrowError: null,
-  _hasRethrowError: !1,
-  invokeGuardedCallback: function(name, func, context, a, b, c, d, e, f) {
-    invokeGuardedCallback.apply(ReactErrorUtils, arguments);
-  },
-  invokeGuardedCallbackAndCatchFirstError: function(
-    name,
-    func,
-    context,
-    a,
-    b,
-    c,
-    d,
-    e,
-    f
-  ) {
-    ReactErrorUtils.invokeGuardedCallback.apply(this, arguments);
-    if (ReactErrorUtils.hasCaughtError()) {
-      var error = ReactErrorUtils.clearCaughtError();
-      ReactErrorUtils._hasRethrowError ||
-        ((ReactErrorUtils._hasRethrowError = !0),
-        (ReactErrorUtils._rethrowError = error));
-    }
-  },
-  rethrowCaughtError: function() {
-    return rethrowCaughtError.apply(ReactErrorUtils, arguments);
-  },
-  hasCaughtError: function() {
-    return ReactErrorUtils._hasCaughtError;
-  },
-  clearCaughtError: function() {
-    if (ReactErrorUtils._hasCaughtError) {
-      var error = ReactErrorUtils._caughtError;
-      ReactErrorUtils._caughtError = null;
-      ReactErrorUtils._hasCaughtError = !1;
-      return error;
+var hasError = !1,
+  caughtError = null,
+  hasRethrowError = !1,
+  rethrowError = null,
+  reporter = {
+    onError: function(error) {
+      hasError = !0;
+      caughtError = error;
     }
-    invariant(
-      !1,
-      "clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue."
-    );
-  }
-};
-function rethrowCaughtError() {
-  if (ReactErrorUtils._hasRethrowError) {
-    var error = ReactErrorUtils._rethrowError;
-    ReactErrorUtils._rethrowError = null;
-    ReactErrorUtils._hasRethrowError = !1;
-    throw error;
+  };
+function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
+  hasError = !1;
+  caughtError = null;
+  invokeGuardedCallbackImpl.apply(reporter, arguments);
+}
+function invokeGuardedCallbackAndCatchFirstError(
+  name,
+  func,
+  context,
+  a,
+  b,
+  c,
+  d,
+  e,
+  f
+) {
+  invokeGuardedCallback.apply(this, arguments);
+  if (hasError) {
+    if (hasError) {
+      var error = caughtError;
+      hasError = !1;
+      caughtError = null;
+    } else
+      invariant(
+        !1,
+        "clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue."
+      ),
+        (error = void 0);
+    hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
 var eventPluginOrder = null,
@@ -165,12 +170,7 @@ var plugins = [],
 function executeDispatch(event, simulated, listener, inst) {
   simulated = event.type || "unknown-event";
   event.currentTarget = getNodeFromInstance(inst);
-  ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
-    simulated,
-    listener,
-    void 0,
-    event
-  );
+  invokeGuardedCallbackAndCatchFirstError(simulated, listener, void 0, event);
   event.currentTarget = null;
 }
 function executeDirectDispatch(event) {
@@ -294,7 +294,7 @@ function getListener(inst, registrationName) {
 }
 function getParent(inst) {
   do inst = inst.return;
-  while (inst && 5 !== inst.tag);
+  while (inst && 7 !== inst.tag);
   return inst ? inst : null;
 }
 function traverseTwoPhase(inst, fn, arg) {
@@ -347,9 +347,6 @@ function accumulateDirectDispatchesSingle(event) {
     }
   }
 }
-var shouldBeReleasedProperties = "dispatchConfig _targetInst nativeEvent isDefaultPrevented isPropagationStopped _dispatchListeners _dispatchInstances".split(
-  " "
-);
 function functionThatReturnsTrue() {
   return !0;
 }
@@ -407,12 +404,9 @@ Object.assign(SyntheticEvent.prototype, {
     var Interface = this.constructor.Interface,
       propName;
     for (propName in Interface) this[propName] = null;
-    for (
-      Interface = 0;
-      Interface < shouldBeReleasedProperties.length;
-      Interface++
-    )
-      this[shouldBeReleasedProperties[Interface]] = null;
+    this.nativeEvent = this._targetInst = this.dispatchConfig = null;
+    this.isPropagationStopped = this.isDefaultPrevented = functionThatReturnsFalse;
+    this._dispatchInstances = this._dispatchListeners = null;
   }
 });
 SyntheticEvent.Interface = {
@@ -458,7 +452,7 @@ function getPooledEvent(dispatchConfig, targetInst, nativeEvent, nativeInst) {
 function releasePooledEvent(event) {
   invariant(
     event instanceof this,
-    "Trying to release an event instance  into a pool of a different type."
+    "Trying to release an event instance into a pool of a different type."
   );
   event.destructor();
   10 > this.eventPool.length && this.eventPool.push(event);
@@ -615,7 +609,9 @@ function accumulate(current, next) {
     ? next
     : Array.isArray(current)
       ? current.concat(next)
-      : Array.isArray(next) ? [current].concat(next) : [current, next];
+      : Array.isArray(next)
+        ? [current].concat(next)
+        : [current, next];
 }
 var responderInst = null,
   trackedTouchCount = 0;
@@ -881,7 +877,9 @@ var eventTypes$1 = {
           ? eventTypes$1.responderStart
           : targetInst
             ? eventTypes$1.responderMove
-            : depthA ? eventTypes$1.responderEnd : null)
+            : depthA
+              ? eventTypes$1.responderEnd
+              : null)
       )
         (JSCompiler_temp$jscomp$0 = ResponderSyntheticEvent.getPooled(
           JSCompiler_temp$jscomp$0,
@@ -935,7 +933,9 @@ var eventTypes$1 = {
       if (
         (topLevelType = JSCompiler_temp$jscomp$0
           ? eventTypes$1.responderTerminate
-          : topLevelType ? eventTypes$1.responderRelease : null)
+          : topLevelType
+            ? eventTypes$1.responderRelease
+            : null)
       )
         (nativeEvent = ResponderSyntheticEvent.getPooled(
           topLevelType,
@@ -1001,22 +1001,15 @@ injection.injectEventPluginsByName({
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;
 }
-var Injected$jscomp$inline_574 = {
-  getClosestInstanceFromNode: getInstanceFromInstance,
-  getInstanceFromNode: getInstanceFromInstance,
-  getNodeFromInstance: function(inst) {
-    inst = inst.stateNode.canonical._nativeTag;
-    invariant(inst, "All native instances should have a tag.");
-    return inst;
-  },
-  getFiberCurrentPropsFromNode: function(inst) {
-    return inst.canonical.currentProps;
-  }
+getFiberCurrentPropsFromNode = function(inst) {
+  return inst.canonical.currentProps;
+};
+getInstanceFromNode = getInstanceFromInstance;
+getNodeFromInstance = function(inst) {
+  inst = inst.stateNode.canonical._nativeTag;
+  invariant(inst, "All native instances should have a tag.");
+  return inst;
 };
-getFiberCurrentPropsFromNode =
-  Injected$jscomp$inline_574.getFiberCurrentPropsFromNode;
-getInstanceFromNode = Injected$jscomp$inline_574.getInstanceFromNode;
-getNodeFromInstance = Injected$jscomp$inline_574.getNodeFromInstance;
 ResponderEventPlugin.injection.injectGlobalResponderHandler({
   onChange: function(from, to, blockNativeResponder) {
     null !== to
@@ -1027,8 +1020,8 @@ ResponderEventPlugin.injection.injectGlobalResponderHandler({
       : UIManager.clearJSResponder();
   }
 });
-var ReactCurrentOwner =
-    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,
+var ReactSharedInternals =
+    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
   hasSymbol = "function" === typeof Symbol && Symbol.for,
   REACT_ELEMENT_TYPE = hasSymbol ? Symbol.for("react.element") : 60103,
   REACT_PORTAL_TYPE = hasSymbol ? Symbol.for("react.portal") : 60106,
@@ -1037,48 +1030,62 @@ var ReactCurrentOwner =
   REACT_PROFILER_TYPE = hasSymbol ? Symbol.for("react.profiler") : 60114,
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol.for("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol.for("react.context") : 60110,
-  REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol.for("react.async_mode") : 60111,
+  REACT_CONCURRENT_MODE_TYPE = hasSymbol
+    ? Symbol.for("react.concurrent_mode")
+    : 60111,
   REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for("react.forward_ref") : 60112,
-  REACT_TIMEOUT_TYPE = hasSymbol ? Symbol.for("react.timeout") : 60113,
+  REACT_SUSPENSE_TYPE = hasSymbol ? Symbol.for("react.suspense") : 60113,
+  REACT_PURE_TYPE = hasSymbol ? Symbol.for("react.pure") : 60115,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
-  if (null === maybeIterable || "undefined" === typeof maybeIterable)
-    return null;
+  if (null === maybeIterable || "object" !== typeof maybeIterable) return null;
   maybeIterable =
     (MAYBE_ITERATOR_SYMBOL && maybeIterable[MAYBE_ITERATOR_SYMBOL]) ||
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(fiber) {
-  var type = fiber.type;
-  if ("function" === typeof type) return type.displayName || type.name;
+function getWrappedName(outerType, innerType, wrapperName) {
+  innerType = innerType.displayName || innerType.name || "";
+  return (
+    outerType.displayName ||
+    ("" !== innerType ? wrapperName + "(" + innerType + ")" : wrapperName)
+  );
+}
+function getComponentName(type) {
+  if (null == type) return null;
+  if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
   switch (type) {
-    case REACT_ASYNC_MODE_TYPE:
-      return "AsyncMode";
-    case REACT_CONTEXT_TYPE:
-      return "Context.Consumer";
+    case REACT_CONCURRENT_MODE_TYPE:
+      return "ConcurrentMode";
     case REACT_FRAGMENT_TYPE:
-      return "ReactFragment";
+      return "Fragment";
     case REACT_PORTAL_TYPE:
-      return "ReactPortal";
+      return "Portal";
     case REACT_PROFILER_TYPE:
-      return "Profiler(" + fiber.pendingProps.id + ")";
-    case REACT_PROVIDER_TYPE:
-      return "Context.Provider";
+      return "Profiler";
     case REACT_STRICT_MODE_TYPE:
       return "StrictMode";
-    case REACT_TIMEOUT_TYPE:
-      return "Timeout";
+    case REACT_SUSPENSE_TYPE:
+      return "Suspense";
   }
-  if ("object" === typeof type && null !== type)
+  if ("object" === typeof type) {
     switch (type.$$typeof) {
+      case REACT_CONTEXT_TYPE:
+        return "Context.Consumer";
+      case REACT_PROVIDER_TYPE:
+        return "Context.Provider";
       case REACT_FORWARD_REF_TYPE:
-        return (
-          (fiber = type.render.displayName || type.render.name || ""),
-          "" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef"
-        );
+        return getWrappedName(type, type.render, "ForwardRef");
+      case REACT_PURE_TYPE:
+        return getWrappedName(type, type.render, "Pure");
     }
+    if (
+      "function" === typeof type.then &&
+      (type = 1 === type._reactStatus ? type._reactResult : null)
+    )
+      return getComponentName(type);
+  }
   return null;
 }
 function isFiberMountedImpl(fiber) {
@@ -1089,7 +1096,7 @@ function isFiberMountedImpl(fiber) {
     for (; node.return; )
       if (((node = node.return), 0 !== (node.effectTag & 2))) return 1;
   }
-  return 3 === node.tag ? 2 : 3;
+  return 5 === node.tag ? 2 : 3;
 }
 function assertIsMounted(fiber) {
   invariant(
@@ -1165,14 +1172,14 @@ function findCurrentFiberUsingSlowPath(fiber) {
       "Return fibers should always be each others' alternates. This error is likely caused by a bug in React. Please file an issue."
     );
   }
-  invariant(3 === a.tag, "Unable to find node on an unmounted component.");
+  invariant(5 === a.tag, "Unable to find node on an unmounted component.");
   return a.stateNode.current === a ? fiber : alternate;
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
   if (!parent) return null;
   for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
+    if (7 === node.tag || 8 === node.tag) return node;
     if (node.child) (node.child.return = node), (node = node.child);
     else {
       if (node === parent) break;
@@ -1186,40 +1193,16 @@ function findCurrentHostFiber(parent) {
   }
   return null;
 }
-function findCurrentHostFiberWithNoPortals(parent) {
-  parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child && 4 !== node.tag)
-      (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
-}
-function mountSafeCallback(context, callback) {
+function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   return function() {
-    if (callback) {
-      if ("boolean" === typeof context.__isMounted) {
-        if (!context.__isMounted) return;
-      } else if (
-        "function" === typeof context.isMounted &&
-        !context.isMounted()
-      )
-        return;
+    if (
+      callback &&
+      ("boolean" !== typeof context.__isMounted || context.__isMounted)
+    )
       return callback.apply(context, arguments);
-    }
   };
 }
-var emptyObject$1 = {},
+var emptyObject = {},
   removedKeys = null,
   removedKeyCount = 0;
 function restoreDeletedValuesInNestedArray(
@@ -1237,23 +1220,23 @@ function restoreDeletedValuesInNestedArray(
   else if (node && 0 < removedKeyCount)
     for (i in removedKeys)
       if (removedKeys[i]) {
-        var _nextProp = node[i];
-        if (void 0 !== _nextProp) {
+        var nextProp = node[i];
+        if (void 0 !== nextProp) {
           var attributeConfig = validAttributes[i];
           if (attributeConfig) {
-            "function" === typeof _nextProp && (_nextProp = !0);
-            "undefined" === typeof _nextProp && (_nextProp = null);
+            "function" === typeof nextProp && (nextProp = !0);
+            "undefined" === typeof nextProp && (nextProp = null);
             if ("object" !== typeof attributeConfig)
-              updatePayload[i] = _nextProp;
+              updatePayload[i] = nextProp;
             else if (
               "function" === typeof attributeConfig.diff ||
               "function" === typeof attributeConfig.process
             )
-              (_nextProp =
+              (nextProp =
                 "function" === typeof attributeConfig.process
-                  ? attributeConfig.process(_nextProp)
-                  : _nextProp),
-                (updatePayload[i] = _nextProp);
+                  ? attributeConfig.process(nextProp)
+                  : nextProp),
+                (updatePayload[i] = nextProp);
             removedKeys[i] = !1;
             removedKeyCount--;
           }
@@ -1319,7 +1302,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!Array.isArray(nextProp))
     return diffProperties(
       updatePayload,
-      emptyObject$1,
+      emptyObject,
       nextProp,
       validAttributes
     );
@@ -1337,7 +1320,7 @@ function clearNestedProperty(updatePayload, prevProp, validAttributes) {
     return diffProperties(
       updatePayload,
       prevProp,
-      emptyObject$1,
+      emptyObject,
       validAttributes
     );
   for (var i = 0; i < prevProp.length; i++)
@@ -1464,27 +1447,27 @@ var restoreTarget = null,
 function restoreStateOfTarget(target) {
   if ((target = getInstanceFromNode(target))) {
     invariant(
-      null,
-      "Fiber needs to be injected to handle a fiber target for controlled events. This error is likely caused by a bug in React. Please file an issue."
+      !1,
+      "setRestoreImplementation() needs to be called to handle a target for controlled events. This error is likely caused by a bug in React. Please file an issue."
     );
     var props = getFiberCurrentPropsFromNode(target.stateNode);
-    null.restoreControlledState(target.stateNode, target.type, props);
+    null(target.stateNode, target.type, props);
   }
 }
-function _batchedUpdates(fn, bookkeeping) {
+function _batchedUpdatesImpl(fn, bookkeeping) {
   return fn(bookkeeping);
 }
-function _flushInteractiveUpdates() {}
+function _flushInteractiveUpdatesImpl() {}
 var isBatching = !1;
 function batchedUpdates(fn, bookkeeping) {
   if (isBatching) return fn(bookkeeping);
   isBatching = !0;
   try {
-    return _batchedUpdates(fn, bookkeeping);
+    return _batchedUpdatesImpl(fn, bookkeeping);
   } finally {
     if (((isBatching = !1), null !== restoreTarget || null !== restoreQueue))
       if (
-        (_flushInteractiveUpdates(),
+        (_flushInteractiveUpdatesImpl(),
         restoreTarget &&
           ((bookkeeping = restoreTarget),
           (fn = restoreQueue),
@@ -1514,13 +1497,19 @@ function dispatchEvent(target, topLevelType, nativeEvent) {
     null !== events && (eventQueue = accumulateInto(eventQueue, events));
     events = eventQueue;
     eventQueue = null;
-    events &&
+    if (
+      events &&
       (forEachAccumulated(events, executeDispatchesAndReleaseTopLevel),
       invariant(
         !eventQueue,
         "processEventQueue(): Additional events were enqueued while processing an event queue. Support for this has not yet been implemented."
       ),
-      ReactErrorUtils.rethrowCaughtError());
+      hasRethrowError)
+    )
+      throw ((events = rethrowError),
+      (hasRethrowError = !1),
+      (rethrowError = null),
+      events);
   });
 }
 function shim$1() {
@@ -1547,12 +1536,15 @@ var ReactFabricHostComponent = (function() {
     TextInputState.focusTextInput(this._nativeTag);
   };
   ReactFabricHostComponent.prototype.measure = function(callback) {
-    UIManager.measure(this._nativeTag, mountSafeCallback(this, callback));
+    UIManager.measure(
+      this._nativeTag,
+      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
+    );
   };
   ReactFabricHostComponent.prototype.measureInWindow = function(callback) {
     UIManager.measureInWindow(
       this._nativeTag,
-      mountSafeCallback(this, callback)
+      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
     );
   };
   ReactFabricHostComponent.prototype.measureLayout = function(
@@ -1563,14 +1555,14 @@ var ReactFabricHostComponent = (function() {
     UIManager.measureLayout(
       this._nativeTag,
       relativeToNativeNode,
-      mountSafeCallback(this, onFail),
-      mountSafeCallback(this, onSuccess)
+      mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+      mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
     );
   };
   ReactFabricHostComponent.prototype.setNativeProps = function(nativeProps) {
     nativeProps = diffProperties(
       null,
-      emptyObject$1,
+      emptyObject,
       nativeProps,
       this.viewConfig.validAttributes
     );
@@ -1605,30 +1597,37 @@ function createTextInstance(
     )
   };
 }
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
+var scheduleTimeout = setTimeout,
+  cancelTimeout = clearTimeout,
+  BEFORE_SLASH_RE = /^(.*)[\\\/]/;
+function getStackByFiberInDevAndProd(workInProgress) {
   var info = "";
   do {
     a: switch (workInProgress.tag) {
+      case 4:
       case 0:
       case 1:
       case 2:
-      case 5:
+      case 3:
+      case 7:
+      case 10:
         var owner = workInProgress._debugOwner,
-          source = workInProgress._debugSource;
-        var JSCompiler_inline_result = getComponentName(workInProgress);
-        var ownerName = null;
-        owner && (ownerName = getComponentName(owner));
-        owner = source;
-        JSCompiler_inline_result =
-          "\n    in " +
-          (JSCompiler_inline_result || "Unknown") +
-          (owner
-            ? " (at " +
-              owner.fileName.replace(/^.*[\\\/]/, "") +
+          source = workInProgress._debugSource,
+          name = getComponentName(workInProgress.type);
+        var JSCompiler_inline_result = null;
+        owner && (JSCompiler_inline_result = getComponentName(owner.type));
+        owner = name;
+        name = "";
+        source
+          ? (name =
+              " (at " +
+              source.fileName.replace(BEFORE_SLASH_RE, "") +
               ":" +
-              owner.lineNumber +
-              ")"
-            : ownerName ? " (created by " + ownerName + ")" : "");
+              source.lineNumber +
+              ")")
+          : JSCompiler_inline_result &&
+            (name = " (created by " + JSCompiler_inline_result + ")");
+        JSCompiler_inline_result = "\n    in " + (owner || "Unknown") + name;
         break a;
       default:
         JSCompiler_inline_result = "";
@@ -1641,9 +1640,6 @@ function getStackAddendumByWorkInProgressFiber(workInProgress) {
 new Set();
 var valueStack = [],
   index = -1;
-function createCursor(defaultValue) {
-  return { current: defaultValue };
-}
 function pop(cursor) {
   0 > index ||
     ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
@@ -1653,17 +1649,13 @@ function push(cursor, value) {
   valueStack[index] = cursor.current;
   cursor.current = value;
 }
-var contextStackCursor = createCursor(emptyObject),
-  didPerformWorkStackCursor = createCursor(!1),
-  previousContext = emptyObject;
-function getUnmaskedContext(workInProgress) {
-  return isContextProvider(workInProgress)
-    ? previousContext
-    : contextStackCursor.current;
-}
+var emptyContextObject = {},
+  contextStackCursor = { current: emptyContextObject },
+  didPerformWorkStackCursor = { current: !1 },
+  previousContext = emptyContextObject;
 function getMaskedContext(workInProgress, unmaskedContext) {
   var contextTypes = workInProgress.type.contextTypes;
-  if (!contextTypes) return emptyObject;
+  if (!contextTypes) return emptyContextObject;
   var instance = workInProgress.stateNode;
   if (
     instance &&
@@ -1679,12 +1671,13 @@ function getMaskedContext(workInProgress, unmaskedContext) {
     (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
   return context;
 }
-function isContextProvider(fiber) {
-  return 2 === fiber.tag && null != fiber.type.childContextTypes;
+function isContextProvider(type) {
+  type = type.childContextTypes;
+  return null !== type && void 0 !== type;
 }
-function popContextProvider(fiber) {
-  isContextProvider(fiber) &&
-    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+function popContext(fiber) {
+  pop(didPerformWorkStackCursor, fiber);
+  pop(contextStackCursor, fiber);
 }
 function popTopLevelContextObject(fiber) {
   pop(didPerformWorkStackCursor, fiber);
@@ -1692,32 +1685,31 @@ function popTopLevelContextObject(fiber) {
 }
 function pushTopLevelContextObject(fiber, context, didChange) {
   invariant(
-    contextStackCursor.current === emptyObject,
+    contextStackCursor.current === emptyContextObject,
     "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
   );
   push(contextStackCursor, context, fiber);
   push(didPerformWorkStackCursor, didChange, fiber);
 }
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode,
-    childContextTypes = fiber.type.childContextTypes;
+function processChildContext(fiber, type, parentContext) {
+  var instance = fiber.stateNode;
+  fiber = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
     invariant(
-      contextKey in childContextTypes,
+      contextKey in fiber,
       '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
+      getComponentName(type) || "Unknown",
       contextKey
     );
   return Object.assign({}, parentContext, instance);
 }
 function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) return !1;
   var instance = workInProgress.stateNode;
   instance =
     (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
+    emptyContextObject;
   previousContext = contextStackCursor.current;
   push(contextStackCursor, instance, workInProgress);
   push(
@@ -1727,21 +1719,46 @@ function pushContextProvider(workInProgress) {
   );
   return !0;
 }
-function invalidateContextProvider(workInProgress, didChange) {
+function invalidateContextProvider(workInProgress, type, didChange) {
   var instance = workInProgress.stateNode;
   invariant(
     instance,
     "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
   );
-  if (didChange) {
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    push(contextStackCursor, mergedContext, workInProgress);
-  } else pop(didPerformWorkStackCursor, workInProgress);
+  didChange
+    ? ((type = processChildContext(workInProgress, type, previousContext)),
+      (instance.__reactInternalMemoizedMergedChildContext = type),
+      pop(didPerformWorkStackCursor, workInProgress),
+      pop(contextStackCursor, workInProgress),
+      push(contextStackCursor, type, workInProgress))
+    : pop(didPerformWorkStackCursor, workInProgress);
   push(didPerformWorkStackCursor, didChange, workInProgress);
 }
+var onCommitFiberRoot = null,
+  onCommitFiberUnmount = null;
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {}
+  };
+}
+var isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__;
+function injectInternals(internals) {
+  if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) return !1;
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled || !hook.supportsFiber) return !0;
+  try {
+    var rendererID = hook.inject(internals);
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {}
+  return !0;
+}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -1749,15 +1766,31 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.index = 0;
   this.ref = null;
   this.pendingProps = pendingProps;
-  this.memoizedState = this.updateQueue = this.memoizedProps = null;
+  this.firstContextDependency = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
   this.effectTag = 0;
   this.lastEffect = this.firstEffect = this.nextEffect = null;
-  this.expirationTime = 0;
+  this.childExpirationTime = this.expirationTime = 0;
   this.alternate = null;
-  this.treeBaseTime = this.selfBaseTime = this.actualStartTime = this.actualDuration = 0;
+  this.actualDuration = 0;
+  this.actualStartTime = -1;
+  this.treeBaseDuration = this.selfBaseDuration = 0;
+}
+function shouldConstruct(Component) {
+  Component = Component.prototype;
+  return !(!Component || !Component.isReactComponent);
+}
+function resolveLazyComponentTag(fiber, Component) {
+  if ("function" === typeof Component)
+    return shouldConstruct(Component) ? 3 : 1;
+  if (void 0 !== Component && null !== Component) {
+    fiber = Component.$$typeof;
+    if (fiber === REACT_FORWARD_REF_TYPE) return 14;
+    if (fiber === REACT_PURE_TYPE) return 18;
+  }
+  return 4;
 }
-function createWorkInProgress(current, pendingProps, expirationTime) {
+function createWorkInProgress(current, pendingProps) {
   var workInProgress = current.alternate;
   null === workInProgress
     ? ((workInProgress = new FiberNode(
@@ -1776,28 +1809,30 @@ function createWorkInProgress(current, pendingProps, expirationTime) {
       (workInProgress.firstEffect = null),
       (workInProgress.lastEffect = null),
       (workInProgress.actualDuration = 0),
-      (workInProgress.actualStartTime = 0));
-  workInProgress.expirationTime = expirationTime;
+      (workInProgress.actualStartTime = -1));
+  workInProgress.childExpirationTime = current.childExpirationTime;
+  workInProgress.expirationTime = current.expirationTime;
   workInProgress.child = current.child;
   workInProgress.memoizedProps = current.memoizedProps;
   workInProgress.memoizedState = current.memoizedState;
   workInProgress.updateQueue = current.updateQueue;
+  workInProgress.firstContextDependency = current.firstContextDependency;
   workInProgress.sibling = current.sibling;
   workInProgress.index = current.index;
   workInProgress.ref = current.ref;
-  workInProgress.selfBaseTime = current.selfBaseTime;
-  workInProgress.treeBaseTime = current.treeBaseTime;
+  workInProgress.selfBaseDuration = current.selfBaseDuration;
+  workInProgress.treeBaseDuration = current.treeBaseDuration;
   return workInProgress;
 }
 function createFiberFromElement(element, mode, expirationTime) {
   var type = element.type,
     key = element.key;
   element = element.props;
-  if ("function" === typeof type)
-    var fiberTag = type.prototype && type.prototype.isReactComponent ? 2 : 0;
-  else if ("string" === typeof type) fiberTag = 5;
+  var fiberTag = void 0;
+  if ("function" === typeof type) fiberTag = shouldConstruct(type) ? 2 : 4;
+  else if ("string" === typeof type) fiberTag = 7;
   else
-    switch (type) {
+    a: switch (type) {
       case REACT_FRAGMENT_TYPE:
         return createFiberFromFragment(
           element.children,
@@ -1805,12 +1840,12 @@ function createFiberFromElement(element, mode, expirationTime) {
           expirationTime,
           key
         );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = 11;
+      case REACT_CONCURRENT_MODE_TYPE:
+        fiberTag = 10;
         mode |= 3;
         break;
       case REACT_STRICT_MODE_TYPE:
-        fiberTag = 11;
+        fiberTag = 10;
         mode |= 2;
         break;
       case REACT_PROFILER_TYPE:
@@ -1820,34 +1855,36 @@ function createFiberFromElement(element, mode, expirationTime) {
           (type.expirationTime = expirationTime),
           type
         );
-      case REACT_TIMEOUT_TYPE:
+      case REACT_SUSPENSE_TYPE:
         fiberTag = 16;
-        mode |= 2;
         break;
       default:
-        a: {
-          switch ("object" === typeof type && null !== type
-            ? type.$$typeof
-            : null) {
+        if ("object" === typeof type && null !== type)
+          switch (type.$$typeof) {
             case REACT_PROVIDER_TYPE:
-              fiberTag = 13;
+              fiberTag = 12;
               break a;
             case REACT_CONTEXT_TYPE:
-              fiberTag = 12;
+              fiberTag = 11;
               break a;
             case REACT_FORWARD_REF_TYPE:
-              fiberTag = 14;
+              fiberTag = 13;
+              break a;
+            case REACT_PURE_TYPE:
+              fiberTag = 17;
               break a;
             default:
-              invariant(
-                !1,
-                "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",
-                null == type ? type : typeof type,
-                ""
-              );
+              if ("function" === typeof type.then) {
+                fiberTag = 4;
+                break a;
+              }
           }
-          fiberTag = void 0;
-        }
+        invariant(
+          !1,
+          "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",
+          null == type ? type : typeof type,
+          ""
+        );
     }
   mode = new FiberNode(fiberTag, element, key, mode);
   mode.type = type;
@@ -1855,18 +1892,18 @@ function createFiberFromElement(element, mode, expirationTime) {
   return mode;
 }
 function createFiberFromFragment(elements, mode, expirationTime, key) {
-  elements = new FiberNode(10, elements, key, mode);
+  elements = new FiberNode(9, elements, key, mode);
   elements.expirationTime = expirationTime;
   return elements;
 }
 function createFiberFromText(content, mode, expirationTime) {
-  content = new FiberNode(6, content, null, mode);
+  content = new FiberNode(8, content, null, mode);
   content.expirationTime = expirationTime;
   return content;
 }
 function createFiberFromPortal(portal, mode, expirationTime) {
   mode = new FiberNode(
-    4,
+    6,
     null !== portal.children ? portal.children : [],
     portal.key,
     mode
@@ -1879,60 +1916,6 @@ function createFiberFromPortal(portal, mode, expirationTime) {
   };
   return mode;
 }
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
-  containerInfo = {
-    current: isAsync,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    earliestPendingTime: 0,
-    latestPendingTime: 0,
-    earliestSuspendedTime: 0,
-    latestSuspendedTime: 0,
-    latestPingedTime: 0,
-    didError: !1,
-    pendingCommitExpirationTime: 0,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    nextExpirationTimeToWorkOn: 0,
-    expirationTime: 0,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
-  return (isAsync.stateNode = containerInfo);
-}
-var onCommitFiberRoot = null,
-  onCommitFiberUnmount = null;
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {}
-  };
-}
-function injectInternals(internals) {
-  if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) return !1;
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled || !hook.supportsFiber) return !0;
-  try {
-    var rendererID = hook.inject(internals);
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {}
-  return !0;
-}
-function onCommitRoot(root) {
-  "function" === typeof onCommitFiberRoot && onCommitFiberRoot(root);
-}
-function onCommitUnmount(fiber) {
-  "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
-}
 function markPendingPriorityLevel(root, expirationTime) {
   root.didError = !1;
   var earliestPendingTime = root.earliestPendingTime;
@@ -1942,30 +1925,106 @@ function markPendingPriorityLevel(root, expirationTime) {
       ? (root.earliestPendingTime = expirationTime)
       : root.latestPendingTime < expirationTime &&
         (root.latestPendingTime = expirationTime);
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(expirationTime, root);
+}
+function markCommittedPriorityLevels(root, earliestRemainingTime) {
+  root.didError = !1;
+  if (0 === earliestRemainingTime)
+    (root.earliestPendingTime = 0),
+      (root.latestPendingTime = 0),
+      (root.earliestSuspendedTime = 0),
+      (root.latestSuspendedTime = 0),
+      (root.latestPingedTime = 0);
+  else {
+    var latestPendingTime = root.latestPendingTime;
+    0 !== latestPendingTime &&
+      (latestPendingTime < earliestRemainingTime
+        ? (root.earliestPendingTime = root.latestPendingTime = 0)
+        : root.earliestPendingTime < earliestRemainingTime &&
+          (root.earliestPendingTime = root.latestPendingTime));
+    latestPendingTime = root.earliestSuspendedTime;
+    0 === latestPendingTime
+      ? markPendingPriorityLevel(root, earliestRemainingTime)
+      : earliestRemainingTime > root.latestSuspendedTime
+        ? ((root.earliestSuspendedTime = 0),
+          (root.latestSuspendedTime = 0),
+          (root.latestPingedTime = 0),
+          markPendingPriorityLevel(root, earliestRemainingTime))
+        : earliestRemainingTime < latestPendingTime &&
+          markPendingPriorityLevel(root, earliestRemainingTime);
+  }
+  findNextExpirationTimeToWorkOn(0, root);
+}
+function hasLowerPriorityWork(root, erroredExpirationTime) {
+  var latestPendingTime = root.latestPendingTime,
+    latestSuspendedTime = root.latestSuspendedTime;
+  root = root.latestPingedTime;
+  return (
+    (0 !== latestPendingTime && latestPendingTime > erroredExpirationTime) ||
+    (0 !== latestSuspendedTime &&
+      latestSuspendedTime > erroredExpirationTime) ||
+    (0 !== root && root > erroredExpirationTime)
+  );
+}
+function markSuspendedPriorityLevel(root, suspendedTime) {
+  root.didError = !1;
+  var latestPingedTime = root.latestPingedTime;
+  0 !== latestPingedTime &&
+    latestPingedTime <= suspendedTime &&
+    (root.latestPingedTime = 0);
+  latestPingedTime = root.earliestPendingTime;
+  var latestPendingTime = root.latestPendingTime;
+  latestPingedTime === suspendedTime
+    ? (root.earliestPendingTime =
+        latestPendingTime === suspendedTime
+          ? (root.latestPendingTime = 0)
+          : latestPendingTime)
+    : latestPendingTime === suspendedTime &&
+      (root.latestPendingTime = latestPingedTime);
+  latestPingedTime = root.earliestSuspendedTime;
+  latestPendingTime = root.latestSuspendedTime;
+  0 === latestPingedTime
+    ? (root.earliestSuspendedTime = root.latestSuspendedTime = suspendedTime)
+    : latestPingedTime > suspendedTime
+      ? (root.earliestSuspendedTime = suspendedTime)
+      : latestPendingTime < suspendedTime &&
+        (root.latestSuspendedTime = suspendedTime);
+  findNextExpirationTimeToWorkOn(suspendedTime, root);
+}
+function findEarliestOutstandingPriorityLevel(root, renderExpirationTime) {
+  var earliestPendingTime = root.earliestPendingTime;
+  root = root.earliestSuspendedTime;
+  if (
+    0 === renderExpirationTime ||
+    (0 !== earliestPendingTime && earliestPendingTime < renderExpirationTime)
+  )
+    renderExpirationTime = earliestPendingTime;
+  if (0 === renderExpirationTime || (0 !== root && root < renderExpirationTime))
+    renderExpirationTime = root;
+  return renderExpirationTime;
 }
-function findNextPendingPriorityLevel(root) {
+function findNextExpirationTimeToWorkOn(completedExpirationTime, root) {
   var earliestSuspendedTime = root.earliestSuspendedTime,
-    earliestPendingTime = root.earliestPendingTime;
-  if (0 === earliestSuspendedTime)
-    var nextExpirationTimeToWorkOn = (earliestSuspendedTime = earliestPendingTime);
-  else
-    0 !== earliestPendingTime
-      ? ((nextExpirationTimeToWorkOn = earliestPendingTime),
-        (earliestSuspendedTime =
-          earliestSuspendedTime < earliestPendingTime
-            ? earliestSuspendedTime
-            : earliestPendingTime))
-      : (nextExpirationTimeToWorkOn = earliestSuspendedTime =
-          root.latestPingedTime);
-  root.didError && (earliestSuspendedTime = 1);
-  root.nextExpirationTimeToWorkOn = nextExpirationTimeToWorkOn;
-  root.expirationTime = earliestSuspendedTime;
+    latestSuspendedTime = root.latestSuspendedTime,
+    earliestPendingTime = root.earliestPendingTime,
+    latestPingedTime = root.latestPingedTime;
+  earliestPendingTime =
+    0 !== earliestPendingTime ? earliestPendingTime : latestPingedTime;
+  0 === earliestPendingTime &&
+    (0 === completedExpirationTime ||
+      latestSuspendedTime > completedExpirationTime) &&
+    (earliestPendingTime = latestSuspendedTime);
+  completedExpirationTime = earliestPendingTime;
+  0 !== completedExpirationTime &&
+    0 !== earliestSuspendedTime &&
+    earliestSuspendedTime < completedExpirationTime &&
+    (completedExpirationTime = earliestSuspendedTime);
+  root.nextExpirationTimeToWorkOn = earliestPendingTime;
+  root.expirationTime = completedExpirationTime;
 }
 var hasForceUpdate = !1;
 function createUpdateQueue(baseState) {
   return {
-    expirationTime: 0,
     baseState: baseState,
     firstUpdate: null,
     lastUpdate: null,
@@ -1979,7 +2038,6 @@ function createUpdateQueue(baseState) {
 }
 function cloneUpdateQueue(currentQueue) {
   return {
-    expirationTime: currentQueue.expirationTime,
     baseState: currentQueue.baseState,
     firstUpdate: currentQueue.firstUpdate,
     lastUpdate: currentQueue.lastUpdate,
@@ -2001,14 +2059,12 @@ function createUpdate(expirationTime) {
     nextEffect: null
   };
 }
-function appendUpdateToQueue(queue, update, expirationTime) {
+function appendUpdateToQueue(queue, update) {
   null === queue.lastUpdate
     ? (queue.firstUpdate = queue.lastUpdate = update)
     : ((queue.lastUpdate.next = update), (queue.lastUpdate = update));
-  if (0 === queue.expirationTime || queue.expirationTime > expirationTime)
-    queue.expirationTime = expirationTime;
 }
-function enqueueUpdate(fiber, update, expirationTime) {
+function enqueueUpdate(fiber, update) {
   var alternate = fiber.alternate;
   if (null === alternate) {
     var queue1 = fiber.updateQueue;
@@ -2030,14 +2086,13 @@ function enqueueUpdate(fiber, update, expirationTime) {
         : null === queue2 &&
           (queue2 = alternate.updateQueue = cloneUpdateQueue(queue1));
   null === queue2 || queue1 === queue2
-    ? appendUpdateToQueue(queue1, update, expirationTime)
+    ? appendUpdateToQueue(queue1, update)
     : null === queue1.lastUpdate || null === queue2.lastUpdate
-      ? (appendUpdateToQueue(queue1, update, expirationTime),
-        appendUpdateToQueue(queue2, update, expirationTime))
-      : (appendUpdateToQueue(queue1, update, expirationTime),
-        (queue2.lastUpdate = update));
+      ? (appendUpdateToQueue(queue1, update),
+        appendUpdateToQueue(queue2, update))
+      : (appendUpdateToQueue(queue1, update), (queue2.lastUpdate = update));
 }
-function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
+function enqueueCapturedUpdate(workInProgress, update) {
   var workInProgressQueue = workInProgress.updateQueue;
   workInProgressQueue =
     null === workInProgressQueue
@@ -2049,11 +2104,6 @@ function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
     ? (workInProgressQueue.firstCapturedUpdate = workInProgressQueue.lastCapturedUpdate = update)
     : ((workInProgressQueue.lastCapturedUpdate.next = update),
       (workInProgressQueue.lastCapturedUpdate = update));
-  if (
-    0 === workInProgressQueue.expirationTime ||
-    workInProgressQueue.expirationTime > renderExpirationTime
-  )
-    workInProgressQueue.expirationTime = renderExpirationTime;
 }
 function ensureWorkInProgressQueueIsAClone(workInProgress, queue) {
   var current = workInProgress.alternate;
@@ -2101,95 +2151,83 @@ function processUpdateQueue(
   renderExpirationTime
 ) {
   hasForceUpdate = !1;
-  if (
-    !(0 === queue.expirationTime || queue.expirationTime > renderExpirationTime)
-  ) {
-    queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
-    for (
-      var newBaseState = queue.baseState,
-        newFirstUpdate = null,
-        newExpirationTime = 0,
-        update = queue.firstUpdate,
-        resultState = newBaseState;
-      null !== update;
+  queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
+  for (
+    var newBaseState = queue.baseState,
+      newFirstUpdate = null,
+      newExpirationTime = 0,
+      update = queue.firstUpdate,
+      resultState = newBaseState;
+    null !== update;
 
-    ) {
-      var updateExpirationTime = update.expirationTime;
-      if (updateExpirationTime > renderExpirationTime) {
-        if (
-          (null === newFirstUpdate &&
-            ((newFirstUpdate = update), (newBaseState = resultState)),
-          0 === newExpirationTime || newExpirationTime > updateExpirationTime)
-        )
-          newExpirationTime = updateExpirationTime;
-      } else
-        (resultState = getStateFromUpdate(
-          workInProgress,
-          queue,
-          update,
-          resultState,
-          props,
-          instance
-        )),
-          null !== update.callback &&
-            ((workInProgress.effectTag |= 32),
-            (update.nextEffect = null),
-            null === queue.lastEffect
-              ? (queue.firstEffect = queue.lastEffect = update)
-              : ((queue.lastEffect.nextEffect = update),
-                (queue.lastEffect = update)));
-      update = update.next;
-    }
-    updateExpirationTime = null;
-    for (update = queue.firstCapturedUpdate; null !== update; ) {
-      var _updateExpirationTime = update.expirationTime;
-      if (_updateExpirationTime > renderExpirationTime) {
-        if (
-          (null === updateExpirationTime &&
-            ((updateExpirationTime = update),
-            null === newFirstUpdate && (newBaseState = resultState)),
-          0 === newExpirationTime || newExpirationTime > _updateExpirationTime)
-        )
-          newExpirationTime = _updateExpirationTime;
-      } else
-        (resultState = getStateFromUpdate(
-          workInProgress,
-          queue,
-          update,
-          resultState,
-          props,
-          instance
-        )),
-          null !== update.callback &&
-            ((workInProgress.effectTag |= 32),
-            (update.nextEffect = null),
-            null === queue.lastCapturedEffect
-              ? (queue.firstCapturedEffect = queue.lastCapturedEffect = update)
-              : ((queue.lastCapturedEffect.nextEffect = update),
-                (queue.lastCapturedEffect = update)));
-      update = update.next;
-    }
-    null === newFirstUpdate && (queue.lastUpdate = null);
-    null === updateExpirationTime
-      ? (queue.lastCapturedUpdate = null)
-      : (workInProgress.effectTag |= 32);
-    null === newFirstUpdate &&
-      null === updateExpirationTime &&
-      (newBaseState = resultState);
-    queue.baseState = newBaseState;
-    queue.firstUpdate = newFirstUpdate;
-    queue.firstCapturedUpdate = updateExpirationTime;
-    queue.expirationTime = newExpirationTime;
-    workInProgress.memoizedState = resultState;
+  ) {
+    var updateExpirationTime = update.expirationTime;
+    if (updateExpirationTime > renderExpirationTime) {
+      if (
+        (null === newFirstUpdate &&
+          ((newFirstUpdate = update), (newBaseState = resultState)),
+        0 === newExpirationTime || newExpirationTime > updateExpirationTime)
+      )
+        newExpirationTime = updateExpirationTime;
+    } else
+      (resultState = getStateFromUpdate(
+        workInProgress,
+        queue,
+        update,
+        resultState,
+        props,
+        instance
+      )),
+        null !== update.callback &&
+          ((workInProgress.effectTag |= 32),
+          (update.nextEffect = null),
+          null === queue.lastEffect
+            ? (queue.firstEffect = queue.lastEffect = update)
+            : ((queue.lastEffect.nextEffect = update),
+              (queue.lastEffect = update)));
+    update = update.next;
   }
-}
-function callCallback(callback, context) {
-  invariant(
-    "function" === typeof callback,
-    "Invalid argument passed as callback. Expected a function. Instead received: %s",
-    callback
-  );
-  callback.call(context);
+  updateExpirationTime = null;
+  for (update = queue.firstCapturedUpdate; null !== update; ) {
+    var _updateExpirationTime = update.expirationTime;
+    if (_updateExpirationTime > renderExpirationTime) {
+      if (
+        (null === updateExpirationTime &&
+          ((updateExpirationTime = update),
+          null === newFirstUpdate && (newBaseState = resultState)),
+        0 === newExpirationTime || newExpirationTime > _updateExpirationTime)
+      )
+        newExpirationTime = _updateExpirationTime;
+    } else
+      (resultState = getStateFromUpdate(
+        workInProgress,
+        queue,
+        update,
+        resultState,
+        props,
+        instance
+      )),
+        null !== update.callback &&
+          ((workInProgress.effectTag |= 32),
+          (update.nextEffect = null),
+          null === queue.lastCapturedEffect
+            ? (queue.firstCapturedEffect = queue.lastCapturedEffect = update)
+            : ((queue.lastCapturedEffect.nextEffect = update),
+              (queue.lastCapturedEffect = update)));
+    update = update.next;
+  }
+  null === newFirstUpdate && (queue.lastUpdate = null);
+  null === updateExpirationTime
+    ? (queue.lastCapturedUpdate = null)
+    : (workInProgress.effectTag |= 32);
+  null === newFirstUpdate &&
+    null === updateExpirationTime &&
+    (newBaseState = resultState);
+  queue.baseState = newBaseState;
+  queue.firstUpdate = newFirstUpdate;
+  queue.firstCapturedUpdate = updateExpirationTime;
+  workInProgress.expirationTime = newExpirationTime;
+  workInProgress.memoizedState = resultState;
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
   null !== finishedQueue.firstCapturedUpdate &&
@@ -2197,60 +2235,76 @@ function commitUpdateQueue(finishedWork, finishedQueue, instance) {
       ((finishedQueue.lastUpdate.next = finishedQueue.firstCapturedUpdate),
       (finishedQueue.lastUpdate = finishedQueue.lastCapturedUpdate)),
     (finishedQueue.firstCapturedUpdate = finishedQueue.lastCapturedUpdate = null));
-  finishedWork = finishedQueue.firstEffect;
-  for (
-    finishedQueue.firstEffect = finishedQueue.lastEffect = null;
-    null !== finishedWork;
-
-  ) {
-    var _callback3 = finishedWork.callback;
-    null !== _callback3 &&
-      ((finishedWork.callback = null), callCallback(_callback3, instance));
-    finishedWork = finishedWork.nextEffect;
+  commitUpdateEffects(finishedQueue.firstEffect, instance);
+  finishedQueue.firstEffect = finishedQueue.lastEffect = null;
+  commitUpdateEffects(finishedQueue.firstCapturedEffect, instance);
+  finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
+}
+function commitUpdateEffects(effect, instance) {
+  for (; null !== effect; ) {
+    var _callback3 = effect.callback;
+    if (null !== _callback3) {
+      effect.callback = null;
+      var context = instance;
+      invariant(
+        "function" === typeof _callback3,
+        "Invalid argument passed as callback. Expected a function. Instead received: %s",
+        _callback3
+      );
+      _callback3.call(context);
+    }
+    effect = effect.nextEffect;
   }
-  finishedWork = finishedQueue.firstCapturedEffect;
-  for (
-    finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
-    null !== finishedWork;
-
-  )
-    (finishedQueue = finishedWork.callback),
-      null !== finishedQueue &&
-        ((finishedWork.callback = null), callCallback(finishedQueue, instance)),
-      (finishedWork = finishedWork.nextEffect);
 }
 function createCapturedValue(value, source) {
   return {
     value: value,
     source: source,
-    stack: getStackAddendumByWorkInProgressFiber(source)
+    stack: getStackByFiberInDevAndProd(source)
   };
 }
-var providerCursor = createCursor(null),
-  valueCursor = createCursor(null),
-  changedBitsCursor = createCursor(0);
-function pushProvider(providerFiber) {
+var valueCursor = { current: null },
+  currentlyRenderingFiber = null,
+  lastContextDependency = null,
+  lastContextWithAllBitsObserved = null;
+function pushProvider(providerFiber, nextValue) {
   var context = providerFiber.type._context;
-  push(changedBitsCursor, context._changedBits2, providerFiber);
   push(valueCursor, context._currentValue2, providerFiber);
-  push(providerCursor, providerFiber, providerFiber);
-  context._currentValue2 = providerFiber.pendingProps.value;
-  context._changedBits2 = providerFiber.stateNode;
+  context._currentValue2 = nextValue;
 }
 function popProvider(providerFiber) {
-  var changedBits = changedBitsCursor.current,
-    currentValue = valueCursor.current;
-  pop(providerCursor, providerFiber);
+  var currentValue = valueCursor.current;
   pop(valueCursor, providerFiber);
-  pop(changedBitsCursor, providerFiber);
-  providerFiber = providerFiber.type._context;
-  providerFiber._currentValue2 = currentValue;
-  providerFiber._changedBits2 = changedBits;
+  providerFiber.type._context._currentValue2 = currentValue;
+}
+function prepareToReadContext(workInProgress) {
+  currentlyRenderingFiber = workInProgress;
+  lastContextWithAllBitsObserved = lastContextDependency = null;
+  workInProgress.firstContextDependency = null;
+}
+function readContext(context, observedBits) {
+  if (
+    lastContextWithAllBitsObserved !== context &&
+    !1 !== observedBits &&
+    0 !== observedBits
+  ) {
+    if ("number" !== typeof observedBits || 1073741823 === observedBits)
+      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
+    observedBits = { context: context, observedBits: observedBits, next: null };
+    null === lastContextDependency
+      ? (invariant(
+          null !== currentlyRenderingFiber,
+          "Context.unstable_read(): Context can only be read while React is rendering, e.g. inside the render method or getDerivedStateFromProps."
+        ),
+        (currentlyRenderingFiber.firstContextDependency = lastContextDependency = observedBits))
+      : (lastContextDependency = lastContextDependency.next = observedBits);
+  }
+  return context._currentValue2;
 }
 var NO_CONTEXT = {},
-  contextStackCursor$1 = createCursor(NO_CONTEXT),
-  contextFiberStackCursor = createCursor(NO_CONTEXT),
-  rootInstanceStackCursor = createCursor(NO_CONTEXT);
+  contextStackCursor$1 = { current: NO_CONTEXT },
+  contextFiberStackCursor = { current: NO_CONTEXT },
+  rootInstanceStackCursor = { current: NO_CONTEXT };
 function requiredContext(c) {
   invariant(
     c !== NO_CONTEXT,
@@ -2270,21 +2324,39 @@ function popHostContainer(fiber) {
   pop(contextFiberStackCursor, fiber);
   pop(rootInstanceStackCursor, fiber);
 }
+function pushHostContext(fiber) {
+  requiredContext(rootInstanceStackCursor.current);
+  var context = requiredContext(contextStackCursor$1.current);
+  var nextContext = fiber.type;
+  nextContext =
+    "AndroidTextInput" === nextContext ||
+    "RCTMultilineTextInputView" === nextContext ||
+    "RCTSinglelineTextInputView" === nextContext ||
+    "RCTText" === nextContext ||
+    "RCTVirtualText" === nextContext;
+  nextContext =
+    context.isInAParentText !== nextContext
+      ? { isInAParentText: nextContext }
+      : context;
+  context !== nextContext &&
+    (push(contextFiberStackCursor, fiber, fiber),
+    push(contextStackCursor$1, nextContext, fiber));
+}
 function popHostContext(fiber) {
   contextFiberStackCursor.current === fiber &&
     (pop(contextStackCursor$1, fiber), pop(contextFiberStackCursor, fiber));
 }
-var timerPausedAt = 0,
-  totalElapsedPauseTime = 0;
-function recordElapsedActualRenderTime(fiber) {
-  fiber.actualDuration = now$1() - totalElapsedPauseTime - fiber.actualDuration;
-}
-function resumeActualRenderTimerIfPaused() {
-  0 < timerPausedAt &&
-    ((totalElapsedPauseTime += now$1() - timerPausedAt), (timerPausedAt = 0));
+var commitTime = 0,
+  profilerStartTime = -1;
+function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
+  if (0 <= profilerStartTime) {
+    var elapsedTime = now$1() - profilerStartTime;
+    fiber.actualDuration += elapsedTime;
+    overrideBaseTime && (fiber.selfBaseDuration = elapsedTime);
+    profilerStartTime = -1;
+  }
 }
-var baseStartTime = -1,
-  hasOwnProperty = Object.prototype.hasOwnProperty;
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 function is(x, y) {
   return x === y ? 0 !== x || 0 !== y || 1 / x === 1 / y : x !== x && y !== y;
 }
@@ -2308,22 +2380,24 @@ function shallowEqual(objA, objB) {
       return !1;
   return !0;
 }
+var emptyRefsObject = new React.Component().refs;
 function applyDerivedStateFromProps(
   workInProgress,
+  ctor,
   getDerivedStateFromProps,
   nextProps
 ) {
-  var prevState = workInProgress.memoizedState;
-  getDerivedStateFromProps = getDerivedStateFromProps(nextProps, prevState);
-  prevState =
+  ctor = workInProgress.memoizedState;
+  getDerivedStateFromProps = getDerivedStateFromProps(nextProps, ctor);
+  getDerivedStateFromProps =
     null === getDerivedStateFromProps || void 0 === getDerivedStateFromProps
-      ? prevState
-      : Object.assign({}, prevState, getDerivedStateFromProps);
-  workInProgress.memoizedState = prevState;
-  workInProgress = workInProgress.updateQueue;
-  null !== workInProgress &&
+      ? ctor
+      : Object.assign({}, ctor, getDerivedStateFromProps);
+  workInProgress.memoizedState = getDerivedStateFromProps;
+  nextProps = workInProgress.updateQueue;
+  null !== nextProps &&
     0 === workInProgress.expirationTime &&
-    (workInProgress.baseState = prevState);
+    (nextProps.baseState = getDerivedStateFromProps);
 }
 var classComponentUpdater = {
   isMounted: function(component) {
@@ -2333,49 +2407,49 @@ var classComponentUpdater = {
   },
   enqueueSetState: function(inst, payload, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.tag = 1;
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   }
 };
 function checkShouldComponentUpdate(
   workInProgress,
+  ctor,
   oldProps,
   newProps,
   oldState,
   newState,
-  newContext
+  nextContext
 ) {
-  var instance = workInProgress.stateNode;
-  workInProgress = workInProgress.type;
-  return "function" === typeof instance.shouldComponentUpdate
-    ? instance.shouldComponentUpdate(newProps, newState, newContext)
-    : workInProgress.prototype && workInProgress.prototype.isPureReactComponent
+  workInProgress = workInProgress.stateNode;
+  return "function" === typeof workInProgress.shouldComponentUpdate
+    ? workInProgress.shouldComponentUpdate(newProps, newState, nextContext)
+    : ctor.prototype && ctor.prototype.isPureReactComponent
       ? !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
       : !0;
 }
@@ -2383,38 +2457,46 @@ function callComponentWillReceiveProps(
   workInProgress,
   instance,
   newProps,
-  newContext
+  nextContext
 ) {
   workInProgress = instance.state;
   "function" === typeof instance.componentWillReceiveProps &&
-    instance.componentWillReceiveProps(newProps, newContext);
+    instance.componentWillReceiveProps(newProps, nextContext);
   "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
-    instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    instance.UNSAFE_componentWillReceiveProps(newProps, nextContext);
   instance.state !== workInProgress &&
     classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
 }
-function mountClassInstance(workInProgress, renderExpirationTime) {
-  var ctor = workInProgress.type,
-    instance = workInProgress.stateNode,
-    props = workInProgress.pendingProps,
-    unmaskedContext = getUnmaskedContext(workInProgress);
-  instance.props = props;
+function mountClassInstance(
+  workInProgress,
+  ctor,
+  newProps,
+  renderExpirationTime
+) {
+  var instance = workInProgress.stateNode;
+  instance.props = newProps;
   instance.state = workInProgress.memoizedState;
-  instance.refs = emptyObject;
-  instance.context = getMaskedContext(workInProgress, unmaskedContext);
-  unmaskedContext = workInProgress.updateQueue;
-  null !== unmaskedContext &&
+  instance.refs = emptyRefsObject;
+  var contextType = ctor.contextType;
+  "object" === typeof contextType && null !== contextType
+    ? (instance.context = contextType.unstable_read())
+    : ((contextType = isContextProvider(ctor)
+        ? previousContext
+        : contextStackCursor.current),
+      (instance.context = getMaskedContext(workInProgress, contextType)));
+  contextType = workInProgress.updateQueue;
+  null !== contextType &&
     (processUpdateQueue(
       workInProgress,
-      unmaskedContext,
-      props,
+      contextType,
+      newProps,
       instance,
       renderExpirationTime
     ),
     (instance.state = workInProgress.memoizedState));
-  unmaskedContext = workInProgress.type.getDerivedStateFromProps;
-  "function" === typeof unmaskedContext &&
-    (applyDerivedStateFromProps(workInProgress, unmaskedContext, props),
+  contextType = ctor.getDerivedStateFromProps;
+  "function" === typeof contextType &&
+    (applyDerivedStateFromProps(workInProgress, ctor, contextType, newProps),
     (instance.state = workInProgress.memoizedState));
   "function" === typeof ctor.getDerivedStateFromProps ||
     "function" === typeof instance.getSnapshotBeforeUpdate ||
@@ -2427,12 +2509,12 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
       instance.UNSAFE_componentWillMount(),
     ctor !== instance.state &&
       classComponentUpdater.enqueueReplaceState(instance, instance.state, null),
-    (unmaskedContext = workInProgress.updateQueue),
-    null !== unmaskedContext &&
+    (contextType = workInProgress.updateQueue),
+    null !== contextType &&
       (processUpdateQueue(
         workInProgress,
-        unmaskedContext,
-        props,
+        contextType,
+        newProps,
         instance,
         renderExpirationTime
       ),
@@ -2440,8 +2522,8 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.effectTag |= 4);
 }
-var isArray$1 = Array.isArray;
-function coerceRef(returnFiber, current, element) {
+var isArray = Array.isArray;
+function coerceRef(returnFiber, current$$1, element) {
   returnFiber = element.ref;
   if (
     null !== returnFiber &&
@@ -2453,8 +2535,8 @@ function coerceRef(returnFiber, current, element) {
       var inst = void 0;
       element &&
         (invariant(
-          2 === element.tag,
-          "Stateless function components cannot have refs."
+          2 === element.tag || 3 === element.tag,
+          "Function components cannot have refs."
         ),
         (inst = element.stateNode));
       invariant(
@@ -2464,26 +2546,27 @@ function coerceRef(returnFiber, current, element) {
       );
       var stringRef = "" + returnFiber;
       if (
-        null !== current &&
-        null !== current.ref &&
-        "function" === typeof current.ref &&
-        current.ref._stringRef === stringRef
+        null !== current$$1 &&
+        null !== current$$1.ref &&
+        "function" === typeof current$$1.ref &&
+        current$$1.ref._stringRef === stringRef
       )
-        return current.ref;
-      current = function(value) {
-        var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
+        return current$$1.ref;
+      current$$1 = function(value) {
+        var refs = inst.refs;
+        refs === emptyRefsObject && (refs = inst.refs = {});
         null === value ? delete refs[stringRef] : (refs[stringRef] = value);
       };
-      current._stringRef = stringRef;
-      return current;
+      current$$1._stringRef = stringRef;
+      return current$$1;
     }
     invariant(
       "string" === typeof returnFiber,
-      "Expected ref to be a function or a string."
+      "Expected ref to be a function, a string, an object returned by React.createRef(), or null."
     );
     invariant(
       element._owner,
-      "Element ref was specified as a string (%s) but no owner was set. This could happen for one of the following reasons:\n1. You may be adding a ref to a functional component\n2. You may be adding a ref to a component that was not created inside a component's render method\n3. You have multiple copies of React loaded\nSee https://fb.me/react-refs-must-have-owner for more information.",
+      "Element ref was specified as a string (%s) but no owner was set. This could happen for one of the following reasons:\n1. You may be adding a ref to a function component\n2. You may be adding a ref to a component that was not created inside a component's render method\n3. You have multiple copies of React loaded\nSee https://fb.me/react-refs-must-have-owner for more information.",
       returnFiber
     );
   }
@@ -2553,26 +2636,31 @@ function ChildReconciler(shouldTrackSideEffects) {
       (newFiber.effectTag = 2);
     return newFiber;
   }
-  function updateTextNode(returnFiber, current, textContent, expirationTime) {
-    if (null === current || 6 !== current.tag)
+  function updateTextNode(
+    returnFiber,
+    current$$1,
+    textContent,
+    expirationTime
+  ) {
+    if (null === current$$1 || 8 !== current$$1.tag)
       return (
-        (current = createFiberFromText(
+        (current$$1 = createFiberFromText(
           textContent,
           returnFiber.mode,
           expirationTime
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, textContent, expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, textContent, expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
-  function updateElement(returnFiber, current, element, expirationTime) {
-    if (null !== current && current.type === element.type)
+  function updateElement(returnFiber, current$$1, element, expirationTime) {
+    if (null !== current$$1 && current$$1.type === element.type)
       return (
-        (expirationTime = useFiber(current, element.props, expirationTime)),
-        (expirationTime.ref = coerceRef(returnFiber, current, element)),
+        (expirationTime = useFiber(current$$1, element.props, expirationTime)),
+        (expirationTime.ref = coerceRef(returnFiber, current$$1, element)),
         (expirationTime.return = returnFiber),
         expirationTime
       );
@@ -2581,45 +2669,51 @@ function ChildReconciler(shouldTrackSideEffects) {
       returnFiber.mode,
       expirationTime
     );
-    expirationTime.ref = coerceRef(returnFiber, current, element);
+    expirationTime.ref = coerceRef(returnFiber, current$$1, element);
     expirationTime.return = returnFiber;
     return expirationTime;
   }
-  function updatePortal(returnFiber, current, portal, expirationTime) {
+  function updatePortal(returnFiber, current$$1, portal, expirationTime) {
     if (
-      null === current ||
-      4 !== current.tag ||
-      current.stateNode.containerInfo !== portal.containerInfo ||
-      current.stateNode.implementation !== portal.implementation
+      null === current$$1 ||
+      6 !== current$$1.tag ||
+      current$$1.stateNode.containerInfo !== portal.containerInfo ||
+      current$$1.stateNode.implementation !== portal.implementation
     )
       return (
-        (current = createFiberFromPortal(
+        (current$$1 = createFiberFromPortal(
           portal,
           returnFiber.mode,
           expirationTime
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, portal.children || [], expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, portal.children || [], expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
-  function updateFragment(returnFiber, current, fragment, expirationTime, key) {
-    if (null === current || 10 !== current.tag)
+  function updateFragment(
+    returnFiber,
+    current$$1,
+    fragment,
+    expirationTime,
+    key
+  ) {
+    if (null === current$$1 || 9 !== current$$1.tag)
       return (
-        (current = createFiberFromFragment(
+        (current$$1 = createFiberFromFragment(
           fragment,
           returnFiber.mode,
           expirationTime,
           key
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, fragment, expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, fragment, expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
   function createChild(returnFiber, newChild, expirationTime) {
     if ("string" === typeof newChild || "number" === typeof newChild)
@@ -2656,7 +2750,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2696,7 +2790,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ? updatePortal(returnFiber, oldFiber, newChild, expirationTime)
             : null;
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(
@@ -2764,7 +2858,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             )
           );
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(
@@ -2981,7 +3075,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ) {
               if (isUnkeyedTopLevelFragment.key === isObject)
                 if (
-                  10 === isUnkeyedTopLevelFragment.tag
+                  9 === isUnkeyedTopLevelFragment.tag
                     ? newChild.type === REACT_FRAGMENT_TYPE
                     : isUnkeyedTopLevelFragment.type === newChild.type
                 ) {
@@ -3046,7 +3140,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ) {
               if (currentFirstChild.key === isUnkeyedTopLevelFragment)
                 if (
-                  4 === currentFirstChild.tag &&
+                  6 === currentFirstChild.tag &&
                   currentFirstChild.stateNode.containerInfo ===
                     newChild.containerInfo &&
                   currentFirstChild.stateNode.implementation ===
@@ -3084,7 +3178,7 @@ function ChildReconciler(shouldTrackSideEffects) {
     if ("string" === typeof newChild || "number" === typeof newChild)
       return (
         (newChild = "" + newChild),
-        null !== currentFirstChild && 6 === currentFirstChild.tag
+        null !== currentFirstChild && 8 === currentFirstChild.tag
           ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
             (currentFirstChild = useFiber(
               currentFirstChild,
@@ -3103,7 +3197,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             (returnFiber = currentFirstChild)),
         placeSingleChild(returnFiber)
       );
-    if (isArray$1(newChild))
+    if (isArray(newChild))
       return reconcileChildrenArray(
         returnFiber,
         currentFirstChild,
@@ -3121,7 +3215,8 @@ function ChildReconciler(shouldTrackSideEffects) {
     if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
       switch (returnFiber.tag) {
         case 2:
-        case 1:
+        case 3:
+        case 0:
           (expirationTime = returnFiber.type),
             invariant(
               !1,
@@ -3139,12 +3234,12 @@ var reconcileChildFibers = ChildReconciler(!0),
   isHydrating = !1;
 function tryHydrate(fiber, nextInstance) {
   switch (fiber.tag) {
-    case 5:
+    case 7:
       return (
         (nextInstance = shim$1(nextInstance, fiber.type, fiber.pendingProps)),
         null !== nextInstance ? ((fiber.stateNode = nextInstance), !0) : !1
       );
-    case 6:
+    case 8:
       return (
         (nextInstance = shim$1(nextInstance, fiber.pendingProps)),
         null !== nextInstance ? ((fiber.stateNode = nextInstance), !0) : !1
@@ -3167,7 +3262,7 @@ function tryToClaimNextHydratableInstance(fiber$jscomp$0) {
           return;
         }
         var returnFiber = hydrationParentFiber,
-          fiber = new FiberNode(5, null, null, 0);
+          fiber = new FiberNode(7, null, null, 0);
         fiber.type = "DELETED";
         fiber.stateNode = firstAttemptedInstance;
         fiber.return = returnFiber;
@@ -3185,22 +3280,47 @@ function tryToClaimNextHydratableInstance(fiber$jscomp$0) {
         (hydrationParentFiber = fiber$jscomp$0);
   }
 }
-function reconcileChildren(current, workInProgress, nextChildren) {
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    workInProgress.expirationTime
-  );
-}
-function reconcileChildrenAtExpirationTime(
-  current,
-  workInProgress,
-  nextChildren,
-  renderExpirationTime
-) {
-  workInProgress.child =
-    null === current
+function readLazyComponentType(thenable) {
+  switch (thenable._reactStatus) {
+    case 1:
+      return thenable._reactResult;
+    case 2:
+      throw thenable._reactResult;
+    case 0:
+      throw thenable;
+    default:
+      throw ((thenable._reactStatus = 0),
+      thenable.then(
+        function(resolvedValue) {
+          if (0 === thenable._reactStatus) {
+            thenable._reactStatus = 1;
+            if ("object" === typeof resolvedValue && null !== resolvedValue) {
+              var defaultExport = resolvedValue.default;
+              resolvedValue =
+                void 0 !== defaultExport && null !== defaultExport
+                  ? defaultExport
+                  : resolvedValue;
+            }
+            thenable._reactResult = resolvedValue;
+          }
+        },
+        function(error) {
+          0 === thenable._reactStatus &&
+            ((thenable._reactStatus = 2), (thenable._reactResult = error));
+        }
+      ),
+      thenable);
+  }
+}
+var ReactCurrentOwner$3 = ReactSharedInternals.ReactCurrentOwner;
+function reconcileChildren(
+  current$$1,
+  workInProgress,
+  nextChildren,
+  renderExpirationTime
+) {
+  workInProgress.child =
+    null === current$$1
       ? mountChildFibers(
           workInProgress,
           null,
@@ -3209,57 +3329,397 @@ function reconcileChildrenAtExpirationTime(
         )
       : reconcileChildFibers(
           workInProgress,
-          current.child,
+          current$$1.child,
           nextChildren,
           renderExpirationTime
         );
 }
-function markRef(current, workInProgress) {
+function updateForwardRef(
+  current$$1,
+  workInProgress,
+  type,
+  nextProps,
+  renderExpirationTime
+) {
+  type = type.render;
+  var ref = workInProgress.ref;
+  if (
+    !didPerformWorkStackCursor.current &&
+    workInProgress.memoizedProps === nextProps &&
+    ref === (null !== current$$1 ? current$$1.ref : null)
+  )
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
+  type = type(nextProps, ref);
+  reconcileChildren(current$$1, workInProgress, type, renderExpirationTime);
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
+}
+function updatePureComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  updateExpirationTime,
+  renderExpirationTime
+) {
+  var render = Component.render,
+    ref = workInProgress.ref;
+  if (
+    null !== current$$1 &&
+    (0 === updateExpirationTime ||
+      updateExpirationTime > renderExpirationTime) &&
+    ((updateExpirationTime = current$$1.memoizedProps),
+    (Component = Component.compare),
+    (Component = null !== Component ? Component : shallowEqual),
+    workInProgress.ref === current$$1.ref &&
+      Component(updateExpirationTime, nextProps))
+  )
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  render = render(nextProps, ref);
+  workInProgress.effectTag |= 1;
+  reconcileChildren(current$$1, workInProgress, render, renderExpirationTime);
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
+}
+function markRef(current$$1, workInProgress) {
   var ref = workInProgress.ref;
   if (
-    (null === current && null !== ref) ||
-    (null !== current && current.ref !== ref)
+    (null === current$$1 && null !== ref) ||
+    (null !== current$$1 && current$$1.ref !== ref)
   )
     workInProgress.effectTag |= 128;
 }
+function updateFunctionComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
+  var unmaskedContext = isContextProvider(Component)
+    ? previousContext
+    : contextStackCursor.current;
+  unmaskedContext = getMaskedContext(workInProgress, unmaskedContext);
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  Component = Component(nextProps, unmaskedContext);
+  workInProgress.effectTag |= 1;
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    Component,
+    renderExpirationTime
+  );
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
+}
+function updateClassComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
+  if (isContextProvider(Component)) {
+    var hasContext = !0;
+    pushContextProvider(workInProgress);
+  } else hasContext = !1;
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  if (null === current$$1)
+    if (null === workInProgress.stateNode) {
+      var isLegacyContextConsumer = !1,
+        unmaskedContext = emptyContextObject;
+      var context = Component.contextType;
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((unmaskedContext = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (isLegacyContextConsumer = Component.contextTypes),
+          (context = (isLegacyContextConsumer =
+            null !== isLegacyContextConsumer &&
+            void 0 !== isLegacyContextConsumer)
+            ? getMaskedContext(workInProgress, unmaskedContext)
+            : emptyContextObject));
+      var instance = new Component(nextProps, context);
+      workInProgress.memoizedState =
+        null !== instance.state && void 0 !== instance.state
+          ? instance.state
+          : null;
+      instance.updater = classComponentUpdater;
+      workInProgress.stateNode = instance;
+      instance._reactInternalFiber = workInProgress;
+      isLegacyContextConsumer &&
+        ((isLegacyContextConsumer = workInProgress.stateNode),
+        (isLegacyContextConsumer.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
+        (isLegacyContextConsumer.__reactInternalMemoizedMaskedChildContext = context));
+      mountClassInstance(
+        workInProgress,
+        Component,
+        nextProps,
+        renderExpirationTime
+      );
+      nextProps = !0;
+    } else {
+      unmaskedContext = workInProgress.stateNode;
+      isLegacyContextConsumer = workInProgress.memoizedProps;
+      unmaskedContext.props = isLegacyContextConsumer;
+      var oldContext = unmaskedContext.context;
+      context = Component.contextType;
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((context = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (context = getMaskedContext(workInProgress, context)));
+      var getDerivedStateFromProps = Component.getDerivedStateFromProps;
+      (instance =
+        "function" === typeof getDerivedStateFromProps ||
+        "function" === typeof unmaskedContext.getSnapshotBeforeUpdate) ||
+        ("function" !==
+          typeof unmaskedContext.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof unmaskedContext.componentWillReceiveProps) ||
+        ((isLegacyContextConsumer !== nextProps || oldContext !== context) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            unmaskedContext,
+            nextProps,
+            context
+          ));
+      hasForceUpdate = !1;
+      var oldState = workInProgress.memoizedState;
+      oldContext = unmaskedContext.state = oldState;
+      var updateQueue = workInProgress.updateQueue;
+      null !== updateQueue &&
+        (processUpdateQueue(
+          workInProgress,
+          updateQueue,
+          nextProps,
+          unmaskedContext,
+          renderExpirationTime
+        ),
+        (oldContext = workInProgress.memoizedState));
+      isLegacyContextConsumer !== nextProps ||
+      oldState !== oldContext ||
+      didPerformWorkStackCursor.current ||
+      hasForceUpdate
+        ? ("function" === typeof getDerivedStateFromProps &&
+            (applyDerivedStateFromProps(
+              workInProgress,
+              Component,
+              getDerivedStateFromProps,
+              nextProps
+            ),
+            (oldContext = workInProgress.memoizedState)),
+          (isLegacyContextConsumer =
+            hasForceUpdate ||
+            checkShouldComponentUpdate(
+              workInProgress,
+              Component,
+              isLegacyContextConsumer,
+              nextProps,
+              oldState,
+              oldContext,
+              context
+            ))
+            ? (instance ||
+                ("function" !==
+                  typeof unmaskedContext.UNSAFE_componentWillMount &&
+                  "function" !== typeof unmaskedContext.componentWillMount) ||
+                ("function" === typeof unmaskedContext.componentWillMount &&
+                  unmaskedContext.componentWillMount(),
+                "function" ===
+                  typeof unmaskedContext.UNSAFE_componentWillMount &&
+                  unmaskedContext.UNSAFE_componentWillMount()),
+              "function" === typeof unmaskedContext.componentDidMount &&
+                (workInProgress.effectTag |= 4))
+            : ("function" === typeof unmaskedContext.componentDidMount &&
+                (workInProgress.effectTag |= 4),
+              (workInProgress.memoizedProps = nextProps),
+              (workInProgress.memoizedState = oldContext)),
+          (unmaskedContext.props = nextProps),
+          (unmaskedContext.state = oldContext),
+          (unmaskedContext.context = context),
+          (nextProps = isLegacyContextConsumer))
+        : ("function" === typeof unmaskedContext.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          (nextProps = !1));
+    }
+  else
+    (unmaskedContext = workInProgress.stateNode),
+      (isLegacyContextConsumer = workInProgress.memoizedProps),
+      (unmaskedContext.props = isLegacyContextConsumer),
+      (oldContext = unmaskedContext.context),
+      (context = Component.contextType),
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((context = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (context = getMaskedContext(workInProgress, context))),
+      (getDerivedStateFromProps = Component.getDerivedStateFromProps),
+      (instance =
+        "function" === typeof getDerivedStateFromProps ||
+        "function" === typeof unmaskedContext.getSnapshotBeforeUpdate) ||
+        ("function" !==
+          typeof unmaskedContext.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof unmaskedContext.componentWillReceiveProps) ||
+        ((isLegacyContextConsumer !== nextProps || oldContext !== context) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            unmaskedContext,
+            nextProps,
+            context
+          )),
+      (hasForceUpdate = !1),
+      (oldContext = workInProgress.memoizedState),
+      (oldState = unmaskedContext.state = oldContext),
+      (updateQueue = workInProgress.updateQueue),
+      null !== updateQueue &&
+        (processUpdateQueue(
+          workInProgress,
+          updateQueue,
+          nextProps,
+          unmaskedContext,
+          renderExpirationTime
+        ),
+        (oldState = workInProgress.memoizedState)),
+      isLegacyContextConsumer !== nextProps ||
+      oldContext !== oldState ||
+      didPerformWorkStackCursor.current ||
+      hasForceUpdate
+        ? ("function" === typeof getDerivedStateFromProps &&
+            (applyDerivedStateFromProps(
+              workInProgress,
+              Component,
+              getDerivedStateFromProps,
+              nextProps
+            ),
+            (oldState = workInProgress.memoizedState)),
+          (getDerivedStateFromProps =
+            hasForceUpdate ||
+            checkShouldComponentUpdate(
+              workInProgress,
+              Component,
+              isLegacyContextConsumer,
+              nextProps,
+              oldContext,
+              oldState,
+              context
+            ))
+            ? (instance ||
+                ("function" !==
+                  typeof unmaskedContext.UNSAFE_componentWillUpdate &&
+                  "function" !== typeof unmaskedContext.componentWillUpdate) ||
+                ("function" === typeof unmaskedContext.componentWillUpdate &&
+                  unmaskedContext.componentWillUpdate(
+                    nextProps,
+                    oldState,
+                    context
+                  ),
+                "function" ===
+                  typeof unmaskedContext.UNSAFE_componentWillUpdate &&
+                  unmaskedContext.UNSAFE_componentWillUpdate(
+                    nextProps,
+                    oldState,
+                    context
+                  )),
+              "function" === typeof unmaskedContext.componentDidUpdate &&
+                (workInProgress.effectTag |= 4),
+              "function" === typeof unmaskedContext.getSnapshotBeforeUpdate &&
+                (workInProgress.effectTag |= 256))
+            : ("function" !== typeof unmaskedContext.componentDidUpdate ||
+                (isLegacyContextConsumer === current$$1.memoizedProps &&
+                  oldContext === current$$1.memoizedState) ||
+                (workInProgress.effectTag |= 4),
+              "function" !== typeof unmaskedContext.getSnapshotBeforeUpdate ||
+                (isLegacyContextConsumer === current$$1.memoizedProps &&
+                  oldContext === current$$1.memoizedState) ||
+                (workInProgress.effectTag |= 256),
+              (workInProgress.memoizedProps = nextProps),
+              (workInProgress.memoizedState = oldState)),
+          (unmaskedContext.props = nextProps),
+          (unmaskedContext.state = oldState),
+          (unmaskedContext.context = context),
+          (nextProps = getDerivedStateFromProps))
+        : ("function" !== typeof unmaskedContext.componentDidUpdate ||
+            (isLegacyContextConsumer === current$$1.memoizedProps &&
+              oldContext === current$$1.memoizedState) ||
+            (workInProgress.effectTag |= 4),
+          "function" !== typeof unmaskedContext.getSnapshotBeforeUpdate ||
+            (isLegacyContextConsumer === current$$1.memoizedProps &&
+              oldContext === current$$1.memoizedState) ||
+            (workInProgress.effectTag |= 256),
+          (nextProps = !1));
+  return finishClassComponent(
+    current$$1,
+    workInProgress,
+    Component,
+    nextProps,
+    hasContext,
+    renderExpirationTime
+  );
+}
 function finishClassComponent(
-  current,
+  current$$1,
   workInProgress,
+  Component,
   shouldUpdate,
   hasContext,
   renderExpirationTime
 ) {
-  markRef(current, workInProgress);
+  markRef(current$$1, workInProgress);
   var didCaptureError = 0 !== (workInProgress.effectTag & 64);
   if (!shouldUpdate && !didCaptureError)
     return (
-      hasContext && invalidateContextProvider(workInProgress, !1),
-      bailoutOnAlreadyFinishedWork(current, workInProgress)
+      hasContext && invalidateContextProvider(workInProgress, Component, !1),
+      bailoutOnAlreadyFinishedWork(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      )
     );
   shouldUpdate = workInProgress.stateNode;
-  ReactCurrentOwner.current = workInProgress;
-  if (didCaptureError) {
+  ReactCurrentOwner$3.current = workInProgress;
+  if (
+    didCaptureError &&
+    "function" !== typeof Component.getDerivedStateFromError
+  ) {
     var nextChildren = null;
-    baseStartTime = -1;
+    profilerStartTime = -1;
   } else nextChildren = shouldUpdate.render();
   workInProgress.effectTag |= 1;
-  didCaptureError &&
-    (reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      null,
-      renderExpirationTime
-    ),
-    (workInProgress.child = null));
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    renderExpirationTime
-  );
+  null !== current$$1 && didCaptureError
+    ? ((didCaptureError = nextChildren),
+      (workInProgress.child = reconcileChildFibers(
+        workInProgress,
+        current$$1.child,
+        null,
+        renderExpirationTime
+      )),
+      (workInProgress.child = reconcileChildFibers(
+        workInProgress,
+        null,
+        didCaptureError,
+        renderExpirationTime
+      )))
+    : reconcileChildren(
+        current$$1,
+        workInProgress,
+        nextChildren,
+        renderExpirationTime
+      );
   workInProgress.memoizedState = shouldUpdate.state;
   workInProgress.memoizedProps = shouldUpdate.props;
-  hasContext && invalidateContextProvider(workInProgress, !0);
+  hasContext && invalidateContextProvider(workInProgress, Component, !0);
   return workInProgress.child;
 }
 function pushHostRootContext(workInProgress) {
@@ -3274,632 +3734,611 @@ function pushHostRootContext(workInProgress) {
       pushTopLevelContextObject(workInProgress, root.context, !1);
   pushHostContainer(workInProgress, root.containerInfo);
 }
-function propagateContextChange(
+function resolveDefaultProps(Component, baseProps) {
+  if (Component && Component.defaultProps) {
+    baseProps = Object.assign({}, baseProps);
+    Component = Component.defaultProps;
+    for (var propName in Component)
+      void 0 === baseProps[propName] &&
+        (baseProps[propName] = Component[propName]);
+  }
+  return baseProps;
+}
+function bailoutOnAlreadyFinishedWork(
+  current$$1,
   workInProgress,
-  context,
-  changedBits,
   renderExpirationTime
 ) {
-  var fiber = workInProgress.child;
-  null !== fiber && (fiber.return = workInProgress);
-  for (; null !== fiber; ) {
-    switch (fiber.tag) {
-      case 12:
-        var nextFiber = fiber.stateNode | 0;
-        if (fiber.type === context && 0 !== (nextFiber & changedBits)) {
-          for (nextFiber = fiber; null !== nextFiber; ) {
-            var alternate = nextFiber.alternate;
-            if (
-              0 === nextFiber.expirationTime ||
-              nextFiber.expirationTime > renderExpirationTime
-            )
-              (nextFiber.expirationTime = renderExpirationTime),
-                null !== alternate &&
-                  (0 === alternate.expirationTime ||
-                    alternate.expirationTime > renderExpirationTime) &&
-                  (alternate.expirationTime = renderExpirationTime);
-            else if (
-              null !== alternate &&
-              (0 === alternate.expirationTime ||
-                alternate.expirationTime > renderExpirationTime)
-            )
-              alternate.expirationTime = renderExpirationTime;
-            else break;
-            nextFiber = nextFiber.return;
-          }
-          nextFiber = null;
-        } else nextFiber = fiber.child;
-        break;
-      case 13:
-        nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
-        break;
-      default:
-        nextFiber = fiber.child;
-    }
-    if (null !== nextFiber) nextFiber.return = fiber;
-    else
-      for (nextFiber = fiber; null !== nextFiber; ) {
-        if (nextFiber === workInProgress) {
-          nextFiber = null;
-          break;
-        }
-        fiber = nextFiber.sibling;
-        if (null !== fiber) {
-          fiber.return = nextFiber.return;
-          nextFiber = fiber;
-          break;
-        }
-        nextFiber = nextFiber.return;
-      }
-    fiber = nextFiber;
-  }
-}
-function updateContextProvider(current, workInProgress, renderExpirationTime) {
-  var context = workInProgress.type._context,
-    newProps = workInProgress.pendingProps,
-    oldProps = workInProgress.memoizedProps,
-    canBailOnProps = !0;
-  if (didPerformWorkStackCursor.current) canBailOnProps = !1;
-  else if (oldProps === newProps)
-    return (
-      (workInProgress.stateNode = 0),
-      pushProvider(workInProgress),
-      bailoutOnAlreadyFinishedWork(current, workInProgress)
-    );
-  var newValue = newProps.value;
-  workInProgress.memoizedProps = newProps;
-  if (null === oldProps) newValue = 1073741823;
-  else if (oldProps.value === newProps.value) {
-    if (oldProps.children === newProps.children && canBailOnProps)
-      return (
-        (workInProgress.stateNode = 0),
-        pushProvider(workInProgress),
-        bailoutOnAlreadyFinishedWork(current, workInProgress)
-      );
-    newValue = 0;
-  } else {
-    var oldValue = oldProps.value;
-    if (
-      (oldValue === newValue &&
-        (0 !== oldValue || 1 / oldValue === 1 / newValue)) ||
-      (oldValue !== oldValue && newValue !== newValue)
-    ) {
-      if (oldProps.children === newProps.children && canBailOnProps)
-        return (
-          (workInProgress.stateNode = 0),
-          pushProvider(workInProgress),
-          bailoutOnAlreadyFinishedWork(current, workInProgress)
-        );
-      newValue = 0;
-    } else if (
-      ((newValue =
-        "function" === typeof context._calculateChangedBits
-          ? context._calculateChangedBits(oldValue, newValue)
-          : 1073741823),
-      (newValue |= 0),
-      0 === newValue)
-    ) {
-      if (oldProps.children === newProps.children && canBailOnProps)
-        return (
-          (workInProgress.stateNode = 0),
-          pushProvider(workInProgress),
-          bailoutOnAlreadyFinishedWork(current, workInProgress)
-        );
-    } else
-      propagateContextChange(
-        workInProgress,
-        context,
-        newValue,
-        renderExpirationTime
-      );
-  }
-  workInProgress.stateNode = newValue;
-  pushProvider(workInProgress);
-  reconcileChildren(current, workInProgress, newProps.children);
-  return workInProgress.child;
-}
-function bailoutOnAlreadyFinishedWork(current, workInProgress) {
-  baseStartTime = -1;
+  null !== current$$1 &&
+    (workInProgress.firstContextDependency = current$$1.firstContextDependency);
+  profilerStartTime = -1;
+  var childExpirationTime = workInProgress.childExpirationTime;
+  if (0 === childExpirationTime || childExpirationTime > renderExpirationTime)
+    return null;
   invariant(
-    null === current || workInProgress.child === current.child,
+    null === current$$1 || workInProgress.child === current$$1.child,
     "Resuming work not yet implemented."
   );
   if (null !== workInProgress.child) {
-    current = workInProgress.child;
-    var newChild = createWorkInProgress(
-      current,
-      current.pendingProps,
-      current.expirationTime
+    current$$1 = workInProgress.child;
+    renderExpirationTime = createWorkInProgress(
+      current$$1,
+      current$$1.pendingProps,
+      current$$1.expirationTime
     );
-    workInProgress.child = newChild;
-    for (newChild.return = workInProgress; null !== current.sibling; )
-      (current = current.sibling),
-        (newChild = newChild.sibling = createWorkInProgress(
-          current,
-          current.pendingProps,
-          current.expirationTime
+    workInProgress.child = renderExpirationTime;
+    for (
+      renderExpirationTime.return = workInProgress;
+      null !== current$$1.sibling;
+
+    )
+      (current$$1 = current$$1.sibling),
+        (renderExpirationTime = renderExpirationTime.sibling = createWorkInProgress(
+          current$$1,
+          current$$1.pendingProps,
+          current$$1.expirationTime
         )),
-        (newChild.return = workInProgress);
-    newChild.sibling = null;
+        (renderExpirationTime.return = workInProgress);
+    renderExpirationTime.sibling = null;
   }
   return workInProgress.child;
 }
-function beginWork(current, workInProgress, renderExpirationTime) {
-  workInProgress.mode & 4 &&
-    ((workInProgress.actualDuration =
-      now$1() - workInProgress.actualDuration - totalElapsedPauseTime),
-    (workInProgress.actualStartTime = now$1()));
+function beginWork(current$$1, workInProgress, renderExpirationTime) {
+  var updateExpirationTime = workInProgress.expirationTime;
   if (
-    0 === workInProgress.expirationTime ||
-    workInProgress.expirationTime > renderExpirationTime
+    null !== current$$1 &&
+    current$$1.memoizedProps === workInProgress.pendingProps &&
+    !didPerformWorkStackCursor.current &&
+    (0 === updateExpirationTime || updateExpirationTime > renderExpirationTime)
   ) {
-    baseStartTime = -1;
     switch (workInProgress.tag) {
-      case 3:
+      case 5:
         pushHostRootContext(workInProgress);
         break;
+      case 7:
+        pushHostContext(workInProgress);
+        break;
       case 2:
-        pushContextProvider(workInProgress);
+        isContextProvider(workInProgress.type) &&
+          pushContextProvider(workInProgress);
         break;
-      case 4:
+      case 3:
+        isContextProvider(workInProgress.type._reactResult) &&
+          pushContextProvider(workInProgress);
+        break;
+      case 6:
         pushHostContainer(
           workInProgress,
           workInProgress.stateNode.containerInfo
         );
         break;
-      case 13:
-        pushProvider(workInProgress);
+      case 12:
+        pushProvider(workInProgress, workInProgress.memoizedProps.value);
+        break;
+      case 15:
+        workInProgress.effectTag |= 4;
     }
-    return null;
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
   }
+  workInProgress.expirationTime = 0;
   switch (workInProgress.tag) {
-    case 0:
+    case 4:
+      var Component = workInProgress.type;
       invariant(
-        null === current,
+        null === current$$1,
         "An indeterminate component should never have mounted. This error is likely caused by a bug in React. Please file an issue."
       );
-      var fn = workInProgress.type,
-        props = workInProgress.pendingProps,
-        unmaskedContext = getUnmaskedContext(workInProgress);
-      unmaskedContext = getMaskedContext(workInProgress, unmaskedContext);
-      fn = fn(props, unmaskedContext);
-      workInProgress.effectTag |= 1;
-      "object" === typeof fn &&
-      null !== fn &&
-      "function" === typeof fn.render &&
-      void 0 === fn.$$typeof
-        ? ((unmaskedContext = workInProgress.type),
-          (workInProgress.tag = 2),
-          (workInProgress.memoizedState =
-            null !== fn.state && void 0 !== fn.state ? fn.state : null),
-          (unmaskedContext = unmaskedContext.getDerivedStateFromProps),
-          "function" === typeof unmaskedContext &&
-            applyDerivedStateFromProps(workInProgress, unmaskedContext, props),
-          (props = pushContextProvider(workInProgress)),
-          (fn.updater = classComponentUpdater),
-          (workInProgress.stateNode = fn),
-          (fn._reactInternalFiber = workInProgress),
-          mountClassInstance(workInProgress, renderExpirationTime),
-          (current = finishClassComponent(
-            current,
+      var props = workInProgress.pendingProps;
+      if (
+        "object" === typeof Component &&
+        null !== Component &&
+        "function" === typeof Component.then
+      ) {
+        Component = readLazyComponentType(Component);
+        var resolvedTag = (workInProgress.tag = resolveLazyComponentTag(
             workInProgress,
-            !0,
-            props,
-            renderExpirationTime
-          )))
-        : ((workInProgress.tag = 1),
-          reconcileChildren(current, workInProgress, fn),
-          (workInProgress.memoizedProps = props),
-          (current = workInProgress.child));
-      return current;
-    case 1:
-      return (
-        (props = workInProgress.type),
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime
-          ? ((fn = getUnmaskedContext(workInProgress)),
-            (fn = getMaskedContext(workInProgress, fn)),
-            (props = props(renderExpirationTime, fn)),
-            (workInProgress.effectTag |= 1),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
-      );
-    case 2:
-      props = pushContextProvider(workInProgress);
-      if (null === current)
-        if (null === workInProgress.stateNode) {
-          var props$jscomp$0 = workInProgress.pendingProps,
-            ctor = workInProgress.type;
-          fn = getUnmaskedContext(workInProgress);
-          var needsContext =
-            2 === workInProgress.tag &&
-            null != workInProgress.type.contextTypes;
-          unmaskedContext = needsContext
-            ? getMaskedContext(workInProgress, fn)
-            : emptyObject;
-          props$jscomp$0 = new ctor(props$jscomp$0, unmaskedContext);
-          workInProgress.memoizedState =
-            null !== props$jscomp$0.state && void 0 !== props$jscomp$0.state
-              ? props$jscomp$0.state
-              : null;
-          props$jscomp$0.updater = classComponentUpdater;
-          workInProgress.stateNode = props$jscomp$0;
-          props$jscomp$0._reactInternalFiber = workInProgress;
-          needsContext &&
-            ((needsContext = workInProgress.stateNode),
-            (needsContext.__reactInternalMemoizedUnmaskedChildContext = fn),
-            (needsContext.__reactInternalMemoizedMaskedChildContext = unmaskedContext));
-          mountClassInstance(workInProgress, renderExpirationTime);
-          fn = !0;
-        } else {
-          ctor = workInProgress.type;
-          fn = workInProgress.stateNode;
-          needsContext = workInProgress.memoizedProps;
-          unmaskedContext = workInProgress.pendingProps;
-          fn.props = needsContext;
-          var oldContext = fn.context;
-          props$jscomp$0 = getUnmaskedContext(workInProgress);
-          props$jscomp$0 = getMaskedContext(workInProgress, props$jscomp$0);
-          var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
-          (ctor =
-            "function" === typeof getDerivedStateFromProps ||
-            "function" === typeof fn.getSnapshotBeforeUpdate) ||
-            ("function" !== typeof fn.UNSAFE_componentWillReceiveProps &&
-              "function" !== typeof fn.componentWillReceiveProps) ||
-            ((needsContext !== unmaskedContext ||
-              oldContext !== props$jscomp$0) &&
-              callComponentWillReceiveProps(
-                workInProgress,
-                fn,
-                unmaskedContext,
-                props$jscomp$0
-              ));
-          hasForceUpdate = !1;
-          var oldState = workInProgress.memoizedState;
-          oldContext = fn.state = oldState;
-          var updateQueue = workInProgress.updateQueue;
-          null !== updateQueue &&
-            (processUpdateQueue(
+            Component
+          )),
+          resolvedProps = resolveDefaultProps(Component, props),
+          child = void 0;
+        switch (resolvedTag) {
+          case 1:
+            child = updateFunctionComponent(
+              current$$1,
               workInProgress,
-              updateQueue,
-              unmaskedContext,
-              fn,
+              Component,
+              resolvedProps,
               renderExpirationTime
-            ),
-            (oldContext = workInProgress.memoizedState));
-          needsContext !== unmaskedContext ||
-          oldState !== oldContext ||
-          didPerformWorkStackCursor.current ||
-          hasForceUpdate
-            ? ("function" === typeof getDerivedStateFromProps &&
-                (applyDerivedStateFromProps(
-                  workInProgress,
-                  getDerivedStateFromProps,
-                  unmaskedContext
-                ),
-                (oldContext = workInProgress.memoizedState)),
-              (needsContext =
-                hasForceUpdate ||
-                checkShouldComponentUpdate(
-                  workInProgress,
-                  needsContext,
-                  unmaskedContext,
-                  oldState,
-                  oldContext,
-                  props$jscomp$0
-                ))
-                ? (ctor ||
-                    ("function" !== typeof fn.UNSAFE_componentWillMount &&
-                      "function" !== typeof fn.componentWillMount) ||
-                    ("function" === typeof fn.componentWillMount &&
-                      fn.componentWillMount(),
-                    "function" === typeof fn.UNSAFE_componentWillMount &&
-                      fn.UNSAFE_componentWillMount()),
-                  "function" === typeof fn.componentDidMount &&
-                    (workInProgress.effectTag |= 4))
-                : ("function" === typeof fn.componentDidMount &&
-                    (workInProgress.effectTag |= 4),
-                  (workInProgress.memoizedProps = unmaskedContext),
-                  (workInProgress.memoizedState = oldContext)),
-              (fn.props = unmaskedContext),
-              (fn.state = oldContext),
-              (fn.context = props$jscomp$0),
-              (fn = needsContext))
-            : ("function" === typeof fn.componentDidMount &&
-                (workInProgress.effectTag |= 4),
-              (fn = !1));
-        }
-      else
-        (ctor = workInProgress.type),
-          (fn = workInProgress.stateNode),
-          (unmaskedContext = workInProgress.memoizedProps),
-          (needsContext = workInProgress.pendingProps),
-          (fn.props = unmaskedContext),
-          (oldContext = fn.context),
-          (props$jscomp$0 = getUnmaskedContext(workInProgress)),
-          (props$jscomp$0 = getMaskedContext(workInProgress, props$jscomp$0)),
-          (getDerivedStateFromProps = ctor.getDerivedStateFromProps),
-          (ctor =
-            "function" === typeof getDerivedStateFromProps ||
-            "function" === typeof fn.getSnapshotBeforeUpdate) ||
-            ("function" !== typeof fn.UNSAFE_componentWillReceiveProps &&
-              "function" !== typeof fn.componentWillReceiveProps) ||
-            ((unmaskedContext !== needsContext ||
-              oldContext !== props$jscomp$0) &&
-              callComponentWillReceiveProps(
-                workInProgress,
-                fn,
-                needsContext,
-                props$jscomp$0
-              )),
-          (hasForceUpdate = !1),
-          (oldContext = workInProgress.memoizedState),
-          (oldState = fn.state = oldContext),
-          (updateQueue = workInProgress.updateQueue),
-          null !== updateQueue &&
-            (processUpdateQueue(
+            );
+            break;
+          case 3:
+            child = updateClassComponent(
+              current$$1,
               workInProgress,
-              updateQueue,
-              needsContext,
-              fn,
+              Component,
+              resolvedProps,
               renderExpirationTime
-            ),
-            (oldState = workInProgress.memoizedState)),
-          unmaskedContext !== needsContext ||
-          oldContext !== oldState ||
-          didPerformWorkStackCursor.current ||
-          hasForceUpdate
-            ? ("function" === typeof getDerivedStateFromProps &&
-                (applyDerivedStateFromProps(
+            );
+            break;
+          case 14:
+            child = updateForwardRef(
+              current$$1,
+              workInProgress,
+              Component,
+              resolvedProps,
+              renderExpirationTime
+            );
+            break;
+          case 18:
+            child = updatePureComponent(
+              current$$1,
+              workInProgress,
+              Component,
+              resolvedProps,
+              updateExpirationTime,
+              renderExpirationTime
+            );
+            break;
+          default:
+            invariant(
+              !1,
+              "Element type is invalid. Received a promise that resolves to: %s. Promise elements must resolve to a class or function.",
+              Component
+            );
+        }
+        workInProgress.memoizedProps = props;
+        workInProgress = child;
+      } else
+        (updateExpirationTime = getMaskedContext(
+          workInProgress,
+          contextStackCursor.current
+        )),
+          prepareToReadContext(workInProgress, renderExpirationTime),
+          (updateExpirationTime = Component(props, updateExpirationTime)),
+          (workInProgress.effectTag |= 1),
+          "object" === typeof updateExpirationTime &&
+          null !== updateExpirationTime &&
+          "function" === typeof updateExpirationTime.render &&
+          void 0 === updateExpirationTime.$$typeof
+            ? ((workInProgress.tag = 2),
+              isContextProvider(Component)
+                ? ((resolvedTag = !0), pushContextProvider(workInProgress))
+                : (resolvedTag = !1),
+              (workInProgress.memoizedState =
+                null !== updateExpirationTime.state &&
+                void 0 !== updateExpirationTime.state
+                  ? updateExpirationTime.state
+                  : null),
+              (resolvedProps = Component.getDerivedStateFromProps),
+              "function" === typeof resolvedProps &&
+                applyDerivedStateFromProps(
                   workInProgress,
-                  getDerivedStateFromProps,
-                  needsContext
+                  Component,
+                  resolvedProps,
+                  props
                 ),
-                (oldState = workInProgress.memoizedState)),
-              (getDerivedStateFromProps =
-                hasForceUpdate ||
-                checkShouldComponentUpdate(
-                  workInProgress,
-                  unmaskedContext,
-                  needsContext,
-                  oldContext,
-                  oldState,
-                  props$jscomp$0
-                ))
-                ? (ctor ||
-                    ("function" !== typeof fn.UNSAFE_componentWillUpdate &&
-                      "function" !== typeof fn.componentWillUpdate) ||
-                    ("function" === typeof fn.componentWillUpdate &&
-                      fn.componentWillUpdate(
-                        needsContext,
-                        oldState,
-                        props$jscomp$0
-                      ),
-                    "function" === typeof fn.UNSAFE_componentWillUpdate &&
-                      fn.UNSAFE_componentWillUpdate(
-                        needsContext,
-                        oldState,
-                        props$jscomp$0
-                      )),
-                  "function" === typeof fn.componentDidUpdate &&
-                    (workInProgress.effectTag |= 4),
-                  "function" === typeof fn.getSnapshotBeforeUpdate &&
-                    (workInProgress.effectTag |= 256))
-                : ("function" !== typeof fn.componentDidUpdate ||
-                    (unmaskedContext === current.memoizedProps &&
-                      oldContext === current.memoizedState) ||
-                    (workInProgress.effectTag |= 4),
-                  "function" !== typeof fn.getSnapshotBeforeUpdate ||
-                    (unmaskedContext === current.memoizedProps &&
-                      oldContext === current.memoizedState) ||
-                    (workInProgress.effectTag |= 256),
-                  (workInProgress.memoizedProps = needsContext),
-                  (workInProgress.memoizedState = oldState)),
-              (fn.props = needsContext),
-              (fn.state = oldState),
-              (fn.context = props$jscomp$0),
-              (fn = getDerivedStateFromProps))
-            : ("function" !== typeof fn.componentDidUpdate ||
-                (unmaskedContext === current.memoizedProps &&
-                  oldContext === current.memoizedState) ||
-                (workInProgress.effectTag |= 4),
-              "function" !== typeof fn.getSnapshotBeforeUpdate ||
-                (unmaskedContext === current.memoizedProps &&
-                  oldContext === current.memoizedState) ||
-                (workInProgress.effectTag |= 256),
-              (fn = !1));
-      return finishClassComponent(
-        current,
+              (updateExpirationTime.updater = classComponentUpdater),
+              (workInProgress.stateNode = updateExpirationTime),
+              (updateExpirationTime._reactInternalFiber = workInProgress),
+              mountClassInstance(
+                workInProgress,
+                Component,
+                props,
+                renderExpirationTime
+              ),
+              (workInProgress = finishClassComponent(
+                current$$1,
+                workInProgress,
+                Component,
+                !0,
+                resolvedTag,
+                renderExpirationTime
+              )))
+            : ((workInProgress.tag = 0),
+              reconcileChildren(
+                current$$1,
+                workInProgress,
+                updateExpirationTime,
+                renderExpirationTime
+              ),
+              (workInProgress.memoizedProps = props),
+              (workInProgress = workInProgress.child));
+      return workInProgress;
+    case 0:
+      return updateFunctionComponent(
+        current$$1,
         workInProgress,
-        fn,
-        props,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        renderExpirationTime
+      );
+    case 1:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateFunctionComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
+    case 2:
+      return updateClassComponent(
+        current$$1,
+        workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
         renderExpirationTime
       );
     case 3:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateClassComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
+    case 5:
       return (
         pushHostRootContext(workInProgress),
-        (props = workInProgress.updateQueue),
-        null !== props
-          ? ((fn = workInProgress.memoizedState),
-            (fn = null !== fn ? fn.element : null),
-            processUpdateQueue(
+        (Component = workInProgress.updateQueue),
+        invariant(
+          null !== Component,
+          "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
+        ),
+        (props = workInProgress.memoizedState),
+        (props = null !== props ? props.element : null),
+        processUpdateQueue(
+          workInProgress,
+          Component,
+          workInProgress.pendingProps,
+          null,
+          renderExpirationTime
+        ),
+        (Component = workInProgress.memoizedState.element),
+        Component === props
+          ? (workInProgress = bailoutOnAlreadyFinishedWork(
+              current$$1,
               workInProgress,
-              props,
-              workInProgress.pendingProps,
-              null,
+              renderExpirationTime
+            ))
+          : (reconcileChildren(
+              current$$1,
+              workInProgress,
+              Component,
               renderExpirationTime
             ),
-            (renderExpirationTime = workInProgress.memoizedState.element),
-            renderExpirationTime === fn
-              ? (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))
-              : (reconcileChildren(
-                  current,
-                  workInProgress,
-                  renderExpirationTime
-                ),
-                (current = workInProgress.child)))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+            (workInProgress = workInProgress.child)),
+        workInProgress
       );
-    case 5:
+    case 7:
       return (
-        requiredContext(rootInstanceStackCursor.current),
-        (renderExpirationTime = requiredContext(contextStackCursor$1.current)),
-        (props = workInProgress.type),
-        (props =
-          "AndroidTextInput" === props ||
-          "RCTMultilineTextInputView" === props ||
-          "RCTSinglelineTextInputView" === props ||
-          "RCTText" === props ||
-          "RCTVirtualText" === props),
-        (props =
-          renderExpirationTime.isInAParentText !== props
-            ? { isInAParentText: props }
-            : renderExpirationTime),
-        renderExpirationTime !== props &&
-          (push(contextFiberStackCursor, workInProgress, workInProgress),
-          push(contextStackCursor$1, props, workInProgress)),
-        null === current && tryToClaimNextHydratableInstance(workInProgress),
-        (props = workInProgress.memoizedProps),
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current || props !== renderExpirationTime
-          ? ((props = renderExpirationTime.children),
-            markRef(current, workInProgress),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
-      );
-    case 6:
+        pushHostContext(workInProgress),
+        null === current$$1 && tryToClaimNextHydratableInstance(workInProgress),
+        (Component = workInProgress.pendingProps),
+        (props = Component.children),
+        markRef(current$$1, workInProgress),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        (workInProgress = workInProgress.child),
+        workInProgress
+      );
+    case 8:
       return (
-        null === current && tryToClaimNextHydratableInstance(workInProgress),
+        null === current$$1 && tryToClaimNextHydratableInstance(workInProgress),
         (workInProgress.memoizedProps = workInProgress.pendingProps),
         null
       );
     case 16:
-      return null;
-    case 4:
+      return (
+        (Component = workInProgress.pendingProps),
+        (props = 0 === (workInProgress.effectTag & 64)),
+        null !== current$$1 && null !== workInProgress.updateQueue
+          ? ((workInProgress.updateQueue = null), (props = !0))
+          : (props = !props),
+        0 !== (workInProgress.mode & 2) &&
+          (props
+            ? (workInProgress.effectTag |= 4)
+            : (workInProgress.stateNode = null)),
+        (updateExpirationTime = Component.children),
+        (updateExpirationTime =
+          "function" === typeof updateExpirationTime
+            ? updateExpirationTime(props)
+            : props
+              ? Component.fallback
+              : updateExpirationTime),
+        null !== current$$1 && props !== workInProgress.memoizedState
+          ? ((workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              current$$1.child,
+              null,
+              renderExpirationTime
+            )),
+            (workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              null,
+              updateExpirationTime,
+              renderExpirationTime
+            )))
+          : reconcileChildren(
+              current$$1,
+              workInProgress,
+              updateExpirationTime,
+              renderExpirationTime
+            ),
+        (workInProgress.memoizedProps = Component),
+        (workInProgress.memoizedState = props),
+        workInProgress.child
+      );
+    case 6:
       return (
         pushHostContainer(
           workInProgress,
           workInProgress.stateNode.containerInfo
         ),
-        (props = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== props
-          ? (null === current
-              ? (workInProgress.child = reconcileChildFibers(
-                  workInProgress,
-                  null,
-                  props,
-                  renderExpirationTime
-                ))
-              : reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = props),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps),
+        null === current$$1
+          ? (workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              null,
+              Component,
+              renderExpirationTime
+            ))
+          : reconcileChildren(
+              current$$1,
+              workInProgress,
+              Component,
+              renderExpirationTime
+            ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
+      );
+    case 13:
+      return updateForwardRef(
+        current$$1,
+        workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        renderExpirationTime
       );
     case 14:
       return (
-        (props = workInProgress.type.render),
-        (renderExpirationTime = workInProgress.pendingProps),
-        (fn = workInProgress.ref),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime ||
-        fn !== (null !== current ? current.ref : null)
-          ? ((props = props(renderExpirationTime, fn)),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateForwardRef(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
       );
-    case 10:
+    case 9:
       return (
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime
-          ? (reconcileChildren(current, workInProgress, renderExpirationTime),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
-    case 11:
+    case 10:
       return (
-        (renderExpirationTime = workInProgress.pendingProps.children),
-        didPerformWorkStackCursor.current ||
-        (null !== renderExpirationTime &&
-          workInProgress.memoizedProps !== renderExpirationTime)
-          ? (reconcileChildren(current, workInProgress, renderExpirationTime),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps.children),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
     case 15:
       return (
-        (renderExpirationTime = workInProgress.pendingProps),
         (workInProgress.effectTag |= 4),
-        workInProgress.memoizedProps === renderExpirationTime
-          ? (current = bailoutOnAlreadyFinishedWork(current, workInProgress))
-          : (reconcileChildren(
-              current,
-              workInProgress,
-              renderExpirationTime.children
-            ),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child)),
-        current
+        (Component = workInProgress.pendingProps),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component.children,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
-    case 13:
-      return updateContextProvider(
-        current,
+    case 12:
+      a: {
+        Component = workInProgress.type._context;
+        props = workInProgress.pendingProps;
+        resolvedTag = workInProgress.memoizedProps;
+        updateExpirationTime = props.value;
+        workInProgress.memoizedProps = props;
+        pushProvider(workInProgress, updateExpirationTime);
+        if (null !== resolvedTag)
+          if (
+            ((resolvedProps = resolvedTag.value),
+            (updateExpirationTime =
+              (resolvedProps === updateExpirationTime &&
+                (0 !== resolvedProps ||
+                  1 / resolvedProps === 1 / updateExpirationTime)) ||
+              (resolvedProps !== resolvedProps &&
+                updateExpirationTime !== updateExpirationTime)
+                ? 0
+                : ("function" === typeof Component._calculateChangedBits
+                    ? Component._calculateChangedBits(
+                        resolvedProps,
+                        updateExpirationTime
+                      )
+                    : 1073741823) | 0),
+            0 === updateExpirationTime)
+          ) {
+            if (
+              resolvedTag.children === props.children &&
+              !didPerformWorkStackCursor.current
+            ) {
+              workInProgress = bailoutOnAlreadyFinishedWork(
+                current$$1,
+                workInProgress,
+                renderExpirationTime
+              );
+              break a;
+            }
+          } else
+            for (
+              resolvedTag = workInProgress.child,
+                null !== resolvedTag && (resolvedTag.return = workInProgress);
+              null !== resolvedTag;
+
+            ) {
+              resolvedProps = resolvedTag.firstContextDependency;
+              if (null !== resolvedProps) {
+                do {
+                  if (
+                    resolvedProps.context === Component &&
+                    0 !== (resolvedProps.observedBits & updateExpirationTime)
+                  ) {
+                    if (2 === resolvedTag.tag || 3 === resolvedTag.tag)
+                      (child = createUpdate(renderExpirationTime)),
+                        (child.tag = 2),
+                        enqueueUpdate(resolvedTag, child);
+                    if (
+                      0 === resolvedTag.expirationTime ||
+                      resolvedTag.expirationTime > renderExpirationTime
+                    )
+                      resolvedTag.expirationTime = renderExpirationTime;
+                    child = resolvedTag.alternate;
+                    null !== child &&
+                      (0 === child.expirationTime ||
+                        child.expirationTime > renderExpirationTime) &&
+                      (child.expirationTime = renderExpirationTime);
+                    for (var node = resolvedTag.return; null !== node; ) {
+                      child = node.alternate;
+                      if (
+                        0 === node.childExpirationTime ||
+                        node.childExpirationTime > renderExpirationTime
+                      )
+                        (node.childExpirationTime = renderExpirationTime),
+                          null !== child &&
+                            (0 === child.childExpirationTime ||
+                              child.childExpirationTime >
+                                renderExpirationTime) &&
+                            (child.childExpirationTime = renderExpirationTime);
+                      else if (
+                        null !== child &&
+                        (0 === child.childExpirationTime ||
+                          child.childExpirationTime > renderExpirationTime)
+                      )
+                        child.childExpirationTime = renderExpirationTime;
+                      else break;
+                      node = node.return;
+                    }
+                  }
+                  child = resolvedTag.child;
+                  resolvedProps = resolvedProps.next;
+                } while (null !== resolvedProps);
+              } else
+                child =
+                  12 === resolvedTag.tag
+                    ? resolvedTag.type === workInProgress.type
+                      ? null
+                      : resolvedTag.child
+                    : resolvedTag.child;
+              if (null !== child) child.return = resolvedTag;
+              else
+                for (child = resolvedTag; null !== child; ) {
+                  if (child === workInProgress) {
+                    child = null;
+                    break;
+                  }
+                  resolvedTag = child.sibling;
+                  if (null !== resolvedTag) {
+                    resolvedTag.return = child.return;
+                    child = resolvedTag;
+                    break;
+                  }
+                  child = child.return;
+                }
+              resolvedTag = child;
+            }
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props.children,
+          renderExpirationTime
+        );
+        workInProgress = workInProgress.child;
+      }
+      return workInProgress;
+    case 11:
+      return (
+        (updateExpirationTime = workInProgress.type),
+        (Component = workInProgress.pendingProps),
+        (props = Component.children),
+        prepareToReadContext(workInProgress, renderExpirationTime),
+        (updateExpirationTime = readContext(
+          updateExpirationTime,
+          Component.unstable_observedBits
+        )),
+        (props = props(updateExpirationTime)),
+        (workInProgress.effectTag |= 1),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
+      );
+    case 17:
+      return updatePureComponent(
+        current$$1,
         workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        updateExpirationTime,
         renderExpirationTime
       );
-    case 12:
-      a: if (
-        ((fn = workInProgress.type),
-        (unmaskedContext = workInProgress.pendingProps),
-        (needsContext = workInProgress.memoizedProps),
-        (props = fn._currentValue2),
-        (props$jscomp$0 = fn._changedBits2),
-        didPerformWorkStackCursor.current ||
-          0 !== props$jscomp$0 ||
-          needsContext !== unmaskedContext)
-      ) {
-        workInProgress.memoizedProps = unmaskedContext;
-        ctor = unmaskedContext.unstable_observedBits;
-        if (void 0 === ctor || null === ctor) ctor = 1073741823;
-        workInProgress.stateNode = ctor;
-        if (0 !== (props$jscomp$0 & ctor))
-          propagateContextChange(
-            workInProgress,
-            fn,
-            props$jscomp$0,
-            renderExpirationTime
-          );
-        else if (needsContext === unmaskedContext) {
-          current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-          break a;
-        }
-        renderExpirationTime = unmaskedContext.children;
-        renderExpirationTime = renderExpirationTime(props);
-        workInProgress.effectTag |= 1;
-        reconcileChildren(current, workInProgress, renderExpirationTime);
-        current = workInProgress.child;
-      } else current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-      return current;
+    case 18:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updatePureComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          updateExpirationTime,
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
     default:
       invariant(
         !1,
@@ -3909,9 +4348,9 @@ function beginWork(current, workInProgress, renderExpirationTime) {
 }
 function appendAllChildren(parent, workInProgress) {
   for (var node = workInProgress.child; null !== node; ) {
-    if (5 === node.tag || 6 === node.tag)
+    if (7 === node.tag || 8 === node.tag)
       FabricUIManager.appendChild(parent.node, node.stateNode.node);
-    else if (4 !== node.tag && null !== node.child) {
+    else if (6 !== node.tag && null !== node.child) {
       node.child.return = node;
       node = node.child;
       continue;
@@ -3934,9 +4373,9 @@ updateHostContainer = function(workInProgress) {
     var container = portalOrRoot.containerInfo,
       newChildSet = FabricUIManager.createChildSet(container);
     a: for (var node = workInProgress.child; null !== node; ) {
-      if (5 === node.tag || 6 === node.tag)
+      if (7 === node.tag || 8 === node.tag)
         FabricUIManager.appendChildToSet(newChildSet, node.stateNode.node);
-      else if (4 !== node.tag && null !== node.child) {
+      else if (6 !== node.tag && null !== node.child) {
         node.child.return = node;
         node = node.child;
         continue;
@@ -3954,35 +4393,48 @@ updateHostContainer = function(workInProgress) {
     FabricUIManager.completeRoot(container, newChildSet);
   }
 };
-updateHostComponent$1 = function(current, workInProgress, updatePayload) {
-  var childrenUnchanged = null === workInProgress.firstEffect;
-  current = current.stateNode;
-  if (childrenUnchanged && null === updatePayload)
-    workInProgress.stateNode = current;
+updateHostComponent$1 = function(current, workInProgress, type, newProps) {
+  type = current.stateNode;
+  var oldProps = current.memoizedProps;
+  if ((current = null === workInProgress.firstEffect) && oldProps === newProps)
+    workInProgress.stateNode = type;
   else {
-    var node = current.node;
-    updatePayload = {
-      node: childrenUnchanged
-        ? null !== updatePayload
-          ? FabricUIManager.cloneNodeWithNewProps(
-              node,
-              updatePayload,
-              workInProgress
-            )
-          : FabricUIManager.cloneNode(node, workInProgress)
-        : null !== updatePayload
-          ? FabricUIManager.cloneNodeWithNewChildrenAndProps(
-              node,
-              updatePayload,
-              workInProgress
-            )
-          : FabricUIManager.cloneNodeWithNewChildren(node, workInProgress),
-      canonical: current.canonical
-    };
-    workInProgress.stateNode = updatePayload;
-    childrenUnchanged
-      ? (workInProgress.effectTag |= 4)
-      : appendAllChildren(updatePayload, workInProgress);
+    var recyclableInstance = workInProgress.stateNode;
+    requiredContext(contextStackCursor$1.current);
+    var updatePayload = null;
+    oldProps !== newProps &&
+      ((oldProps = diffProperties(
+        null,
+        oldProps,
+        newProps,
+        recyclableInstance.canonical.viewConfig.validAttributes
+      )),
+      (recyclableInstance.canonical.currentProps = newProps),
+      (updatePayload = oldProps));
+    current && null === updatePayload
+      ? (workInProgress.stateNode = type)
+      : ((newProps = updatePayload),
+        (recyclableInstance = type.node),
+        (type = {
+          node: current
+            ? null !== newProps
+              ? FabricUIManager.cloneNodeWithNewProps(
+                  recyclableInstance,
+                  newProps
+                )
+              : FabricUIManager.cloneNode(recyclableInstance)
+            : null !== newProps
+              ? FabricUIManager.cloneNodeWithNewChildrenAndProps(
+                  recyclableInstance,
+                  newProps
+                )
+              : FabricUIManager.cloneNodeWithNewChildren(recyclableInstance),
+          canonical: type.canonical
+        }),
+        (workInProgress.stateNode = type),
+        current
+          ? (workInProgress.effectTag |= 4)
+          : appendAllChildren(type, workInProgress));
   }
 };
 updateHostText$1 = function(current, workInProgress, oldText, newText) {
@@ -3997,203 +4449,77 @@ updateHostText$1 = function(current, workInProgress, oldText, newText) {
     )),
     (workInProgress.effectTag |= 4));
 };
-function completeWork(current, workInProgress) {
-  var newProps = workInProgress.pendingProps;
-  workInProgress.mode & 4 && recordElapsedActualRenderTime(workInProgress);
-  switch (workInProgress.tag) {
-    case 1:
-      return null;
-    case 2:
-      return popContextProvider(workInProgress), null;
-    case 3:
-      popHostContainer(workInProgress);
-      popTopLevelContextObject(workInProgress);
-      newProps = workInProgress.stateNode;
-      newProps.pendingContext &&
-        ((newProps.context = newProps.pendingContext),
-        (newProps.pendingContext = null));
-      if (null === current || null === current.child)
-        workInProgress.effectTag &= -3;
-      updateHostContainer(workInProgress);
-      return null;
-    case 5:
-      popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-          rootInstanceStackCursor.current
-        ),
-        type = workInProgress.type;
-      if (null !== current && null != workInProgress.stateNode) {
-        var oldProps = current.memoizedProps,
-          instance = workInProgress.stateNode,
-          currentHostContext = requiredContext(contextStackCursor$1.current),
-          updatePayload = diffProperties(
-            null,
-            oldProps,
-            newProps,
-            instance.canonical.viewConfig.validAttributes
-          );
-        instance.canonical.currentProps = newProps;
-        updateHostComponent$1(
-          current,
-          workInProgress,
-          updatePayload,
-          type,
-          oldProps,
-          newProps,
-          rootContainerInstance,
-          currentHostContext
-        );
-        current.ref !== workInProgress.ref && (workInProgress.effectTag |= 128);
-      } else {
-        if (!newProps)
-          return (
-            invariant(
-              null !== workInProgress.stateNode,
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            null
-          );
-        instance = requiredContext(contextStackCursor$1.current);
-        current = nextReactTag;
-        nextReactTag += 2;
-        oldProps = ReactNativeViewConfigRegistry.get(type);
-        invariant(
-          "RCTView" !== type || !instance.isInAParentText,
-          "Nesting of <View> within <Text> is not currently supported."
-        );
-        type = diffProperties(
-          null,
-          emptyObject$1,
-          newProps,
-          oldProps.validAttributes
-        );
-        rootContainerInstance = FabricUIManager.createNode(
-          current,
-          oldProps.uiViewClassName,
-          rootContainerInstance,
-          type,
-          workInProgress
-        );
-        newProps = new ReactFabricHostComponent(current, oldProps, newProps);
-        newProps = { node: rootContainerInstance, canonical: newProps };
-        appendAllChildren(newProps, workInProgress);
-        workInProgress.stateNode = newProps;
-        null !== workInProgress.ref && (workInProgress.effectTag |= 128);
-      }
-      return null;
-    case 6:
-      if (current && null != workInProgress.stateNode)
-        updateHostText$1(
-          current,
-          workInProgress,
-          current.memoizedProps,
-          newProps
-        );
-      else {
-        if ("string" !== typeof newProps)
-          return (
-            invariant(
-              null !== workInProgress.stateNode,
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            null
-          );
-        rootContainerInstance = requiredContext(
-          rootInstanceStackCursor.current
-        );
-        type = requiredContext(contextStackCursor$1.current);
-        workInProgress.stateNode = createTextInstance(
-          newProps,
-          rootContainerInstance,
-          type,
-          workInProgress
-        );
-      }
-      return null;
-    case 14:
-      return null;
-    case 16:
-      return null;
-    case 10:
-      return null;
-    case 11:
-      return null;
-    case 15:
-      return null;
-    case 4:
-      return (
-        popHostContainer(workInProgress),
-        updateHostContainer(workInProgress),
-        null
-      );
-    case 13:
-      return popProvider(workInProgress), null;
-    case 12:
-      return null;
-    case 0:
-      invariant(
-        !1,
-        "An indeterminate component should have become determinate before completing. This error is likely caused by a bug in React. Please file an issue."
-      );
-    default:
-      invariant(
-        !1,
-        "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
-      );
-  }
+function logCapturedError(capturedError) {
+  var componentStack = capturedError.componentStack,
+    error = capturedError.error;
+  if (error instanceof Error) {
+    capturedError = error.message;
+    var name = error.name;
+    try {
+      error.message =
+        (capturedError ? name + ": " + capturedError : name) +
+        "\n\nThis error is located at:" +
+        componentStack;
+    } catch (e) {}
+  } else
+    error =
+      "string" === typeof error
+        ? Error(error + "\n\nThis error is located at:" + componentStack)
+        : Error("Unspecified error at:" + componentStack);
+  ExceptionsManager.handleException(error, !1);
 }
+var emptyObject$1 = {};
 function logError(boundary, errorInfo) {
   var source = errorInfo.source,
     stack = errorInfo.stack;
   null === stack &&
     null !== source &&
-    (stack = getStackAddendumByWorkInProgressFiber(source));
-  null !== source && getComponentName(source);
-  source = null !== stack ? stack : "";
-  errorInfo = errorInfo.value;
-  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
+    (stack = getStackByFiberInDevAndProd(source));
+  errorInfo = {
+    componentName: null !== source ? getComponentName(source.type) : null,
+    componentStack: null !== stack ? stack : "",
+    error: errorInfo.value,
+    errorBoundary: null,
+    errorBoundaryName: null,
+    errorBoundaryFound: !1,
+    willRetry: !1
+  };
+  null !== boundary &&
+    2 === boundary.tag &&
+    ((errorInfo.errorBoundary = boundary.stateNode),
+    (errorInfo.errorBoundaryName = getComponentName(boundary.type)),
+    (errorInfo.errorBoundaryFound = !0),
+    (errorInfo.willRetry = !0));
   try {
-    if (errorInfo instanceof Error) {
-      var message = errorInfo.message,
-        name = errorInfo.name;
-      var errorToHandle = errorInfo;
-      try {
-        errorToHandle.message =
-          (message ? name + ": " + message : name) +
-          "\n\nThis error is located at:" +
-          source;
-      } catch (e) {}
-    } else
-      errorToHandle =
-        "string" === typeof errorInfo
-          ? Error(errorInfo + "\n\nThis error is located at:" + source)
-          : Error("Unspecified error at:" + source);
-    ExceptionsManager.handleException(errorToHandle, !1);
+    logCapturedError(errorInfo);
   } catch (e) {
-    (e && e.suppressReactErrorLogging) || console.error(e);
+    setTimeout(function() {
+      throw e;
+    });
   }
 }
-function safelyDetachRef(current) {
-  var ref = current.ref;
+function safelyDetachRef(current$$1) {
+  var ref = current$$1.ref;
   if (null !== ref)
     if ("function" === typeof ref)
       try {
         ref(null);
       } catch (refError) {
-        captureCommitPhaseError(current, refError);
+        captureCommitPhaseError(current$$1, refError);
       }
     else ref.current = null;
 }
-function commitWork(current, finishedWork) {
+function commitWork(current$$1, finishedWork) {
   switch (finishedWork.tag) {
     case 2:
+    case 3:
       break;
-    case 5:
+    case 7:
       break;
-    case 6:
+    case 8:
       break;
-    case 3:
-    case 4:
+    case 5:
+    case 6:
       break;
     default:
       invariant(
@@ -4202,6 +4528,9 @@ function commitWork(current, finishedWork) {
       );
   }
 }
+function NoopComponent() {
+  return null;
+}
 function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime = createUpdate(expirationTime);
   expirationTime.tag = 3;
@@ -4216,13 +4545,21 @@ function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
 function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime = createUpdate(expirationTime);
   expirationTime.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error$jscomp$0 = errorInfo.value;
+    expirationTime.payload = function() {
+      return getDerivedStateFromError(error$jscomp$0);
+    };
+  }
   var inst = fiber.stateNode;
   null !== inst &&
     "function" === typeof inst.componentDidCatch &&
     (expirationTime.callback = function() {
-      null === legacyErrorBoundariesThatAlreadyFailed
-        ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-        : legacyErrorBoundariesThatAlreadyFailed.add(this);
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this));
       var error = errorInfo.value,
         stack = errorInfo.stack;
       logError(fiber, errorInfo);
@@ -4232,328 +4569,982 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
     });
   return expirationTime;
 }
-function unwindWork(workInProgress) {
-  workInProgress.mode & 4 && recordElapsedActualRenderTime(workInProgress);
-  switch (workInProgress.tag) {
-    case 2:
-      popContextProvider(workInProgress);
-      var effectTag = workInProgress.effectTag;
-      return effectTag & 1024
-        ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
-          workInProgress)
-        : null;
-    case 3:
-      return (
-        popHostContainer(workInProgress),
-        popTopLevelContextObject(workInProgress),
-        (effectTag = workInProgress.effectTag),
-        effectTag & 1024
-          ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
-            workInProgress)
-          : null
-      );
-    case 5:
-      return popHostContext(workInProgress), null;
-    case 16:
-      return (
-        (effectTag = workInProgress.effectTag),
-        effectTag & 1024
-          ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
-            workInProgress)
-          : null
+function throwException(
+  root,
+  returnFiber,
+  sourceFiber,
+  value,
+  renderExpirationTime
+) {
+  sourceFiber.effectTag |= 512;
+  sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+  if (
+    null !== value &&
+    "object" === typeof value &&
+    "function" === typeof value.then
+  ) {
+    var thenable = value;
+    value = returnFiber;
+    var earliestTimeoutMs = -1,
+      startTimeMs = -1;
+    do {
+      if (16 === value.tag) {
+        var current = value.alternate;
+        if (
+          null !== current &&
+          !0 === current.memoizedState &&
+          null !== current.stateNode
+        ) {
+          startTimeMs = 10 * (current.stateNode.timedOutAt - 2);
+          break;
+        }
+        current = value.pendingProps.maxDuration;
+        if ("number" === typeof current)
+          if (0 >= current) earliestTimeoutMs = 0;
+          else if (-1 === earliestTimeoutMs || current < earliestTimeoutMs)
+            earliestTimeoutMs = current;
+      }
+      value = value.return;
+    } while (null !== value);
+    value = returnFiber;
+    do {
+      if (16 === value.tag && !value.memoizedState) {
+        returnFiber = retrySuspendedRoot.bind(
+          null,
+          root,
+          value,
+          0 === (value.mode & 1) ? 1 : renderExpirationTime
+        );
+        returnFiber = tracing.unstable_wrap(returnFiber);
+        thenable.then(returnFiber, returnFiber);
+        if (0 === (value.mode & 2)) {
+          value.effectTag |= 4;
+          reconcileChildren(
+            sourceFiber.alternate,
+            sourceFiber,
+            null,
+            renderExpirationTime
+          );
+          sourceFiber.effectTag &= -513;
+          4 === sourceFiber.tag && (sourceFiber.tag = 0);
+          if (2 === sourceFiber.tag || 3 === sourceFiber.tag)
+            (sourceFiber.effectTag &= -421),
+              null === sourceFiber.alternate &&
+                ((sourceFiber.tag = 0), (sourceFiber.type = NoopComponent));
+          return;
+        }
+        -1 === earliestTimeoutMs
+          ? (root = 1073741823)
+          : (-1 === startTimeMs &&
+              (startTimeMs =
+                10 *
+                  (findEarliestOutstandingPriorityLevel(
+                    root,
+                    renderExpirationTime
+                  ) -
+                    2) -
+                5e3),
+            (root = startTimeMs + earliestTimeoutMs));
+        0 <= root &&
+          nextLatestAbsoluteTimeoutMs < root &&
+          (nextLatestAbsoluteTimeoutMs = root);
+        value.effectTag |= 1024;
+        value.expirationTime = renderExpirationTime;
+        return;
+      }
+      value = value.return;
+    } while (null !== value);
+    value = Error(
+      "An update was suspended, but no placeholder UI was provided."
+    );
+  }
+  nextRenderDidError = !0;
+  value = createCapturedValue(value, sourceFiber);
+  root = returnFiber;
+  do {
+    switch (root.tag) {
+      case 5:
+        sourceFiber = value;
+        root.effectTag |= 1024;
+        root.expirationTime = renderExpirationTime;
+        renderExpirationTime = createRootErrorUpdate(
+          root,
+          sourceFiber,
+          renderExpirationTime
+        );
+        enqueueCapturedUpdate(root, renderExpirationTime);
+        return;
+      case 2:
+      case 3:
+        if (
+          ((sourceFiber = value),
+          (returnFiber = root.type),
+          (thenable = root.stateNode),
+          0 === (root.effectTag & 64) &&
+            ("function" === typeof returnFiber.getDerivedStateFromError ||
+              (null !== thenable &&
+                "function" === typeof thenable.componentDidCatch &&
+                (null === legacyErrorBoundariesThatAlreadyFailed ||
+                  !legacyErrorBoundariesThatAlreadyFailed.has(thenable)))))
+        ) {
+          root.effectTag |= 1024;
+          root.expirationTime = renderExpirationTime;
+          renderExpirationTime = createClassErrorUpdate(
+            root,
+            sourceFiber,
+            renderExpirationTime
+          );
+          enqueueCapturedUpdate(root, renderExpirationTime);
+          return;
+        }
+    }
+    root = root.return;
+  } while (null !== root);
+}
+function unwindWork(workInProgress) {
+  switch (workInProgress.tag) {
+    case 2:
+      isContextProvider(workInProgress.type) && popContext(workInProgress);
+      var effectTag = workInProgress.effectTag;
+      return effectTag & 1024
+        ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
+          workInProgress)
+        : null;
+    case 3:
+      return (
+        isContextProvider(workInProgress.type._reactResult) &&
+          popContext(workInProgress),
+        (effectTag = workInProgress.effectTag),
+        effectTag & 1024
+          ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
+            workInProgress)
+          : null
+      );
+    case 5:
+      return (
+        popHostContainer(workInProgress),
+        popTopLevelContextObject(workInProgress),
+        (effectTag = workInProgress.effectTag),
+        invariant(
+          0 === (effectTag & 64),
+          "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
+        ),
+        (workInProgress.effectTag = (effectTag & -1025) | 64),
+        workInProgress
+      );
+    case 7:
+      return popHostContext(workInProgress), null;
+    case 16:
+      return (
+        (effectTag = workInProgress.effectTag),
+        effectTag & 1024
+          ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
+            workInProgress)
+          : null
+      );
+    case 6:
+      return popHostContainer(workInProgress), null;
+    case 12:
+      return popProvider(workInProgress), null;
+    default:
+      return null;
+  }
+}
+var Dispatcher = { readContext: readContext },
+  ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner;
+invariant(
+  null != tracing.__interactionsRef &&
+    null != tracing.__interactionsRef.current,
+  "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `schedule/tracing` module with `schedule/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at http://fb.me/react-profiling"
+);
+var isWorking = !1,
+  nextUnitOfWork = null,
+  nextRoot = null,
+  nextRenderExpirationTime = 0,
+  nextLatestAbsoluteTimeoutMs = -1,
+  nextRenderDidError = !1,
+  nextEffect = null,
+  isCommitting$1 = !1,
+  legacyErrorBoundariesThatAlreadyFailed = null;
+function resetStack() {
+  if (null !== nextUnitOfWork)
+    for (
+      var interruptedWork = nextUnitOfWork.return;
+      null !== interruptedWork;
+
+    ) {
+      var interruptedWork$jscomp$0 = interruptedWork;
+      switch (interruptedWork$jscomp$0.tag) {
+        case 2:
+          var childContextTypes =
+            interruptedWork$jscomp$0.type.childContextTypes;
+          null !== childContextTypes &&
+            void 0 !== childContextTypes &&
+            popContext(interruptedWork$jscomp$0);
+          break;
+        case 3:
+          childContextTypes =
+            interruptedWork$jscomp$0.type._reactResult.childContextTypes;
+          null !== childContextTypes &&
+            void 0 !== childContextTypes &&
+            popContext(interruptedWork$jscomp$0);
+          break;
+        case 5:
+          popHostContainer(interruptedWork$jscomp$0);
+          popTopLevelContextObject(interruptedWork$jscomp$0);
+          break;
+        case 7:
+          popHostContext(interruptedWork$jscomp$0);
+          break;
+        case 6:
+          popHostContainer(interruptedWork$jscomp$0);
+          break;
+        case 12:
+          popProvider(interruptedWork$jscomp$0);
+      }
+      interruptedWork = interruptedWork.return;
+    }
+  nextRoot = null;
+  nextRenderExpirationTime = 0;
+  nextLatestAbsoluteTimeoutMs = -1;
+  nextRenderDidError = !1;
+  nextUnitOfWork = null;
+}
+function commitAllHostEffects() {
+  for (; null !== nextEffect; ) {
+    var effectTag = nextEffect.effectTag;
+    if (effectTag & 128) {
+      var current$$1 = nextEffect.alternate;
+      null !== current$$1 &&
+        ((current$$1 = current$$1.ref),
+        null !== current$$1 &&
+          ("function" === typeof current$$1
+            ? current$$1(null)
+            : (current$$1.current = null)));
+    }
+    switch (effectTag & 14) {
+      case 2:
+        nextEffect.effectTag &= -3;
+        break;
+      case 6:
+        nextEffect.effectTag &= -3;
+        commitWork(nextEffect.alternate, nextEffect);
+        break;
+      case 4:
+        commitWork(nextEffect.alternate, nextEffect);
+        break;
+      case 8:
+        effectTag = nextEffect;
+        a: for (var node = (current$$1 = effectTag); ; ) {
+          var current$$1$jscomp$0 = node;
+          "function" === typeof onCommitFiberUnmount &&
+            onCommitFiberUnmount(current$$1$jscomp$0);
+          switch (current$$1$jscomp$0.tag) {
+            case 2:
+            case 3:
+              safelyDetachRef(current$$1$jscomp$0);
+              var instance = current$$1$jscomp$0.stateNode;
+              if ("function" === typeof instance.componentWillUnmount)
+                try {
+                  (instance.props = current$$1$jscomp$0.memoizedProps),
+                    (instance.state = current$$1$jscomp$0.memoizedState),
+                    instance.componentWillUnmount();
+                } catch (unmountError) {
+                  captureCommitPhaseError(current$$1$jscomp$0, unmountError);
+                }
+              break;
+            case 7:
+              safelyDetachRef(current$$1$jscomp$0);
+              break;
+            case 6:
+              FabricUIManager.createChildSet(
+                current$$1$jscomp$0.stateNode.containerInfo
+              );
+          }
+          if (null !== node.child)
+            (node.child.return = node), (node = node.child);
+          else {
+            if (node === current$$1) break;
+            for (; null === node.sibling; ) {
+              if (null === node.return || node.return === current$$1) break a;
+              node = node.return;
+            }
+            node.sibling.return = node.return;
+            node = node.sibling;
+          }
+        }
+        effectTag.return = null;
+        effectTag.child = null;
+        effectTag.alternate &&
+          ((effectTag.alternate.child = null),
+          (effectTag.alternate.return = null));
+    }
+    nextEffect = nextEffect.nextEffect;
+  }
+}
+function commitBeforeMutationLifecycles() {
+  for (; null !== nextEffect; ) {
+    if (nextEffect.effectTag & 256) {
+      var current$$1 = nextEffect.alternate;
+      a: {
+        var finishedWork = nextEffect;
+        switch (finishedWork.tag) {
+          case 2:
+          case 3:
+            if (finishedWork.effectTag & 256 && null !== current$$1) {
+              var prevProps = current$$1.memoizedProps,
+                prevState = current$$1.memoizedState;
+              current$$1 = finishedWork.stateNode;
+              current$$1.props = finishedWork.memoizedProps;
+              current$$1.state = finishedWork.memoizedState;
+              finishedWork = current$$1.getSnapshotBeforeUpdate(
+                prevProps,
+                prevState
+              );
+              current$$1.__reactInternalSnapshotBeforeUpdate = finishedWork;
+            }
+            break a;
+          case 5:
+          case 7:
+          case 8:
+          case 6:
+            break a;
+          default:
+            invariant(
+              !1,
+              "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+            );
+        }
+      }
+    }
+    nextEffect = nextEffect.nextEffect;
+  }
+}
+function commitAllLifeCycles(
+  finishedRoot$jscomp$0,
+  committedExpirationTime$jscomp$0
+) {
+  for (; null !== nextEffect; ) {
+    var effectTag = nextEffect.effectTag;
+    if (effectTag & 36) {
+      var finishedRoot = finishedRoot$jscomp$0,
+        current$$1 = nextEffect.alternate,
+        finishedWork = nextEffect,
+        committedExpirationTime = committedExpirationTime$jscomp$0;
+      switch (finishedWork.tag) {
+        case 2:
+        case 3:
+          finishedRoot = finishedWork.stateNode;
+          if (finishedWork.effectTag & 4)
+            if (null === current$$1)
+              (finishedRoot.props = finishedWork.memoizedProps),
+                (finishedRoot.state = finishedWork.memoizedState),
+                finishedRoot.componentDidMount();
+            else {
+              var prevProps = current$$1.memoizedProps;
+              current$$1 = current$$1.memoizedState;
+              finishedRoot.props = finishedWork.memoizedProps;
+              finishedRoot.state = finishedWork.memoizedState;
+              finishedRoot.componentDidUpdate(
+                prevProps,
+                current$$1,
+                finishedRoot.__reactInternalSnapshotBeforeUpdate
+              );
+            }
+          current$$1 = finishedWork.updateQueue;
+          null !== current$$1 &&
+            ((finishedRoot.props = finishedWork.memoizedProps),
+            (finishedRoot.state = finishedWork.memoizedState),
+            commitUpdateQueue(
+              finishedWork,
+              current$$1,
+              finishedRoot,
+              committedExpirationTime
+            ));
+          break;
+        case 5:
+          current$$1 = finishedWork.updateQueue;
+          if (null !== current$$1) {
+            finishedRoot = null;
+            if (null !== finishedWork.child)
+              switch (finishedWork.child.tag) {
+                case 7:
+                  finishedRoot = finishedWork.child.stateNode.canonical;
+                  break;
+                case 2:
+                case 3:
+                  finishedRoot = finishedWork.child.stateNode;
+              }
+            commitUpdateQueue(
+              finishedWork,
+              current$$1,
+              finishedRoot,
+              committedExpirationTime
+            );
+          }
+          break;
+        case 7:
+          null === current$$1 &&
+            finishedWork.effectTag & 4 &&
+            invariant(
+              !1,
+              "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
+            );
+          break;
+        case 8:
+          break;
+        case 6:
+          break;
+        case 15:
+          committedExpirationTime = finishedWork.memoizedProps.onRender;
+          committedExpirationTime(
+            finishedWork.memoizedProps.id,
+            null === current$$1 ? "mount" : "update",
+            finishedWork.actualDuration,
+            finishedWork.treeBaseDuration,
+            finishedWork.actualStartTime,
+            commitTime,
+            finishedRoot.memoizedInteractions
+          );
+          break;
+        case 16:
+          0 === (finishedWork.mode & 2)
+            ? ((finishedWork.updateQueue = emptyObject$1),
+              scheduleWork(finishedWork, 1))
+            : ((committedExpirationTime = requestCurrentTime()),
+              (finishedWork.stateNode = {
+                timedOutAt: committedExpirationTime
+              }));
+          break;
+        default:
+          invariant(
+            !1,
+            "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+          );
+      }
+    }
+    if (effectTag & 128 && ((effectTag = nextEffect.ref), null !== effectTag)) {
+      finishedWork = nextEffect.stateNode;
+      switch (nextEffect.tag) {
+        case 7:
+          finishedWork = finishedWork.canonical;
+      }
+      "function" === typeof effectTag
+        ? effectTag(finishedWork)
+        : (effectTag.current = finishedWork);
+    }
+    effectTag = nextEffect.nextEffect;
+    nextEffect.nextEffect = null;
+    nextEffect = effectTag;
+  }
+}
+function commitRoot(root, finishedWork) {
+  isCommitting$1 = isWorking = !0;
+  invariant(
+    root.current !== finishedWork,
+    "Cannot commit the same tree as before. This is probably a bug related to the return field. This error is likely caused by a bug in React. Please file an issue."
+  );
+  var committedExpirationTime = root.pendingCommitExpirationTime;
+  invariant(
+    0 !== committedExpirationTime,
+    "Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue."
+  );
+  root.pendingCommitExpirationTime = 0;
+  var updateExpirationTimeBeforeCommit = finishedWork.expirationTime,
+    childExpirationTimeBeforeCommit = finishedWork.childExpirationTime;
+  markCommittedPriorityLevels(
+    root,
+    0 === updateExpirationTimeBeforeCommit ||
+    (0 !== childExpirationTimeBeforeCommit &&
+      childExpirationTimeBeforeCommit < updateExpirationTimeBeforeCommit)
+      ? childExpirationTimeBeforeCommit
+      : updateExpirationTimeBeforeCommit
+  );
+  updateExpirationTimeBeforeCommit = null;
+  updateExpirationTimeBeforeCommit = tracing.__interactionsRef.current;
+  tracing.__interactionsRef.current = root.memoizedInteractions;
+  ReactCurrentOwner$2.current = null;
+  childExpirationTimeBeforeCommit = void 0;
+  1 < finishedWork.effectTag
+    ? null !== finishedWork.lastEffect
+      ? ((finishedWork.lastEffect.nextEffect = finishedWork),
+        (childExpirationTimeBeforeCommit = finishedWork.firstEffect))
+      : (childExpirationTimeBeforeCommit = finishedWork)
+    : (childExpirationTimeBeforeCommit = finishedWork.firstEffect);
+  for (nextEffect = childExpirationTimeBeforeCommit; null !== nextEffect; ) {
+    var didError = !1,
+      error$jscomp$0 = void 0;
+    try {
+      commitBeforeMutationLifecycles();
+    } catch (e) {
+      (didError = !0), (error$jscomp$0 = e);
+    }
+    didError &&
+      (invariant(
+        null !== nextEffect,
+        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+      ),
+      captureCommitPhaseError(nextEffect, error$jscomp$0),
+      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+  }
+  commitTime = now$1();
+  for (nextEffect = childExpirationTimeBeforeCommit; null !== nextEffect; ) {
+    didError = !1;
+    error$jscomp$0 = void 0;
+    try {
+      commitAllHostEffects();
+    } catch (e) {
+      (didError = !0), (error$jscomp$0 = e);
+    }
+    didError &&
+      (invariant(
+        null !== nextEffect,
+        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+      ),
+      captureCommitPhaseError(nextEffect, error$jscomp$0),
+      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+  }
+  root.current = finishedWork;
+  for (nextEffect = childExpirationTimeBeforeCommit; null !== nextEffect; ) {
+    childExpirationTimeBeforeCommit = !1;
+    didError = void 0;
+    try {
+      commitAllLifeCycles(root, committedExpirationTime);
+    } catch (e) {
+      (childExpirationTimeBeforeCommit = !0), (didError = e);
+    }
+    childExpirationTimeBeforeCommit &&
+      (invariant(
+        null !== nextEffect,
+        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+      ),
+      captureCommitPhaseError(nextEffect, didError),
+      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+  }
+  isWorking = isCommitting$1 = !1;
+  "function" === typeof onCommitFiberRoot &&
+    onCommitFiberRoot(finishedWork.stateNode);
+  childExpirationTimeBeforeCommit = finishedWork.expirationTime;
+  finishedWork = finishedWork.childExpirationTime;
+  var earliestRemainingTimeAfterCommit =
+    0 === childExpirationTimeBeforeCommit ||
+    (0 !== finishedWork && finishedWork < childExpirationTimeBeforeCommit)
+      ? finishedWork
+      : childExpirationTimeBeforeCommit;
+  0 === earliestRemainingTimeAfterCommit &&
+    (legacyErrorBoundariesThatAlreadyFailed = null);
+  onCommit(root, earliestRemainingTimeAfterCommit);
+  tracing.__interactionsRef.current = updateExpirationTimeBeforeCommit;
+  var subscriber = void 0;
+  try {
+    if (
+      ((subscriber = tracing.__subscriberRef.current),
+      null !== subscriber && 0 < root.memoizedInteractions.size)
+    )
+      subscriber.onWorkStopped(
+        root.memoizedInteractions,
+        1e3 * committedExpirationTime + root.interactionThreadID
       );
-    case 4:
-      return popHostContainer(workInProgress), null;
-    case 13:
-      return popProvider(workInProgress), null;
-    default:
-      return null;
+  } catch (error) {
+    hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
+  } finally {
+    var pendingInteractionMap = root.pendingInteractionMap;
+    pendingInteractionMap.forEach(function(
+      scheduledInteractions,
+      scheduledExpirationTime
+    ) {
+      if (
+        0 === earliestRemainingTimeAfterCommit ||
+        scheduledExpirationTime < earliestRemainingTimeAfterCommit
+      )
+        pendingInteractionMap.delete(scheduledExpirationTime),
+          scheduledInteractions.forEach(function(interaction) {
+            interaction.__count--;
+            if (null !== subscriber && 0 === interaction.__count)
+              try {
+                subscriber.onInteractionScheduledWorkCompleted(interaction);
+              } catch (error) {
+                hasUnhandledError ||
+                  ((hasUnhandledError = !0), (unhandledError = error));
+              }
+          });
+    });
   }
 }
-var originalStartTimeMs = now$1(),
-  mostRecentCurrentTime = 2,
-  mostRecentCurrentTimeMs = originalStartTimeMs,
-  lastUniqueAsyncExpiration = 0,
-  expirationContext = 0,
-  isWorking = !1,
-  nextUnitOfWork = null,
-  nextRoot = null,
-  nextRenderExpirationTime = 0,
-  nextLatestTimeoutMs = -1,
-  nextRenderDidError = !1,
-  nextEffect = null,
-  isCommitting$1 = !1,
-  legacyErrorBoundariesThatAlreadyFailed = null;
-function resetStack() {
-  if (null !== nextUnitOfWork)
-    for (
-      var interruptedWork = nextUnitOfWork.return;
-      null !== interruptedWork;
-
-    ) {
-      var interruptedWork$jscomp$0 = interruptedWork;
-      interruptedWork$jscomp$0.mode & 4 &&
-        (resumeActualRenderTimerIfPaused(),
-        recordElapsedActualRenderTime(interruptedWork$jscomp$0));
-      switch (interruptedWork$jscomp$0.tag) {
+function completeUnitOfWork(workInProgress) {
+  for (;;) {
+    var current$$1 = workInProgress.alternate,
+      returnFiber = workInProgress.return,
+      siblingFiber = workInProgress.sibling;
+    if (0 === (workInProgress.effectTag & 512)) {
+      if (workInProgress.mode & 4) {
+        var fiber = workInProgress;
+        profilerStartTime = now$1();
+        0 > fiber.actualStartTime && (fiber.actualStartTime = now$1());
+      }
+      var current = current$$1;
+      current$$1 = workInProgress;
+      fiber = current$$1.pendingProps;
+      switch (current$$1.tag) {
+        case 0:
+        case 1:
+          break;
         case 2:
-          popContextProvider(interruptedWork$jscomp$0);
+          isContextProvider(current$$1.type) && popContext(current$$1);
           break;
         case 3:
-          popHostContainer(interruptedWork$jscomp$0);
-          popTopLevelContextObject(interruptedWork$jscomp$0);
+          isContextProvider(current$$1.type._reactResult) &&
+            popContext(current$$1);
           break;
         case 5:
-          popHostContext(interruptedWork$jscomp$0);
+          popHostContainer(current$$1);
+          popTopLevelContextObject(current$$1);
+          fiber = current$$1.stateNode;
+          fiber.pendingContext &&
+            ((fiber.context = fiber.pendingContext),
+            (fiber.pendingContext = null));
+          if (null === current || null === current.child)
+            current$$1.effectTag &= -3;
+          updateHostContainer(current$$1);
           break;
-        case 4:
-          popHostContainer(interruptedWork$jscomp$0);
+        case 7:
+          popHostContext(current$$1);
+          var rootContainerInstance = requiredContext(
+              rootInstanceStackCursor.current
+            ),
+            type = current$$1.type;
+          if (null !== current && null != current$$1.stateNode)
+            updateHostComponent$1(
+              current,
+              current$$1,
+              type,
+              fiber,
+              rootContainerInstance
+            ),
+              current.ref !== current$$1.ref && (current$$1.effectTag |= 128);
+          else if (fiber) {
+            var currentHostContext = requiredContext(
+                contextStackCursor$1.current
+              ),
+              internalInstanceHandle = current$$1;
+            current = nextReactTag;
+            nextReactTag += 2;
+            var viewConfig = ReactNativeViewConfigRegistry.get(type);
+            invariant(
+              "RCTView" !== type || !currentHostContext.isInAParentText,
+              "Nesting of <View> within <Text> is not currently supported."
+            );
+            type = diffProperties(
+              null,
+              emptyObject,
+              fiber,
+              viewConfig.validAttributes
+            );
+            rootContainerInstance = FabricUIManager.createNode(
+              current,
+              viewConfig.uiViewClassName,
+              rootContainerInstance,
+              type,
+              internalInstanceHandle
+            );
+            fiber = new ReactFabricHostComponent(current, viewConfig, fiber);
+            fiber = { node: rootContainerInstance, canonical: fiber };
+            appendAllChildren(fiber, current$$1);
+            current$$1.stateNode = fiber;
+            null !== current$$1.ref && (current$$1.effectTag |= 128);
+          } else
+            invariant(
+              null !== current$$1.stateNode,
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          break;
+        case 8:
+          current && null != current$$1.stateNode
+            ? updateHostText$1(
+                current,
+                current$$1,
+                current.memoizedProps,
+                fiber
+              )
+            : ("string" !== typeof fiber &&
+                invariant(
+                  null !== current$$1.stateNode,
+                  "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+                ),
+              (rootContainerInstance = requiredContext(
+                rootInstanceStackCursor.current
+              )),
+              (current = requiredContext(contextStackCursor$1.current)),
+              (current$$1.stateNode = createTextInstance(
+                fiber,
+                rootContainerInstance,
+                current,
+                current$$1
+              )));
           break;
         case 13:
-          popProvider(interruptedWork$jscomp$0);
+        case 14:
+          break;
+        case 16:
+          break;
+        case 9:
+          break;
+        case 10:
+          break;
+        case 15:
+          break;
+        case 6:
+          popHostContainer(current$$1);
+          updateHostContainer(current$$1);
+          break;
+        case 12:
+          popProvider(current$$1);
+          break;
+        case 11:
+          break;
+        case 17:
+        case 18:
+          break;
+        case 4:
+          invariant(
+            !1,
+            "An indeterminate component should have become determinate before completing. This error is likely caused by a bug in React. Please file an issue."
+          );
+        default:
+          invariant(
+            !1,
+            "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
+          );
       }
-      interruptedWork = interruptedWork.return;
-    }
-  nextRoot = null;
-  nextRenderExpirationTime = 0;
-  nextLatestTimeoutMs = -1;
-  nextRenderDidError = !1;
-  nextUnitOfWork = null;
-}
-function completeUnitOfWork(workInProgress$jscomp$0) {
-  for (;;) {
-    var current = workInProgress$jscomp$0.alternate,
-      returnFiber = workInProgress$jscomp$0.return,
-      siblingFiber = workInProgress$jscomp$0.sibling;
-    if (0 === (workInProgress$jscomp$0.effectTag & 512)) {
-      current = completeWork(
-        current,
-        workInProgress$jscomp$0,
-        nextRenderExpirationTime
-      );
-      var workInProgress = workInProgress$jscomp$0;
+      nextUnitOfWork = null;
+      workInProgress.mode & 4 &&
+        stopProfilerTimerIfRunningAndRecordDelta(workInProgress, !1);
+      current$$1 = workInProgress;
       if (
         1073741823 === nextRenderExpirationTime ||
-        1073741823 !== workInProgress.expirationTime
+        1073741823 !== current$$1.childExpirationTime
       ) {
-        var newExpirationTime = 0;
-        switch (workInProgress.tag) {
-          case 3:
-          case 2:
-            var updateQueue = workInProgress.updateQueue;
-            null !== updateQueue &&
-              (newExpirationTime = updateQueue.expirationTime);
-        }
-        if (workInProgress.mode & 4) {
-          updateQueue = workInProgress.selfBaseTime;
-          for (var child = workInProgress.child; null !== child; )
-            (updateQueue += child.treeBaseTime),
-              0 !== child.expirationTime &&
-                (0 === newExpirationTime ||
-                  newExpirationTime > child.expirationTime) &&
-                (newExpirationTime = child.expirationTime),
-              (child = child.sibling);
-          workInProgress.treeBaseTime = updateQueue;
+        fiber = 0;
+        if (current$$1.mode & 4) {
+          rootContainerInstance = current$$1.actualDuration;
+          current = current$$1.selfBaseDuration;
+          viewConfig =
+            null === current$$1.alternate ||
+            current$$1.child !== current$$1.alternate.child;
+          for (type = current$$1.child; null !== type; ) {
+            internalInstanceHandle = type.expirationTime;
+            currentHostContext = type.childExpirationTime;
+            if (
+              0 === fiber ||
+              (0 !== internalInstanceHandle && internalInstanceHandle < fiber)
+            )
+              fiber = internalInstanceHandle;
+            if (
+              0 === fiber ||
+              (0 !== currentHostContext && currentHostContext < fiber)
+            )
+              fiber = currentHostContext;
+            viewConfig && (rootContainerInstance += type.actualDuration);
+            current += type.treeBaseDuration;
+            type = type.sibling;
+          }
+          current$$1.actualDuration = rootContainerInstance;
+          current$$1.treeBaseDuration = current;
         } else
-          for (updateQueue = workInProgress.child; null !== updateQueue; )
-            0 !== updateQueue.expirationTime &&
-              (0 === newExpirationTime ||
-                newExpirationTime > updateQueue.expirationTime) &&
-              (newExpirationTime = updateQueue.expirationTime),
-              (updateQueue = updateQueue.sibling);
-        workInProgress.expirationTime = newExpirationTime;
+          for (
+            rootContainerInstance = current$$1.child;
+            null !== rootContainerInstance;
+
+          ) {
+            current = rootContainerInstance.expirationTime;
+            viewConfig = rootContainerInstance.childExpirationTime;
+            if (0 === fiber || (0 !== current && current < fiber))
+              fiber = current;
+            if (0 === fiber || (0 !== viewConfig && viewConfig < fiber))
+              fiber = viewConfig;
+            rootContainerInstance = rootContainerInstance.sibling;
+          }
+        current$$1.childExpirationTime = fiber;
       }
-      if (null !== current) return current;
       null !== returnFiber &&
         0 === (returnFiber.effectTag & 512) &&
         (null === returnFiber.firstEffect &&
-          (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
-        null !== workInProgress$jscomp$0.lastEffect &&
+          (returnFiber.firstEffect = workInProgress.firstEffect),
+        null !== workInProgress.lastEffect &&
           (null !== returnFiber.lastEffect &&
-            (returnFiber.lastEffect.nextEffect =
-              workInProgress$jscomp$0.firstEffect),
-          (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
-        1 < workInProgress$jscomp$0.effectTag &&
+            (returnFiber.lastEffect.nextEffect = workInProgress.firstEffect),
+          (returnFiber.lastEffect = workInProgress.lastEffect)),
+        1 < workInProgress.effectTag &&
           (null !== returnFiber.lastEffect
-            ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
-            : (returnFiber.firstEffect = workInProgress$jscomp$0),
-          (returnFiber.lastEffect = workInProgress$jscomp$0)));
+            ? (returnFiber.lastEffect.nextEffect = workInProgress)
+            : (returnFiber.firstEffect = workInProgress),
+          (returnFiber.lastEffect = workInProgress)));
     } else {
-      workInProgress$jscomp$0 = unwindWork(
-        workInProgress$jscomp$0,
-        nextRenderExpirationTime
-      );
-      if (null !== workInProgress$jscomp$0)
-        return (
-          (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
-        );
+      workInProgress.mode & 4 &&
+        stopProfilerTimerIfRunningAndRecordDelta(workInProgress, !1);
+      workInProgress = unwindWork(workInProgress, nextRenderExpirationTime);
+      if (null !== workInProgress) {
+        if (workInProgress.mode & 4) {
+          returnFiber = workInProgress.actualDuration;
+          for (siblingFiber = workInProgress.child; null !== siblingFiber; )
+            (returnFiber += siblingFiber.actualDuration),
+              (siblingFiber = siblingFiber.sibling);
+          workInProgress.actualDuration = returnFiber;
+        }
+        workInProgress.effectTag &= 511;
+        return workInProgress;
+      }
       null !== returnFiber &&
         ((returnFiber.firstEffect = returnFiber.lastEffect = null),
         (returnFiber.effectTag |= 512));
     }
     if (null !== siblingFiber) return siblingFiber;
-    if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+    if (null !== returnFiber) workInProgress = returnFiber;
     else break;
   }
   return null;
 }
 function performUnitOfWork(workInProgress) {
-  var current = workInProgress.alternate;
-  workInProgress.mode & 4 && (baseStartTime = now$1());
-  current = beginWork(current, workInProgress, nextRenderExpirationTime);
+  var current$$1 = workInProgress.alternate;
+  workInProgress.mode & 4 &&
+    ((profilerStartTime = now$1()),
+    0 > workInProgress.actualStartTime &&
+      (workInProgress.actualStartTime = now$1()));
+  current$$1 = beginWork(current$$1, workInProgress, nextRenderExpirationTime);
   workInProgress.mode & 4 &&
-    (-1 !== baseStartTime &&
-      (workInProgress.selfBaseTime = now$1() - baseStartTime),
-    (baseStartTime = -1));
-  null === current && (current = completeUnitOfWork(workInProgress));
-  ReactCurrentOwner.current = null;
-  return current;
-}
-function renderRoot(root$jscomp$0, isYieldy) {
+    stopProfilerTimerIfRunningAndRecordDelta(workInProgress, !0);
+  null === current$$1 && (current$$1 = completeUnitOfWork(workInProgress));
+  ReactCurrentOwner$2.current = null;
+  return current$$1;
+}
+function renderRoot(root, isYieldy, isExpired) {
   invariant(
     !isWorking,
     "renderRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
   );
   isWorking = !0;
-  var expirationTime = root$jscomp$0.nextExpirationTimeToWorkOn;
+  ReactCurrentOwner$2.currentDispatcher = Dispatcher;
+  var expirationTime = root.nextExpirationTimeToWorkOn;
   if (
     expirationTime !== nextRenderExpirationTime ||
-    root$jscomp$0 !== nextRoot ||
+    root !== nextRoot ||
     null === nextUnitOfWork
-  )
-    resetStack(),
-      (nextRoot = root$jscomp$0),
-      (nextRenderExpirationTime = expirationTime),
-      (nextLatestTimeoutMs = -1),
-      (nextRenderDidError = !1),
-      (nextUnitOfWork = createWorkInProgress(
-        nextRoot.current,
-        null,
-        nextRenderExpirationTime
-      )),
-      (root$jscomp$0.pendingCommitExpirationTime = 0);
-  var didFatal = !1;
+  ) {
+    resetStack();
+    nextRoot = root;
+    nextRenderExpirationTime = expirationTime;
+    nextUnitOfWork = createWorkInProgress(
+      nextRoot.current,
+      null,
+      nextRenderExpirationTime
+    );
+    root.pendingCommitExpirationTime = 0;
+    var interactions = new Set();
+    root.pendingInteractionMap.forEach(function(
+      scheduledInteractions,
+      scheduledExpirationTime
+    ) {
+      scheduledExpirationTime <= expirationTime &&
+        scheduledInteractions.forEach(function(interaction) {
+          return interactions.add(interaction);
+        });
+    });
+    root.memoizedInteractions = interactions;
+    if (0 < interactions.size) {
+      var subscriber = tracing.__subscriberRef.current;
+      if (null !== subscriber) {
+        var threadID = 1e3 * expirationTime + root.interactionThreadID;
+        try {
+          subscriber.onWorkStarted(interactions, threadID);
+        } catch (error) {
+          hasUnhandledError ||
+            ((hasUnhandledError = !0), (unhandledError = error));
+        }
+      }
+    }
+  }
+  subscriber = null;
+  subscriber = tracing.__interactionsRef.current;
+  tracing.__interactionsRef.current = root.memoizedInteractions;
+  threadID = !1;
   do {
     try {
-      if (isYieldy) {
+      if (isYieldy)
         for (; null !== nextUnitOfWork && !shouldYield(); )
           nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-        0 === timerPausedAt && (timerPausedAt = now$1());
-      } else
+      else
         for (; null !== nextUnitOfWork; )
           nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
     } catch (thrownValue) {
-      if (((baseStartTime = -1), null === nextUnitOfWork))
-        (didFatal = !0), onUncaughtError(thrownValue);
+      if (null === nextUnitOfWork)
+        (threadID = !0), onUncaughtError(thrownValue);
       else {
         invariant(
           null !== nextUnitOfWork,
           "Failed to replay rendering after an error. This is likely caused by a bug in React. Please file an issue with a reproducing case to help us find it."
         );
-        isYieldy = nextUnitOfWork;
-        var returnFiber = isYieldy.return;
-        if (null === returnFiber) {
-          didFatal = !0;
-          onUncaughtError(thrownValue);
-          break;
-        }
-        a: {
-          var root = root$jscomp$0,
-            returnFiber$jscomp$0 = returnFiber,
-            sourceFiber = isYieldy,
-            value = thrownValue;
-          returnFiber = nextRenderExpirationTime;
-          sourceFiber.effectTag |= 512;
-          sourceFiber.firstEffect = sourceFiber.lastEffect = null;
-          nextRenderDidError = !0;
-          if (
-            (root.didError || 1 === returnFiber) &&
-            (returnFiber === root.latestPendingTime ||
-              returnFiber === root.latestSuspendedTime)
-          ) {
-            value = createCapturedValue(value, sourceFiber);
-            root = returnFiber$jscomp$0;
-            do {
-              switch (root.tag) {
-                case 3:
-                  root.effectTag |= 1024;
-                  value = createRootErrorUpdate(root, value, returnFiber);
-                  enqueueCapturedUpdate(root, value, returnFiber);
-                  break a;
-                case 2:
-                  if (
-                    ((returnFiber$jscomp$0 = value),
-                    (sourceFiber = root.stateNode),
-                    0 === (root.effectTag & 64) &&
-                      null !== sourceFiber &&
-                      "function" === typeof sourceFiber.componentDidCatch &&
-                      (null === legacyErrorBoundariesThatAlreadyFailed ||
-                        !legacyErrorBoundariesThatAlreadyFailed.has(
-                          sourceFiber
-                        )))
-                  ) {
-                    root.effectTag |= 1024;
-                    value = createClassErrorUpdate(
-                      root,
-                      returnFiber$jscomp$0,
-                      returnFiber
-                    );
-                    enqueueCapturedUpdate(root, value, returnFiber);
-                    break a;
-                  }
-              }
-              root = root.return;
-            } while (null !== root);
-          }
+        var sourceFiber = nextUnitOfWork,
+          returnFiber = sourceFiber.return;
+        if (null === returnFiber) (threadID = !0), onUncaughtError(thrownValue);
+        else {
+          throwException(
+            root,
+            returnFiber,
+            sourceFiber,
+            thrownValue,
+            nextRenderExpirationTime
+          );
+          nextUnitOfWork = completeUnitOfWork(sourceFiber);
+          continue;
         }
-        nextUnitOfWork = completeUnitOfWork(isYieldy);
       }
     }
     break;
   } while (1);
+  tracing.__interactionsRef.current = subscriber;
   isWorking = !1;
-  didFatal
-    ? (root$jscomp$0.finishedWork = null)
-    : null === nextUnitOfWork
-      ? ((didFatal = root$jscomp$0.current.alternate),
-        invariant(
-          null !== didFatal,
-          "Finished root should have a work-in-progress. This error is likely caused by a bug in React. Please file an issue."
-        ),
-        0 === (didFatal.effectTag & 512)
-          ? ((root$jscomp$0.pendingCommitExpirationTime = expirationTime),
-            (root$jscomp$0.finishedWork = didFatal))
-          : (!nextRenderDidError ||
-            (expirationTime !== root$jscomp$0.latestPendingTime &&
-              expirationTime !== root$jscomp$0.latestSuspendedTime)
-              ? ((didFatal = root$jscomp$0.earliestPendingTime),
-                (isYieldy = root$jscomp$0.latestPendingTime),
-                didFatal === expirationTime
-                  ? (root$jscomp$0.earliestPendingTime =
-                      isYieldy === expirationTime
-                        ? (root$jscomp$0.latestPendingTime = 0)
-                        : isYieldy)
-                  : isYieldy === expirationTime &&
-                    (root$jscomp$0.latestPendingTime = didFatal),
-                (didFatal = root$jscomp$0.latestSuspendedTime),
-                didFatal === expirationTime &&
-                  (root$jscomp$0.latestPingedTime = 0),
-                (isYieldy = root$jscomp$0.earliestSuspendedTime),
-                0 === isYieldy
-                  ? (root$jscomp$0.earliestSuspendedTime = root$jscomp$0.latestSuspendedTime = expirationTime)
-                  : isYieldy > expirationTime
-                    ? (root$jscomp$0.earliestSuspendedTime = expirationTime)
-                    : didFatal < expirationTime &&
-                      (root$jscomp$0.latestSuspendedTime = expirationTime))
-              : (root$jscomp$0.didError = !0),
-            findNextPendingPriorityLevel(root$jscomp$0),
-            onSuspend(
-              root$jscomp$0,
-              expirationTime,
-              root$jscomp$0.expirationTime,
-              nextLatestTimeoutMs
-            )))
-      : (root$jscomp$0.finishedWork = null);
+  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = ReactCurrentOwner$2.currentDispatcher = null;
+  if (threadID) (nextRoot = null), (root.finishedWork = null);
+  else if (null !== nextUnitOfWork) root.finishedWork = null;
+  else {
+    isYieldy = root.current.alternate;
+    invariant(
+      null !== isYieldy,
+      "Finished root should have a work-in-progress. This error is likely caused by a bug in React. Please file an issue."
+    );
+    nextRoot = null;
+    if (nextRenderDidError) {
+      if (hasLowerPriorityWork(root, expirationTime)) {
+        markSuspendedPriorityLevel(root, expirationTime);
+        onSuspend(root, isYieldy, expirationTime, root.expirationTime, -1);
+        return;
+      }
+      if (!root.didError && !isExpired) {
+        root.didError = !0;
+        isExpired = root.nextExpirationTimeToWorkOn = expirationTime;
+        subscriber = root.expirationTime = 1;
+        onSuspend(root, isYieldy, isExpired, subscriber, -1);
+        return;
+      }
+    }
+    isExpired || -1 === nextLatestAbsoluteTimeoutMs
+      ? onComplete(root, isYieldy, expirationTime)
+      : (markSuspendedPriorityLevel(root, expirationTime),
+        (isExpired =
+          10 *
+          (findEarliestOutstandingPriorityLevel(root, expirationTime) - 2)),
+        isExpired < nextLatestAbsoluteTimeoutMs &&
+          (nextLatestAbsoluteTimeoutMs = isExpired),
+        (isExpired = 10 * (requestCurrentTime() - 2)),
+        (isExpired = nextLatestAbsoluteTimeoutMs - isExpired),
+        onSuspend(
+          root,
+          isYieldy,
+          expirationTime,
+          root.expirationTime,
+          0 > isExpired ? 0 : isExpired
+        ));
+  }
 }
 function captureCommitPhaseError(fiber, error) {
   var JSCompiler_inline_result;
@@ -4569,101 +5560,156 @@ function captureCommitPhaseError(fiber, error) {
     ) {
       switch (JSCompiler_inline_result.tag) {
         case 2:
+        case 3:
           var instance = JSCompiler_inline_result.stateNode;
           if (
             "function" ===
-              typeof JSCompiler_inline_result.type.getDerivedStateFromCatch ||
+              typeof JSCompiler_inline_result.type.getDerivedStateFromError ||
             ("function" === typeof instance.componentDidCatch &&
               (null === legacyErrorBoundariesThatAlreadyFailed ||
                 !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
           ) {
             fiber = createCapturedValue(error, fiber);
             fiber = createClassErrorUpdate(JSCompiler_inline_result, fiber, 1);
-            enqueueUpdate(JSCompiler_inline_result, fiber, 1);
+            enqueueUpdate(JSCompiler_inline_result, fiber);
             scheduleWork(JSCompiler_inline_result, 1);
             JSCompiler_inline_result = void 0;
             break a;
           }
           break;
-        case 3:
+        case 5:
           fiber = createCapturedValue(error, fiber);
           fiber = createRootErrorUpdate(JSCompiler_inline_result, fiber, 1);
-          enqueueUpdate(JSCompiler_inline_result, fiber, 1);
+          enqueueUpdate(JSCompiler_inline_result, fiber);
           scheduleWork(JSCompiler_inline_result, 1);
           JSCompiler_inline_result = void 0;
           break a;
       }
       JSCompiler_inline_result = JSCompiler_inline_result.return;
     }
-    3 === fiber.tag &&
+    5 === fiber.tag &&
       ((JSCompiler_inline_result = createCapturedValue(error, fiber)),
       (JSCompiler_inline_result = createRootErrorUpdate(
         fiber,
         JSCompiler_inline_result,
         1
       )),
-      enqueueUpdate(fiber, JSCompiler_inline_result, 1),
+      enqueueUpdate(fiber, JSCompiler_inline_result),
       scheduleWork(fiber, 1));
     JSCompiler_inline_result = void 0;
   }
   return JSCompiler_inline_result;
 }
 function computeExpirationForFiber(currentTime, fiber) {
-  currentTime =
-    0 !== expirationContext
-      ? expirationContext
-      : isWorking
-        ? isCommitting$1 ? 1 : nextRenderExpirationTime
-        : fiber.mode & 1
-          ? isBatchingInteractiveUpdates
-            ? 2 + 10 * ((((currentTime - 2 + 15) / 10) | 0) + 1)
-            : 2 + 25 * ((((currentTime - 2 + 500) / 25) | 0) + 1)
-          : 1;
+  isWorking
+    ? (currentTime = isCommitting$1 ? 1 : nextRenderExpirationTime)
+    : fiber.mode & 1
+      ? ((currentTime = isBatchingInteractiveUpdates
+          ? 2 + 10 * ((((currentTime - 2 + 15) / 10) | 0) + 1)
+          : 2 + 25 * ((((currentTime - 2 + 500) / 25) | 0) + 1)),
+        null !== nextRoot &&
+          currentTime === nextRenderExpirationTime &&
+          (currentTime += 1))
+      : (currentTime = 1);
   isBatchingInteractiveUpdates &&
-    (0 === lowestPendingInteractiveExpirationTime ||
-      currentTime > lowestPendingInteractiveExpirationTime) &&
-    (lowestPendingInteractiveExpirationTime = currentTime);
+    currentTime > lowestPriorityPendingInteractiveExpirationTime &&
+    (lowestPriorityPendingInteractiveExpirationTime = currentTime);
   return currentTime;
 }
-function scheduleWork(fiber, expirationTime) {
-  for (; null !== fiber; ) {
-    if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
-      fiber.expirationTime = expirationTime;
-    null !== fiber.alternate &&
-      (0 === fiber.alternate.expirationTime ||
-        fiber.alternate.expirationTime > expirationTime) &&
-      (fiber.alternate.expirationTime = expirationTime);
-    if (null === fiber.return)
-      if (3 === fiber.tag) {
-        var root = fiber.stateNode;
-        !isWorking &&
-          0 !== nextRenderExpirationTime &&
-          expirationTime < nextRenderExpirationTime &&
-          resetStack();
-        markPendingPriorityLevel(root, expirationTime);
-        (isWorking && !isCommitting$1 && nextRoot === root) ||
-          requestWork(root, root.expirationTime);
-        nestedUpdateCount > NESTED_UPDATE_LIMIT &&
-          invariant(
-            !1,
-            "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."
-          );
-      } else break;
-    fiber = fiber.return;
+function retrySuspendedRoot(root, fiber, suspendedTime) {
+  var retryTime = root.earliestSuspendedTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
+  if (
+    0 !== retryTime &&
+    suspendedTime >= retryTime &&
+    suspendedTime <= latestSuspendedTime
+  ) {
+    latestSuspendedTime = retryTime = suspendedTime;
+    root.didError = !1;
+    var latestPingedTime = root.latestPingedTime;
+    if (0 === latestPingedTime || latestPingedTime < latestSuspendedTime)
+      root.latestPingedTime = latestSuspendedTime;
+    findNextExpirationTimeToWorkOn(latestSuspendedTime, root);
+  } else
+    (retryTime = requestCurrentTime()),
+      (retryTime = computeExpirationForFiber(retryTime, fiber)),
+      markPendingPriorityLevel(root, retryTime);
+  0 !== (fiber.mode & 1) &&
+    root === nextRoot &&
+    nextRenderExpirationTime === suspendedTime &&
+    (nextRoot = null);
+  scheduleWorkToRoot(fiber, retryTime);
+  fiber = root.expirationTime;
+  0 !== fiber && requestWork(root, fiber);
+}
+function scheduleWorkToRoot(fiber, expirationTime) {
+  if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
+    fiber.expirationTime = expirationTime;
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    (0 === alternate.expirationTime ||
+      alternate.expirationTime > expirationTime) &&
+    (alternate.expirationTime = expirationTime);
+  var node = fiber.return,
+    root = null;
+  if (null === node && 5 === fiber.tag) root = fiber.stateNode;
+  else
+    for (; null !== node; ) {
+      alternate = node.alternate;
+      if (
+        0 === node.childExpirationTime ||
+        node.childExpirationTime > expirationTime
+      )
+        node.childExpirationTime = expirationTime;
+      null !== alternate &&
+        (0 === alternate.childExpirationTime ||
+          alternate.childExpirationTime > expirationTime) &&
+        (alternate.childExpirationTime = expirationTime);
+      if (null === node.return && 5 === node.tag) {
+        root = node.stateNode;
+        break;
+      }
+      node = node.return;
+    }
+  if (null === root) return null;
+  fiber = tracing.__interactionsRef.current;
+  if (0 < fiber.size) {
+    alternate = root.pendingInteractionMap;
+    var pendingInteractions = alternate.get(expirationTime);
+    null != pendingInteractions
+      ? fiber.forEach(function(interaction) {
+          pendingInteractions.has(interaction) || interaction.__count++;
+          pendingInteractions.add(interaction);
+        })
+      : (alternate.set(expirationTime, new Set(fiber)),
+        fiber.forEach(function(interaction) {
+          interaction.__count++;
+        }));
+    alternate = tracing.__subscriberRef.current;
+    if (null !== alternate)
+      alternate.onWorkScheduled(
+        fiber,
+        1e3 * expirationTime + root.interactionThreadID
+      );
   }
+  return root;
 }
-function recalculateCurrentTime() {
-  mostRecentCurrentTimeMs = now$1() - originalStartTimeMs;
-  return (mostRecentCurrentTime = ((mostRecentCurrentTimeMs / 10) | 0) + 2);
-}
-function syncUpdates(fn, a, b, c, d) {
-  var previousExpirationContext = expirationContext;
-  expirationContext = 1;
-  try {
-    return fn(a, b, c, d);
-  } finally {
-    expirationContext = previousExpirationContext;
-  }
+function scheduleWork(fiber, expirationTime) {
+  fiber = scheduleWorkToRoot(fiber, expirationTime);
+  null !== fiber &&
+    (!isWorking &&
+      0 !== nextRenderExpirationTime &&
+      expirationTime < nextRenderExpirationTime &&
+      resetStack(),
+    markPendingPriorityLevel(fiber, expirationTime),
+    (isWorking && !isCommitting$1 && nextRoot === fiber) ||
+      requestWork(fiber, fiber.expirationTime),
+    nestedUpdateCount > NESTED_UPDATE_LIMIT &&
+      ((nestedUpdateCount = 0),
+      invariant(
+        !1,
+        "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 firstScheduledRoot = null,
   lastScheduledRoot = null,
@@ -4672,7 +5718,7 @@ var firstScheduledRoot = null,
   isRendering = !1,
   nextFlushedRoot = null,
   nextFlushedExpirationTime = 0,
-  lowestPendingInteractiveExpirationTime = 0,
+  lowestPriorityPendingInteractiveExpirationTime = 0,
   deadlineDidExpire = !1,
   hasUnhandledError = !1,
   unhandledError = null,
@@ -4681,38 +5727,76 @@ var firstScheduledRoot = null,
   isUnbatchingUpdates = !1,
   isBatchingInteractiveUpdates = !1,
   completedBatches = null,
-  NESTED_UPDATE_LIMIT = 1e3,
+  originalStartTimeMs = now$1(),
+  currentRendererTime = ((originalStartTimeMs / 10) | 0) + 2,
+  currentSchedulerTime = currentRendererTime,
+  NESTED_UPDATE_LIMIT = 50,
   nestedUpdateCount = 0,
+  lastCommittedRootDuringThisBatch = null,
   timeHeuristicForUnitOfWork = 1;
-function scheduleCallbackWithExpirationTime(expirationTime) {
+function recomputeCurrentRendererTime() {
+  currentRendererTime = (((now$1() - originalStartTimeMs) / 10) | 0) + 2;
+}
+function scheduleCallbackWithExpirationTime(root, expirationTime) {
   if (0 !== callbackExpirationTime) {
     if (expirationTime > callbackExpirationTime) return;
-    if (null !== callbackID) {
-      var callbackID$jscomp$0 = callbackID;
-      scheduledCallback = null;
-      clearTimeout(callbackID$jscomp$0);
-    }
+    null !== callbackID &&
+      ((root = callbackID), (scheduledCallback = null), clearTimeout(root));
   }
   callbackExpirationTime = expirationTime;
   now$1();
   scheduledCallback = performAsyncWork;
   callbackID = setTimeout(setTimeoutCallback, 1);
 }
-function onSuspend(root, suspendedExpirationTime, expirationTime, timeoutMs) {
-  0 <= timeoutMs &&
-    setTimeout(function() {
-      var latestSuspendedTime = root.latestSuspendedTime;
-      0 !== latestSuspendedTime &&
-        latestSuspendedTime <= suspendedExpirationTime &&
-        ((latestSuspendedTime = root.latestPingedTime),
-        0 === latestSuspendedTime ||
-          latestSuspendedTime < suspendedExpirationTime) &&
-        (root.latestPingedTime = suspendedExpirationTime);
-      findNextPendingPriorityLevel(root);
-      latestSuspendedTime = root.expirationTime;
-      0 !== latestSuspendedTime && requestWork(root, latestSuspendedTime);
-    }, timeoutMs);
+function onComplete(root, finishedWork, expirationTime) {
+  root.pendingCommitExpirationTime = expirationTime;
+  root.finishedWork = finishedWork;
+}
+function onSuspend(
+  root,
+  finishedWork,
+  suspendedExpirationTime,
+  rootExpirationTime,
+  msUntilTimeout
+) {
+  root.expirationTime = rootExpirationTime;
+  0 !== msUntilTimeout || shouldYield()
+    ? 0 < msUntilTimeout &&
+      (root.timeoutHandle = scheduleTimeout(
+        onTimeout.bind(null, root, finishedWork, suspendedExpirationTime),
+        msUntilTimeout
+      ))
+    : ((root.pendingCommitExpirationTime = suspendedExpirationTime),
+      (root.finishedWork = finishedWork));
+}
+function onTimeout(root, finishedWork, suspendedExpirationTime) {
+  root.pendingCommitExpirationTime = suspendedExpirationTime;
+  root.finishedWork = finishedWork;
+  recomputeCurrentRendererTime();
+  currentSchedulerTime = currentRendererTime;
+  invariant(
+    !isRendering,
+    "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
+  );
+  nextFlushedRoot = root;
+  nextFlushedExpirationTime = suspendedExpirationTime;
+  performWorkOnRoot(root, suspendedExpirationTime, !0);
+  performWork(1, null);
+}
+function onCommit(root, expirationTime) {
   root.expirationTime = expirationTime;
+  root.finishedWork = null;
+}
+function requestCurrentTime() {
+  if (isRendering) return currentSchedulerTime;
+  findHighestPriorityRoot();
+  if (
+    0 === nextFlushedExpirationTime ||
+    1073741823 === nextFlushedExpirationTime
+  )
+    recomputeCurrentRendererTime(),
+      (currentSchedulerTime = currentRendererTime);
+  return currentSchedulerTime;
 }
 function requestWork(root, expirationTime) {
   if (null === root.nextScheduledRoot)
@@ -4735,10 +5819,10 @@ function requestWork(root, expirationTime) {
       ? isUnbatchingUpdates &&
         ((nextFlushedRoot = root),
         (nextFlushedExpirationTime = 1),
-        performWorkOnRoot(root, 1, !1))
+        performWorkOnRoot(root, 1, !0))
       : 1 === expirationTime
         ? performWork(1, null)
-        : scheduleCallbackWithExpirationTime(expirationTime));
+        : scheduleCallbackWithExpirationTime(root, expirationTime));
 }
 function findHighestPriorityRoot() {
   var highestPriorityWork = 0,
@@ -4780,40 +5864,50 @@ function findHighestPriorityRoot() {
           (highestPriorityWork = remainingExpirationTime),
             (highestPriorityRoot = root);
         if (root === lastScheduledRoot) break;
+        if (1 === highestPriorityWork) break;
         previousScheduledRoot = root;
         root = root.nextScheduledRoot;
       }
     }
-  previousScheduledRoot = nextFlushedRoot;
-  null !== previousScheduledRoot &&
-  previousScheduledRoot === highestPriorityRoot &&
-  1 === highestPriorityWork
-    ? nestedUpdateCount++
-    : (nestedUpdateCount = 0);
   nextFlushedRoot = highestPriorityRoot;
   nextFlushedExpirationTime = highestPriorityWork;
 }
 function performAsyncWork(dl) {
+  if (dl.didTimeout && null !== firstScheduledRoot) {
+    recomputeCurrentRendererTime();
+    var root = firstScheduledRoot;
+    do {
+      var expirationTime = root.expirationTime;
+      0 !== expirationTime &&
+        currentRendererTime >= expirationTime &&
+        (root.nextExpirationTimeToWorkOn = currentRendererTime);
+      root = root.nextScheduledRoot;
+    } while (root !== firstScheduledRoot);
+  }
   performWork(0, dl);
 }
 function performWork(minExpirationTime, dl) {
   deadline = dl;
   findHighestPriorityRoot();
-  resumeActualRenderTimerIfPaused();
   if (null !== deadline)
     for (
-      ;
+      recomputeCurrentRendererTime(),
+        currentSchedulerTime = currentRendererTime;
       null !== nextFlushedRoot &&
       0 !== nextFlushedExpirationTime &&
       (0 === minExpirationTime ||
         minExpirationTime >= nextFlushedExpirationTime) &&
-      (!deadlineDidExpire ||
-        recalculateCurrentTime() >= nextFlushedExpirationTime);
+      (!deadlineDidExpire || currentRendererTime >= nextFlushedExpirationTime);
 
     )
-      recalculateCurrentTime(),
-        performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !0),
-        findHighestPriorityRoot();
+      performWorkOnRoot(
+        nextFlushedRoot,
+        nextFlushedExpirationTime,
+        currentRendererTime >= nextFlushedExpirationTime
+      ),
+        findHighestPriorityRoot(),
+        recomputeCurrentRendererTime(),
+        (currentSchedulerTime = currentRendererTime);
   else
     for (
       ;
@@ -4823,22 +5917,25 @@ function performWork(minExpirationTime, dl) {
         minExpirationTime >= nextFlushedExpirationTime);
 
     )
-      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !1),
+      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !0),
         findHighestPriorityRoot();
   null !== deadline && ((callbackExpirationTime = 0), (callbackID = null));
   0 !== nextFlushedExpirationTime &&
-    scheduleCallbackWithExpirationTime(nextFlushedExpirationTime);
+    scheduleCallbackWithExpirationTime(
+      nextFlushedRoot,
+      nextFlushedExpirationTime
+    );
   deadline = null;
   deadlineDidExpire = !1;
-  finishRendering();
-}
-function finishRendering() {
   nestedUpdateCount = 0;
-  if (null !== completedBatches) {
-    var batches = completedBatches;
-    completedBatches = null;
-    for (var i = 0; i < batches.length; i++) {
-      var batch = batches[i];
+  lastCommittedRootDuringThisBatch = null;
+  if (null !== completedBatches)
+    for (
+      minExpirationTime = completedBatches, completedBatches = null, dl = 0;
+      dl < minExpirationTime.length;
+      dl++
+    ) {
+      var batch = minExpirationTime[dl];
       try {
         batch._onComplete();
       } catch (error) {
@@ -4846,41 +5943,47 @@ function finishRendering() {
           ((hasUnhandledError = !0), (unhandledError = error));
       }
     }
-  }
   if (hasUnhandledError)
-    throw ((batches = unhandledError),
+    throw ((minExpirationTime = unhandledError),
     (unhandledError = null),
     (hasUnhandledError = !1),
-    batches);
+    minExpirationTime);
 }
-function performWorkOnRoot(root, expirationTime, isYieldy) {
+function performWorkOnRoot(root, expirationTime, isExpired) {
   invariant(
     !isRendering,
     "performWorkOnRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
   );
   isRendering = !0;
-  isYieldy
-    ? ((isYieldy = root.finishedWork),
-      null !== isYieldy
-        ? completeRoot$1(root, isYieldy, expirationTime)
+  if (null === deadline || isExpired) {
+    var finishedWork = root.finishedWork;
+    null !== finishedWork
+      ? completeRoot$1(root, finishedWork, expirationTime)
+      : ((root.finishedWork = null),
+        (finishedWork = root.timeoutHandle),
+        -1 !== finishedWork &&
+          ((root.timeoutHandle = -1), cancelTimeout(finishedWork)),
+        renderRoot(root, !1, isExpired),
+        (finishedWork = root.finishedWork),
+        null !== finishedWork &&
+          completeRoot$1(root, finishedWork, expirationTime));
+  } else
+    (finishedWork = root.finishedWork),
+      null !== finishedWork
+        ? completeRoot$1(root, finishedWork, expirationTime)
         : ((root.finishedWork = null),
-          renderRoot(root, !0),
-          (isYieldy = root.finishedWork),
-          null !== isYieldy &&
+          (finishedWork = root.timeoutHandle),
+          -1 !== finishedWork &&
+            ((root.timeoutHandle = -1), cancelTimeout(finishedWork)),
+          renderRoot(root, !0, isExpired),
+          (finishedWork = root.finishedWork),
+          null !== finishedWork &&
             (shouldYield()
-              ? ((root.finishedWork = isYieldy),
-                0 === timerPausedAt && (timerPausedAt = now$1()))
-              : completeRoot$1(root, isYieldy, expirationTime))))
-    : ((isYieldy = root.finishedWork),
-      null !== isYieldy
-        ? completeRoot$1(root, isYieldy, expirationTime)
-        : ((root.finishedWork = null),
-          renderRoot(root, !1),
-          (isYieldy = root.finishedWork),
-          null !== isYieldy && completeRoot$1(root, isYieldy, expirationTime)));
+              ? (root.finishedWork = finishedWork)
+              : completeRoot$1(root, finishedWork, expirationTime)));
   isRendering = !1;
 }
-function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
+function completeRoot$1(root, finishedWork, expirationTime) {
   var firstBatch = root.firstBatch;
   if (
     null !== firstBatch &&
@@ -4890,328 +5993,22 @@ function completeRoot$1(root, finishedWork$jscomp$0, expirationTime) {
       : completedBatches.push(firstBatch),
     firstBatch._defer)
   ) {
-    root.finishedWork = finishedWork$jscomp$0;
+    root.finishedWork = finishedWork;
     root.expirationTime = 0;
     return;
   }
   root.finishedWork = null;
-  isCommitting$1 = isWorking = !0;
-  invariant(
-    root.current !== finishedWork$jscomp$0,
-    "Cannot commit the same tree as before. This is probably a bug related to the return field. This error is likely caused by a bug in React. Please file an issue."
-  );
-  expirationTime = root.pendingCommitExpirationTime;
-  invariant(
-    0 !== expirationTime,
-    "Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue."
-  );
-  root.pendingCommitExpirationTime = 0;
-  firstBatch = finishedWork$jscomp$0.expirationTime;
-  recalculateCurrentTime();
-  root.didError = !1;
-  if (0 === firstBatch)
-    (root.earliestPendingTime = 0),
-      (root.latestPendingTime = 0),
-      (root.earliestSuspendedTime = 0),
-      (root.latestSuspendedTime = 0),
-      (root.latestPingedTime = 0);
-  else {
-    var latestPendingTime = root.latestPendingTime;
-    0 !== latestPendingTime &&
-      (latestPendingTime < firstBatch
-        ? (root.earliestPendingTime = root.latestPendingTime = 0)
-        : root.earliestPendingTime < firstBatch &&
-          (root.earliestPendingTime = root.latestPendingTime));
-    latestPendingTime = root.earliestSuspendedTime;
-    0 === latestPendingTime
-      ? markPendingPriorityLevel(root, firstBatch)
-      : firstBatch > root.latestSuspendedTime
-        ? ((root.earliestSuspendedTime = 0),
-          (root.latestSuspendedTime = 0),
-          (root.latestPingedTime = 0),
-          markPendingPriorityLevel(root, firstBatch))
-        : firstBatch < latestPendingTime &&
-          markPendingPriorityLevel(root, firstBatch);
-  }
-  findNextPendingPriorityLevel(root);
-  ReactCurrentOwner.current = null;
-  1 < finishedWork$jscomp$0.effectTag
-    ? null !== finishedWork$jscomp$0.lastEffect
-      ? ((finishedWork$jscomp$0.lastEffect.nextEffect = finishedWork$jscomp$0),
-        (firstBatch = finishedWork$jscomp$0.firstEffect))
-      : (firstBatch = finishedWork$jscomp$0)
-    : (firstBatch = finishedWork$jscomp$0.firstEffect);
-  for (nextEffect = firstBatch; null !== nextEffect; ) {
-    latestPendingTime = !1;
-    var error = void 0;
-    try {
-      for (; null !== nextEffect; ) {
-        if (nextEffect.effectTag & 256) {
-          var current = nextEffect.alternate,
-            finishedWork = nextEffect;
-          switch (finishedWork.tag) {
-            case 2:
-              if (finishedWork.effectTag & 256 && null !== current) {
-                var prevProps = current.memoizedProps,
-                  prevState = current.memoizedState,
-                  instance = finishedWork.stateNode;
-                instance.props = finishedWork.memoizedProps;
-                instance.state = finishedWork.memoizedState;
-                var snapshot = instance.getSnapshotBeforeUpdate(
-                  prevProps,
-                  prevState
-                );
-                instance.__reactInternalSnapshotBeforeUpdate = snapshot;
-              }
-              break;
-            case 3:
-            case 5:
-            case 6:
-            case 4:
-              break;
-            default:
-              invariant(
-                !1,
-                "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-              );
-          }
-        }
-        nextEffect = nextEffect.nextEffect;
-      }
-    } catch (e) {
-      (latestPendingTime = !0), (error = e);
-    }
-    latestPendingTime &&
-      (invariant(
-        null !== nextEffect,
-        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
-      ),
-      captureCommitPhaseError(nextEffect, error),
-      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
-  }
-  now$1();
-  for (nextEffect = firstBatch; null !== nextEffect; ) {
-    current = !1;
-    prevProps = void 0;
-    try {
-      for (; null !== nextEffect; ) {
-        var effectTag = nextEffect.effectTag;
-        if (effectTag & 128) {
-          var current$jscomp$0 = nextEffect.alternate;
-          if (null !== current$jscomp$0) {
-            var currentRef = current$jscomp$0.ref;
-            null !== currentRef &&
-              ("function" === typeof currentRef
-                ? currentRef(null)
-                : (currentRef.current = null));
-          }
-        }
-        switch (effectTag & 14) {
-          case 2:
-            nextEffect.effectTag &= -3;
-            break;
-          case 6:
-            nextEffect.effectTag &= -3;
-            commitWork(nextEffect.alternate, nextEffect);
-            break;
-          case 4:
-            commitWork(nextEffect.alternate, nextEffect);
-            break;
-          case 8:
-            prevState = nextEffect;
-            a: for (snapshot = instance = prevState; ; ) {
-              latestPendingTime = snapshot;
-              "function" === typeof onCommitUnmount &&
-                onCommitUnmount(latestPendingTime);
-              switch (latestPendingTime.tag) {
-                case 2:
-                  safelyDetachRef(latestPendingTime);
-                  var instance$jscomp$0 = latestPendingTime.stateNode;
-                  if (
-                    "function" === typeof instance$jscomp$0.componentWillUnmount
-                  )
-                    try {
-                      (instance$jscomp$0.props =
-                        latestPendingTime.memoizedProps),
-                        (instance$jscomp$0.state =
-                          latestPendingTime.memoizedState),
-                        instance$jscomp$0.componentWillUnmount();
-                    } catch (unmountError) {
-                      captureCommitPhaseError(latestPendingTime, unmountError);
-                    }
-                  break;
-                case 5:
-                  safelyDetachRef(latestPendingTime);
-                  break;
-                case 4:
-                  FabricUIManager.createChildSet(
-                    latestPendingTime.stateNode.containerInfo
-                  );
-              }
-              if (null !== snapshot.child)
-                (snapshot.child.return = snapshot), (snapshot = snapshot.child);
-              else {
-                if (snapshot === instance) break;
-                for (; null === snapshot.sibling; ) {
-                  if (null === snapshot.return || snapshot.return === instance)
-                    break a;
-                  snapshot = snapshot.return;
-                }
-                snapshot.sibling.return = snapshot.return;
-                snapshot = snapshot.sibling;
-              }
-            }
-            prevState.return = null;
-            prevState.child = null;
-            prevState.alternate &&
-              ((prevState.alternate.child = null),
-              (prevState.alternate.return = null));
-        }
-        nextEffect = nextEffect.nextEffect;
-      }
-    } catch (e) {
-      (current = !0), (prevProps = e);
-    }
-    current &&
-      (invariant(
-        null !== nextEffect,
-        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
-      ),
-      captureCommitPhaseError(nextEffect, prevProps),
-      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
-  }
-  root.current = finishedWork$jscomp$0;
-  for (nextEffect = firstBatch; null !== nextEffect; ) {
-    effectTag = !1;
-    current$jscomp$0 = void 0;
-    try {
-      for (currentRef = expirationTime; null !== nextEffect; ) {
-        var effectTag$jscomp$0 = nextEffect.effectTag;
-        if (effectTag$jscomp$0 & 36) {
-          var current$jscomp$1 = nextEffect.alternate;
-          instance$jscomp$0 = nextEffect;
-          firstBatch = currentRef;
-          switch (instance$jscomp$0.tag) {
-            case 2:
-              var instance$jscomp$1 = instance$jscomp$0.stateNode;
-              if (instance$jscomp$0.effectTag & 4)
-                if (null === current$jscomp$1)
-                  (instance$jscomp$1.props = instance$jscomp$0.memoizedProps),
-                    (instance$jscomp$1.state = instance$jscomp$0.memoizedState),
-                    instance$jscomp$1.componentDidMount();
-                else {
-                  var prevProps$jscomp$0 = current$jscomp$1.memoizedProps,
-                    prevState$jscomp$0 = current$jscomp$1.memoizedState;
-                  instance$jscomp$1.props = instance$jscomp$0.memoizedProps;
-                  instance$jscomp$1.state = instance$jscomp$0.memoizedState;
-                  instance$jscomp$1.componentDidUpdate(
-                    prevProps$jscomp$0,
-                    prevState$jscomp$0,
-                    instance$jscomp$1.__reactInternalSnapshotBeforeUpdate
-                  );
-                }
-              var updateQueue = instance$jscomp$0.updateQueue;
-              null !== updateQueue &&
-                ((instance$jscomp$1.props = instance$jscomp$0.memoizedProps),
-                (instance$jscomp$1.state = instance$jscomp$0.memoizedState),
-                commitUpdateQueue(
-                  instance$jscomp$0,
-                  updateQueue,
-                  instance$jscomp$1,
-                  firstBatch
-                ));
-              break;
-            case 3:
-              var _updateQueue = instance$jscomp$0.updateQueue;
-              if (null !== _updateQueue) {
-                current = null;
-                if (null !== instance$jscomp$0.child)
-                  switch (instance$jscomp$0.child.tag) {
-                    case 5:
-                      current = instance$jscomp$0.child.stateNode.canonical;
-                      break;
-                    case 2:
-                      current = instance$jscomp$0.child.stateNode;
-                  }
-                commitUpdateQueue(
-                  instance$jscomp$0,
-                  _updateQueue,
-                  current,
-                  firstBatch
-                );
-              }
-              break;
-            case 5:
-              null === current$jscomp$1 &&
-                instance$jscomp$0.effectTag & 4 &&
-                invariant(
-                  !1,
-                  "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
-                );
-              break;
-            case 6:
-              break;
-            case 4:
-              break;
-            case 15:
-              break;
-            case 16:
-              break;
-            default:
-              invariant(
-                !1,
-                "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-              );
-          }
-        }
-        if (effectTag$jscomp$0 & 128) {
-          instance$jscomp$0 = void 0;
-          var ref = nextEffect.ref;
-          if (null !== ref) {
-            var instance$jscomp$2 = nextEffect.stateNode;
-            switch (nextEffect.tag) {
-              case 5:
-                instance$jscomp$0 = instance$jscomp$2.canonical;
-                break;
-              default:
-                instance$jscomp$0 = instance$jscomp$2;
-            }
-            "function" === typeof ref
-              ? ref(instance$jscomp$0)
-              : (ref.current = instance$jscomp$0);
-          }
-        }
-        var next = nextEffect.nextEffect;
-        nextEffect.nextEffect = null;
-        nextEffect = next;
-      }
-    } catch (e) {
-      (effectTag = !0), (current$jscomp$0 = e);
-    }
-    effectTag &&
-      (invariant(
-        null !== nextEffect,
-        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
-      ),
-      captureCommitPhaseError(nextEffect, current$jscomp$0),
-      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
-  }
-  totalElapsedPauseTime = 0;
-  isWorking = isCommitting$1 = !1;
-  "function" === typeof onCommitRoot &&
-    onCommitRoot(finishedWork$jscomp$0.stateNode);
-  finishedWork$jscomp$0 = root.expirationTime;
-  0 === finishedWork$jscomp$0 &&
-    (legacyErrorBoundariesThatAlreadyFailed = null);
-  root.expirationTime = finishedWork$jscomp$0;
-  root.finishedWork = null;
+  root === lastCommittedRootDuringThisBatch
+    ? nestedUpdateCount++
+    : ((lastCommittedRootDuringThisBatch = root), (nestedUpdateCount = 0));
+  commitRoot(root, finishedWork);
 }
 function shouldYield() {
-  return null === deadline ||
-    deadlineDidExpire ||
-    deadline.timeRemaining() > timeHeuristicForUnitOfWork
-    ? !1
-    : (deadlineDidExpire = !0);
+  return deadlineDidExpire
+    ? !0
+    : null === deadline || deadline.timeRemaining() > timeHeuristicForUnitOfWork
+      ? !1
+      : (deadlineDidExpire = !0);
 }
 function onUncaughtError(error) {
   invariant(
@@ -5221,51 +6018,54 @@ function onUncaughtError(error) {
   nextFlushedRoot.expirationTime = 0;
   hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
 }
-function updateContainerAtExpirationTime(
-  element,
-  container,
-  parentComponent,
-  expirationTime,
-  callback
-) {
-  var current = container.current;
-  if (parentComponent) {
-    parentComponent = parentComponent._reactInternalFiber;
-    var parentContext;
-    b: {
-      invariant(
-        2 === isFiberMountedImpl(parentComponent) && 2 === parentComponent.tag,
-        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-      );
-      for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
-        if (isContextProvider(parentContext)) {
-          parentContext =
-            parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
-          break b;
-        }
-        parentContext = parentContext.return;
-        invariant(
-          parentContext,
-          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-        );
+function getContextForSubtree(parentComponent) {
+  if (!parentComponent) return emptyContextObject;
+  parentComponent = parentComponent._reactInternalFiber;
+  a: {
+    invariant(
+      2 === isFiberMountedImpl(parentComponent) &&
+        (2 === parentComponent.tag || 3 === parentComponent.tag),
+      "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+    );
+    var parentContext = parentComponent;
+    do {
+      switch (parentContext.tag) {
+        case 5:
+          parentContext = parentContext.stateNode.context;
+          break a;
+        case 2:
+          if (isContextProvider(parentContext.type)) {
+            parentContext =
+              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
+            break a;
+          }
+          break;
+        case 3:
+          if (isContextProvider(parentContext.type._reactResult)) {
+            parentContext =
+              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
+            break a;
+          }
       }
-      parentContext = parentContext.stateNode.context;
-    }
-    parentComponent = isContextProvider(parentComponent)
-      ? processChildContext(parentComponent, parentContext)
-      : parentContext;
-  } else parentComponent = emptyObject;
-  null === container.context
-    ? (container.context = parentComponent)
-    : (container.pendingContext = parentComponent);
-  container = callback;
-  callback = createUpdate(expirationTime);
-  callback.payload = { element: element };
-  container = void 0 === container ? null : container;
-  null !== container && (callback.callback = container);
-  enqueueUpdate(current, callback, expirationTime);
-  scheduleWork(current, expirationTime);
-  return expirationTime;
+      parentContext = parentContext.return;
+    } while (null !== parentContext);
+    invariant(
+      !1,
+      "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+    );
+    parentContext = void 0;
+  }
+  if (2 === parentComponent.tag) {
+    var Component = parentComponent.type;
+    if (isContextProvider(Component))
+      return processChildContext(parentComponent, Component, parentContext);
+  } else if (
+    3 === parentComponent.tag &&
+    ((Component = parentComponent.type._reactResult),
+    isContextProvider(Component))
+  )
+    return processChildContext(parentComponent, Component, parentContext);
+  return parentContext;
 }
 function findHostInstance$1(component) {
   var fiber = component._reactInternalFiber;
@@ -5281,158 +6081,23 @@ function findHostInstance$1(component) {
   return null === component ? null : component.stateNode;
 }
 function updateContainer(element, container, parentComponent, callback) {
-  var current = container.current,
-    currentTime = recalculateCurrentTime();
-  current = computeExpirationForFiber(currentTime, current);
-  return updateContainerAtExpirationTime(
-    element,
-    container,
-    parentComponent,
-    current,
-    callback
-  );
-}
-function getPublicRootInstance(container) {
-  container = container.current;
-  if (!container.child) return null;
-  switch (container.child.tag) {
-    case 5:
-      return container.child.stateNode.canonical;
-    default:
-      return container.child.stateNode;
-  }
-}
-function injectIntoDevTools(devToolsConfig) {
-  var findFiberByHostInstance = devToolsConfig.findFiberByHostInstance;
-  return injectInternals(
-    Object.assign({}, devToolsConfig, {
-      findHostInstanceByFiber: function(fiber) {
-        fiber = findCurrentHostFiber(fiber);
-        return null === fiber ? null : fiber.stateNode;
-      },
-      findFiberByHostInstance: function(instance) {
-        return findFiberByHostInstance
-          ? findFiberByHostInstance(instance)
-          : null;
-      }
-    })
-  );
+  var current$$1 = container.current,
+    currentTime = requestCurrentTime();
+  current$$1 = computeExpirationForFiber(currentTime, current$$1);
+  currentTime = container.current;
+  parentComponent = getContextForSubtree(parentComponent);
+  null === container.context
+    ? (container.context = parentComponent)
+    : (container.pendingContext = parentComponent);
+  container = callback;
+  callback = createUpdate(current$$1);
+  callback.payload = { element: element };
+  container = void 0 === container ? null : container;
+  null !== container && (callback.callback = container);
+  enqueueUpdate(currentTime, callback);
+  scheduleWork(currentTime, current$$1);
+  return current$$1;
 }
-var ReactFabricRenderer = {
-  updateContainerAtExpirationTime: updateContainerAtExpirationTime,
-  createContainer: function(containerInfo, isAsync, hydrate) {
-    return createFiberRoot(containerInfo, isAsync, hydrate);
-  },
-  updateContainer: updateContainer,
-  flushRoot: function(root, expirationTime) {
-    invariant(
-      !isRendering,
-      "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
-    );
-    nextFlushedRoot = root;
-    nextFlushedExpirationTime = expirationTime;
-    performWorkOnRoot(root, expirationTime, !1);
-    performWork(1, null);
-    finishRendering();
-  },
-  requestWork: requestWork,
-  computeUniqueAsyncExpiration: function() {
-    var result =
-      2 + 25 * ((((recalculateCurrentTime() - 2 + 500) / 25) | 0) + 1);
-    result <= lastUniqueAsyncExpiration &&
-      (result = lastUniqueAsyncExpiration + 1);
-    return (lastUniqueAsyncExpiration = result);
-  },
-  batchedUpdates: function(fn, a) {
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      return fn(a);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates) ||
-        isRendering ||
-        performWork(1, null);
-    }
-  },
-  unbatchedUpdates: function(fn, a) {
-    if (isBatchingUpdates && !isUnbatchingUpdates) {
-      isUnbatchingUpdates = !0;
-      try {
-        return fn(a);
-      } finally {
-        isUnbatchingUpdates = !1;
-      }
-    }
-    return fn(a);
-  },
-  deferredUpdates: function(fn) {
-    var previousExpirationContext = expirationContext;
-    expirationContext =
-      2 + 25 * ((((recalculateCurrentTime() - 2 + 500) / 25) | 0) + 1);
-    try {
-      return fn();
-    } finally {
-      expirationContext = previousExpirationContext;
-    }
-  },
-  syncUpdates: syncUpdates,
-  interactiveUpdates: function(fn, a, b) {
-    if (isBatchingInteractiveUpdates) return fn(a, b);
-    isBatchingUpdates ||
-      isRendering ||
-      0 === lowestPendingInteractiveExpirationTime ||
-      (performWork(lowestPendingInteractiveExpirationTime, null),
-      (lowestPendingInteractiveExpirationTime = 0));
-    var previousIsBatchingInteractiveUpdates = isBatchingInteractiveUpdates,
-      previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = isBatchingInteractiveUpdates = !0;
-    try {
-      return fn(a, b);
-    } finally {
-      (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
-        (isBatchingUpdates = previousIsBatchingUpdates) ||
-          isRendering ||
-          performWork(1, null);
-    }
-  },
-  flushInteractiveUpdates: function() {
-    isRendering ||
-      0 === lowestPendingInteractiveExpirationTime ||
-      (performWork(lowestPendingInteractiveExpirationTime, null),
-      (lowestPendingInteractiveExpirationTime = 0));
-  },
-  flushControlled: function(fn) {
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      syncUpdates(fn);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates) ||
-        isRendering ||
-        performWork(1, null);
-    }
-  },
-  flushSync: function(fn, a) {
-    invariant(
-      !isRendering,
-      "flushSync was called from inside a lifecycle method. It cannot be called when React is already rendering."
-    );
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      return syncUpdates(fn, a);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates), performWork(1, null);
-    }
-  },
-  getPublicRootInstance: getPublicRootInstance,
-  findHostInstance: findHostInstance$1,
-  findHostInstanceWithNoPortals: function(fiber) {
-    fiber = findCurrentHostFiberWithNoPortals(fiber);
-    return null === fiber ? null : fiber.stateNode;
-  },
-  injectIntoDevTools: injectIntoDevTools
-};
 function createPortal(children, containerInfo, implementation) {
   var key =
     3 < arguments.length && void 0 !== arguments[3] ? arguments[3] : null;
@@ -5480,8 +6145,23 @@ function findNodeHandle(componentOrHandle) {
       ? componentOrHandle.canonical._nativeTag
       : componentOrHandle._nativeTag;
 }
-_batchedUpdates = ReactFabricRenderer.batchedUpdates;
-_flushInteractiveUpdates = ReactFabricRenderer.flushInteractiveUpdates;
+_batchedUpdatesImpl = function(fn, a) {
+  var previousIsBatchingUpdates = isBatchingUpdates;
+  isBatchingUpdates = !0;
+  try {
+    return fn(a);
+  } finally {
+    (isBatchingUpdates = previousIsBatchingUpdates) ||
+      isRendering ||
+      performWork(1, null);
+  }
+};
+_flushInteractiveUpdatesImpl = function() {
+  isRendering ||
+    0 === lowestPriorityPendingInteractiveExpirationTime ||
+    (performWork(lowestPriorityPendingInteractiveExpirationTime, null),
+    (lowestPriorityPendingInteractiveExpirationTime = 0));
+};
 var roots = new Map(),
   ReactFabric = {
     NativeComponent: (function(findNodeHandle, findHostInstance) {
@@ -5509,13 +6189,13 @@ var roots = new Map(),
         ReactNativeComponent.prototype.measure = function(callback) {
           UIManager.measure(
             findNodeHandle(this),
-            mountSafeCallback(this, callback)
+            mountSafeCallback_NOT_REALLY_SAFE(this, callback)
           );
         };
         ReactNativeComponent.prototype.measureInWindow = function(callback) {
           UIManager.measureInWindow(
             findNodeHandle(this),
-            mountSafeCallback(this, callback)
+            mountSafeCallback_NOT_REALLY_SAFE(this, callback)
           );
         };
         ReactNativeComponent.prototype.measureLayout = function(
@@ -5526,8 +6206,8 @@ var roots = new Map(),
           UIManager.measureLayout(
             findNodeHandle(this),
             relativeToNativeNode,
-            mountSafeCallback(this, onFail),
-            mountSafeCallback(this, onSuccess)
+            mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+            mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
           );
         };
         ReactNativeComponent.prototype.setNativeProps = function(nativeProps) {
@@ -5540,7 +6220,7 @@ var roots = new Map(),
               maybeInstance.viewConfig || maybeInstance.canonical.viewConfig;
             nativeProps = diffProperties(
               null,
-              emptyObject$1,
+              emptyObject,
               nativeProps,
               viewConfig.validAttributes
             );
@@ -5558,11 +6238,48 @@ var roots = new Map(),
     findNodeHandle: findNodeHandle,
     render: function(element, containerTag, callback) {
       var root = roots.get(containerTag);
-      root ||
-        ((root = createFiberRoot(containerTag, !1, !1)),
-        roots.set(containerTag, root));
+      if (!root) {
+        root = 0;
+        isDevToolsPresent && (root |= 4);
+        root = new FiberNode(5, null, null, root);
+        var root$jscomp$0 = {
+          current: root,
+          containerInfo: containerTag,
+          pendingChildren: null,
+          earliestPendingTime: 0,
+          latestPendingTime: 0,
+          earliestSuspendedTime: 0,
+          latestSuspendedTime: 0,
+          latestPingedTime: 0,
+          didError: !1,
+          pendingCommitExpirationTime: 0,
+          finishedWork: null,
+          timeoutHandle: -1,
+          context: null,
+          pendingContext: null,
+          hydrate: !1,
+          nextExpirationTimeToWorkOn: 0,
+          expirationTime: 0,
+          firstBatch: null,
+          nextScheduledRoot: null,
+          interactionThreadID: tracing.unstable_getThreadID(),
+          memoizedInteractions: new Set(),
+          pendingInteractionMap: new Map()
+        };
+        root = root.stateNode = root$jscomp$0;
+        roots.set(containerTag, root);
+      }
       updateContainer(element, root, null, callback);
-      return getPublicRootInstance(root);
+      a: if (((element = root.current), element.child))
+        switch (element.child.tag) {
+          case 7:
+            element = element.child.stateNode.canonical;
+            break a;
+          default:
+            element = element.child.stateNode;
+        }
+      else element = null;
+      return element;
     },
     unmountComponentAtNode: function(containerTag) {
       var root = roots.get(containerTag);
@@ -5585,21 +6302,21 @@ var roots = new Map(),
           measure: function(callback) {
             UIManager.measure(
               findNodeHandle(this),
-              mountSafeCallback(this, callback)
+              mountSafeCallback_NOT_REALLY_SAFE(this, callback)
             );
           },
           measureInWindow: function(callback) {
             UIManager.measureInWindow(
               findNodeHandle(this),
-              mountSafeCallback(this, callback)
+              mountSafeCallback_NOT_REALLY_SAFE(this, callback)
             );
           },
           measureLayout: function(relativeToNativeNode, onSuccess, onFail) {
             UIManager.measureLayout(
               findNodeHandle(this),
               relativeToNativeNode,
-              mountSafeCallback(this, onFail),
-              mountSafeCallback(this, onSuccess)
+              mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+              mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
             );
           },
           setNativeProps: function(nativeProps) {
@@ -5611,7 +6328,7 @@ var roots = new Map(),
               var viewConfig = maybeInstance.viewConfig;
               nativeProps = diffProperties(
                 null,
-                emptyObject$1,
+                emptyObject,
                 nativeProps,
                 viewConfig.validAttributes
               );
@@ -5633,13 +6350,28 @@ var roots = new Map(),
       })(findNodeHandle, findHostInstance$1)
     }
   };
-injectIntoDevTools({
+(function(devToolsConfig) {
+  var findFiberByHostInstance = devToolsConfig.findFiberByHostInstance;
+  return injectInternals(
+    Object.assign({}, devToolsConfig, {
+      findHostInstanceByFiber: function(fiber) {
+        fiber = findCurrentHostFiber(fiber);
+        return null === fiber ? null : fiber.stateNode;
+      },
+      findFiberByHostInstance: function(instance) {
+        return findFiberByHostInstance
+          ? findFiberByHostInstance(instance)
+          : null;
+      }
+    })
+  );
+})({
   findFiberByHostInstance: getInstanceFromInstance,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.4.1",
+  version: "16.6.0-alpha.8af6728",
   rendererPackageName: "react-native-renderer"
 });
 var ReactFabric$2 = { default: ReactFabric },
   ReactFabric$3 = (ReactFabric$2 && ReactFabric) || ReactFabric$2;
-module.exports = ReactFabric$3.default ? ReactFabric$3.default : ReactFabric$3;
+module.exports = ReactFabric$3.default || ReactFabric$3;
diff --git a/Libraries/Renderer/oss/ReactNativeRenderer-dev.js b/Libraries/Renderer/oss/ReactNativeRenderer-dev.js
index c18f1f137a6a00..e77e96de3e20ea 100644
--- a/Libraries/Renderer/oss/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/oss/ReactNativeRenderer-dev.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,29 +17,81 @@ if (__DEV__) {
 "use strict";
 
 require("InitializeCore");
-var invariant = require("fbjs/lib/invariant");
-var warning = require("fbjs/lib/warning");
 var ReactNativeViewConfigRegistry = require("ReactNativeViewConfigRegistry");
 var UIManager = require("UIManager");
 var RCTEventEmitter = require("RCTEventEmitter");
 var React = require("react");
-var emptyObject = require("fbjs/lib/emptyObject");
 var deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev");
 var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
 var TextInputState = require("TextInputState");
 var checkPropTypes = require("prop-types/checkPropTypes");
+var tracing = require("scheduler/tracing");
 var ExceptionsManager = require("ExceptionsManager");
 
-var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
-  this._hasCaughtError = false;
-  this._caughtError = null;
+/**
+ * Use invariant() to assert state which your program assumes to be true.
+ *
+ * Provide sprintf-style format (only %s is supported) and arguments
+ * to provide information about what broke and what you were
+ * expecting.
+ *
+ * The invariant message will be stripped in production, but the invariant
+ * will remain to ensure logic does not differ in production.
+ */
+
+var validateFormat = function() {};
+
+{
+  validateFormat = function(format) {
+    if (format === undefined) {
+      throw new Error("invariant requires an error message argument");
+    }
+  };
+}
+
+function invariant(condition, format, a, b, c, d, e, f) {
+  validateFormat(format);
+
+  if (!condition) {
+    var error = void 0;
+    if (format === undefined) {
+      error = new Error(
+        "Minified exception occurred; use the non-minified dev environment " +
+          "for the full error message and additional helpful warnings."
+      );
+    } else {
+      var args = [a, b, c, d, e, f];
+      var argIndex = 0;
+      error = new Error(
+        format.replace(/%s/g, function() {
+          return args[argIndex++];
+        })
+      );
+      error.name = "Invariant Violation";
+    }
+
+    error.framesToPop = 1; // we don't care about invariant's own frame
+    throw error;
+  }
+}
+
+var invokeGuardedCallbackImpl = function(
+  name,
+  func,
+  context,
+  a,
+  b,
+  c,
+  d,
+  e,
+  f
+) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
   try {
     func.apply(context, funcArgs);
   } catch (error) {
-    this._caughtError = error;
-    this._hasCaughtError = true;
+    this.onError(error);
   }
 };
 
@@ -108,6 +160,18 @@ var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
       // the error event at all.
       var didError = true;
 
+      // Keeps track of the value of window.event so that we can reset it
+      // during the callback to let user code access window.event in the
+      // browsers that support it.
+      var windowEvent = window.event;
+
+      // Keeps track of the descriptor of window.event to restore it after event
+      // dispatching: https://github.com/facebook/react/issues/13688
+      var windowEventDescriptor = Object.getOwnPropertyDescriptor(
+        window,
+        "event"
+      );
+
       // Create an event handler for our fake event. We will synchronously
       // dispatch our fake event using `dispatchEvent`. Inside the handler, we
       // call the user-provided callback.
@@ -118,6 +182,18 @@ var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
         // nested call would trigger the fake event handlers of any call higher
         // in the stack.
         fakeNode.removeEventListener(evtType, callCallback, false);
+
+        // We check for window.hasOwnProperty('event') to prevent the
+        // window.event assignment in both IE <= 10 as they throw an error
+        // "Member not found" in strict mode, and in Firefox which does not
+        // support window.event.
+        if (
+          typeof window.event !== "undefined" &&
+          window.hasOwnProperty("event")
+        ) {
+          window.event = windowEvent;
+        }
+
         func.apply(context, funcArgs);
         didError = false;
       }
@@ -138,19 +214,31 @@ var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
       var didSetError = false;
       var isCrossOriginError = false;
 
-      function onError(event) {
+      function handleWindowError(event) {
         error = event.error;
         didSetError = true;
         if (error === null && event.colno === 0 && event.lineno === 0) {
           isCrossOriginError = true;
         }
+        if (event.defaultPrevented) {
+          // Some other error handler has prevented default.
+          // Browsers silence the error report if this happens.
+          // We'll remember this to later decide whether to log it or not.
+          if (error != null && typeof error === "object") {
+            try {
+              error._suppressLogging = true;
+            } catch (inner) {
+              // Ignore.
+            }
+          }
+        }
       }
 
       // Create a fake event type.
       var evtType = "react-" + (name ? name : "invokeguardedcallback");
 
       // Attach our event handlers
-      window.addEventListener("error", onError);
+      window.addEventListener("error", handleWindowError);
       fakeNode.addEventListener(evtType, callCallback, false);
 
       // Synchronously dispatch our fake event. If the user-provided function
@@ -158,6 +246,10 @@ var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
       evt.initEvent(evtType, false, false);
       fakeNode.dispatchEvent(evt);
 
+      if (windowEventDescriptor) {
+        Object.defineProperty(window, "event", windowEventDescriptor);
+      }
+
       if (didError) {
         if (!didSetError) {
           // The callback errored, but the error event never fired.
@@ -178,116 +270,115 @@ var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
               "See https://fb.me/react-crossorigin-error for more information."
           );
         }
-        this._hasCaughtError = true;
-        this._caughtError = error;
-      } else {
-        this._hasCaughtError = false;
-        this._caughtError = null;
+        this.onError(error);
       }
 
       // Remove our event listeners
-      window.removeEventListener("error", onError);
+      window.removeEventListener("error", handleWindowError);
     };
 
-    invokeGuardedCallback = invokeGuardedCallbackDev;
+    invokeGuardedCallbackImpl = invokeGuardedCallbackDev;
   }
 }
 
-var invokeGuardedCallback$1 = invokeGuardedCallback;
+var invokeGuardedCallbackImpl$1 = invokeGuardedCallbackImpl;
 
-var ReactErrorUtils = {
-  // Used by Fiber to simulate a try-catch.
-  _caughtError: null,
-  _hasCaughtError: false,
+// Used by Fiber to simulate a try-catch.
+var hasError = false;
+var caughtError = null;
 
-  // Used by event system to capture/rethrow the first error.
-  _rethrowError: null,
-  _hasRethrowError: false,
-
-  /**
-   * Call a function while guarding against errors that happens within it.
-   * Returns an error if it throws, otherwise null.
-   *
-   * In production, this is implemented using a try-catch. The reason we don't
-   * use a try-catch directly is so that we can swap out a different
-   * implementation in DEV mode.
-   *
-   * @param {String} name of the guard to use for logging or debugging
-   * @param {Function} func The function to invoke
-   * @param {*} context The context to use when calling the function
-   * @param {...*} args Arguments for function
-   */
-  invokeGuardedCallback: function(name, func, context, a, b, c, d, e, f) {
-    invokeGuardedCallback$1.apply(ReactErrorUtils, arguments);
-  },
-
-  /**
-   * Same as invokeGuardedCallback, but instead of returning an error, it stores
-   * it in a global so it can be rethrown by `rethrowCaughtError` later.
-   * TODO: See if _caughtError and _rethrowError can be unified.
-   *
-   * @param {String} name of the guard to use for logging or debugging
-   * @param {Function} func The function to invoke
-   * @param {*} context The context to use when calling the function
-   * @param {...*} args Arguments for function
-   */
-  invokeGuardedCallbackAndCatchFirstError: function(
-    name,
-    func,
-    context,
-    a,
-    b,
-    c,
-    d,
-    e,
-    f
-  ) {
-    ReactErrorUtils.invokeGuardedCallback.apply(this, arguments);
-    if (ReactErrorUtils.hasCaughtError()) {
-      var error = ReactErrorUtils.clearCaughtError();
-      if (!ReactErrorUtils._hasRethrowError) {
-        ReactErrorUtils._hasRethrowError = true;
-        ReactErrorUtils._rethrowError = error;
-      }
-    }
-  },
+// Used by event system to capture/rethrow the first error.
+var hasRethrowError = false;
+var rethrowError = null;
 
-  /**
-   * During execution of guarded functions we will capture the first error which
-   * we will rethrow to be handled by the top level error handler.
-   */
-  rethrowCaughtError: function() {
-    return rethrowCaughtError.apply(ReactErrorUtils, arguments);
-  },
+var reporter = {
+  onError: function(error) {
+    hasError = true;
+    caughtError = error;
+  }
+};
 
-  hasCaughtError: function() {
-    return ReactErrorUtils._hasCaughtError;
-  },
+/**
+ * Call a function while guarding against errors that happens within it.
+ * Returns an error if it throws, otherwise null.
+ *
+ * In production, this is implemented using a try-catch. The reason we don't
+ * use a try-catch directly is so that we can swap out a different
+ * implementation in DEV mode.
+ *
+ * @param {String} name of the guard to use for logging or debugging
+ * @param {Function} func The function to invoke
+ * @param {*} context The context to use when calling the function
+ * @param {...*} args Arguments for function
+ */
+function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
+  hasError = false;
+  caughtError = null;
+  invokeGuardedCallbackImpl$1.apply(reporter, arguments);
+}
 
-  clearCaughtError: function() {
-    if (ReactErrorUtils._hasCaughtError) {
-      var error = ReactErrorUtils._caughtError;
-      ReactErrorUtils._caughtError = null;
-      ReactErrorUtils._hasCaughtError = false;
-      return error;
-    } else {
-      invariant(
-        false,
-        "clearCaughtError was called but no error was captured. This error " +
-          "is likely caused by a bug in React. Please file an issue."
-      );
+/**
+ * Same as invokeGuardedCallback, but instead of returning an error, it stores
+ * it in a global so it can be rethrown by `rethrowCaughtError` later.
+ * TODO: See if caughtError and rethrowError can be unified.
+ *
+ * @param {String} name of the guard to use for logging or debugging
+ * @param {Function} func The function to invoke
+ * @param {*} context The context to use when calling the function
+ * @param {...*} args Arguments for function
+ */
+function invokeGuardedCallbackAndCatchFirstError(
+  name,
+  func,
+  context,
+  a,
+  b,
+  c,
+  d,
+  e,
+  f
+) {
+  invokeGuardedCallback.apply(this, arguments);
+  if (hasError) {
+    var error = clearCaughtError();
+    if (!hasRethrowError) {
+      hasRethrowError = true;
+      rethrowError = error;
     }
   }
-};
+}
 
-var rethrowCaughtError = function() {
-  if (ReactErrorUtils._hasRethrowError) {
-    var error = ReactErrorUtils._rethrowError;
-    ReactErrorUtils._rethrowError = null;
-    ReactErrorUtils._hasRethrowError = false;
+/**
+ * During execution of guarded functions we will capture the first error which
+ * we will rethrow to be handled by the top level error handler.
+ */
+function rethrowCaughtError() {
+  if (hasRethrowError) {
+    var error = rethrowError;
+    hasRethrowError = false;
+    rethrowError = null;
     throw error;
   }
-};
+}
+
+function hasCaughtError() {
+  return hasError;
+}
+
+function clearCaughtError() {
+  if (hasError) {
+    var error = caughtError;
+    hasError = false;
+    caughtError = null;
+    return error;
+  } else {
+    invariant(
+      false,
+      "clearCaughtError was called but no error was captured. This error " +
+        "is likely caused by a bug in React. Please file an issue."
+    );
+  }
+}
 
 /**
  * Injectable ordering of event plugins.
@@ -499,27 +590,132 @@ function injectEventPluginsByName(injectedNamesToPlugins) {
   }
 }
 
+/**
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
+
+var warningWithoutStack = function() {};
+
+{
+  warningWithoutStack = function(condition, format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 2 ? _len - 2 : 0),
+        _key = 2;
+      _key < _len;
+      _key++
+    ) {
+      args[_key - 2] = arguments[_key];
+    }
+
+    if (format === undefined) {
+      throw new Error(
+        "`warningWithoutStack(condition, format, ...args)` requires a warning " +
+          "message argument"
+      );
+    }
+    if (args.length > 8) {
+      // Check before the condition to catch violations early.
+      throw new Error(
+        "warningWithoutStack() currently supports at most 8 arguments."
+      );
+    }
+    if (condition) {
+      return;
+    }
+    if (typeof console !== "undefined") {
+      var _args$map = args.map(function(item) {
+          return "" + item;
+        }),
+        a = _args$map[0],
+        b = _args$map[1],
+        c = _args$map[2],
+        d = _args$map[3],
+        e = _args$map[4],
+        f = _args$map[5],
+        g = _args$map[6],
+        h = _args$map[7];
+
+      var message = "Warning: " + format;
+
+      // We intentionally don't use spread (or .apply) because it breaks IE9:
+      // https://github.com/facebook/react/issues/13610
+      switch (args.length) {
+        case 0:
+          console.error(message);
+          break;
+        case 1:
+          console.error(message, a);
+          break;
+        case 2:
+          console.error(message, a, b);
+          break;
+        case 3:
+          console.error(message, a, b, c);
+          break;
+        case 4:
+          console.error(message, a, b, c, d);
+          break;
+        case 5:
+          console.error(message, a, b, c, d, e);
+          break;
+        case 6:
+          console.error(message, a, b, c, d, e, f);
+          break;
+        case 7:
+          console.error(message, a, b, c, d, e, f, g);
+          break;
+        case 8:
+          console.error(message, a, b, c, d, e, f, g, h);
+          break;
+        default:
+          throw new Error(
+            "warningWithoutStack() currently supports at most 8 arguments."
+          );
+      }
+    }
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      var argIndex = 0;
+      var _message =
+        "Warning: " +
+        format.replace(/%s/g, function() {
+          return args[argIndex++];
+        });
+      throw new Error(_message);
+    } catch (x) {}
+  };
+}
+
+var warningWithoutStack$1 = warningWithoutStack;
+
 var getFiberCurrentPropsFromNode = null;
 var getInstanceFromNode = null;
 var getNodeFromInstance = null;
 
-var injection$1 = {
-  injectComponentTree: function(Injected) {
-    getFiberCurrentPropsFromNode = Injected.getFiberCurrentPropsFromNode;
-    getInstanceFromNode = Injected.getInstanceFromNode;
-    getNodeFromInstance = Injected.getNodeFromInstance;
-
-    {
-      !(getNodeFromInstance && getInstanceFromNode)
-        ? warning(
-            false,
-            "EventPluginUtils.injection.injectComponentTree(...): Injected " +
-              "module is missing getNodeFromInstance or getInstanceFromNode."
-          )
-        : void 0;
-    }
+function setComponentTree(
+  getFiberCurrentPropsFromNodeImpl,
+  getInstanceFromNodeImpl,
+  getNodeFromInstanceImpl
+) {
+  getFiberCurrentPropsFromNode = getFiberCurrentPropsFromNodeImpl;
+  getInstanceFromNode = getInstanceFromNodeImpl;
+  getNodeFromInstance = getNodeFromInstanceImpl;
+  {
+    !(getNodeFromInstance && getInstanceFromNode)
+      ? warningWithoutStack$1(
+          false,
+          "EventPluginUtils.setComponentTree(...): Injected " +
+            "module is missing getNodeFromInstance or getInstanceFromNode."
+        )
+      : void 0;
   }
-};
+}
 
 var validateEventDispatches = void 0;
 {
@@ -530,15 +726,19 @@ var validateEventDispatches = void 0;
     var listenersIsArr = Array.isArray(dispatchListeners);
     var listenersLen = listenersIsArr
       ? dispatchListeners.length
-      : dispatchListeners ? 1 : 0;
+      : dispatchListeners
+        ? 1
+        : 0;
 
     var instancesIsArr = Array.isArray(dispatchInstances);
     var instancesLen = instancesIsArr
       ? dispatchInstances.length
-      : dispatchInstances ? 1 : 0;
+      : dispatchInstances
+        ? 1
+        : 0;
 
     !(instancesIsArr === listenersIsArr && instancesLen === listenersLen)
-      ? warning(false, "EventPluginUtils: Invalid `event`.")
+      ? warningWithoutStack$1(false, "EventPluginUtils: Invalid `event`.")
       : void 0;
   };
 }
@@ -553,12 +753,7 @@ var validateEventDispatches = void 0;
 function executeDispatch(event, simulated, listener, inst) {
   var type = event.type || "unknown-event";
   event.currentTarget = getNodeFromInstance(inst);
-  ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
-    type,
-    listener,
-    undefined,
-    event
-  );
+  invokeGuardedCallbackAndCatchFirstError(type, listener, undefined, event);
   event.currentTarget = null;
 }
 
@@ -919,7 +1114,7 @@ function runEventsInBatch(events, simulated) {
       "an event queue. Support for this has not yet been implemented."
   );
   // This would be a good time to rethrow if any of the event handlers threw.
-  ReactErrorUtils.rethrowCaughtError();
+  rethrowCaughtError();
 }
 
 function runExtractedEventsInBatch(
@@ -937,21 +1132,25 @@ function runExtractedEventsInBatch(
   runEventsInBatch(events, false);
 }
 
-var IndeterminateComponent = 0; // Before we know whether it is functional or class
-var FunctionalComponent = 1;
+var FunctionComponent = 0;
+var FunctionComponentLazy = 1;
 var ClassComponent = 2;
-var HostRoot = 3; // Root of a host tree. Could be nested inside another node.
-var HostPortal = 4; // A subtree. Could be an entry point to a different renderer.
-var HostComponent = 5;
-var HostText = 6;
-
-var Fragment = 10;
-var Mode = 11;
-var ContextConsumer = 12;
-var ContextProvider = 13;
-var ForwardRef = 14;
+var ClassComponentLazy = 3;
+var IndeterminateComponent = 4; // Before we know whether it is function or class
+var HostRoot = 5; // Root of a host tree. Could be nested inside another node.
+var HostPortal = 6; // A subtree. Could be an entry point to a different renderer.
+var HostComponent = 7;
+var HostText = 8;
+var Fragment = 9;
+var Mode = 10;
+var ContextConsumer = 11;
+var ContextProvider = 12;
+var ForwardRef = 13;
+var ForwardRefLazy = 14;
 var Profiler = 15;
-var TimeoutComponent = 16;
+var SuspenseComponent = 16;
+var PureComponent = 17;
+var PureComponentLazy = 18;
 
 function getParent(inst) {
   do {
@@ -1080,7 +1279,9 @@ function listenerAtPhase(inst, event, propagationPhase) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   {
-    !inst ? warning(false, "Dispatching inst must not be null") : void 0;
+    !inst
+      ? warningWithoutStack$1(false, "Dispatching inst must not be null")
+      : void 0;
   }
   var listener = listenerAtPhase(inst, event, phase);
   if (listener) {
@@ -1160,19 +1361,8 @@ function accumulateDirectDispatches(events) {
 
 /* eslint valid-typeof: 0 */
 
-var didWarnForAddedNewProperty = false;
 var EVENT_POOL_SIZE = 10;
 
-var shouldBeReleasedProperties = [
-  "dispatchConfig",
-  "_targetInst",
-  "nativeEvent",
-  "isDefaultPrevented",
-  "isPropagationStopped",
-  "_dispatchListeners",
-  "_dispatchInstances"
-];
-
 /**
  * @interface Event
  * @see http://www.w3.org/TR/DOM-Level-3-Events/
@@ -1231,6 +1421,8 @@ function SyntheticEvent(
     delete this.nativeEvent;
     delete this.preventDefault;
     delete this.stopPropagation;
+    delete this.isDefaultPrevented;
+    delete this.isPropagationStopped;
   }
 
   this.dispatchConfig = dispatchConfig;
@@ -1336,15 +1528,35 @@ Object.assign(SyntheticEvent.prototype, {
         );
       }
     }
-    for (var i = 0; i < shouldBeReleasedProperties.length; i++) {
-      this[shouldBeReleasedProperties[i]] = null;
-    }
+    this.dispatchConfig = null;
+    this._targetInst = null;
+    this.nativeEvent = null;
+    this.isDefaultPrevented = functionThatReturnsFalse;
+    this.isPropagationStopped = functionThatReturnsFalse;
+    this._dispatchListeners = null;
+    this._dispatchInstances = null;
     {
       Object.defineProperty(
         this,
         "nativeEvent",
         getPooledWarningPropertyDefinition("nativeEvent", null)
       );
+      Object.defineProperty(
+        this,
+        "isDefaultPrevented",
+        getPooledWarningPropertyDefinition(
+          "isDefaultPrevented",
+          functionThatReturnsFalse
+        )
+      );
+      Object.defineProperty(
+        this,
+        "isPropagationStopped",
+        getPooledWarningPropertyDefinition(
+          "isPropagationStopped",
+          functionThatReturnsFalse
+        )
+      );
       Object.defineProperty(
         this,
         "preventDefault",
@@ -1385,51 +1597,6 @@ SyntheticEvent.extend = function(Interface) {
   return Class;
 };
 
-/** Proxying after everything set on SyntheticEvent
- * to resolve Proxy issue on some WebKit browsers
- * in which some Event properties are set to undefined (GH#10010)
- */
-{
-  var isProxySupported =
-    typeof Proxy === "function" &&
-    // https://github.com/facebook/react/issues/12011
-    !Object.isSealed(new Proxy({}, {}));
-
-  if (isProxySupported) {
-    /*eslint-disable no-func-assign */
-    SyntheticEvent = new Proxy(SyntheticEvent, {
-      construct: function(target, args) {
-        return this.apply(target, Object.create(target.prototype), args);
-      },
-      apply: function(constructor, that, args) {
-        return new Proxy(constructor.apply(that, args), {
-          set: function(target, prop, value) {
-            if (
-              prop !== "isPersistent" &&
-              !target.constructor.Interface.hasOwnProperty(prop) &&
-              shouldBeReleasedProperties.indexOf(prop) === -1
-            ) {
-              !(didWarnForAddedNewProperty || target.isPersistent())
-                ? warning(
-                    false,
-                    "This synthetic event is reused for performance reasons. If you're " +
-                      "seeing this, you're adding a new property in the synthetic event object. " +
-                      "The property is never released. See " +
-                      "https://fb.me/react-event-pooling for more information."
-                  )
-                : void 0;
-              didWarnForAddedNewProperty = true;
-            }
-            target[prop] = value;
-            return true;
-          }
-        });
-      }
-    });
-    /*eslint-enable no-func-assign */
-  }
-}
-
 addEventPoolingTo(SyntheticEvent);
 
 /**
@@ -1465,7 +1632,7 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
   function warn(action, result) {
     var warningCondition = false;
     !warningCondition
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "This synthetic event is reused for performance reasons. If you're seeing this, " +
             "you're %s `%s` on a released/nullified synthetic event. %s. " +
@@ -1504,7 +1671,7 @@ function releasePooledEvent(event) {
   var EventConstructor = this;
   invariant(
     event instanceof EventConstructor,
-    "Trying to release an event instance  into a pool of a different type."
+    "Trying to release an event instance into a pool of a different type."
   );
   event.destructor();
   if (EventConstructor.eventPool.length < EVENT_POOL_SIZE) {
@@ -1518,14 +1685,12 @@ function addEventPoolingTo(EventConstructor) {
   EventConstructor.release = releasePooledEvent;
 }
 
-var SyntheticEvent$1 = SyntheticEvent;
-
 /**
  * `touchHistory` isn't actually on the native event, but putting it in the
  * interface will ensure that it is cleaned up when pooled/destroyed. The
  * `ResponderEventPlugin` will populate it appropriately.
  */
-var ResponderSyntheticEvent = SyntheticEvent$1.extend({
+var ResponderSyntheticEvent = SyntheticEvent.extend({
   touchHistory: function(nativeEvent) {
     return null; // Actually doesn't even look at the native event.
   }
@@ -1617,7 +1782,7 @@ function getTouchIdentifier(_ref) {
   invariant(identifier != null, "Touch object is missing identifier.");
   {
     !(identifier <= MAX_TOUCH_BANK)
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "Touch identifier %s is greater than maximum supported %s which causes " +
             "performance issues backfilling array locations for all of the indices.",
@@ -1724,7 +1889,7 @@ var ResponderTouchHistoryStore = {
         {
           var activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
           !(activeRecord != null && activeRecord.touchActive)
-            ? warning(false, "Cannot find single active touch.")
+            ? warningWithoutStack$1(false, "Cannot find single active touch.")
             : void 0;
         }
       }
@@ -2279,7 +2444,9 @@ var ResponderEventPlugin = {
       ? eventTypes$1.responderStart
       : isResponderTouchMove
         ? eventTypes$1.responderMove
-        : isResponderTouchEnd ? eventTypes$1.responderEnd : null;
+        : isResponderTouchEnd
+          ? eventTypes$1.responderEnd
+          : null;
 
     if (incrementalTouch) {
       var gesture = ResponderSyntheticEvent.getPooled(
@@ -2302,7 +2469,9 @@ var ResponderEventPlugin = {
       noResponderTouches(nativeEvent);
     var finalTouch = isResponderTerminate
       ? eventTypes$1.responderTerminate
-      : isResponderRelease ? eventTypes$1.responderRelease : null;
+      : isResponderRelease
+        ? eventTypes$1.responderRelease
+        : null;
     if (finalTouch) {
       var finalEvent = ResponderSyntheticEvent.getPooled(
         finalTouch,
@@ -2362,7 +2531,7 @@ var ReactNativeBridgeEventPlugin = {
       'Unsupported top level event type "%s" dispatched',
       topLevelType
     );
-    var event = SyntheticEvent$1.getPooled(
+    var event = SyntheticEvent.getPooled(
       bubbleDispatchConfig || directDispatchConfig,
       targetInst,
       nativeEvent,
@@ -2438,20 +2607,9 @@ function updateFiberProps(tag, props) {
   instanceProps[tag] = props;
 }
 
-var ReactNativeComponentTree = Object.freeze({
-  precacheFiberNode: precacheFiberNode,
-  uncacheFiberNode: uncacheFiberNode,
-  getClosestInstanceFromNode: getInstanceFromTag,
-  getInstanceFromNode: getInstanceFromTag,
-  getNodeFromInstance: getTagFromInstance,
-  getFiberCurrentPropsFromNode: getFiberCurrentPropsFromNode$1,
-  updateFiberProps: updateFiberProps
-});
-
 // Use to restore controlled state after a change event has fired.
 
-var fiberHostComponent = null;
-
+var restoreImpl = null;
 var restoreTarget = null;
 var restoreQueue = null;
 
@@ -2464,17 +2622,12 @@ function restoreStateOfTarget(target) {
     return;
   }
   invariant(
-    fiberHostComponent &&
-      typeof fiberHostComponent.restoreControlledState === "function",
-    "Fiber needs to be injected to handle a fiber target for controlled " +
+    typeof restoreImpl === "function",
+    "setRestoreImplementation() needs to be called to handle a target for controlled " +
       "events. This error is likely caused by a bug in React. Please file an issue."
   );
   var props = getFiberCurrentPropsFromNode(internalInstance.stateNode);
-  fiberHostComponent.restoreControlledState(
-    internalInstance.stateNode,
-    internalInstance.type,
-    props
-  );
+  restoreImpl(internalInstance.stateNode, internalInstance.type, props);
 }
 
 function needsStateRestore() {
@@ -2505,13 +2658,10 @@ function restoreStateIfNeeded() {
 // scheduled work and instead do synchronous work.
 
 // Defaults
-var _batchedUpdates = function(fn, bookkeeping) {
+var _batchedUpdatesImpl = function(fn, bookkeeping) {
   return fn(bookkeeping);
 };
-var _interactiveUpdates = function(fn, a, b) {
-  return fn(a, b);
-};
-var _flushInteractiveUpdates = function() {};
+var _flushInteractiveUpdatesImpl = function() {};
 
 var isBatching = false;
 function batchedUpdates(fn, bookkeeping) {
@@ -2522,7 +2672,7 @@ function batchedUpdates(fn, bookkeeping) {
   }
   isBatching = true;
   try {
-    return _batchedUpdates(fn, bookkeeping);
+    return _batchedUpdatesImpl(fn, bookkeeping);
   } finally {
     // Here we wait until all updates have propagated, which is important
     // when using controlled components within layers:
@@ -2534,19 +2684,20 @@ function batchedUpdates(fn, bookkeeping) {
       // If a controlled event was fired, we may need to restore the state of
       // the DOM node back to the controlled value. This is necessary when React
       // bails out of the update without touching the DOM.
-      _flushInteractiveUpdates();
+      _flushInteractiveUpdatesImpl();
       restoreStateIfNeeded();
     }
   }
 }
 
-var injection$2 = {
-  injectRenderer: function(renderer) {
-    _batchedUpdates = renderer.batchedUpdates;
-    _interactiveUpdates = renderer.interactiveUpdates;
-    _flushInteractiveUpdates = renderer.flushInteractiveUpdates;
-  }
-};
+function setBatchingImplementation(
+  batchedUpdatesImpl,
+  interactiveUpdatesImpl,
+  flushInteractiveUpdatesImpl
+) {
+  _batchedUpdatesImpl = batchedUpdatesImpl;
+  _flushInteractiveUpdatesImpl = flushInteractiveUpdatesImpl;
+}
 
 /**
  * Version of `ReactBrowserEventEmitter` that works on the receiving side of a
@@ -2682,7 +2833,7 @@ function receiveTouches(eventTopLevelType, touches, changedIndices) {
     if (target !== null && target !== undefined) {
       if (target < 1) {
         {
-          warning(
+          warningWithoutStack$1(
             false,
             "A view is reporting that a touch occurred on tag zero."
           );
@@ -2722,7 +2873,11 @@ var ReactNativeGlobalResponderHandler = {
  */
 RCTEventEmitter.register(ReactNativeEventEmitter);
 
-injection$1.injectComponentTree(ReactNativeComponentTree);
+setComponentTree(
+  getFiberCurrentPropsFromNode$1,
+  getInstanceFromTag,
+  getTagFromInstance
+);
 
 ResponderEventPlugin.injection.injectGlobalResponderHandler(
   ReactNativeGlobalResponderHandler
@@ -2752,10 +2907,8 @@ function set(key, value) {
   key._reactInternalFiber = value;
 }
 
-var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-var ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
-var ReactDebugCurrentFrame = ReactInternals.ReactDebugCurrentFrame;
+var ReactSharedInternals =
+  React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 
 // The Symbol used to tag the ReactElement-like types. If there is no native Symbol
 // nor polyfill, then a plain number is used for performance.
@@ -2770,17 +2923,20 @@ var REACT_STRICT_MODE_TYPE = hasSymbol
 var REACT_PROFILER_TYPE = hasSymbol ? Symbol.for("react.profiler") : 0xead2;
 var REACT_PROVIDER_TYPE = hasSymbol ? Symbol.for("react.provider") : 0xeacd;
 var REACT_CONTEXT_TYPE = hasSymbol ? Symbol.for("react.context") : 0xeace;
-var REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol.for("react.async_mode") : 0xeacf;
+var REACT_CONCURRENT_MODE_TYPE = hasSymbol
+  ? Symbol.for("react.concurrent_mode")
+  : 0xeacf;
 var REACT_FORWARD_REF_TYPE = hasSymbol
   ? Symbol.for("react.forward_ref")
   : 0xead0;
-var REACT_TIMEOUT_TYPE = hasSymbol ? Symbol.for("react.timeout") : 0xead1;
+var REACT_SUSPENSE_TYPE = hasSymbol ? Symbol.for("react.suspense") : 0xead1;
+var REACT_PURE_TYPE = hasSymbol ? Symbol.for("react.pure") : 0xead3;
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
 var FAUX_ITERATOR_SYMBOL = "@@iterator";
 
 function getIteratorFn(maybeIterable) {
-  if (maybeIterable === null || typeof maybeIterable === "undefined") {
+  if (maybeIterable === null || typeof maybeIterable !== "object") {
     return null;
   }
   var maybeIterator =
@@ -2792,40 +2948,77 @@ function getIteratorFn(maybeIterable) {
   return null;
 }
 
-function getComponentName(fiber) {
-  var type = fiber.type;
+var Pending = 0;
+var Resolved = 1;
+var Rejected = 2;
+
+function getResultFromResolvedThenable(thenable) {
+  return thenable._reactResult;
+}
+
+function refineResolvedThenable(thenable) {
+  return thenable._reactStatus === Resolved ? thenable._reactResult : null;
+}
+
+function getWrappedName(outerType, innerType, wrapperName) {
+  var functionName = innerType.displayName || innerType.name || "";
+  return (
+    outerType.displayName ||
+    (functionName !== "" ? wrapperName + "(" + functionName + ")" : wrapperName)
+  );
+}
 
+function getComponentName(type) {
+  if (type == null) {
+    // Host root, text node or just invalid type.
+    return null;
+  }
+  {
+    if (typeof type.tag === "number") {
+      warningWithoutStack$1(
+        false,
+        "Received an unexpected object in getComponentName(). " +
+          "This is likely a bug in React. Please file an issue."
+      );
+    }
+  }
   if (typeof type === "function") {
-    return type.displayName || type.name;
+    return type.displayName || type.name || null;
   }
   if (typeof type === "string") {
     return type;
   }
   switch (type) {
-    case REACT_ASYNC_MODE_TYPE:
-      return "AsyncMode";
-    case REACT_CONTEXT_TYPE:
-      return "Context.Consumer";
+    case REACT_CONCURRENT_MODE_TYPE:
+      return "ConcurrentMode";
     case REACT_FRAGMENT_TYPE:
-      return "ReactFragment";
+      return "Fragment";
     case REACT_PORTAL_TYPE:
-      return "ReactPortal";
+      return "Portal";
     case REACT_PROFILER_TYPE:
-      return "Profiler(" + fiber.pendingProps.id + ")";
-    case REACT_PROVIDER_TYPE:
-      return "Context.Provider";
+      return "Profiler";
     case REACT_STRICT_MODE_TYPE:
       return "StrictMode";
-    case REACT_TIMEOUT_TYPE:
-      return "Timeout";
+    case REACT_SUSPENSE_TYPE:
+      return "Suspense";
   }
-  if (typeof type === "object" && type !== null) {
+  if (typeof type === "object") {
     switch (type.$$typeof) {
+      case REACT_CONTEXT_TYPE:
+        return "Context.Consumer";
+      case REACT_PROVIDER_TYPE:
+        return "Context.Provider";
       case REACT_FORWARD_REF_TYPE:
-        var functionName = type.render.displayName || type.render.name || "";
-        return functionName !== ""
-          ? "ForwardRef(" + functionName + ")"
-          : "ForwardRef";
+        return getWrappedName(type, type.render, "ForwardRef");
+      case REACT_PURE_TYPE:
+        return getWrappedName(type, type.render, "Pure");
+    }
+    if (typeof type.then === "function") {
+      var thenable = type;
+      var resolvedThenable = refineResolvedThenable(thenable);
+      if (resolvedThenable) {
+        return getComponentName(resolvedThenable);
+      }
     }
   }
   return null;
@@ -2846,12 +3039,17 @@ var DidCapture = /*            */ 64;
 var Ref = /*                   */ 128;
 var Snapshot = /*              */ 256;
 
+// Update & Callback & Ref & Snapshot
+var LifecycleEffectMask = /*   */ 420;
+
 // Union of all host effects
 var HostEffectMask = /*        */ 511;
 
 var Incomplete = /*            */ 512;
 var ShouldCapture = /*         */ 1024;
 
+var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner;
+
 var MOUNTING = 1;
 var MOUNTED = 2;
 var UNMOUNTED = 3;
@@ -2891,19 +3089,22 @@ function isFiberMounted(fiber) {
 
 function isMounted(component) {
   {
-    var owner = ReactCurrentOwner.current;
-    if (owner !== null && owner.tag === ClassComponent) {
+    var owner = ReactCurrentOwner$1.current;
+    if (
+      owner !== null &&
+      (owner.tag === ClassComponent || owner.tag === ClassComponentLazy)
+    ) {
       var ownerFiber = owner;
       var instance = ownerFiber.stateNode;
       !instance._warnedAboutRefsInRender
-        ? warning(
+        ? warningWithoutStack$1(
             false,
             "%s is accessing isMounted inside its render() function. " +
               "render() should be a pure function of props and state. It should " +
               "never access something that requires stale data from the previous " +
               "render, such as refs. Move this logic to componentDidMount and " +
               "componentDidUpdate instead.",
-            getComponentName(ownerFiber) || "A component"
+            getComponentName(ownerFiber.type) || "A component"
           )
         : void 0;
       instance._warnedAboutRefsInRender = true;
@@ -3083,41 +3284,8 @@ function findCurrentHostFiber(parent) {
   return null;
 }
 
-function findCurrentHostFiberWithNoPortals(parent) {
-  var currentParent = findCurrentFiberUsingSlowPath(parent);
-  if (!currentParent) {
-    return null;
-  }
-
-  // Next we'll drill down this component to find the first HostComponent/Text.
-  var node = currentParent;
-  while (true) {
-    if (node.tag === HostComponent || node.tag === HostText) {
-      return node;
-    } else if (node.child && node.tag !== HostPortal) {
-      node.child.return = node;
-      node = node.child;
-      continue;
-    }
-    if (node === currentParent) {
-      return null;
-    }
-    while (!node.sibling) {
-      if (!node.return || node.return === currentParent) {
-        return null;
-      }
-      node = node.return;
-    }
-    node.sibling.return = node.return;
-    node = node.sibling;
-  }
-  // Flow needs the return null here, but ESLint complains about it.
-  // eslint-disable-next-line no-unreachable
-  return null;
-}
-
 // Modules provided by RN:
-var emptyObject$1 = {};
+var emptyObject = {};
 
 /**
  * Create a payload that contains all the updates between two sets of props.
@@ -3162,8 +3330,8 @@ function restoreDeletedValuesInNestedArray(
       if (!removedKeys[propKey]) {
         continue;
       }
-      var _nextProp = obj[propKey];
-      if (_nextProp === undefined) {
+      var nextProp = obj[propKey];
+      if (nextProp === undefined) {
         continue;
       }
 
@@ -3172,16 +3340,16 @@ function restoreDeletedValuesInNestedArray(
         continue; // not a valid native prop
       }
 
-      if (typeof _nextProp === "function") {
-        _nextProp = true;
+      if (typeof nextProp === "function") {
+        nextProp = true;
       }
-      if (typeof _nextProp === "undefined") {
-        _nextProp = null;
+      if (typeof nextProp === "undefined") {
+        nextProp = null;
       }
 
       if (typeof attributeConfig !== "object") {
         // case: !Object is the default case
-        updatePayload[propKey] = _nextProp;
+        updatePayload[propKey] = nextProp;
       } else if (
         typeof attributeConfig.diff === "function" ||
         typeof attributeConfig.process === "function"
@@ -3189,8 +3357,8 @@ function restoreDeletedValuesInNestedArray(
         // case: CustomAttributeConfiguration
         var nextValue =
           typeof attributeConfig.process === "function"
-            ? attributeConfig.process(_nextProp)
-            : _nextProp;
+            ? attributeConfig.process(nextProp)
+            : nextProp;
         updatePayload[propKey] = nextValue;
       }
       removedKeys[propKey] = false;
@@ -3521,7 +3689,7 @@ function diffProperties(updatePayload, prevProps, nextProps, validAttributes) {
  */
 function addProperties(updatePayload, props, validAttributes) {
   // TODO: Fast path
-  return diffProperties(updatePayload, emptyObject$1, props, validAttributes);
+  return diffProperties(updatePayload, emptyObject, props, validAttributes);
 }
 
 /**
@@ -3530,12 +3698,7 @@ function addProperties(updatePayload, props, validAttributes) {
  */
 function clearProperties(updatePayload, prevProps, validAttributes) {
   // TODO: Fast path
-  return diffProperties(
-    updatePayload,
-    prevProps,
-    emptyObject$1,
-    validAttributes
-  );
+  return diffProperties(updatePayload, prevProps, emptyObject, validAttributes);
 }
 
 function create(props, validAttributes) {
@@ -3559,26 +3722,33 @@ function diff(prevProps, nextProps, validAttributes) {
  * In the future, we should cleanup callbacks by cancelling them instead of
  * using this.
  */
-function mountSafeCallback(context, callback) {
+function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   return function() {
     if (!callback) {
       return undefined;
     }
+    // This protects against createClass() components.
+    // We don't know if there is code depending on it.
+    // We intentionally don't use isMounted() because even accessing
+    // isMounted property on a React ES6 class will trigger a warning.
     if (typeof context.__isMounted === "boolean") {
-      // TODO(gaearon): this is gross and should be removed.
-      // It is currently necessary because View uses createClass,
-      // and so any measure() calls on View (which are done by React
-      // DevTools) trigger the isMounted() deprecation warning.
       if (!context.__isMounted) {
         return undefined;
       }
-      // The else branch is important so that we don't
-      // trigger the deprecation warning by calling isMounted.
-    } else if (typeof context.isMounted === "function") {
-      if (!context.isMounted()) {
-        return undefined;
-      }
     }
+
+    // FIXME: there used to be other branches that protected
+    // against unmounted host components. But RN host components don't
+    // define isMounted() anymore, so those checks didn't do anything.
+
+    // They caused false positive warning noise so we removed them:
+    // https://github.com/facebook/react-native/issues/18868#issuecomment-413579095
+
+    // However, this means that the callback is NOT guaranteed to be safe
+    // for host components. The solution we should implement is to make
+    // UIManager.measure() and similar calls truly cancelable. Then we
+    // can change our own code calling them to cancel when something unmounts.
+
     return callback.apply(context, arguments);
   };
 }
@@ -3652,7 +3822,10 @@ var ReactNativeFiberHostComponent = (function() {
   };
 
   ReactNativeFiberHostComponent.prototype.measure = function measure(callback) {
-    UIManager.measure(this._nativeTag, mountSafeCallback(this, callback));
+    UIManager.measure(
+      this._nativeTag,
+      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
+    );
   };
 
   ReactNativeFiberHostComponent.prototype.measureInWindow = function measureInWindow(
@@ -3660,7 +3833,7 @@ var ReactNativeFiberHostComponent = (function() {
   ) {
     UIManager.measureInWindow(
       this._nativeTag,
-      mountSafeCallback(this, callback)
+      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
     );
   };
 
@@ -3672,8 +3845,8 @@ var ReactNativeFiberHostComponent = (function() {
     UIManager.measureLayout(
       this._nativeTag,
       relativeToNativeNode,
-      mountSafeCallback(this, onFail),
-      mountSafeCallback(this, onSuccess)
+      mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+      mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
     );
   };
 
@@ -3803,6 +3976,11 @@ var didNotFindHydratableTextInstance = shim$1;
 // Modules provided by RN:
 // Unused
 
+var UPDATE_SIGNAL = {};
+{
+  Object.freeze(UPDATE_SIGNAL);
+}
+
 // Counter for uniquely identifying views.
 // % 10 === 1 means it is a rootTag.
 // % 2 === 0 means it is a Fabric tag.
@@ -3962,7 +4140,7 @@ function prepareUpdate(
   rootContainerInstance,
   hostContext
 ) {
-  return emptyObject;
+  return UPDATE_SIGNAL;
 }
 
 function resetAfterCommit(containerInfo) {
@@ -3974,6 +4152,10 @@ var isPrimaryRenderer = true;
 var scheduleDeferredCallback = scheduleDeferredCallback$1;
 var cancelDeferredCallback = cancelDeferredCallback$1;
 
+var scheduleTimeout = setTimeout;
+var cancelTimeout = clearTimeout;
+var noTimeout = -1;
+
 function shouldDeprioritizeSubtree(type, props) {
   return false;
 }
@@ -4146,32 +4328,51 @@ function resetTextContent(instance) {
   // Noop
 }
 
+var BEFORE_SLASH_RE = /^(.*)[\\\/]/;
+
 var describeComponentFrame = function(name, source, ownerName) {
-  return (
-    "\n    in " +
-    (name || "Unknown") +
-    (source
-      ? " (at " +
-        source.fileName.replace(/^.*[\\\/]/, "") +
-        ":" +
-        source.lineNumber +
-        ")"
-      : ownerName ? " (created by " + ownerName + ")" : "")
-  );
+  var sourceInfo = "";
+  if (source) {
+    var path = source.fileName;
+    var fileName = path.replace(BEFORE_SLASH_RE, "");
+    {
+      // In DEV, include code for a common special case:
+      // prefer "folder/index.js" instead of just "index.js".
+      if (/^index\./.test(fileName)) {
+        var match = path.match(BEFORE_SLASH_RE);
+        if (match) {
+          var pathBeforeSlash = match[1];
+          if (pathBeforeSlash) {
+            var folderName = pathBeforeSlash.replace(BEFORE_SLASH_RE, "");
+            fileName = folderName + "/" + fileName;
+          }
+        }
+      }
+    }
+    sourceInfo = " (at " + fileName + ":" + source.lineNumber + ")";
+  } else if (ownerName) {
+    sourceInfo = " (created by " + ownerName + ")";
+  }
+  return "\n    in " + (name || "Unknown") + sourceInfo;
 };
 
+var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
 function describeFiber(fiber) {
   switch (fiber.tag) {
     case IndeterminateComponent:
-    case FunctionalComponent:
+    case FunctionComponent:
+    case FunctionComponentLazy:
     case ClassComponent:
+    case ClassComponentLazy:
     case HostComponent:
+    case Mode:
       var owner = fiber._debugOwner;
       var source = fiber._debugSource;
-      var name = getComponentName(fiber);
+      var name = getComponentName(fiber.type);
       var ownerName = null;
       if (owner) {
-        ownerName = getComponentName(owner);
+        ownerName = getComponentName(owner.type);
       }
       return describeComponentFrame(name, source, ownerName);
     default:
@@ -4179,82 +4380,73 @@ function describeFiber(fiber) {
   }
 }
 
-// This function can only be called with a work-in-progress fiber and
-// only during begin or complete phase. Do not call it under any other
-// circumstances.
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
+function getStackByFiberInDevAndProd(workInProgress) {
   var info = "";
   var node = workInProgress;
   do {
     info += describeFiber(node);
-    // Otherwise this return pointer might point to the wrong tree:
     node = node.return;
   } while (node);
   return info;
 }
 
-function getCurrentFiberOwnerName() {
+var current = null;
+var phase = null;
+
+function getCurrentFiberOwnerNameInDevOrNull() {
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
+    if (current === null) {
       return null;
     }
-    var owner = fiber._debugOwner;
+    var owner = current._debugOwner;
     if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner);
+      return getComponentName(owner.type);
     }
   }
   return null;
 }
 
-function getCurrentFiberStackAddendum() {
+function getCurrentFiberStackInDev() {
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
+    if (current === null) {
+      return "";
     }
     // Safe because if current fiber exists, we are reconciling,
     // and it is guaranteed to be the work-in-progress version.
-    return getStackAddendumByWorkInProgressFiber(fiber);
+    return getStackByFiberInDevAndProd(current);
   }
-  return null;
+  return "";
 }
 
 function resetCurrentFiber() {
-  ReactDebugCurrentFrame.getCurrentStack = null;
-  ReactDebugCurrentFiber.current = null;
-  ReactDebugCurrentFiber.phase = null;
+  {
+    ReactDebugCurrentFrame.getCurrentStack = null;
+    current = null;
+    phase = null;
+  }
 }
 
 function setCurrentFiber(fiber) {
-  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
-  ReactDebugCurrentFiber.current = fiber;
-  ReactDebugCurrentFiber.phase = null;
+  {
+    ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackInDev;
+    current = fiber;
+    phase = null;
+  }
 }
 
-function setCurrentPhase(phase) {
-  ReactDebugCurrentFiber.phase = phase;
+function setCurrentPhase(lifeCyclePhase) {
+  {
+    phase = lifeCyclePhase;
+  }
 }
 
-var ReactDebugCurrentFiber = {
-  current: null,
-  phase: null,
-  resetCurrentFiber: resetCurrentFiber,
-  setCurrentFiber: setCurrentFiber,
-  setCurrentPhase: setCurrentPhase,
-  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
-};
-
 var debugRenderPhaseSideEffects = false;
 var debugRenderPhaseSideEffectsForStrictMode = false;
-var enableGetDerivedStateFromCatch = false;
-var enableSuspense = false;
 var enableUserTimingAPI = true;
 var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
 var warnAboutDeprecatedLifecycles = false;
-var warnAboutLegacyContextAPI = false;
 var enableProfilerTimer = true;
+var enableSchedulerTracing = true;
 
 // Only used in www builds.
 
@@ -4295,9 +4487,9 @@ var formatMarkName = function(markName) {
   return reactEmoji + " " + markName;
 };
 
-var formatLabel = function(label, warning$$1) {
-  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
-  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
+var formatLabel = function(label, warning) {
+  var prefix = warning ? warningEmoji + " " : reactEmoji + " ";
+  var suffix = warning ? " Warning: " + warning : "";
   return "" + prefix + label + suffix;
 };
 
@@ -4309,9 +4501,9 @@ var clearMark = function(markName) {
   performance.clearMarks(formatMarkName(markName));
 };
 
-var endMark = function(label, markName, warning$$1) {
+var endMark = function(label, markName, warning) {
   var formattedMarkName = formatMarkName(markName);
-  var formattedLabel = formatLabel(label, warning$$1);
+  var formattedLabel = formatLabel(label, warning);
   try {
     performance.measure(formattedLabel, formattedMarkName);
   } catch (err) {}
@@ -4339,7 +4531,7 @@ var getFiberLabel = function(componentName, isMounted, phase) {
 };
 
 var beginFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
+  var componentName = getComponentName(fiber.type) || "Unknown";
   var debugID = fiber._debugID;
   var isMounted = fiber.alternate !== null;
   var label = getFiberLabel(componentName, isMounted, phase);
@@ -4358,7 +4550,7 @@ var beginFiberMark = function(fiber, phase) {
 };
 
 var clearFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
+  var componentName = getComponentName(fiber.type) || "Unknown";
   var debugID = fiber._debugID;
   var isMounted = fiber.alternate !== null;
   var label = getFiberLabel(componentName, isMounted, phase);
@@ -4366,13 +4558,13 @@ var clearFiberMark = function(fiber, phase) {
   clearMark(markName);
 };
 
-var endFiberMark = function(fiber, phase, warning$$1) {
-  var componentName = getComponentName(fiber) || "Unknown";
+var endFiberMark = function(fiber, phase, warning) {
+  var componentName = getComponentName(fiber.type) || "Unknown";
   var debugID = fiber._debugID;
   var isMounted = fiber.alternate !== null;
   var label = getFiberLabel(componentName, isMounted, phase);
   var markName = getFiberMarkName(label, debugID);
-  endMark(label, markName, warning$$1);
+  endMark(label, markName, warning);
 };
 
 var shouldIgnoreFiber = function(fiber) {
@@ -4464,13 +4656,13 @@ function stopRequestCallbackTimer(didExpire, expirationTime) {
   if (enableUserTimingAPI) {
     if (supportsUserTiming) {
       isWaitingForCallback = false;
-      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
+      var warning = didExpire ? "React was blocked by main thread" : null;
       endMark(
         "(Waiting for async callback... will force flush in " +
           expirationTime +
           " ms)",
         "(Waiting for async callback...)",
-        warning$$1
+        warning
       );
     }
   }
@@ -4528,8 +4720,11 @@ function stopFailedWorkTimer(fiber) {
       return;
     }
     fiber._debugIsCurrentlyTiming = false;
-    var warning$$1 = "An error was thrown inside this error boundary";
-    endFiberMark(fiber, null, warning$$1);
+    var warning =
+      fiber.tag === SuspenseComponent
+        ? "Rendering was suspended"
+        : "An error was thrown inside this error boundary";
+    endFiberMark(fiber, null, warning);
   }
 }
 
@@ -4553,10 +4748,10 @@ function stopPhaseTimer() {
       return;
     }
     if (currentPhase !== null && currentPhaseFiber !== null) {
-      var warning$$1 = hasScheduledUpdateInCurrentPhase
+      var warning = hasScheduledUpdateInCurrentPhase
         ? "Scheduled a cascading update"
         : null;
-      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
+      endFiberMark(currentPhaseFiber, currentPhase, warning);
     }
     currentPhase = null;
     currentPhaseFiber = null;
@@ -4583,17 +4778,17 @@ function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
     if (!supportsUserTiming) {
       return;
     }
-    var warning$$1 = null;
+    var warning = null;
     if (interruptedBy !== null) {
       if (interruptedBy.tag === HostRoot) {
-        warning$$1 = "A top-level update interrupted the previous render";
+        warning = "A top-level update interrupted the previous render";
       } else {
-        var componentName = getComponentName(interruptedBy) || "Unknown";
-        warning$$1 =
+        var componentName = getComponentName(interruptedBy.type) || "Unknown";
+        warning =
           "An update to " + componentName + " interrupted the previous render";
       }
     } else if (commitCountInCurrentWorkLoop > 1) {
-      warning$$1 = "There were cascading updates";
+      warning = "There were cascading updates";
     }
     commitCountInCurrentWorkLoop = 0;
     var label = didCompleteRoot
@@ -4601,7 +4796,7 @@ function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
       : "(React Tree Reconciliation: Yielded)";
     // Pause any measurements until the next loop.
     pauseTimers();
-    endMark(label, "(React Tree Reconciliation)", warning$$1);
+    endMark(label, "(React Tree Reconciliation)", warning);
   }
 }
 
@@ -4623,18 +4818,18 @@ function stopCommitTimer() {
       return;
     }
 
-    var warning$$1 = null;
+    var warning = null;
     if (hasScheduledUpdateInCurrentCommit) {
-      warning$$1 = "Lifecycle hook scheduled a cascading update";
+      warning = "Lifecycle hook scheduled a cascading update";
     } else if (commitCountInCurrentWorkLoop > 0) {
-      warning$$1 = "Caused by a cascading update in earlier commit";
+      warning = "Caused by a cascading update in earlier commit";
     }
     hasScheduledUpdateInCurrentCommit = false;
     commitCountInCurrentWorkLoop++;
     isCommitting = false;
     labelsInCurrentCommit.clear();
 
-    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
+    endMark("(Committing Changes)", "(Committing Changes)", warning);
   }
 }
 
@@ -4732,14 +4927,14 @@ function createCursor(defaultValue) {
 function pop(cursor, fiber) {
   if (index < 0) {
     {
-      warning(false, "Unexpected pop.");
+      warningWithoutStack$1(false, "Unexpected pop.");
     }
     return;
   }
 
   {
     if (fiber !== fiberStack[index]) {
-      warning(false, "Unexpected Fiber popped.");
+      warningWithoutStack$1(false, "Unexpected Fiber popped.");
     }
   }
 
@@ -4769,7 +4964,7 @@ function push(cursor, value, fiber) {
 function checkThatStackIsEmpty() {
   {
     if (index !== -1) {
-      warning(
+      warningWithoutStack$1(
         false,
         "Expected an empty stack. Something was not reset properly."
       );
@@ -4791,20 +4986,28 @@ var warnedAboutMissingGetChildContext = void 0;
   warnedAboutMissingGetChildContext = {};
 }
 
+var emptyContextObject = {};
+{
+  Object.freeze(emptyContextObject);
+}
+
 // A cursor to the current merged context object on the stack.
-var contextStackCursor = createCursor(emptyObject);
+var contextStackCursor = createCursor(emptyContextObject);
 // A cursor to a boolean indicating whether the context has changed.
 var didPerformWorkStackCursor = createCursor(false);
 // Keep track of the previous context object that was on the stack.
 // We use this to get access to the parent context after we have already
 // pushed the next context provider, and now need to merge their contexts.
-var previousContext = emptyObject;
+var previousContext = emptyContextObject;
 
-function getUnmaskedContext(workInProgress) {
-  var hasOwnContext = isContextProvider(workInProgress);
-  if (hasOwnContext) {
+function getUnmaskedContext(
+  workInProgress,
+  Component,
+  didPushOwnContextIfProvider
+) {
+  if (didPushOwnContextIfProvider && isContextProvider(Component)) {
     // If the fiber is a context provider itself, when we read its context
-    // we have already pushed its own child context on the stack. A context
+    // we may have already pushed its own child context on the stack. A context
     // provider should not "see" its own child context. Therefore we read the
     // previous (parent) context instead for a context provider.
     return previousContext;
@@ -4822,7 +5025,7 @@ function getMaskedContext(workInProgress, unmaskedContext) {
   var type = workInProgress.type;
   var contextTypes = type.contextTypes;
   if (!contextTypes) {
-    return emptyObject;
+    return emptyContextObject;
   }
 
   // Avoid recreating masked context unless unmasked context has changed.
@@ -4842,13 +5045,13 @@ function getMaskedContext(workInProgress, unmaskedContext) {
   }
 
   {
-    var name = getComponentName(workInProgress) || "Unknown";
+    var name = getComponentName(type) || "Unknown";
     checkPropTypes(
       contextTypes,
       context,
       "context",
       name,
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      getCurrentFiberStackInDev
     );
   }
 
@@ -4865,19 +5068,12 @@ function hasContextChanged() {
   return didPerformWorkStackCursor.current;
 }
 
-function isContextConsumer(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
-}
-
-function isContextProvider(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+function isContextProvider(type) {
+  var childContextTypes = type.childContextTypes;
+  return childContextTypes !== null && childContextTypes !== undefined;
 }
 
-function popContextProvider(fiber) {
-  if (!isContextProvider(fiber)) {
-    return;
-  }
-
+function popContext(fiber) {
   pop(didPerformWorkStackCursor, fiber);
   pop(contextStackCursor, fiber);
 }
@@ -4889,7 +5085,7 @@ function popTopLevelContextObject(fiber) {
 
 function pushTopLevelContextObject(fiber, context, didChange) {
   invariant(
-    contextStackCursor.current === emptyObject,
+    contextStackCursor.current === emptyContextObject,
     "Unexpected context found on stack. " +
       "This error is likely caused by a bug in React. Please file an issue."
   );
@@ -4898,19 +5094,19 @@ function pushTopLevelContextObject(fiber, context, didChange) {
   push(didPerformWorkStackCursor, didChange, fiber);
 }
 
-function processChildContext(fiber, parentContext) {
+function processChildContext(fiber, type, parentContext) {
   var instance = fiber.stateNode;
-  var childContextTypes = fiber.type.childContextTypes;
+  var childContextTypes = type.childContextTypes;
 
   // TODO (bvaughn) Replace this behavior with an invariant() in the future.
   // It has only been added in Fiber to match the (unintentional) behavior in Stack.
   if (typeof instance.getChildContext !== "function") {
     {
-      var componentName = getComponentName(fiber) || "Unknown";
+      var componentName = getComponentName(type) || "Unknown";
 
       if (!warnedAboutMissingGetChildContext[componentName]) {
         warnedAboutMissingGetChildContext[componentName] = true;
-        warning(
+        warningWithoutStack$1(
           false,
           "%s.childContextTypes is specified but there is no getChildContext() method " +
             "on the instance. You can either define getChildContext() on %s or remove " +
@@ -4925,24 +5121,24 @@ function processChildContext(fiber, parentContext) {
 
   var childContext = void 0;
   {
-    ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
+    setCurrentPhase("getChildContext");
   }
   startPhaseTimer(fiber, "getChildContext");
   childContext = instance.getChildContext();
   stopPhaseTimer();
   {
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+    setCurrentPhase(null);
   }
   for (var contextKey in childContext) {
     invariant(
       contextKey in childContextTypes,
       '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
+      getComponentName(type) || "Unknown",
       contextKey
     );
   }
   {
-    var name = getComponentName(fiber) || "Unknown";
+    var name = getComponentName(type) || "Unknown";
     checkPropTypes(
       childContextTypes,
       childContext,
@@ -4953,7 +5149,7 @@ function processChildContext(fiber, parentContext) {
       // context from the parent component instance. The stack will be missing
       // because it's outside of the reconciliation, and so the pointer has not
       // been set. This is rare and doesn't matter. We'll also remove that API.
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      getCurrentFiberStackInDev
     );
   }
 
@@ -4961,17 +5157,13 @@ function processChildContext(fiber, parentContext) {
 }
 
 function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) {
-    return false;
-  }
-
   var instance = workInProgress.stateNode;
   // We push the context as early as possible to ensure stack integrity.
   // If the instance does not exist yet, we will push null at first,
   // and replace it on the stack later when invalidating the context.
   var memoizedMergedChildContext =
     (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
+    emptyContextObject;
 
   // Remember the parent context so we can merge with it later.
   // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
@@ -4986,7 +5178,7 @@ function pushContextProvider(workInProgress) {
   return true;
 }
 
-function invalidateContextProvider(workInProgress, didChange) {
+function invalidateContextProvider(workInProgress, type, didChange) {
   var instance = workInProgress.stateNode;
   invariant(
     instance,
@@ -4998,7 +5190,11 @@ function invalidateContextProvider(workInProgress, didChange) {
     // Merge parent and own context.
     // Skip this if we're not updating due to sCU.
     // This avoids unnecessarily recomputing memoized values.
-    var mergedContext = processChildContext(workInProgress, previousContext);
+    var mergedContext = processChildContext(
+      workInProgress,
+      type,
+      previousContext
+    );
     instance.__reactInternalMemoizedMergedChildContext = mergedContext;
 
     // Replace the old (or empty) context with the new one.
@@ -5018,35 +5214,131 @@ function findCurrentUnmaskedContext(fiber) {
   // Currently this is only used with renderSubtreeIntoContainer; not sure if it
   // makes sense elsewhere
   invariant(
-    isFiberMounted(fiber) && fiber.tag === ClassComponent,
+    isFiberMounted(fiber) &&
+      (fiber.tag === ClassComponent || fiber.tag === ClassComponentLazy),
     "Expected subtree parent to be a mounted class component. " +
       "This error is likely caused by a bug in React. Please file an issue."
   );
 
   var node = fiber;
-  while (node.tag !== HostRoot) {
-    if (isContextProvider(node)) {
-      return node.stateNode.__reactInternalMemoizedMergedChildContext;
+  do {
+    switch (node.tag) {
+      case HostRoot:
+        return node.stateNode.context;
+      case ClassComponent: {
+        var Component = node.type;
+        if (isContextProvider(Component)) {
+          return node.stateNode.__reactInternalMemoizedMergedChildContext;
+        }
+        break;
+      }
+      case ClassComponentLazy: {
+        var _Component = getResultFromResolvedThenable(node.type);
+        if (isContextProvider(_Component)) {
+          return node.stateNode.__reactInternalMemoizedMergedChildContext;
+        }
+        break;
+      }
     }
-    var parent = node.return;
-    invariant(
-      parent,
-      "Found unexpected detached subtree parent. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
-    node = parent;
+    node = node.return;
+  } while (node !== null);
+  invariant(
+    false,
+    "Found unexpected detached subtree parent. " +
+      "This error is likely caused by a bug in React. Please file an issue."
+  );
+}
+
+var onCommitFiberRoot = null;
+var onCommitFiberUnmount = null;
+var hasLoggedError = false;
+
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {
+      if (true && !hasLoggedError) {
+        hasLoggedError = true;
+        warningWithoutStack$1(
+          false,
+          "React DevTools encountered an error: %s",
+          err
+        );
+      }
+    }
+  };
+}
+
+var isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined";
+
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
+  }
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
+  }
+  if (!hook.supportsFiber) {
+    {
+      warningWithoutStack$1(
+        false,
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://fb.me/react-devtools"
+      );
+    }
+    // DevTools exists, even though it doesn't support Fiber.
+    return true;
+  }
+  try {
+    var rendererID = hook.inject(internals);
+    // We have successfully injected, so now it is safe to set up hooks.
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      warningWithoutStack$1(
+        false,
+        "React DevTools encountered an error: %s.",
+        err
+      );
+    }
+  }
+  // DevTools exists
+  return true;
+}
+
+function onCommitRoot(root) {
+  if (typeof onCommitFiberRoot === "function") {
+    onCommitFiberRoot(root);
+  }
+}
+
+function onCommitUnmount(fiber) {
+  if (typeof onCommitFiberUnmount === "function") {
+    onCommitFiberUnmount(fiber);
   }
-  return node.stateNode.context;
 }
 
 // Max 31 bit integer. The max integer size in V8 for 32-bit systems.
 // Math.pow(2, 30) - 1
 // 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
+var maxSigned31BitInt = 1073741823;
 
 var NoWork = 0;
 var Sync = 1;
-var Never = MAX_SIGNED_31_BIT_INT;
+var Never = maxSigned31BitInt;
 
 var UNIT_SIZE = 10;
 var MAGIC_NUMBER_OFFSET = 2;
@@ -5075,8 +5367,41 @@ function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
   );
 }
 
+var LOW_PRIORITY_EXPIRATION = 5000;
+var LOW_PRIORITY_BATCH_SIZE = 250;
+
+function computeAsyncExpiration(currentTime) {
+  return computeExpirationBucket(
+    currentTime,
+    LOW_PRIORITY_EXPIRATION,
+    LOW_PRIORITY_BATCH_SIZE
+  );
+}
+
+// We intentionally set a higher expiration time for interactive updates in
+// dev than in production.
+//
+// If the main thread is being blocked so long that you hit the expiration,
+// it's a problem that could be solved with better scheduling.
+//
+// People will be more likely to notice this and fix it with the long
+// expiration time in development.
+//
+// In production we opt for better UX at the risk of masking scheduling
+// problems, by expiring fast.
+var HIGH_PRIORITY_EXPIRATION = 500;
+var HIGH_PRIORITY_BATCH_SIZE = 100;
+
+function computeInteractiveExpiration(currentTime) {
+  return computeExpirationBucket(
+    currentTime,
+    HIGH_PRIORITY_EXPIRATION,
+    HIGH_PRIORITY_BATCH_SIZE
+  );
+}
+
 var NoContext = 0;
-var AsyncMode = 1;
+var ConcurrentMode = 1;
 var StrictMode = 2;
 var ProfileMode = 4;
 
@@ -5127,6 +5452,7 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.memoizedProps = null;
   this.updateQueue = null;
   this.memoizedState = null;
+  this.firstContextDependency = null;
 
   this.mode = mode;
 
@@ -5138,14 +5464,15 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.lastEffect = null;
 
   this.expirationTime = NoWork;
+  this.childExpirationTime = NoWork;
 
   this.alternate = null;
 
   if (enableProfilerTimer) {
     this.actualDuration = 0;
-    this.actualStartTime = 0;
-    this.selfBaseTime = 0;
-    this.treeBaseTime = 0;
+    this.actualStartTime = -1;
+    this.selfBaseDuration = 0;
+    this.treeBaseDuration = 0;
   }
 
   {
@@ -5178,7 +5505,25 @@ var createFiber = function(tag, pendingProps, key, mode) {
 };
 
 function shouldConstruct(Component) {
-  return !!(Component.prototype && Component.prototype.isReactComponent);
+  var prototype = Component.prototype;
+  return !!(prototype && prototype.isReactComponent);
+}
+
+function resolveLazyComponentTag(fiber, Component) {
+  if (typeof Component === "function") {
+    return shouldConstruct(Component)
+      ? ClassComponentLazy
+      : FunctionComponentLazy;
+  } else if (Component !== undefined && Component !== null) {
+    var $$typeof = Component.$$typeof;
+    if ($$typeof === REACT_FORWARD_REF_TYPE) {
+      return ForwardRefLazy;
+    }
+    if ($$typeof === REACT_PURE_TYPE) {
+      return PureComponentLazy;
+    }
+  }
+  return IndeterminateComponent;
 }
 
 // This is used to create an alternate fiber to do work on.
@@ -5226,16 +5571,18 @@ function createWorkInProgress(current, pendingProps, expirationTime) {
       // This has the downside of resetting values for different priority renders,
       // But works for yielding (the common case) and should support resuming.
       workInProgress.actualDuration = 0;
-      workInProgress.actualStartTime = 0;
+      workInProgress.actualStartTime = -1;
     }
   }
 
-  workInProgress.expirationTime = expirationTime;
+  workInProgress.childExpirationTime = current.childExpirationTime;
+  workInProgress.expirationTime = current.expirationTime;
 
   workInProgress.child = current.child;
   workInProgress.memoizedProps = current.memoizedProps;
   workInProgress.memoizedState = current.memoizedState;
   workInProgress.updateQueue = current.updateQueue;
+  workInProgress.firstContextDependency = current.firstContextDependency;
 
   // These will be overridden during the parent's reconciliation
   workInProgress.sibling = current.sibling;
@@ -5243,15 +5590,23 @@ function createWorkInProgress(current, pendingProps, expirationTime) {
   workInProgress.ref = current.ref;
 
   if (enableProfilerTimer) {
-    workInProgress.selfBaseTime = current.selfBaseTime;
-    workInProgress.treeBaseTime = current.treeBaseTime;
+    workInProgress.selfBaseDuration = current.selfBaseDuration;
+    workInProgress.treeBaseDuration = current.treeBaseDuration;
   }
 
   return workInProgress;
 }
 
-function createHostRootFiber(isAsync) {
-  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
+function createHostRootFiber(isConcurrent) {
+  var mode = isConcurrent ? ConcurrentMode | StrictMode : NoContext;
+
+  if (enableProfilerTimer && isDevToolsPresent) {
+    // Always collect profile timings when DevTools are present.
+    // This enables DevTools to start capturing timing at any point–
+    // Without some nodes in the tree having empty base times.
+    mode |= ProfileMode;
+  }
+
   return createFiber(HostRoot, null, null, mode);
 }
 
@@ -5272,7 +5627,7 @@ function createFiberFromElement(element, mode, expirationTime) {
   } else if (typeof type === "string") {
     fiberTag = HostComponent;
   } else {
-    switch (type) {
+    getTag: switch (type) {
       case REACT_FRAGMENT_TYPE:
         return createFiberFromFragment(
           pendingProps.children,
@@ -5280,9 +5635,9 @@ function createFiberFromElement(element, mode, expirationTime) {
           expirationTime,
           key
         );
-      case REACT_ASYNC_MODE_TYPE:
+      case REACT_CONCURRENT_MODE_TYPE:
         fiberTag = Mode;
-        mode |= AsyncMode | StrictMode;
+        mode |= ConcurrentMode | StrictMode;
         break;
       case REACT_STRICT_MODE_TYPE:
         fiberTag = Mode;
@@ -5290,15 +5645,60 @@ function createFiberFromElement(element, mode, expirationTime) {
         break;
       case REACT_PROFILER_TYPE:
         return createFiberFromProfiler(pendingProps, mode, expirationTime, key);
-      case REACT_TIMEOUT_TYPE:
-        fiberTag = TimeoutComponent;
-        // Suspense does not require async, but its children should be strict
-        // mode compatible.
-        mode |= StrictMode;
-        break;
-      default:
-        fiberTag = getFiberTagFromObjectType(type, owner);
+      case REACT_SUSPENSE_TYPE:
+        fiberTag = SuspenseComponent;
         break;
+      default: {
+        if (typeof type === "object" && type !== null) {
+          switch (type.$$typeof) {
+            case REACT_PROVIDER_TYPE:
+              fiberTag = ContextProvider;
+              break getTag;
+            case REACT_CONTEXT_TYPE:
+              // This is a consumer
+              fiberTag = ContextConsumer;
+              break getTag;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = ForwardRef;
+              break getTag;
+            case REACT_PURE_TYPE:
+              fiberTag = PureComponent;
+              break getTag;
+            default: {
+              if (typeof type.then === "function") {
+                fiberTag = IndeterminateComponent;
+                break getTag;
+              }
+            }
+          }
+        }
+        var info = "";
+        {
+          if (
+            type === undefined ||
+            (typeof type === "object" &&
+              type !== null &&
+              Object.keys(type).length === 0)
+          ) {
+            info +=
+              " You likely forgot to export your component from the file " +
+              "it's defined in, or you might have mixed up default and " +
+              "named imports.";
+          }
+          var ownerName = owner ? getComponentName(owner.type) : null;
+          if (ownerName) {
+            info += "\n\nCheck the render method of `" + ownerName + "`.";
+          }
+        }
+        invariant(
+          false,
+          "Element type is invalid: expected a string (for built-in " +
+            "components) or a class/function (for composite components) " +
+            "but got: %s.%s",
+          type == null ? type : typeof type,
+          info
+        );
+      }
     }
   }
 
@@ -5314,49 +5714,6 @@ function createFiberFromElement(element, mode, expirationTime) {
   return fiber;
 }
 
-function getFiberTagFromObjectType(type, owner) {
-  var $$typeof =
-    typeof type === "object" && type !== null ? type.$$typeof : null;
-
-  switch ($$typeof) {
-    case REACT_PROVIDER_TYPE:
-      return ContextProvider;
-    case REACT_CONTEXT_TYPE:
-      // This is a consumer
-      return ContextConsumer;
-    case REACT_FORWARD_REF_TYPE:
-      return ForwardRef;
-    default: {
-      var info = "";
-      {
-        if (
-          type === undefined ||
-          (typeof type === "object" &&
-            type !== null &&
-            Object.keys(type).length === 0)
-        ) {
-          info +=
-            " You likely forgot to export your component from the file " +
-            "it's defined in, or you might have mixed up default and " +
-            "named imports.";
-        }
-        var ownerName = owner ? getComponentName(owner) : null;
-        if (ownerName) {
-          info += "\n\nCheck the render method of `" + ownerName + "`.";
-        }
-      }
-      invariant(
-        false,
-        "Element type is invalid: expected a string (for built-in " +
-          "components) or a class/function (for composite components) " +
-          "but got: %s.%s",
-        type == null ? type : typeof type,
-        info
-      );
-    }
-  }
-}
-
 function createFiberFromFragment(elements, mode, expirationTime, key) {
   var fiber = createFiber(Fragment, elements, key, mode);
   fiber.expirationTime = expirationTime;
@@ -5369,7 +5726,7 @@ function createFiberFromProfiler(pendingProps, mode, expirationTime, key) {
       typeof pendingProps.id !== "string" ||
       typeof pendingProps.onRender !== "function"
     ) {
-      invariant(
+      warningWithoutStack$1(
         false,
         'Profiler must specify an "id" string and "onRender" function as props'
       );
@@ -5434,18 +5791,20 @@ function assignFiberPropertiesInDEV(target, source) {
   target.memoizedProps = source.memoizedProps;
   target.updateQueue = source.updateQueue;
   target.memoizedState = source.memoizedState;
+  target.firstContextDependency = source.firstContextDependency;
   target.mode = source.mode;
   target.effectTag = source.effectTag;
   target.nextEffect = source.nextEffect;
   target.firstEffect = source.firstEffect;
   target.lastEffect = source.lastEffect;
   target.expirationTime = source.expirationTime;
+  target.childExpirationTime = source.childExpirationTime;
   target.alternate = source.alternate;
   if (enableProfilerTimer) {
     target.actualDuration = source.actualDuration;
     target.actualStartTime = source.actualStartTime;
-    target.selfBaseTime = source.selfBaseTime;
-    target.treeBaseTime = source.treeBaseTime;
+    target.selfBaseDuration = source.selfBaseDuration;
+    target.treeBaseDuration = source.treeBaseDuration;
   }
   target._debugID = source._debugID;
   target._debugSource = source._debugSource;
@@ -5456,135 +5815,114 @@ function assignFiberPropertiesInDEV(target, source) {
 
 // TODO: This should be lifted into the renderer.
 
-function createFiberRoot(containerInfo, isAsync, hydrate) {
+// The following attributes are only used by interaction tracing builds.
+// They enable interactions to be associated with their async work,
+// And expose interaction metadata to the React DevTools Profiler plugin.
+// Note that these attributes are only defined when the enableSchedulerTracing flag is enabled.
+
+// Exported FiberRoot type includes all properties,
+// To avoid requiring potentially error-prone :any casts throughout the project.
+// Profiling properties are only safe to access in profiling builds (when enableSchedulerTracing is true).
+// The types are defined separately within this file to ensure they stay in sync.
+// (We don't have to use an inline :any cast when enableSchedulerTracing is disabled.)
+
+function createFiberRoot(containerInfo, isConcurrent, hydrate) {
   // Cyclic construction. This cheats the type system right now because
   // stateNode is any.
-  var uninitializedFiber = createHostRootFiber(isAsync);
-  var root = {
-    current: uninitializedFiber,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-
-    earliestPendingTime: NoWork,
-    latestPendingTime: NoWork,
-    earliestSuspendedTime: NoWork,
-    latestSuspendedTime: NoWork,
-    latestPingedTime: NoWork,
-
-    didError: false,
-
-    pendingCommitExpirationTime: NoWork,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    nextExpirationTimeToWorkOn: NoWork,
-    expirationTime: NoWork,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
+  var uninitializedFiber = createHostRootFiber(isConcurrent);
+
+  var root = void 0;
+  if (enableSchedulerTracing) {
+    root = {
+      current: uninitializedFiber,
+      containerInfo: containerInfo,
+      pendingChildren: null,
+
+      earliestPendingTime: NoWork,
+      latestPendingTime: NoWork,
+      earliestSuspendedTime: NoWork,
+      latestSuspendedTime: NoWork,
+      latestPingedTime: NoWork,
+
+      didError: false,
+
+      pendingCommitExpirationTime: NoWork,
+      finishedWork: null,
+      timeoutHandle: noTimeout,
+      context: null,
+      pendingContext: null,
+      hydrate: hydrate,
+      nextExpirationTimeToWorkOn: NoWork,
+      expirationTime: NoWork,
+      firstBatch: null,
+      nextScheduledRoot: null,
+
+      interactionThreadID: tracing.unstable_getThreadID(),
+      memoizedInteractions: new Set(),
+      pendingInteractionMap: new Map()
+    };
+  } else {
+    root = {
+      current: uninitializedFiber,
+      containerInfo: containerInfo,
+      pendingChildren: null,
+
+      earliestPendingTime: NoWork,
+      latestPendingTime: NoWork,
+      earliestSuspendedTime: NoWork,
+      latestSuspendedTime: NoWork,
+      latestPingedTime: NoWork,
+
+      didError: false,
+
+      pendingCommitExpirationTime: NoWork,
+      finishedWork: null,
+      timeoutHandle: noTimeout,
+      context: null,
+      pendingContext: null,
+      hydrate: hydrate,
+      nextExpirationTimeToWorkOn: NoWork,
+      expirationTime: NoWork,
+      firstBatch: null,
+      nextScheduledRoot: null
+    };
+  }
+
   uninitializedFiber.stateNode = root;
+
+  // The reason for the way the Flow types are structured in this file,
+  // Is to avoid needing :any casts everywhere interaction tracing fields are used.
+  // Unfortunately that requires an :any cast for non-interaction tracing capable builds.
+  // $FlowFixMe Remove this :any cast and replace it with something better.
   return root;
 }
 
-var onCommitFiberRoot = null;
-var onCommitFiberUnmount = null;
-var hasLoggedError = false;
+/**
+ * Forked from fbjs/warning:
+ * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
+ *
+ * Only change is we use console.warn instead of console.error,
+ * and do nothing when 'console' is not supported.
+ * This really simplifies the code.
+ * ---
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
 
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {
-      if (true && !hasLoggedError) {
-        hasLoggedError = true;
-        warning(false, "React DevTools encountered an error: %s", err);
-      }
-    }
-  };
-}
-
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
-  }
-  if (!hook.supportsFiber) {
-    {
-      warning(
-        false,
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://fb.me/react-devtools"
-      );
-    }
-    // DevTools exists, even though it doesn't support Fiber.
-    return true;
-  }
-  try {
-    var rendererID = hook.inject(internals);
-    // We have successfully injected, so now it is safe to set up hooks.
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      warning(false, "React DevTools encountered an error: %s.", err);
-    }
-  }
-  // DevTools exists
-  return true;
-}
-
-function onCommitRoot(root) {
-  if (typeof onCommitFiberRoot === "function") {
-    onCommitFiberRoot(root);
-  }
-}
-
-function onCommitUnmount(fiber) {
-  if (typeof onCommitFiberUnmount === "function") {
-    onCommitFiberUnmount(fiber);
-  }
-}
-
-/**
- * Forked from fbjs/warning:
- * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
- *
- * Only change is we use console.warn instead of console.error,
- * and do nothing when 'console' is not supported.
- * This really simplifies the code.
- * ---
- * Similar to invariant but only logs a warning if the condition is not met.
- * This can be used to log issues in development environments in critical
- * paths. Removing the logging code for production environments will keep the
- * same logic and follow the same code paths.
- */
-
-var lowPriorityWarning = function() {};
-
-{
-  var printWarning = function(format) {
-    for (
-      var _len = arguments.length,
-        args = Array(_len > 1 ? _len - 1 : 0),
-        _key = 1;
-      _key < _len;
-      _key++
-    ) {
-      args[_key - 1] = arguments[_key];
+var lowPriorityWarning = function() {};
+
+{
+  var printWarning = function(format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 1 ? _len - 1 : 0),
+        _key = 1;
+      _key < _len;
+      _key++
+    ) {
+      args[_key - 1] = arguments[_key];
     }
 
     var argIndex = 0;
@@ -5607,7 +5945,7 @@ var lowPriorityWarning = function() {};
   lowPriorityWarning = function(condition, format) {
     if (format === undefined) {
       throw new Error(
-        "`warning(condition, format, ...args)` requires a warning " +
+        "`lowPriorityWarning(condition, format, ...args)` requires a warning " +
           "message argument"
       );
     }
@@ -5685,7 +6023,7 @@ var ReactStrictModeWarnings = {
         if (lifecycleWarnings.length > 0) {
           var componentNames = new Set();
           lifecycleWarnings.forEach(function(fiber) {
-            componentNames.add(getComponentName(fiber) || "Component");
+            componentNames.add(getComponentName(fiber.type) || "Component");
             didWarnAboutUnsafeLifecycles.add(fiber.type);
           });
 
@@ -5702,11 +6040,9 @@ var ReactStrictModeWarnings = {
       });
 
       if (lifecyclesWarningMesages.length > 0) {
-        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-          strictRoot
-        );
+        var strictRootComponentStack = getStackByFiberInDevAndProd(strictRoot);
 
-        warning(
+        warningWithoutStack$1(
           false,
           "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
             "\n\n%s" +
@@ -5739,7 +6075,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillMountWarnings.length > 0) {
       var uniqueNames = new Set();
       pendingComponentWillMountWarnings.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
+        uniqueNames.add(getComponentName(fiber.type) || "Component");
         didWarnAboutDeprecatedLifecycles.add(fiber.type);
       });
 
@@ -5762,7 +6098,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillReceivePropsWarnings.length > 0) {
       var _uniqueNames = new Set();
       pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
-        _uniqueNames.add(getComponentName(fiber) || "Component");
+        _uniqueNames.add(getComponentName(fiber.type) || "Component");
         didWarnAboutDeprecatedLifecycles.add(fiber.type);
       });
 
@@ -5784,7 +6120,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillUpdateWarnings.length > 0) {
       var _uniqueNames2 = new Set();
       pendingComponentWillUpdateWarnings.forEach(function(fiber) {
-        _uniqueNames2.add(getComponentName(fiber) || "Component");
+        _uniqueNames2.add(getComponentName(fiber.type) || "Component");
         didWarnAboutDeprecatedLifecycles.add(fiber.type);
       });
 
@@ -5841,7 +6177,7 @@ var ReactStrictModeWarnings = {
   ) {
     var strictRoot = findStrictRoot(fiber);
     if (strictRoot === null) {
-      warning(
+      warningWithoutStack$1(
         false,
         "Expected to find a StrictMode component in a strict mode tree. " +
           "This error is likely caused by a bug in React. Please file an issue."
@@ -5908,7 +6244,7 @@ var ReactStrictModeWarnings = {
   ) {
     var strictRoot = findStrictRoot(fiber);
     if (strictRoot === null) {
-      warning(
+      warningWithoutStack$1(
         false,
         "Expected to find a StrictMode component in a strict mode tree. " +
           "This error is likely caused by a bug in React. Please file an issue."
@@ -5940,16 +6276,14 @@ var ReactStrictModeWarnings = {
     pendingLegacyContextWarning.forEach(function(fiberArray, strictRoot) {
       var uniqueNames = new Set();
       fiberArray.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
+        uniqueNames.add(getComponentName(fiber.type) || "Component");
         didWarnAboutLegacyContext.add(fiber.type);
       });
 
       var sortedNames = setToSortedString(uniqueNames);
-      var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-        strictRoot
-      );
+      var strictRootComponentStack = getStackByFiberInDevAndProd(strictRoot);
 
-      warning(
+      warningWithoutStack$1(
         false,
         "Legacy context API has been detected within a strict-mode tree: %s" +
           "\n\nPlease update the following components: %s" +
@@ -5972,7 +6306,9 @@ var ReactFiberInstrumentation = {
 
 var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
 
-// TODO: Offscreen updates
+// TODO: Offscreen updates should never suspend. However, a promise that
+// suspended inside an offscreen subtree should be able to ping at the priority
+// of the outer render.
 
 function markPendingPriorityLevel(root, expirationTime) {
   // If there's a gap between completing a failed root and retrying it,
@@ -5997,10 +6333,10 @@ function markPendingPriorityLevel(root, expirationTime) {
       }
     }
   }
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(expirationTime, root);
 }
 
-function markCommittedPriorityLevels(root, currentTime, earliestRemainingTime) {
+function markCommittedPriorityLevels(root, earliestRemainingTime) {
   root.didError = false;
 
   if (earliestRemainingTime === NoWork) {
@@ -6010,7 +6346,7 @@ function markCommittedPriorityLevels(root, currentTime, earliestRemainingTime) {
     root.earliestSuspendedTime = NoWork;
     root.latestSuspendedTime = NoWork;
     root.latestPingedTime = NoWork;
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
@@ -6039,7 +6375,7 @@ function markCommittedPriorityLevels(root, currentTime, earliestRemainingTime) {
     // There's no suspended work. Treat the earliest remaining level as a
     // pending level.
     markPendingPriorityLevel(root, earliestRemainingTime);
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
@@ -6054,7 +6390,7 @@ function markCommittedPriorityLevels(root, currentTime, earliestRemainingTime) {
     // There's no suspended work. Treat the earliest remaining level as a
     // pending level.
     markPendingPriorityLevel(root, earliestRemainingTime);
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
@@ -6062,31 +6398,41 @@ function markCommittedPriorityLevels(root, currentTime, earliestRemainingTime) {
     // The earliest remaining time is earlier than all the suspended work.
     // Treat it as a pending update.
     markPendingPriorityLevel(root, earliestRemainingTime);
-    findNextPendingPriorityLevel(root);
+    findNextExpirationTimeToWorkOn(NoWork, root);
     return;
   }
 
   // The earliest remaining time falls within the range of known suspended
   // levels. We should treat this as suspended work.
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(NoWork, root);
+}
+
+function hasLowerPriorityWork(root, erroredExpirationTime) {
+  var latestPendingTime = root.latestPendingTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
+  var latestPingedTime = root.latestPingedTime;
+  return (
+    (latestPendingTime !== NoWork &&
+      latestPendingTime > erroredExpirationTime) ||
+    (latestSuspendedTime !== NoWork &&
+      latestSuspendedTime > erroredExpirationTime) ||
+    (latestPingedTime !== NoWork && latestPingedTime > erroredExpirationTime)
+  );
 }
 
-function hasLowerPriorityWork(root, renderExpirationTime) {
+function isPriorityLevelSuspended(root, expirationTime) {
+  var earliestSuspendedTime = root.earliestSuspendedTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
   return (
-    renderExpirationTime !== root.latestPendingTime &&
-    renderExpirationTime !== root.latestSuspendedTime
+    earliestSuspendedTime !== NoWork &&
+    expirationTime >= earliestSuspendedTime &&
+    expirationTime <= latestSuspendedTime
   );
 }
 
-function markSuspendedPriorityLevel(root, suspendedTime, didError) {
-  if (didError && !hasLowerPriorityWork(root, suspendedTime)) {
-    // TODO: When we add back resuming, we need to ensure the progressed work
-    // is thrown out and not reused during the restarted render. One way to
-    // invalidate the progressed work is to restart at expirationTime + 1.
-    root.didError = true;
-    findNextPendingPriorityLevel(root);
-    return;
-  }
+function markSuspendedPriorityLevel(root, suspendedTime) {
+  root.didError = false;
+  clearPing(root, suspendedTime);
 
   // First, check the known pending levels and update them if needed.
   var earliestPendingTime = root.earliestPendingTime;
@@ -6106,15 +6452,9 @@ function markSuspendedPriorityLevel(root, suspendedTime, didError) {
     root.latestPendingTime = earliestPendingTime;
   }
 
-  // Next, if we're working on the lowest known suspended level, clear the ping.
-  // TODO: What if a promise suspends and pings before the root completes?
-  var latestSuspendedTime = root.latestSuspendedTime;
-  if (latestSuspendedTime === suspendedTime) {
-    root.latestPingedTime = NoWork;
-  }
-
   // Finally, update the known suspended levels.
   var earliestSuspendedTime = root.earliestSuspendedTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
   if (earliestSuspendedTime === NoWork) {
     // No other suspended levels.
     root.earliestSuspendedTime = root.latestSuspendedTime = suspendedTime;
@@ -6127,44 +6467,94 @@ function markSuspendedPriorityLevel(root, suspendedTime, didError) {
       root.latestSuspendedTime = suspendedTime;
     }
   }
-  findNextPendingPriorityLevel(root);
+
+  findNextExpirationTimeToWorkOn(suspendedTime, root);
 }
 
 function markPingedPriorityLevel(root, pingedTime) {
-  var latestSuspendedTime = root.latestSuspendedTime;
-  if (latestSuspendedTime !== NoWork && latestSuspendedTime <= pingedTime) {
-    var latestPingedTime = root.latestPingedTime;
-    if (latestPingedTime === NoWork || latestPingedTime < pingedTime) {
-      root.latestPingedTime = pingedTime;
-    }
+  root.didError = false;
+
+  // TODO: When we add back resuming, we need to ensure the progressed work
+  // is thrown out and not reused during the restarted render. One way to
+  // invalidate the progressed work is to restart at expirationTime + 1.
+  var latestPingedTime = root.latestPingedTime;
+  if (latestPingedTime === NoWork || latestPingedTime < pingedTime) {
+    root.latestPingedTime = pingedTime;
+  }
+  findNextExpirationTimeToWorkOn(pingedTime, root);
+}
+
+function clearPing(root, completedTime) {
+  // TODO: Track whether the root was pinged during the render phase. If so,
+  // we need to make sure we don't lose track of it.
+  var latestPingedTime = root.latestPingedTime;
+  if (latestPingedTime !== NoWork && latestPingedTime <= completedTime) {
+    root.latestPingedTime = NoWork;
+  }
+}
+
+function findEarliestOutstandingPriorityLevel(root, renderExpirationTime) {
+  var earliestExpirationTime = renderExpirationTime;
+
+  var earliestPendingTime = root.earliestPendingTime;
+  var earliestSuspendedTime = root.earliestSuspendedTime;
+  if (
+    earliestExpirationTime === NoWork ||
+    (earliestPendingTime !== NoWork &&
+      earliestPendingTime < earliestExpirationTime)
+  ) {
+    earliestExpirationTime = earliestPendingTime;
+  }
+  if (
+    earliestExpirationTime === NoWork ||
+    (earliestSuspendedTime !== NoWork &&
+      earliestSuspendedTime < earliestExpirationTime)
+  ) {
+    earliestExpirationTime = earliestSuspendedTime;
+  }
+  return earliestExpirationTime;
+}
+
+function didExpireAtExpirationTime(root, currentTime) {
+  var expirationTime = root.expirationTime;
+  if (expirationTime !== NoWork && currentTime >= expirationTime) {
+    // The root has expired. Flush all work up to the current time.
+    root.nextExpirationTimeToWorkOn = currentTime;
   }
-  findNextPendingPriorityLevel(root);
 }
 
-function findNextPendingPriorityLevel(root) {
+function findNextExpirationTimeToWorkOn(completedExpirationTime, root) {
   var earliestSuspendedTime = root.earliestSuspendedTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
   var earliestPendingTime = root.earliestPendingTime;
-  var nextExpirationTimeToWorkOn = void 0;
-  var expirationTime = void 0;
-  if (earliestSuspendedTime === NoWork) {
-    // Fast path. There's no suspended work.
-    nextExpirationTimeToWorkOn = expirationTime = earliestPendingTime;
-  } else if (earliestPendingTime !== NoWork) {
-    // Check if there's known pending work.
-    nextExpirationTimeToWorkOn = earliestPendingTime;
-    expirationTime =
-      earliestSuspendedTime < earliestPendingTime
-        ? earliestSuspendedTime
-        : earliestPendingTime;
-  } else {
-    // Finally, if a suspended level was pinged, work on that. Otherwise there's
-    // nothing to work on.
-    nextExpirationTimeToWorkOn = expirationTime = root.latestPingedTime;
+  var latestPingedTime = root.latestPingedTime;
+
+  // Work on the earliest pending time. Failing that, work on the latest
+  // pinged time.
+  var nextExpirationTimeToWorkOn =
+    earliestPendingTime !== NoWork ? earliestPendingTime : latestPingedTime;
+
+  // If there is no pending or pinged work, check if there's suspended work
+  // that's lower priority than what we just completed.
+  if (
+    nextExpirationTimeToWorkOn === NoWork &&
+    (completedExpirationTime === NoWork ||
+      latestSuspendedTime > completedExpirationTime)
+  ) {
+    // The lowest priority suspended work is the work most likely to be
+    // committed next. Let's start rendering it again, so that if it times out,
+    // it's ready to commit.
+    nextExpirationTimeToWorkOn = latestSuspendedTime;
   }
 
-  if (root.didError) {
-    // Revert to synchronous mode.
-    expirationTime = Sync;
+  var expirationTime = nextExpirationTimeToWorkOn;
+  if (
+    expirationTime !== NoWork &&
+    earliestSuspendedTime !== NoWork &&
+    earliestSuspendedTime < expirationTime
+  ) {
+    // Expire using the earliest known expiration time.
+    expirationTime = earliestSuspendedTime;
   }
 
   root.nextExpirationTimeToWorkOn = nextExpirationTimeToWorkOn;
@@ -6271,7 +6661,6 @@ var resetCurrentlyProcessingQueue = void 0;
 
 function createUpdateQueue(baseState) {
   var queue = {
-    expirationTime: NoWork,
     baseState: baseState,
     firstUpdate: null,
     lastUpdate: null,
@@ -6287,7 +6676,6 @@ function createUpdateQueue(baseState) {
 
 function cloneUpdateQueue(currentQueue) {
   var queue = {
-    expirationTime: currentQueue.expirationTime,
     baseState: currentQueue.baseState,
     firstUpdate: currentQueue.firstUpdate,
     lastUpdate: currentQueue.lastUpdate,
@@ -6319,7 +6707,7 @@ function createUpdate(expirationTime) {
   };
 }
 
-function appendUpdateToQueue(queue, update, expirationTime) {
+function appendUpdateToQueue(queue, update) {
   // Append the update to the end of the list.
   if (queue.lastUpdate === null) {
     // Queue is empty
@@ -6328,17 +6716,9 @@ function appendUpdateToQueue(queue, update, expirationTime) {
     queue.lastUpdate.next = update;
     queue.lastUpdate = update;
   }
-  if (
-    queue.expirationTime === NoWork ||
-    queue.expirationTime > expirationTime
-  ) {
-    // The incoming update has the earliest expiration of any update in the
-    // queue. Update the queue's expiration time.
-    queue.expirationTime = expirationTime;
-  }
 }
 
-function enqueueUpdate(fiber, update, expirationTime) {
+function enqueueUpdate(fiber, update) {
   // Update queues are created lazily.
   var alternate = fiber.alternate;
   var queue1 = void 0;
@@ -6376,19 +6756,19 @@ function enqueueUpdate(fiber, update, expirationTime) {
   }
   if (queue2 === null || queue1 === queue2) {
     // There's only a single queue.
-    appendUpdateToQueue(queue1, update, expirationTime);
+    appendUpdateToQueue(queue1, update);
   } else {
     // There are two queues. We need to append the update to both queues,
     // while accounting for the persistent structure of the list — we don't
     // want the same update to be added multiple times.
     if (queue1.lastUpdate === null || queue2.lastUpdate === null) {
       // One of the queues is not empty. We must add the update to both queues.
-      appendUpdateToQueue(queue1, update, expirationTime);
-      appendUpdateToQueue(queue2, update, expirationTime);
+      appendUpdateToQueue(queue1, update);
+      appendUpdateToQueue(queue2, update);
     } else {
       // Both queues are non-empty. The last update is the same in both lists,
       // because of structural sharing. So, only append to one of the lists.
-      appendUpdateToQueue(queue1, update, expirationTime);
+      appendUpdateToQueue(queue1, update);
       // But we still need to update the `lastUpdate` pointer of queue2.
       queue2.lastUpdate = update;
     }
@@ -6396,12 +6776,12 @@ function enqueueUpdate(fiber, update, expirationTime) {
 
   {
     if (
-      fiber.tag === ClassComponent &&
+      (fiber.tag === ClassComponent || fiber.tag === ClassComponentLazy) &&
       (currentlyProcessingQueue === queue1 ||
         (queue2 !== null && currentlyProcessingQueue === queue2)) &&
       !didWarnUpdateInsideUpdate
     ) {
-      warning(
+      warningWithoutStack$1(
         false,
         "An update (setState, replaceState, or forceUpdate) was scheduled " +
           "from inside an update function. Update functions should be pure, " +
@@ -6413,7 +6793,7 @@ function enqueueUpdate(fiber, update, expirationTime) {
   }
 }
 
-function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
+function enqueueCapturedUpdate(workInProgress, update) {
   // Captured updates go into a separate list, and only on the work-in-
   // progress queue.
   var workInProgressQueue = workInProgress.updateQueue;
@@ -6439,14 +6819,6 @@ function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
     workInProgressQueue.lastCapturedUpdate.next = update;
     workInProgressQueue.lastCapturedUpdate = update;
   }
-  if (
-    workInProgressQueue.expirationTime === NoWork ||
-    workInProgressQueue.expirationTime > renderExpirationTime
-  ) {
-    // The incoming update has the earliest expiration of any update in the
-    // queue. Update the queue's expiration time.
-    workInProgressQueue.expirationTime = renderExpirationTime;
-  }
 }
 
 function ensureWorkInProgressQueueIsAClone(workInProgress, queue) {
@@ -6536,14 +6908,6 @@ function processUpdateQueue(
 ) {
   hasForceUpdate = false;
 
-  if (
-    queue.expirationTime === NoWork ||
-    queue.expirationTime > renderExpirationTime
-  ) {
-    // Insufficient priority. Bailout.
-    return;
-  }
-
   queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
 
   {
@@ -6675,8 +7039,15 @@ function processUpdateQueue(
   queue.baseState = newBaseState;
   queue.firstUpdate = newFirstUpdate;
   queue.firstCapturedUpdate = newFirstCapturedUpdate;
-  queue.expirationTime = newExpirationTime;
 
+  // Set the remaining expiration time to be whatever is remaining in the queue.
+  // This should be fine because the only two other things that contribute to
+  // expiration time are props and context. We're already in the middle of the
+  // begin phase by the time we start processing the queue, so we've already
+  // dealt with the props. Context in components that specify
+  // shouldComponentUpdate is tricky; but we'll have to account for
+  // that regardless.
+  workInProgress.expirationTime = newExpirationTime;
   workInProgress.memoizedState = resultState;
 
   {
@@ -6723,8 +7094,14 @@ function commitUpdateQueue(
   }
 
   // Commit the effects
-  var effect = finishedQueue.firstEffect;
+  commitUpdateEffects(finishedQueue.firstEffect, instance);
   finishedQueue.firstEffect = finishedQueue.lastEffect = null;
+
+  commitUpdateEffects(finishedQueue.firstCapturedEffect, instance);
+  finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
+}
+
+function commitUpdateEffects(effect, instance) {
   while (effect !== null) {
     var _callback3 = effect.callback;
     if (_callback3 !== null) {
@@ -6733,17 +7110,6 @@ function commitUpdateQueue(
     }
     effect = effect.nextEffect;
   }
-
-  effect = finishedQueue.firstCapturedEffect;
-  finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
-  while (effect !== null) {
-    var _callback4 = effect.callback;
-    if (_callback4 !== null) {
-      effect.callback = null;
-      callCallback(_callback4, instance);
-    }
-    effect = effect.nextEffect;
-  }
 }
 
 function createCapturedValue(value, source) {
@@ -6752,13 +7118,48 @@ function createCapturedValue(value, source) {
   return {
     value: value,
     source: source,
-    stack: getStackAddendumByWorkInProgressFiber(source)
+    stack: getStackByFiberInDevAndProd(source)
+  };
+}
+
+/**
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
+
+var warning = warningWithoutStack$1;
+
+{
+  warning = function(condition, format) {
+    if (condition) {
+      return;
+    }
+    var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+    var stack = ReactDebugCurrentFrame.getStackAddendum();
+    // eslint-disable-next-line react-internal/warning-and-invariant-args
+
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 2 ? _len - 2 : 0),
+        _key = 2;
+      _key < _len;
+      _key++
+    ) {
+      args[_key - 2] = arguments[_key];
+    }
+
+    warningWithoutStack$1.apply(
+      undefined,
+      [false, format + "%s"].concat(args, [stack])
+    );
   };
 }
 
-var providerCursor = createCursor(null);
+var warning$1 = warning;
+
 var valueCursor = createCursor(null);
-var changedBitsCursor = createCursor(0);
 
 var rendererSigil = void 0;
 {
@@ -6766,23 +7167,32 @@ var rendererSigil = void 0;
   rendererSigil = {};
 }
 
-function pushProvider(providerFiber) {
+var currentlyRenderingFiber = null;
+var lastContextDependency = null;
+var lastContextWithAllBitsObserved = null;
+
+function resetContextDependences() {
+  // This is called right before React yields execution, to ensure `readContext`
+  // cannot be called outside the render phase.
+  currentlyRenderingFiber = null;
+  lastContextDependency = null;
+  lastContextWithAllBitsObserved = null;
+}
+
+function pushProvider(providerFiber, nextValue) {
   var context = providerFiber.type._context;
 
   if (isPrimaryRenderer) {
-    push(changedBitsCursor, context._changedBits, providerFiber);
     push(valueCursor, context._currentValue, providerFiber);
-    push(providerCursor, providerFiber, providerFiber);
 
-    context._currentValue = providerFiber.pendingProps.value;
-    context._changedBits = providerFiber.stateNode;
+    context._currentValue = nextValue;
     {
       !(
         context._currentRenderer === undefined ||
         context._currentRenderer === null ||
         context._currentRenderer === rendererSigil
       )
-        ? warning(
+        ? warningWithoutStack$1(
             false,
             "Detected multiple renderers concurrently rendering the " +
               "same context provider. This is currently unsupported."
@@ -6791,19 +7201,16 @@ function pushProvider(providerFiber) {
       context._currentRenderer = rendererSigil;
     }
   } else {
-    push(changedBitsCursor, context._changedBits2, providerFiber);
     push(valueCursor, context._currentValue2, providerFiber);
-    push(providerCursor, providerFiber, providerFiber);
 
-    context._currentValue2 = providerFiber.pendingProps.value;
-    context._changedBits2 = providerFiber.stateNode;
+    context._currentValue2 = nextValue;
     {
       !(
         context._currentRenderer2 === undefined ||
         context._currentRenderer2 === null ||
         context._currentRenderer2 === rendererSigil
       )
-        ? warning(
+        ? warningWithoutStack$1(
             false,
             "Detected multiple renderers concurrently rendering the " +
               "same context provider. This is currently unsupported."
@@ -6815,61 +7222,250 @@ function pushProvider(providerFiber) {
 }
 
 function popProvider(providerFiber) {
-  var changedBits = changedBitsCursor.current;
   var currentValue = valueCursor.current;
 
-  pop(providerCursor, providerFiber);
   pop(valueCursor, providerFiber);
-  pop(changedBitsCursor, providerFiber);
 
   var context = providerFiber.type._context;
   if (isPrimaryRenderer) {
     context._currentValue = currentValue;
-    context._changedBits = changedBits;
   } else {
     context._currentValue2 = currentValue;
-    context._changedBits2 = changedBits;
   }
 }
 
-function getContextCurrentValue(context) {
-  return isPrimaryRenderer ? context._currentValue : context._currentValue2;
-}
+function calculateChangedBits(context, newValue, oldValue) {
+  // Use Object.is to compare the new context value to the old value. Inlined
+  // Object.is polyfill.
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+  if (
+    (oldValue === newValue &&
+      (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
+    (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
+  ) {
+    // No change
+    return 0;
+  } else {
+    var changedBits =
+      typeof context._calculateChangedBits === "function"
+        ? context._calculateChangedBits(oldValue, newValue)
+        : maxSigned31BitInt;
 
-function getContextChangedBits(context) {
-  return isPrimaryRenderer ? context._changedBits : context._changedBits2;
+    {
+      !((changedBits & maxSigned31BitInt) === changedBits)
+        ? warning$1(
+            false,
+            "calculateChangedBits: Expected the return value to be a " +
+              "31-bit integer. Instead received: %s",
+            changedBits
+          )
+        : void 0;
+    }
+    return changedBits | 0;
+  }
 }
 
-var NO_CONTEXT = {};
-
-var contextStackCursor$1 = createCursor(NO_CONTEXT);
-var contextFiberStackCursor = createCursor(NO_CONTEXT);
-var rootInstanceStackCursor = createCursor(NO_CONTEXT);
+function propagateContextChange(
+  workInProgress,
+  context,
+  changedBits,
+  renderExpirationTime
+) {
+  var fiber = workInProgress.child;
+  if (fiber !== null) {
+    // Set the return pointer of the child to the work-in-progress fiber.
+    fiber.return = workInProgress;
+  }
+  while (fiber !== null) {
+    var nextFiber = void 0;
 
-function requiredContext(c) {
-  invariant(
-    c !== NO_CONTEXT,
-    "Expected host context to exist. This error is likely caused by a bug " +
-      "in React. Please file an issue."
-  );
-  return c;
-}
+    // Visit this fiber.
+    var dependency = fiber.firstContextDependency;
+    if (dependency !== null) {
+      do {
+        // Check if the context matches.
+        if (
+          dependency.context === context &&
+          (dependency.observedBits & changedBits) !== 0
+        ) {
+          // Match! Schedule an update on this fiber.
 
-function getRootHostContainer() {
-  var rootInstance = requiredContext(rootInstanceStackCursor.current);
-  return rootInstance;
-}
+          if (
+            fiber.tag === ClassComponent ||
+            fiber.tag === ClassComponentLazy
+          ) {
+            // Schedule a force update on the work-in-progress.
+            var update = createUpdate(renderExpirationTime);
+            update.tag = ForceUpdate;
+            // TODO: Because we don't have a work-in-progress, this will add the
+            // update to the current fiber, too, which means it will persist even if
+            // this render is thrown away. Since it's a race condition, not sure it's
+            // worth fixing.
+            enqueueUpdate(fiber, update);
+          }
 
-function pushHostContainer(fiber, nextRootInstance) {
-  // Push current root instance onto the stack;
-  // This allows us to reset root when portals are popped.
-  push(rootInstanceStackCursor, nextRootInstance, fiber);
-  // Track the context and the Fiber that provided it.
-  // This enables us to pop only Fibers that provide unique contexts.
-  push(contextFiberStackCursor, fiber, fiber);
+          if (
+            fiber.expirationTime === NoWork ||
+            fiber.expirationTime > renderExpirationTime
+          ) {
+            fiber.expirationTime = renderExpirationTime;
+          }
+          var alternate = fiber.alternate;
+          if (
+            alternate !== null &&
+            (alternate.expirationTime === NoWork ||
+              alternate.expirationTime > renderExpirationTime)
+          ) {
+            alternate.expirationTime = renderExpirationTime;
+          }
+          // Update the child expiration time of all the ancestors, including
+          // the alternates.
+          var node = fiber.return;
+          while (node !== null) {
+            alternate = node.alternate;
+            if (
+              node.childExpirationTime === NoWork ||
+              node.childExpirationTime > renderExpirationTime
+            ) {
+              node.childExpirationTime = renderExpirationTime;
+              if (
+                alternate !== null &&
+                (alternate.childExpirationTime === NoWork ||
+                  alternate.childExpirationTime > renderExpirationTime)
+              ) {
+                alternate.childExpirationTime = renderExpirationTime;
+              }
+            } else if (
+              alternate !== null &&
+              (alternate.childExpirationTime === NoWork ||
+                alternate.childExpirationTime > renderExpirationTime)
+            ) {
+              alternate.childExpirationTime = renderExpirationTime;
+            } else {
+              // Neither alternate was updated, which means the rest of the
+              // ancestor path already has sufficient priority.
+              break;
+            }
+            node = node.return;
+          }
+        }
+        nextFiber = fiber.child;
+        dependency = dependency.next;
+      } while (dependency !== null);
+    } else if (fiber.tag === ContextProvider) {
+      // Don't scan deeper if this is a matching provider
+      nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
+    } else {
+      // Traverse down.
+      nextFiber = fiber.child;
+    }
 
-  // Finally, we need to push the host context to the stack.
-  // However, we can't just call getRootHostContext() and push it because
+    if (nextFiber !== null) {
+      // Set the return pointer of the child to the work-in-progress fiber.
+      nextFiber.return = fiber;
+    } else {
+      // No child. Traverse to next sibling.
+      nextFiber = fiber;
+      while (nextFiber !== null) {
+        if (nextFiber === workInProgress) {
+          // We're back to the root of this subtree. Exit.
+          nextFiber = null;
+          break;
+        }
+        var sibling = nextFiber.sibling;
+        if (sibling !== null) {
+          // Set the return pointer of the sibling to the work-in-progress fiber.
+          sibling.return = nextFiber.return;
+          nextFiber = sibling;
+          break;
+        }
+        // No more siblings. Traverse up.
+        nextFiber = nextFiber.return;
+      }
+    }
+    fiber = nextFiber;
+  }
+}
+
+function prepareToReadContext(workInProgress, renderExpirationTime) {
+  currentlyRenderingFiber = workInProgress;
+  lastContextDependency = null;
+  lastContextWithAllBitsObserved = null;
+
+  // Reset the work-in-progress list
+  workInProgress.firstContextDependency = null;
+}
+
+function readContext(context, observedBits) {
+  if (lastContextWithAllBitsObserved === context) {
+    // Nothing to do. We already observe everything in this context.
+  } else if (observedBits === false || observedBits === 0) {
+    // Do not observe any updates.
+  } else {
+    var resolvedObservedBits = void 0; // Avoid deopting on observable arguments or heterogeneous types.
+    if (
+      typeof observedBits !== "number" ||
+      observedBits === maxSigned31BitInt
+    ) {
+      // Observe all updates.
+      lastContextWithAllBitsObserved = context;
+      resolvedObservedBits = maxSigned31BitInt;
+    } else {
+      resolvedObservedBits = observedBits;
+    }
+
+    var contextItem = {
+      context: context,
+      observedBits: resolvedObservedBits,
+      next: null
+    };
+
+    if (lastContextDependency === null) {
+      invariant(
+        currentlyRenderingFiber !== null,
+        "Context.unstable_read(): Context can only be read while React is " +
+          "rendering, e.g. inside the render method or getDerivedStateFromProps."
+      );
+      // This is the first dependency in the list
+      currentlyRenderingFiber.firstContextDependency = lastContextDependency = contextItem;
+    } else {
+      // Append a new context item.
+      lastContextDependency = lastContextDependency.next = contextItem;
+    }
+  }
+  return isPrimaryRenderer ? context._currentValue : context._currentValue2;
+}
+
+var NO_CONTEXT = {};
+
+var contextStackCursor$1 = createCursor(NO_CONTEXT);
+var contextFiberStackCursor = createCursor(NO_CONTEXT);
+var rootInstanceStackCursor = createCursor(NO_CONTEXT);
+
+function requiredContext(c) {
+  invariant(
+    c !== NO_CONTEXT,
+    "Expected host context to exist. This error is likely caused by a bug " +
+      "in React. Please file an issue."
+  );
+  return c;
+}
+
+function getRootHostContainer() {
+  var rootInstance = requiredContext(rootInstanceStackCursor.current);
+  return rootInstance;
+}
+
+function pushHostContainer(fiber, nextRootInstance) {
+  // Push current root instance onto the stack;
+  // This allows us to reset root when portals are popped.
+  push(rootInstanceStackCursor, nextRootInstance, fiber);
+  // Track the context and the Fiber that provided it.
+  // This enables us to pop only Fibers that provide unique contexts.
+  push(contextFiberStackCursor, fiber, fiber);
+
+  // Finally, we need to push the host context to the stack.
+  // However, we can't just call getRootHostContext() and push it because
   // we'd have a different number of entries on the stack depending on
   // whether getRootHostContext() throws somewhere in renderer code or not.
   // So we push an empty value first. This lets us safely unwind on errors.
@@ -6919,6 +7515,7 @@ function popHostContext(fiber) {
 }
 
 var commitTime = 0;
+var profilerStartTime = -1;
 
 function getCommitTime() {
   return commitTime;
@@ -6931,127 +7528,38 @@ function recordCommitTime() {
   commitTime = now();
 }
 
-/**
- * The "actual" render time is total time required to render the descendants of a Profiler component.
- * This time is stored as a stack, since Profilers can be nested.
- * This time is started during the "begin" phase and stopped during the "complete" phase.
- * It is paused (and accumulated) in the event of an interruption or an aborted render.
- */
-
-var fiberStack$1 = void 0;
-
-{
-  fiberStack$1 = [];
-}
-
-var timerPausedAt = 0;
-var totalElapsedPauseTime = 0;
-
-function checkActualRenderTimeStackEmpty() {
-  if (!enableProfilerTimer) {
-    return;
-  }
-  {
-    !(fiberStack$1.length === 0)
-      ? warning(
-          false,
-          "Expected an empty stack. Something was not reset properly."
-        )
-      : void 0;
-  }
-}
-
-function markActualRenderTimeStarted(fiber) {
-  if (!enableProfilerTimer) {
-    return;
-  }
-  {
-    fiberStack$1.push(fiber);
-  }
-
-  fiber.actualDuration = now() - fiber.actualDuration - totalElapsedPauseTime;
-  fiber.actualStartTime = now();
-}
-
-function pauseActualRenderTimerIfRunning() {
-  if (!enableProfilerTimer) {
-    return;
-  }
-  if (timerPausedAt === 0) {
-    timerPausedAt = now();
-  }
-}
-
-function recordElapsedActualRenderTime(fiber) {
+function startProfilerTimer(fiber) {
   if (!enableProfilerTimer) {
     return;
   }
-  {
-    !(fiber === fiberStack$1.pop())
-      ? warning(false, "Unexpected Fiber (%s) popped.", getComponentName(fiber))
-      : void 0;
-  }
 
-  fiber.actualDuration = now() - totalElapsedPauseTime - fiber.actualDuration;
-}
+  profilerStartTime = now();
 
-function resetActualRenderTimer() {
-  if (!enableProfilerTimer) {
-    return;
+  if (fiber.actualStartTime < 0) {
+    fiber.actualStartTime = now();
   }
-  totalElapsedPauseTime = 0;
 }
 
-function resumeActualRenderTimerIfPaused() {
+function stopProfilerTimerIfRunning(fiber) {
   if (!enableProfilerTimer) {
     return;
   }
-  if (timerPausedAt > 0) {
-    totalElapsedPauseTime += now() - timerPausedAt;
-    timerPausedAt = 0;
-  }
+  profilerStartTime = -1;
 }
 
-/**
- * The "base" render time is the duration of the “begin” phase of work for a particular fiber.
- * This time is measured and stored on each fiber.
- * The time for all sibling fibers are accumulated and stored on their parent during the "complete" phase.
- * If a fiber bails out (sCU false) then its "base" timer is cancelled and the fiber is not updated.
- */
-
-var baseStartTime = -1;
-
-function recordElapsedBaseRenderTimeIfRunning(fiber) {
+function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
   if (!enableProfilerTimer) {
     return;
   }
-  if (baseStartTime !== -1) {
-    fiber.selfBaseTime = now() - baseStartTime;
-  }
-}
 
-function startBaseRenderTimer() {
-  if (!enableProfilerTimer) {
-    return;
-  }
-  {
-    if (baseStartTime !== -1) {
-      warning(
-        false,
-        "Cannot start base timer that is already running. " +
-          "This error is likely caused by a bug in React. " +
-          "Please file an issue."
-      );
+  if (profilerStartTime >= 0) {
+    var elapsedTime = now() - profilerStartTime;
+    fiber.actualDuration += elapsedTime;
+    if (overrideBaseTime) {
+      fiber.selfBaseDuration = elapsedTime;
     }
+    profilerStartTime = -1;
   }
-  baseStartTime = now();
-}
-
-function stopBaseRenderTimerIfRunning() {
-  if (!enableProfilerTimer) {
-    return;
-  }
-  baseStartTime = -1;
 }
 
 /*eslint-disable no-self-compare */
@@ -7115,7 +7623,11 @@ function shallowEqual(objA, objB) {
 }
 
 var fakeInternalInstance = {};
-var isArray = Array.isArray;
+var isArray$1 = Array.isArray;
+
+// React.Component uses a shared frozen object by default.
+// We'll use it to determine whether we need to initialize legacy refs.
+var emptyRefsObject = new React.Component().refs;
 
 var didWarnAboutStateAssignmentForComponent = void 0;
 var didWarnAboutUninitializedState = void 0;
@@ -7124,13 +7636,19 @@ var didWarnAboutLegacyLifecyclesAndDerivedState = void 0;
 var didWarnAboutUndefinedDerivedState = void 0;
 var warnOnUndefinedDerivedState = void 0;
 var warnOnInvalidCallback = void 0;
+var didWarnAboutDirectlyAssigningPropsToState = void 0;
+var didWarnAboutContextTypeAndContextTypes = void 0;
+var didWarnAboutInvalidateContextType = void 0;
 
 {
   didWarnAboutStateAssignmentForComponent = new Set();
   didWarnAboutUninitializedState = new Set();
   didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = new Set();
   didWarnAboutLegacyLifecyclesAndDerivedState = new Set();
+  didWarnAboutDirectlyAssigningPropsToState = new Set();
   didWarnAboutUndefinedDerivedState = new Set();
+  didWarnAboutContextTypeAndContextTypes = new Set();
+  didWarnAboutInvalidateContextType = new Set();
 
   var didWarnOnInvalidCallback = new Set();
 
@@ -7141,7 +7659,7 @@ var warnOnInvalidCallback = void 0;
     var key = callerName + "_" + callback;
     if (!didWarnOnInvalidCallback.has(key)) {
       didWarnOnInvalidCallback.add(key);
-      warning(
+      warningWithoutStack$1(
         false,
         "%s(...): Expected the last optional `callback` argument to be a " +
           "function. Instead received: %s.",
@@ -7151,12 +7669,12 @@ var warnOnInvalidCallback = void 0;
     }
   };
 
-  warnOnUndefinedDerivedState = function(workInProgress, partialState) {
+  warnOnUndefinedDerivedState = function(type, partialState) {
     if (partialState === undefined) {
-      var componentName = getComponentName(workInProgress) || "Component";
+      var componentName = getComponentName(type) || "Component";
       if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
         didWarnAboutUndefinedDerivedState.add(componentName);
-        warning(
+        warningWithoutStack$1(
           false,
           "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
             "You have returned undefined.",
@@ -7190,6 +7708,7 @@ var warnOnInvalidCallback = void 0;
 
 function applyDerivedStateFromProps(
   workInProgress,
+  ctor,
   getDerivedStateFromProps,
   nextProps
 ) {
@@ -7209,7 +7728,7 @@ function applyDerivedStateFromProps(
   var partialState = getDerivedStateFromProps(nextProps, prevState);
 
   {
-    warnOnUndefinedDerivedState(workInProgress, partialState);
+    warnOnUndefinedDerivedState(ctor, partialState);
   }
   // Merge the partial state and the previous state.
   var memoizedState =
@@ -7221,7 +7740,7 @@ function applyDerivedStateFromProps(
   // Once the update queue is empty, persist the derived state onto the
   // base state.
   var updateQueue = workInProgress.updateQueue;
-  if (updateQueue !== null && updateQueue.expirationTime === NoWork) {
+  if (updateQueue !== null && workInProgress.expirationTime === NoWork) {
     updateQueue.baseState = memoizedState;
   }
 }
@@ -7230,7 +7749,7 @@ var classComponentUpdater = {
   isMounted: isMounted,
   enqueueSetState: function(inst, payload, callback) {
     var fiber = get$1(inst);
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     var expirationTime = computeExpirationForFiber(currentTime, fiber);
 
     var update = createUpdate(expirationTime);
@@ -7242,12 +7761,12 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update, expirationTime);
+    enqueueUpdate(fiber, update);
     scheduleWork(fiber, expirationTime);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     var fiber = get$1(inst);
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     var expirationTime = computeExpirationForFiber(currentTime, fiber);
 
     var update = createUpdate(expirationTime);
@@ -7261,12 +7780,12 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update, expirationTime);
+    enqueueUpdate(fiber, update);
     scheduleWork(fiber, expirationTime);
   },
   enqueueForceUpdate: function(inst, callback) {
     var fiber = get$1(inst);
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     var expirationTime = computeExpirationForFiber(currentTime, fiber);
 
     var update = createUpdate(expirationTime);
@@ -7279,37 +7798,37 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update, expirationTime);
+    enqueueUpdate(fiber, update);
     scheduleWork(fiber, expirationTime);
   }
 };
 
 function checkShouldComponentUpdate(
   workInProgress,
+  ctor,
   oldProps,
   newProps,
   oldState,
   newState,
-  newContext
+  nextContext
 ) {
   var instance = workInProgress.stateNode;
-  var ctor = workInProgress.type;
   if (typeof instance.shouldComponentUpdate === "function") {
     startPhaseTimer(workInProgress, "shouldComponentUpdate");
     var shouldUpdate = instance.shouldComponentUpdate(
       newProps,
       newState,
-      newContext
+      nextContext
     );
     stopPhaseTimer();
 
     {
       !(shouldUpdate !== undefined)
-        ? warning(
+        ? warningWithoutStack$1(
             false,
             "%s.shouldComponentUpdate(): Returned undefined instead of a " +
               "boolean value. Make sure to return true or false.",
-            getComponentName(workInProgress) || "Component"
+            getComponentName(ctor) || "Component"
           )
         : void 0;
     }
@@ -7326,23 +7845,22 @@ function checkShouldComponentUpdate(
   return true;
 }
 
-function checkClassInstance(workInProgress) {
+function checkClassInstance(workInProgress, ctor, newProps) {
   var instance = workInProgress.stateNode;
-  var type = workInProgress.type;
   {
-    var name = getComponentName(workInProgress) || "Component";
+    var name = getComponentName(ctor) || "Component";
     var renderPresent = instance.render;
 
     if (!renderPresent) {
-      if (type.prototype && typeof type.prototype.render === "function") {
-        warning(
+      if (ctor.prototype && typeof ctor.prototype.render === "function") {
+        warningWithoutStack$1(
           false,
           "%s(...): No `render` method found on the returned component " +
             "instance: did you accidentally return an object from the constructor?",
           name
         );
       } else {
-        warning(
+        warningWithoutStack$1(
           false,
           "%s(...): No `render` method found on the returned component " +
             "instance: you may have forgotten to define `render`.",
@@ -7356,7 +7874,7 @@ function checkClassInstance(workInProgress) {
       instance.getInitialState.isReactClassApproved ||
       instance.state;
     !noGetInitialStateOnES6
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "getInitialState was defined on %s, a plain JavaScript class. " +
             "This is only supported for classes created using React.createClass. " +
@@ -7368,7 +7886,7 @@ function checkClassInstance(workInProgress) {
       !instance.getDefaultProps ||
       instance.getDefaultProps.isReactClassApproved;
     !noGetDefaultPropsOnES6
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "getDefaultProps was defined on %s, a plain JavaScript class. " +
             "This is only supported for classes created using React.createClass. " +
@@ -7378,26 +7896,50 @@ function checkClassInstance(workInProgress) {
       : void 0;
     var noInstancePropTypes = !instance.propTypes;
     !noInstancePropTypes
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "propTypes was defined as an instance property on %s. Use a static " +
             "property to define propTypes instead.",
           name
         )
       : void 0;
+    var noInstanceContextType = !instance.contextType;
+    !noInstanceContextType
+      ? warningWithoutStack$1(
+          false,
+          "contextType was defined as an instance property on %s. Use a static " +
+            "property to define contextType instead.",
+          name
+        )
+      : void 0;
     var noInstanceContextTypes = !instance.contextTypes;
     !noInstanceContextTypes
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "contextTypes was defined as an instance property on %s. Use a static " +
             "property to define contextTypes instead.",
           name
         )
       : void 0;
+
+    if (
+      ctor.contextType &&
+      ctor.contextTypes &&
+      !didWarnAboutContextTypeAndContextTypes.has(ctor)
+    ) {
+      didWarnAboutContextTypeAndContextTypes.add(ctor);
+      warningWithoutStack$1(
+        false,
+        "%s declares both contextTypes and contextType static properties. " +
+          "The legacy contextTypes property will be ignored.",
+        name
+      );
+    }
+
     var noComponentShouldUpdate =
       typeof instance.componentShouldUpdate !== "function";
     !noComponentShouldUpdate
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s has a method called " +
             "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
@@ -7407,22 +7949,22 @@ function checkClassInstance(workInProgress) {
         )
       : void 0;
     if (
-      type.prototype &&
-      type.prototype.isPureReactComponent &&
+      ctor.prototype &&
+      ctor.prototype.isPureReactComponent &&
       typeof instance.shouldComponentUpdate !== "undefined"
     ) {
-      warning(
+      warningWithoutStack$1(
         false,
         "%s has a method called shouldComponentUpdate(). " +
           "shouldComponentUpdate should not be used when extending React.PureComponent. " +
           "Please extend React.Component if shouldComponentUpdate is used.",
-        getComponentName(workInProgress) || "A pure component"
+        getComponentName(ctor) || "A pure component"
       );
     }
     var noComponentDidUnmount =
       typeof instance.componentDidUnmount !== "function";
     !noComponentDidUnmount
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s has a method called " +
             "componentDidUnmount(). But there is no such lifecycle method. " +
@@ -7433,7 +7975,7 @@ function checkClassInstance(workInProgress) {
     var noComponentDidReceiveProps =
       typeof instance.componentDidReceiveProps !== "function";
     !noComponentDidReceiveProps
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s has a method called " +
             "componentDidReceiveProps(). But there is no such lifecycle method. " +
@@ -7446,7 +7988,7 @@ function checkClassInstance(workInProgress) {
     var noComponentWillRecieveProps =
       typeof instance.componentWillRecieveProps !== "function";
     !noComponentWillRecieveProps
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s has a method called " +
             "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
@@ -7456,16 +7998,16 @@ function checkClassInstance(workInProgress) {
     var noUnsafeComponentWillRecieveProps =
       typeof instance.UNSAFE_componentWillRecieveProps !== "function";
     !noUnsafeComponentWillRecieveProps
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s has a method called " +
             "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
           name
         )
       : void 0;
-    var hasMutatedProps = instance.props !== workInProgress.pendingProps;
+    var hasMutatedProps = instance.props !== newProps;
     !(instance.props === undefined || !hasMutatedProps)
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s(...): When calling super() in `%s`, make sure to pass " +
             "up the same props that your component's constructor was passed.",
@@ -7475,7 +8017,7 @@ function checkClassInstance(workInProgress) {
       : void 0;
     var noInstanceDefaultProps = !instance.defaultProps;
     !noInstanceDefaultProps
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
             " Instead, define defaultProps as a static property on %s.",
@@ -7487,21 +8029,21 @@ function checkClassInstance(workInProgress) {
     if (
       typeof instance.getSnapshotBeforeUpdate === "function" &&
       typeof instance.componentDidUpdate !== "function" &&
-      !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
+      !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(ctor)
     ) {
-      didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
-      warning(
+      didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(ctor);
+      warningWithoutStack$1(
         false,
         "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
           "This component defines getSnapshotBeforeUpdate() only.",
-        getComponentName(workInProgress)
+        getComponentName(ctor)
       );
     }
 
     var noInstanceGetDerivedStateFromProps =
       typeof instance.getDerivedStateFromProps !== "function";
     !noInstanceGetDerivedStateFromProps
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s: getDerivedStateFromProps() is defined as an instance method " +
             "and will be ignored. Instead, declare it as a static method.",
@@ -7509,19 +8051,19 @@ function checkClassInstance(workInProgress) {
         )
       : void 0;
     var noInstanceGetDerivedStateFromCatch =
-      typeof instance.getDerivedStateFromCatch !== "function";
+      typeof instance.getDerivedStateFromError !== "function";
     !noInstanceGetDerivedStateFromCatch
-      ? warning(
+      ? warningWithoutStack$1(
           false,
-          "%s: getDerivedStateFromCatch() is defined as an instance method " +
+          "%s: getDerivedStateFromError() is defined as an instance method " +
             "and will be ignored. Instead, declare it as a static method.",
           name
         )
       : void 0;
     var noStaticGetSnapshotBeforeUpdate =
-      typeof type.getSnapshotBeforeUpdate !== "function";
+      typeof ctor.getSnapshotBeforeUpdate !== "function";
     !noStaticGetSnapshotBeforeUpdate
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "%s: getSnapshotBeforeUpdate() is defined as a static method " +
             "and will be ignored. Instead, declare it as an instance method.",
@@ -7529,12 +8071,16 @@ function checkClassInstance(workInProgress) {
         )
       : void 0;
     var _state = instance.state;
-    if (_state && (typeof _state !== "object" || isArray(_state))) {
-      warning(false, "%s.state: must be set to an object or null", name);
+    if (_state && (typeof _state !== "object" || isArray$1(_state))) {
+      warningWithoutStack$1(
+        false,
+        "%s.state: must be set to an object or null",
+        name
+      );
     }
     if (typeof instance.getChildContext === "function") {
-      !(typeof type.childContextTypes === "object")
-        ? warning(
+      !(typeof ctor.childContextTypes === "object")
+        ? warningWithoutStack$1(
             false,
             "%s.getChildContext(): childContextTypes must be defined in order to " +
               "use getChildContext().",
@@ -7555,13 +8101,43 @@ function adoptClassInstance(workInProgress, instance) {
   }
 }
 
-function constructClassInstance(workInProgress, props, renderExpirationTime) {
-  var ctor = workInProgress.type;
-  var unmaskedContext = getUnmaskedContext(workInProgress);
-  var needsContext = isContextConsumer(workInProgress);
-  var context = needsContext
-    ? getMaskedContext(workInProgress, unmaskedContext)
-    : emptyObject;
+function constructClassInstance(
+  workInProgress,
+  ctor,
+  props,
+  renderExpirationTime
+) {
+  var isLegacyContextConsumer = false;
+  var unmaskedContext = emptyContextObject;
+  var context = null;
+  var contextType = ctor.contextType;
+  if (typeof contextType === "object" && contextType !== null) {
+    {
+      if (
+        typeof contextType.unstable_read !== "function" &&
+        !didWarnAboutInvalidateContextType.has(ctor)
+      ) {
+        didWarnAboutInvalidateContextType.add(ctor);
+        warningWithoutStack$1(
+          false,
+          "%s defines an invalid contextType. " +
+            "contextType should point to the Context object returned by React.createContext(). " +
+            "Did you accidentally pass the Context.Provider instead?",
+          getComponentName(ctor) || "Component"
+        );
+      }
+    }
+
+    context = contextType.unstable_read();
+  } else {
+    unmaskedContext = getUnmaskedContext(workInProgress, ctor, true);
+    var contextTypes = ctor.contextTypes;
+    isLegacyContextConsumer =
+      contextTypes !== null && contextTypes !== undefined;
+    context = isLegacyContextConsumer
+      ? getMaskedContext(workInProgress, unmaskedContext)
+      : emptyContextObject;
+  }
 
   // Instantiate twice to help detect side-effects.
   {
@@ -7583,15 +8159,18 @@ function constructClassInstance(workInProgress, props, renderExpirationTime) {
 
   {
     if (typeof ctor.getDerivedStateFromProps === "function" && state === null) {
-      var componentName = getComponentName(workInProgress) || "Component";
+      var componentName = getComponentName(ctor) || "Component";
       if (!didWarnAboutUninitializedState.has(componentName)) {
         didWarnAboutUninitializedState.add(componentName);
-        warning(
+        warningWithoutStack$1(
           false,
-          "%s: Did not properly initialize state during construction. " +
-            "Expected state to be an object, but it was %s.",
+          "`%s` uses `getDerivedStateFromProps` but its initial state is " +
+            "%s. This is not recommended. Instead, define the initial state by " +
+            "assigning an object to `this.state` in the constructor of `%s`. " +
+            "This ensures that `getDerivedStateFromProps` arguments have a consistent shape.",
           componentName,
-          instance.state === null ? "null" : "undefined"
+          instance.state === null ? "null" : "undefined",
+          componentName
         );
       }
     }
@@ -7637,14 +8216,14 @@ function constructClassInstance(workInProgress, props, renderExpirationTime) {
         foundWillReceivePropsName !== null ||
         foundWillUpdateName !== null
       ) {
-        var _componentName = getComponentName(workInProgress) || "Component";
+        var _componentName = getComponentName(ctor) || "Component";
         var newApiName =
           typeof ctor.getDerivedStateFromProps === "function"
             ? "getDerivedStateFromProps()"
             : "getSnapshotBeforeUpdate()";
         if (!didWarnAboutLegacyLifecyclesAndDerivedState.has(_componentName)) {
           didWarnAboutLegacyLifecyclesAndDerivedState.add(_componentName);
-          warning(
+          warningWithoutStack$1(
             false,
             "Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n" +
               "%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n" +
@@ -7665,7 +8244,7 @@ function constructClassInstance(workInProgress, props, renderExpirationTime) {
 
   // Cache unmasked context so we can avoid recreating masked context unless necessary.
   // ReactFiberContext usually updates this cache but can't for newly-created instances.
-  if (needsContext) {
+  if (isLegacyContextConsumer) {
     cacheContext(workInProgress, unmaskedContext, context);
   }
 
@@ -7687,12 +8266,12 @@ function callComponentWillMount(workInProgress, instance) {
 
   if (oldState !== instance.state) {
     {
-      warning(
+      warningWithoutStack$1(
         false,
         "%s.componentWillMount(): Assigning directly to this.state is " +
           "deprecated (except inside a component's " +
           "constructor). Use setState instead.",
-        getComponentName(workInProgress) || "Component"
+        getComponentName(workInProgress.type) || "Component"
       );
     }
     classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
@@ -7703,24 +8282,24 @@ function callComponentWillReceiveProps(
   workInProgress,
   instance,
   newProps,
-  newContext
+  nextContext
 ) {
   var oldState = instance.state;
   startPhaseTimer(workInProgress, "componentWillReceiveProps");
   if (typeof instance.componentWillReceiveProps === "function") {
-    instance.componentWillReceiveProps(newProps, newContext);
+    instance.componentWillReceiveProps(newProps, nextContext);
   }
   if (typeof instance.UNSAFE_componentWillReceiveProps === "function") {
-    instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    instance.UNSAFE_componentWillReceiveProps(newProps, nextContext);
   }
   stopPhaseTimer();
 
   if (instance.state !== oldState) {
     {
-      var componentName = getComponentName(workInProgress) || "Component";
+      var componentName = getComponentName(workInProgress.type) || "Component";
       if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
         didWarnAboutStateAssignmentForComponent.add(componentName);
-        warning(
+        warningWithoutStack$1(
           false,
           "%s.componentWillReceiveProps(): Assigning directly to " +
             "this.state is deprecated (except inside a component's " +
@@ -7734,23 +8313,44 @@ function callComponentWillReceiveProps(
 }
 
 // Invokes the mount life-cycles on a previously never rendered instance.
-function mountClassInstance(workInProgress, renderExpirationTime) {
-  var ctor = workInProgress.type;
-
+function mountClassInstance(
+  workInProgress,
+  ctor,
+  newProps,
+  renderExpirationTime
+) {
   {
-    checkClassInstance(workInProgress);
+    checkClassInstance(workInProgress, ctor, newProps);
   }
 
   var instance = workInProgress.stateNode;
-  var props = workInProgress.pendingProps;
-  var unmaskedContext = getUnmaskedContext(workInProgress);
-
-  instance.props = props;
+  instance.props = newProps;
   instance.state = workInProgress.memoizedState;
-  instance.refs = emptyObject;
-  instance.context = getMaskedContext(workInProgress, unmaskedContext);
+  instance.refs = emptyRefsObject;
+
+  var contextType = ctor.contextType;
+  if (typeof contextType === "object" && contextType !== null) {
+    instance.context = contextType.unstable_read();
+  } else {
+    var unmaskedContext = getUnmaskedContext(workInProgress, ctor, true);
+    instance.context = getMaskedContext(workInProgress, unmaskedContext);
+  }
 
   {
+    if (instance.state === newProps) {
+      var componentName = getComponentName(ctor) || "Component";
+      if (!didWarnAboutDirectlyAssigningPropsToState.has(componentName)) {
+        didWarnAboutDirectlyAssigningPropsToState.add(componentName);
+        warningWithoutStack$1(
+          false,
+          "%s: It is not recommended to assign props directly to state " +
+            "because updates to props won't be reflected in state. " +
+            "In most cases, it is better to use props directly.",
+          componentName
+        );
+      }
+    }
+
     if (workInProgress.mode & StrictMode) {
       ReactStrictModeWarnings.recordUnsafeLifecycleWarnings(
         workInProgress,
@@ -7776,16 +8376,21 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
     processUpdateQueue(
       workInProgress,
       updateQueue,
-      props,
+      newProps,
       instance,
       renderExpirationTime
     );
     instance.state = workInProgress.memoizedState;
   }
 
-  var getDerivedStateFromProps = workInProgress.type.getDerivedStateFromProps;
+  var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
   if (typeof getDerivedStateFromProps === "function") {
-    applyDerivedStateFromProps(workInProgress, getDerivedStateFromProps, props);
+    applyDerivedStateFromProps(
+      workInProgress,
+      ctor,
+      getDerivedStateFromProps,
+      newProps
+    );
     instance.state = workInProgress.memoizedState;
   }
 
@@ -7805,7 +8410,7 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
       processUpdateQueue(
         workInProgress,
         updateQueue,
-        props,
+        newProps,
         instance,
         renderExpirationTime
       );
@@ -7818,17 +8423,30 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
   }
 }
 
-function resumeMountClassInstance(workInProgress, renderExpirationTime) {
-  var ctor = workInProgress.type;
+function resumeMountClassInstance(
+  workInProgress,
+  ctor,
+  newProps,
+  renderExpirationTime
+) {
   var instance = workInProgress.stateNode;
 
   var oldProps = workInProgress.memoizedProps;
-  var newProps = workInProgress.pendingProps;
   instance.props = oldProps;
 
   var oldContext = instance.context;
-  var newUnmaskedContext = getUnmaskedContext(workInProgress);
-  var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+  var contextType = ctor.contextType;
+  var nextContext = void 0;
+  if (typeof contextType === "object" && contextType !== null) {
+    nextContext = contextType.unstable_read();
+  } else {
+    var nextLegacyUnmaskedContext = getUnmaskedContext(
+      workInProgress,
+      ctor,
+      true
+    );
+    nextContext = getMaskedContext(workInProgress, nextLegacyUnmaskedContext);
+  }
 
   var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
   var hasNewLifecycles =
@@ -7846,12 +8464,12 @@ function resumeMountClassInstance(workInProgress, renderExpirationTime) {
     (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
       typeof instance.componentWillReceiveProps === "function")
   ) {
-    if (oldProps !== newProps || oldContext !== newContext) {
+    if (oldProps !== newProps || oldContext !== nextContext) {
       callComponentWillReceiveProps(
         workInProgress,
         instance,
         newProps,
-        newContext
+        nextContext
       );
     }
   }
@@ -7888,6 +8506,7 @@ function resumeMountClassInstance(workInProgress, renderExpirationTime) {
   if (typeof getDerivedStateFromProps === "function") {
     applyDerivedStateFromProps(
       workInProgress,
+      ctor,
       getDerivedStateFromProps,
       newProps
     );
@@ -7898,11 +8517,12 @@ function resumeMountClassInstance(workInProgress, renderExpirationTime) {
     checkHasForceUpdateAfterProcessing() ||
     checkShouldComponentUpdate(
       workInProgress,
+      ctor,
       oldProps,
       newProps,
       oldState,
       newState,
-      newContext
+      nextContext
     );
 
   if (shouldUpdate) {
@@ -7942,23 +8562,33 @@ function resumeMountClassInstance(workInProgress, renderExpirationTime) {
   // if shouldComponentUpdate returns false.
   instance.props = newProps;
   instance.state = newState;
-  instance.context = newContext;
+  instance.context = nextContext;
 
   return shouldUpdate;
 }
 
 // Invokes the update life-cycles and returns false if it shouldn't rerender.
-function updateClassInstance(current, workInProgress, renderExpirationTime) {
-  var ctor = workInProgress.type;
+function updateClassInstance(
+  current,
+  workInProgress,
+  ctor,
+  newProps,
+  renderExpirationTime
+) {
   var instance = workInProgress.stateNode;
 
   var oldProps = workInProgress.memoizedProps;
-  var newProps = workInProgress.pendingProps;
   instance.props = oldProps;
 
   var oldContext = instance.context;
-  var newUnmaskedContext = getUnmaskedContext(workInProgress);
-  var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+  var contextType = ctor.contextType;
+  var nextContext = void 0;
+  if (typeof contextType === "object" && contextType !== null) {
+    nextContext = contextType.unstable_read();
+  } else {
+    var nextUnmaskedContext = getUnmaskedContext(workInProgress, ctor, true);
+    nextContext = getMaskedContext(workInProgress, nextUnmaskedContext);
+  }
 
   var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
   var hasNewLifecycles =
@@ -7976,12 +8606,12 @@ function updateClassInstance(current, workInProgress, renderExpirationTime) {
     (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
       typeof instance.componentWillReceiveProps === "function")
   ) {
-    if (oldProps !== newProps || oldContext !== newContext) {
+    if (oldProps !== newProps || oldContext !== nextContext) {
       callComponentWillReceiveProps(
         workInProgress,
         instance,
         newProps,
-        newContext
+        nextContext
       );
     }
   }
@@ -8032,6 +8662,7 @@ function updateClassInstance(current, workInProgress, renderExpirationTime) {
   if (typeof getDerivedStateFromProps === "function") {
     applyDerivedStateFromProps(
       workInProgress,
+      ctor,
       getDerivedStateFromProps,
       newProps
     );
@@ -8042,11 +8673,12 @@ function updateClassInstance(current, workInProgress, renderExpirationTime) {
     checkHasForceUpdateAfterProcessing() ||
     checkShouldComponentUpdate(
       workInProgress,
+      ctor,
       oldProps,
       newProps,
       oldState,
       newState,
-      newContext
+      nextContext
     );
 
   if (shouldUpdate) {
@@ -8059,10 +8691,10 @@ function updateClassInstance(current, workInProgress, renderExpirationTime) {
     ) {
       startPhaseTimer(workInProgress, "componentWillUpdate");
       if (typeof instance.componentWillUpdate === "function") {
-        instance.componentWillUpdate(newProps, newState, newContext);
+        instance.componentWillUpdate(newProps, newState, nextContext);
       }
       if (typeof instance.UNSAFE_componentWillUpdate === "function") {
-        instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
+        instance.UNSAFE_componentWillUpdate(newProps, newState, nextContext);
       }
       stopPhaseTimer();
     }
@@ -8102,15 +8734,13 @@ function updateClassInstance(current, workInProgress, renderExpirationTime) {
   // if shouldComponentUpdate returns false.
   instance.props = newProps;
   instance.state = newState;
-  instance.context = newContext;
+  instance.context = nextContext;
 
   return shouldUpdate;
 }
 
-var getCurrentFiberStackAddendum$2 =
-  ReactDebugCurrentFiber.getCurrentFiberStackAddendum;
-
 var didWarnAboutMaps = void 0;
+var didWarnAboutGenerators = void 0;
 var didWarnAboutStringRefInStrictMode = void 0;
 var ownerHasKeyUseWarning = void 0;
 var ownerHasFunctionTypeWarning = void 0;
@@ -8118,6 +8748,7 @@ var warnForMissingKey = function(child) {};
 
 {
   didWarnAboutMaps = false;
+  didWarnAboutGenerators = false;
   didWarnAboutStringRefInStrictMode = {};
 
   /**
@@ -8146,25 +8777,24 @@ var warnForMissingKey = function(child) {};
       "Each child in an array or iterator should have a unique " +
       '"key" prop. See https://fb.me/react-warning-keys for ' +
       "more information." +
-      (getCurrentFiberStackAddendum$2() || "");
+      getCurrentFiberStackInDev();
     if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
       return;
     }
     ownerHasKeyUseWarning[currentComponentErrorInfo] = true;
 
-    warning(
+    warning$1(
       false,
       "Each child in an array or iterator should have a unique " +
         '"key" prop. See https://fb.me/react-warning-keys for ' +
-        "more information.%s",
-      getCurrentFiberStackAddendum$2()
+        "more information."
     );
   };
 }
 
-var isArray$1 = Array.isArray;
+var isArray = Array.isArray;
 
-function coerceRef(returnFiber, current, element) {
+function coerceRef(returnFiber, current$$1, element) {
   var mixedRef = element.ref;
   if (
     mixedRef !== null &&
@@ -8173,18 +8803,18 @@ function coerceRef(returnFiber, current, element) {
   ) {
     {
       if (returnFiber.mode & StrictMode) {
-        var componentName = getComponentName(returnFiber) || "Component";
+        var componentName = getComponentName(returnFiber.type) || "Component";
         if (!didWarnAboutStringRefInStrictMode[componentName]) {
-          warning(
+          warningWithoutStack$1(
             false,
-            'A string ref, "%s", has been found within a strict mode tree. ' +
+            'A string ref, "%s", has been found within a strict mode tree. ' +
               "String refs are a source of potential bugs and should be avoided. " +
               "We recommend using createRef() instead." +
               "\n%s" +
               "\n\nLearn more about using refs safely here:" +
               "\nhttps://fb.me/react-strict-mode-string-ref",
             mixedRef,
-            getStackAddendumByWorkInProgressFiber(returnFiber)
+            getStackByFiberInDevAndProd(returnFiber)
           );
           didWarnAboutStringRefInStrictMode[componentName] = true;
         }
@@ -8197,8 +8827,9 @@ function coerceRef(returnFiber, current, element) {
       if (owner) {
         var ownerFiber = owner;
         invariant(
-          ownerFiber.tag === ClassComponent,
-          "Stateless function components cannot have refs."
+          ownerFiber.tag === ClassComponent ||
+            ownerFiber.tag === ClassComponentLazy,
+          "Function components cannot have refs."
         );
         inst = ownerFiber.stateNode;
       }
@@ -8211,15 +8842,19 @@ function coerceRef(returnFiber, current, element) {
       var stringRef = "" + mixedRef;
       // Check if previous string ref matches new string ref
       if (
-        current !== null &&
-        current.ref !== null &&
-        typeof current.ref === "function" &&
-        current.ref._stringRef === stringRef
+        current$$1 !== null &&
+        current$$1.ref !== null &&
+        typeof current$$1.ref === "function" &&
+        current$$1.ref._stringRef === stringRef
       ) {
-        return current.ref;
+        return current$$1.ref;
       }
       var ref = function(value) {
-        var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
+        var refs = inst.refs;
+        if (refs === emptyRefsObject) {
+          // This is a lazy pooled frozen object, so we need to initialize.
+          refs = inst.refs = {};
+        }
         if (value === null) {
           delete refs[stringRef];
         } else {
@@ -8231,13 +8866,13 @@ function coerceRef(returnFiber, current, element) {
     } else {
       invariant(
         typeof mixedRef === "string",
-        "Expected ref to be a function or a string."
+        "Expected ref to be a function, a string, an object returned by React.createRef(), or null."
       );
       invariant(
         element._owner,
         "Element ref was specified as a string (%s) but no owner was set. This could happen for one of" +
           " the following reasons:\n" +
-          "1. You may be adding a ref to a functional component\n" +
+          "1. You may be adding a ref to a function component\n" +
           "2. You may be adding a ref to a component that was not created inside a component's render method\n" +
           "3. You have multiple copies of React loaded\n" +
           "See https://fb.me/react-refs-must-have-owner for more information.",
@@ -8255,7 +8890,7 @@ function throwOnInvalidObjectType(returnFiber, newChild) {
       addendum =
         " If you meant to render a collection of children, use an array " +
         "instead." +
-        (getCurrentFiberStackAddendum$2() || "");
+        getCurrentFiberStackInDev();
     }
     invariant(
       false,
@@ -8273,19 +8908,18 @@ function warnOnFunctionType() {
     "Functions are not valid as a React child. This may happen if " +
     "you return a Component instead of <Component /> from render. " +
     "Or maybe you meant to call this function rather than return it." +
-    (getCurrentFiberStackAddendum$2() || "");
+    getCurrentFiberStackInDev();
 
   if (ownerHasFunctionTypeWarning[currentComponentErrorInfo]) {
     return;
   }
   ownerHasFunctionTypeWarning[currentComponentErrorInfo] = true;
 
-  warning(
+  warning$1(
     false,
     "Functions are not valid as a React child. This may happen if " +
       "you return a Component instead of <Component /> from render. " +
-      "Or maybe you meant to call this function rather than return it.%s",
-    getCurrentFiberStackAddendum$2() || ""
+      "Or maybe you meant to call this function rather than return it."
   );
 }
 
@@ -8363,9 +8997,9 @@ function ChildReconciler(shouldTrackSideEffects) {
       // Noop.
       return lastPlacedIndex;
     }
-    var current = newFiber.alternate;
-    if (current !== null) {
-      var oldIndex = current.index;
+    var current$$1 = newFiber.alternate;
+    if (current$$1 !== null) {
+      var oldIndex = current$$1.index;
       if (oldIndex < lastPlacedIndex) {
         // This is a move.
         newFiber.effectTag = Placement;
@@ -8390,8 +9024,13 @@ function ChildReconciler(shouldTrackSideEffects) {
     return newFiber;
   }
 
-  function updateTextNode(returnFiber, current, textContent, expirationTime) {
-    if (current === null || current.tag !== HostText) {
+  function updateTextNode(
+    returnFiber,
+    current$$1,
+    textContent,
+    expirationTime
+  ) {
+    if (current$$1 === null || current$$1.tag !== HostText) {
       // Insert
       var created = createFiberFromText(
         textContent,
@@ -8402,17 +9041,17 @@ function ChildReconciler(shouldTrackSideEffects) {
       return created;
     } else {
       // Update
-      var existing = useFiber(current, textContent, expirationTime);
+      var existing = useFiber(current$$1, textContent, expirationTime);
       existing.return = returnFiber;
       return existing;
     }
   }
 
-  function updateElement(returnFiber, current, element, expirationTime) {
-    if (current !== null && current.type === element.type) {
+  function updateElement(returnFiber, current$$1, element, expirationTime) {
+    if (current$$1 !== null && current$$1.type === element.type) {
       // Move based on index
-      var existing = useFiber(current, element.props, expirationTime);
-      existing.ref = coerceRef(returnFiber, current, element);
+      var existing = useFiber(current$$1, element.props, expirationTime);
+      existing.ref = coerceRef(returnFiber, current$$1, element);
       existing.return = returnFiber;
       {
         existing._debugSource = element._source;
@@ -8426,18 +9065,18 @@ function ChildReconciler(shouldTrackSideEffects) {
         returnFiber.mode,
         expirationTime
       );
-      created.ref = coerceRef(returnFiber, current, element);
+      created.ref = coerceRef(returnFiber, current$$1, element);
       created.return = returnFiber;
       return created;
     }
   }
 
-  function updatePortal(returnFiber, current, portal, expirationTime) {
+  function updatePortal(returnFiber, current$$1, portal, expirationTime) {
     if (
-      current === null ||
-      current.tag !== HostPortal ||
-      current.stateNode.containerInfo !== portal.containerInfo ||
-      current.stateNode.implementation !== portal.implementation
+      current$$1 === null ||
+      current$$1.tag !== HostPortal ||
+      current$$1.stateNode.containerInfo !== portal.containerInfo ||
+      current$$1.stateNode.implementation !== portal.implementation
     ) {
       // Insert
       var created = createFiberFromPortal(
@@ -8449,14 +9088,24 @@ function ChildReconciler(shouldTrackSideEffects) {
       return created;
     } else {
       // Update
-      var existing = useFiber(current, portal.children || [], expirationTime);
+      var existing = useFiber(
+        current$$1,
+        portal.children || [],
+        expirationTime
+      );
       existing.return = returnFiber;
       return existing;
     }
   }
 
-  function updateFragment(returnFiber, current, fragment, expirationTime, key) {
-    if (current === null || current.tag !== Fragment) {
+  function updateFragment(
+    returnFiber,
+    current$$1,
+    fragment,
+    expirationTime,
+    key
+  ) {
+    if (current$$1 === null || current$$1.tag !== Fragment) {
       // Insert
       var created = createFiberFromFragment(
         fragment,
@@ -8468,7 +9117,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       return created;
     } else {
       // Update
-      var existing = useFiber(current, fragment, expirationTime);
+      var existing = useFiber(current$$1, fragment, expirationTime);
       existing.return = returnFiber;
       return existing;
     }
@@ -8511,7 +9160,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _created3 = createFiberFromFragment(
           newChild,
           returnFiber.mode,
@@ -8591,7 +9240,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         if (key !== null) {
           return null;
         }
@@ -8673,7 +9322,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _matchedFiber3 = existingChildren.get(newIdx) || null;
         return updateFragment(
           returnFiber,
@@ -8721,15 +9370,14 @@ function ChildReconciler(shouldTrackSideEffects) {
             knownKeys.add(key);
             break;
           }
-          warning(
+          warning$1(
             false,
             "Encountered two children with the same key, `%s`. " +
               "Keys should be unique so that components maintain their identity " +
               "across updates. Non-unique keys may cause children to be " +
               "duplicated and/or omitted — the behavior is unsupported and " +
-              "could change in a future version.%s",
-            key,
-            getCurrentFiberStackAddendum$2()
+              "could change in a future version.",
+            key
           );
           break;
         default:
@@ -8917,15 +9565,34 @@ function ChildReconciler(shouldTrackSideEffects) {
     );
 
     {
+      // We don't support rendering Generators because it's a mutation.
+      // See https://github.com/facebook/react/issues/12995
+      if (
+        typeof Symbol === "function" &&
+        // $FlowFixMe Flow doesn't know about toStringTag
+        newChildrenIterable[Symbol.toStringTag] === "Generator"
+      ) {
+        !didWarnAboutGenerators
+          ? warning$1(
+              false,
+              "Using Generators as children is unsupported and will likely yield " +
+                "unexpected results because enumerating a generator mutates it. " +
+                "You may convert it to an array with `Array.from()` or the " +
+                "`[...spread]` operator before rendering. Keep in mind " +
+                "you might need to polyfill these features for older browsers."
+            )
+          : void 0;
+        didWarnAboutGenerators = true;
+      }
+
       // Warn about using Maps as children
       if (newChildrenIterable.entries === iteratorFn) {
         !didWarnAboutMaps
-          ? warning(
+          ? warning$1(
               false,
               "Using Maps as children is unsupported and will likely yield " +
                 "unexpected results. Convert it to a sequence/iterable of keyed " +
-                "ReactElements instead.%s",
-              getCurrentFiberStackAddendum$2()
+                "ReactElements instead."
             )
           : void 0;
         didWarnAboutMaps = true;
@@ -9270,7 +9937,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       );
     }
 
-    if (isArray$1(newChild)) {
+    if (isArray(newChild)) {
       return reconcileChildrenArray(
         returnFiber,
         currentFirstChild,
@@ -9302,7 +9969,8 @@ function ChildReconciler(shouldTrackSideEffects) {
       // component, throw an error. If Fiber return types are disabled,
       // we already threw above.
       switch (returnFiber.tag) {
-        case ClassComponent: {
+        case ClassComponent:
+        case ClassComponentLazy: {
           {
             var instance = returnFiber.stateNode;
             if (instance.render._isMockFunction) {
@@ -9314,7 +9982,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         // Intentionally fall through to the next case, which handles both
         // functions and classes
         // eslint-disable-next-lined no-fallthrough
-        case FunctionalComponent: {
+        case FunctionComponent: {
           var Component = returnFiber.type;
           invariant(
             false,
@@ -9337,9 +10005,9 @@ function ChildReconciler(shouldTrackSideEffects) {
 var reconcileChildFibers = ChildReconciler(true);
 var mountChildFibers = ChildReconciler(false);
 
-function cloneChildFibers(current, workInProgress) {
+function cloneChildFibers(current$$1, workInProgress) {
   invariant(
-    current === null || workInProgress.child === current.child,
+    current$$1 === null || workInProgress.child === current$$1.child,
     "Resuming work not yet implemented."
   );
 
@@ -9685,36 +10353,70 @@ function resetHydrationState() {
   isHydrating = false;
 }
 
-var getCurrentFiberStackAddendum$1 =
-  ReactDebugCurrentFiber.getCurrentFiberStackAddendum;
+function readLazyComponentType(thenable) {
+  var status = thenable._reactStatus;
+  switch (status) {
+    case Resolved:
+      var Component = thenable._reactResult;
+      return Component;
+    case Rejected:
+      throw thenable._reactResult;
+    case Pending:
+      throw thenable;
+    default: {
+      thenable._reactStatus = Pending;
+      thenable.then(
+        function(resolvedValue) {
+          if (thenable._reactStatus === Pending) {
+            thenable._reactStatus = Resolved;
+            if (typeof resolvedValue === "object" && resolvedValue !== null) {
+              // If the `default` property is not empty, assume it's the result
+              // of an async import() and use that. Otherwise, use the
+              // resolved value itself.
+              var defaultExport = resolvedValue.default;
+              resolvedValue =
+                defaultExport !== undefined && defaultExport !== null
+                  ? defaultExport
+                  : resolvedValue;
+            } else {
+              resolvedValue = resolvedValue;
+            }
+            thenable._reactResult = resolvedValue;
+          }
+        },
+        function(error) {
+          if (thenable._reactStatus === Pending) {
+            thenable._reactStatus = Rejected;
+            thenable._reactResult = error;
+          }
+        }
+      );
+      throw thenable;
+    }
+  }
+}
+
+var ReactCurrentOwner$3 = ReactSharedInternals.ReactCurrentOwner;
 
 var didWarnAboutBadClass = void 0;
-var didWarnAboutGetDerivedStateOnFunctionalComponent = void 0;
-var didWarnAboutStatelessRefs = void 0;
+var didWarnAboutContextTypeOnFunctionComponent = void 0;
+var didWarnAboutGetDerivedStateOnFunctionComponent = void 0;
+var didWarnAboutFunctionRefs = void 0;
 
 {
   didWarnAboutBadClass = {};
-  didWarnAboutGetDerivedStateOnFunctionalComponent = {};
-  didWarnAboutStatelessRefs = {};
+  didWarnAboutContextTypeOnFunctionComponent = {};
+  didWarnAboutGetDerivedStateOnFunctionComponent = {};
+  didWarnAboutFunctionRefs = {};
 }
 
-// TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
-function reconcileChildren(current, workInProgress, nextChildren) {
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    workInProgress.expirationTime
-  );
-}
-
-function reconcileChildrenAtExpirationTime(
-  current,
+function reconcileChildren(
+  current$$1,
   workInProgress,
   nextChildren,
   renderExpirationTime
 ) {
-  if (current === null) {
+  if (current$$1 === null) {
     // If this is a fresh new component that hasn't been rendered yet, we
     // won't update its child set by applying minimal side-effects. Instead,
     // we will add them all to the child before it gets rendered. That means
@@ -9734,161 +10436,280 @@ function reconcileChildrenAtExpirationTime(
     // let's throw it out.
     workInProgress.child = reconcileChildFibers(
       workInProgress,
-      current.child,
+      current$$1.child,
       nextChildren,
       renderExpirationTime
     );
   }
 }
 
-function updateForwardRef(current, workInProgress) {
-  var render = workInProgress.type.render;
-  var nextProps = workInProgress.pendingProps;
-  var ref = workInProgress.ref;
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (workInProgress.memoizedProps === nextProps) {
-    var currentRef = current !== null ? current.ref : null;
-    if (ref === currentRef) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-  }
+function forceUnmountCurrentAndReconcile(
+  current$$1,
+  workInProgress,
+  nextChildren,
+  renderExpirationTime
+) {
+  // This function is fork of reconcileChildren. It's used in cases where we
+  // want to reconcile without matching against the existing set. This has the
+  // effect of all current children being unmounted; even if the type and key
+  // are the same, the old child is unmounted and a new child is created.
+  //
+  // To do this, we're going to go through the reconcile algorithm twice. In
+  // the first pass, we schedule a deletion for all the current children by
+  // passing null.
+  workInProgress.child = reconcileChildFibers(
+    workInProgress,
+    current$$1.child,
+    null,
+    renderExpirationTime
+  );
+  // In the second pass, we mount the new children. The trick here is that we
+  // pass null in place of where we usually pass the current child set. This has
+  // the effect of remounting all children regardless of whether their their
+  // identity matches.
+  workInProgress.child = reconcileChildFibers(
+    workInProgress,
+    null,
+    nextChildren,
+    renderExpirationTime
+  );
+}
+
+function updateForwardRef(
+  current$$1,
+  workInProgress,
+  type,
+  nextProps,
+  renderExpirationTime
+) {
+  var render = type.render;
+  var ref = workInProgress.ref;
+  if (hasContextChanged()) {
+    // Normally we can bail out on props equality but if context has changed
+    // we don't do the bailout and we have to reuse existing props instead.
+  } else if (workInProgress.memoizedProps === nextProps) {
+    var currentRef = current$$1 !== null ? current$$1.ref : null;
+    if (ref === currentRef) {
+      return bailoutOnAlreadyFinishedWork(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      );
+    }
+  }
 
   var nextChildren = void 0;
   {
-    ReactCurrentOwner.current = workInProgress;
-    ReactDebugCurrentFiber.setCurrentPhase("render");
+    ReactCurrentOwner$3.current = workInProgress;
+    setCurrentPhase("render");
     nextChildren = render(nextProps, ref);
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+    setCurrentPhase(null);
   }
 
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
   memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
 
-function updateFragment(current, workInProgress) {
-  var nextChildren = workInProgress.pendingProps;
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (workInProgress.memoizedProps === nextChildren) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+function updatePureComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  updateExpirationTime,
+  renderExpirationTime
+) {
+  var render = Component.render;
+  var ref = workInProgress.ref;
+
+  if (
+    current$$1 !== null &&
+    (updateExpirationTime === NoWork ||
+      updateExpirationTime > renderExpirationTime)
+  ) {
+    var prevProps = current$$1.memoizedProps;
+    // Default to shallow comparison
+    var compare = Component.compare;
+    compare = compare !== null ? compare : shallowEqual;
+    if (
+      workInProgress.ref === current$$1.ref &&
+      compare(prevProps, nextProps)
+    ) {
+      return bailoutOnAlreadyFinishedWork(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      );
+    }
   }
-  reconcileChildren(current, workInProgress, nextChildren);
+
+  // The rest is a fork of updateFunctionComponent
+  var nextChildren = void 0;
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  {
+    ReactCurrentOwner$3.current = workInProgress;
+    setCurrentPhase("render");
+    nextChildren = render(nextProps, ref);
+    setCurrentPhase(null);
+  }
+
+  // React DevTools reads this flag.
+  workInProgress.effectTag |= PerformedWork;
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
+  memoizeProps(workInProgress, nextProps);
+  return workInProgress.child;
+}
+
+function updateFragment(current$$1, workInProgress, renderExpirationTime) {
+  var nextChildren = workInProgress.pendingProps;
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
   memoizeProps(workInProgress, nextChildren);
   return workInProgress.child;
 }
 
-function updateMode(current, workInProgress) {
+function updateMode(current$$1, workInProgress, renderExpirationTime) {
   var nextChildren = workInProgress.pendingProps.children;
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (
-    nextChildren === null ||
-    workInProgress.memoizedProps === nextChildren
-  ) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
   memoizeProps(workInProgress, nextChildren);
   return workInProgress.child;
 }
 
-function updateProfiler(current, workInProgress) {
-  var nextProps = workInProgress.pendingProps;
+function updateProfiler(current$$1, workInProgress, renderExpirationTime) {
   if (enableProfilerTimer) {
     workInProgress.effectTag |= Update;
   }
-  if (workInProgress.memoizedProps === nextProps) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
+  var nextProps = workInProgress.pendingProps;
   var nextChildren = nextProps.children;
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
   memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
 
-function markRef(current, workInProgress) {
+function markRef(current$$1, workInProgress) {
   var ref = workInProgress.ref;
   if (
-    (current === null && ref !== null) ||
-    (current !== null && current.ref !== ref)
+    (current$$1 === null && ref !== null) ||
+    (current$$1 !== null && current$$1.ref !== ref)
   ) {
     // Schedule a Ref effect
     workInProgress.effectTag |= Ref;
   }
 }
 
-function updateFunctionalComponent(current, workInProgress) {
-  var fn = workInProgress.type;
-  var nextProps = workInProgress.pendingProps;
-
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else {
-    if (workInProgress.memoizedProps === nextProps) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    // TODO: consider bringing fn.shouldComponentUpdate() back.
-    // It used to be here.
-  }
-
-  var unmaskedContext = getUnmaskedContext(workInProgress);
+function updateFunctionComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
+  var unmaskedContext = getUnmaskedContext(workInProgress, Component, true);
   var context = getMaskedContext(workInProgress, unmaskedContext);
 
   var nextChildren = void 0;
-
+  prepareToReadContext(workInProgress, renderExpirationTime);
   {
-    ReactCurrentOwner.current = workInProgress;
-    ReactDebugCurrentFiber.setCurrentPhase("render");
-    nextChildren = fn(nextProps, context);
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+    ReactCurrentOwner$3.current = workInProgress;
+    setCurrentPhase("render");
+    nextChildren = Component(nextProps, context);
+    setCurrentPhase(null);
   }
+
   // React DevTools reads this flag.
   workInProgress.effectTag |= PerformedWork;
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
   memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
 
-function updateClassComponent(current, workInProgress, renderExpirationTime) {
+function updateClassComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
   // Push context providers early to prevent context stack mismatches.
   // During mounting we don't know the child context yet as the instance doesn't exist.
   // We will invalidate the child context in finishClassComponent() right after rendering.
-  var hasContext = pushContextProvider(workInProgress);
+  var hasContext = void 0;
+  if (isContextProvider(Component)) {
+    hasContext = true;
+    pushContextProvider(workInProgress);
+  } else {
+    hasContext = false;
+  }
+  prepareToReadContext(workInProgress, renderExpirationTime);
+
   var shouldUpdate = void 0;
-  if (current === null) {
+  if (current$$1 === null) {
     if (workInProgress.stateNode === null) {
       // In the initial pass we might need to construct the instance.
       constructClassInstance(
         workInProgress,
-        workInProgress.pendingProps,
+        Component,
+        nextProps,
+        renderExpirationTime
+      );
+      mountClassInstance(
+        workInProgress,
+        Component,
+        nextProps,
         renderExpirationTime
       );
-      mountClassInstance(workInProgress, renderExpirationTime);
-
       shouldUpdate = true;
     } else {
       // In a resume, we'll already have an instance we can reuse.
       shouldUpdate = resumeMountClassInstance(
         workInProgress,
+        Component,
+        nextProps,
         renderExpirationTime
       );
     }
   } else {
     shouldUpdate = updateClassInstance(
-      current,
+      current$$1,
       workInProgress,
+      Component,
+      nextProps,
       renderExpirationTime
     );
   }
   return finishClassComponent(
-    current,
+    current$$1,
     workInProgress,
+    Component,
     shouldUpdate,
     hasContext,
     renderExpirationTime
@@ -9896,36 +10717,39 @@ function updateClassComponent(current, workInProgress, renderExpirationTime) {
 }
 
 function finishClassComponent(
-  current,
+  current$$1,
   workInProgress,
+  Component,
   shouldUpdate,
   hasContext,
   renderExpirationTime
 ) {
   // Refs should update even if shouldComponentUpdate returns false
-  markRef(current, workInProgress);
+  markRef(current$$1, workInProgress);
 
   var didCaptureError = (workInProgress.effectTag & DidCapture) !== NoEffect;
 
   if (!shouldUpdate && !didCaptureError) {
     // Context providers should defer to sCU for rendering
     if (hasContext) {
-      invalidateContextProvider(workInProgress, false);
+      invalidateContextProvider(workInProgress, Component, false);
     }
 
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
   }
 
-  var ctor = workInProgress.type;
   var instance = workInProgress.stateNode;
 
   // Rerender
-  ReactCurrentOwner.current = workInProgress;
+  ReactCurrentOwner$3.current = workInProgress;
   var nextChildren = void 0;
   if (
     didCaptureError &&
-    (!enableGetDerivedStateFromCatch ||
-      typeof ctor.getDerivedStateFromCatch !== "function")
+    typeof Component.getDerivedStateFromError !== "function"
   ) {
     // If we captured an error, but getDerivedStateFrom catch is not defined,
     // unmount all the children. componentDidCatch will schedule an update to
@@ -9935,11 +10759,11 @@ function finishClassComponent(
     nextChildren = null;
 
     if (enableProfilerTimer) {
-      stopBaseRenderTimerIfRunning();
+      stopProfilerTimerIfRunning(workInProgress);
     }
   } else {
     {
-      ReactDebugCurrentFiber.setCurrentPhase("render");
+      setCurrentPhase("render");
       nextChildren = instance.render();
       if (
         debugRenderPhaseSideEffects ||
@@ -9948,32 +10772,32 @@ function finishClassComponent(
       ) {
         instance.render();
       }
-      ReactDebugCurrentFiber.setCurrentPhase(null);
+      setCurrentPhase(null);
     }
   }
 
   // React DevTools reads this flag.
   workInProgress.effectTag |= PerformedWork;
-  if (didCaptureError) {
-    // If we're recovering from an error, reconcile twice: first to delete
-    // all the existing children.
-    reconcileChildrenAtExpirationTime(
-      current,
+  if (current$$1 !== null && didCaptureError) {
+    // If we're recovering from an error, reconcile without reusing any of
+    // the existing children. Conceptually, the normal children and the children
+    // that are shown on error are two different sets, so we shouldn't reuse
+    // normal children even if their identities match.
+    forceUnmountCurrentAndReconcile(
+      current$$1,
       workInProgress,
-      null,
+      nextChildren,
+      renderExpirationTime
+    );
+  } else {
+    reconcileChildren(
+      current$$1,
+      workInProgress,
+      nextChildren,
       renderExpirationTime
     );
-    workInProgress.child = null;
-    // Now we can continue reconciling like normal. This has the effect of
-    // remounting all children regardless of whether their their
-    // identity matches.
   }
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    renderExpirationTime
-  );
+
   // Memoize props and state using the values we just used to render.
   // TODO: Restructure so we never read values from the instance.
   memoizeState(workInProgress, instance.state);
@@ -9981,7 +10805,7 @@ function finishClassComponent(
 
   // The context might have changed so we need to recalculate it.
   if (hasContext) {
-    invalidateContextProvider(workInProgress, true);
+    invalidateContextProvider(workInProgress, Component, true);
   }
 
   return workInProgress.child;
@@ -10002,99 +10826,89 @@ function pushHostRootContext(workInProgress) {
   pushHostContainer(workInProgress, root.containerInfo);
 }
 
-function updateHostRoot(current, workInProgress, renderExpirationTime) {
+function updateHostRoot(current$$1, workInProgress, renderExpirationTime) {
   pushHostRootContext(workInProgress);
   var updateQueue = workInProgress.updateQueue;
-  if (updateQueue !== null) {
-    var nextProps = workInProgress.pendingProps;
-    var prevState = workInProgress.memoizedState;
-    var prevChildren = prevState !== null ? prevState.element : null;
-    processUpdateQueue(
+  invariant(
+    updateQueue !== null,
+    "If the root does not have an updateQueue, we should have already " +
+      "bailed out. This error is likely caused by a bug in React. Please " +
+      "file an issue."
+  );
+  var nextProps = workInProgress.pendingProps;
+  var prevState = workInProgress.memoizedState;
+  var prevChildren = prevState !== null ? prevState.element : null;
+  processUpdateQueue(
+    workInProgress,
+    updateQueue,
+    nextProps,
+    null,
+    renderExpirationTime
+  );
+  var nextState = workInProgress.memoizedState;
+  // Caution: React DevTools currently depends on this property
+  // being called "element".
+  var nextChildren = nextState.element;
+  if (nextChildren === prevChildren) {
+    // If the state is the same as before, that's a bailout because we had
+    // no work that expires at this time.
+    resetHydrationState();
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
+  }
+  var root = workInProgress.stateNode;
+  if (
+    (current$$1 === null || current$$1.child === null) &&
+    root.hydrate &&
+    enterHydrationState(workInProgress)
+  ) {
+    // If we don't have any current children this might be the first pass.
+    // We always try to hydrate. If this isn't a hydration pass there won't
+    // be any children to hydrate which is effectively the same thing as
+    // not hydrating.
+
+    // This is a bit of a hack. We track the host root as a placement to
+    // know that we're currently in a mounting state. That way isMounted
+    // works as expected. We must reset this before committing.
+    // TODO: Delete this when we delete isMounted and findDOMNode.
+    workInProgress.effectTag |= Placement;
+
+    // Ensure that children mount into this root without tracking
+    // side-effects. This ensures that we don't store Placement effects on
+    // nodes that will be hydrated.
+    workInProgress.child = mountChildFibers(
       workInProgress,
-      updateQueue,
-      nextProps,
       null,
+      nextChildren,
       renderExpirationTime
     );
-    var nextState = workInProgress.memoizedState;
-    // Caution: React DevTools currently depends on this property
-    // being called "element".
-    var nextChildren = nextState.element;
-
-    if (nextChildren === prevChildren) {
-      // If the state is the same as before, that's a bailout because we had
-      // no work that expires at this time.
-      resetHydrationState();
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    var root = workInProgress.stateNode;
-    if (
-      (current === null || current.child === null) &&
-      root.hydrate &&
-      enterHydrationState(workInProgress)
-    ) {
-      // If we don't have any current children this might be the first pass.
-      // We always try to hydrate. If this isn't a hydration pass there won't
-      // be any children to hydrate which is effectively the same thing as
-      // not hydrating.
-
-      // This is a bit of a hack. We track the host root as a placement to
-      // know that we're currently in a mounting state. That way isMounted
-      // works as expected. We must reset this before committing.
-      // TODO: Delete this when we delete isMounted and findDOMNode.
-      workInProgress.effectTag |= Placement;
-
-      // Ensure that children mount into this root without tracking
-      // side-effects. This ensures that we don't store Placement effects on
-      // nodes that will be hydrated.
-      workInProgress.child = mountChildFibers(
-        workInProgress,
-        null,
-        nextChildren,
-        renderExpirationTime
-      );
-    } else {
-      // Otherwise reset hydration state in case we aborted and resumed another
-      // root.
-      resetHydrationState();
-      reconcileChildren(current, workInProgress, nextChildren);
-    }
-    return workInProgress.child;
+  } else {
+    // Otherwise reset hydration state in case we aborted and resumed another
+    // root.
+    reconcileChildren(
+      current$$1,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
+    resetHydrationState();
   }
-  resetHydrationState();
-  // If there is no update queue, that's a bailout because the root has no props.
-  return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  return workInProgress.child;
 }
 
-function updateHostComponent(current, workInProgress, renderExpirationTime) {
+function updateHostComponent(current$$1, workInProgress, renderExpirationTime) {
   pushHostContext(workInProgress);
 
-  if (current === null) {
+  if (current$$1 === null) {
     tryToClaimNextHydratableInstance(workInProgress);
   }
 
   var type = workInProgress.type;
-  var memoizedProps = workInProgress.memoizedProps;
   var nextProps = workInProgress.pendingProps;
-  var prevProps = current !== null ? current.memoizedProps : null;
-
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (memoizedProps === nextProps) {
-    var isHidden =
-      workInProgress.mode & AsyncMode &&
-      shouldDeprioritizeSubtree(type, nextProps);
-    if (isHidden) {
-      // Before bailing out, make sure we've deprioritized a hidden component.
-      workInProgress.expirationTime = Never;
-    }
-    if (!isHidden || renderExpirationTime !== Never) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-    // If we're rendering a hidden node at hidden priority, don't bailout. The
-    // parent is complete, but the children may not be.
-  }
+  var prevProps = current$$1 !== null ? current$$1.memoizedProps : null;
 
   var nextChildren = nextProps.children;
   var isDirectTextChild = shouldSetTextContent(type, nextProps);
@@ -10105,34 +10919,38 @@ function updateHostComponent(current, workInProgress, renderExpirationTime) {
     // this in the host environment that also have access to this prop. That
     // avoids allocating another HostText fiber and traversing it.
     nextChildren = null;
-  } else if (prevProps && shouldSetTextContent(type, prevProps)) {
+  } else if (prevProps !== null && shouldSetTextContent(type, prevProps)) {
     // If we're switching from a direct text child to a normal child, or to
     // empty, we need to schedule the text content to be reset.
     workInProgress.effectTag |= ContentReset;
   }
 
-  markRef(current, workInProgress);
+  markRef(current$$1, workInProgress);
 
   // Check the host config to see if the children are offscreen/hidden.
   if (
     renderExpirationTime !== Never &&
-    workInProgress.mode & AsyncMode &&
+    workInProgress.mode & ConcurrentMode &&
     shouldDeprioritizeSubtree(type, nextProps)
   ) {
-    // Down-prioritize the children.
+    // Schedule this fiber to re-render at offscreen priority. Then bailout.
     workInProgress.expirationTime = Never;
-    // Bailout and come back to this fiber later.
     workInProgress.memoizedProps = nextProps;
     return null;
   }
 
-  reconcileChildren(current, workInProgress, nextChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  );
   memoizeProps(workInProgress, nextProps);
   return workInProgress.child;
 }
 
-function updateHostText(current, workInProgress) {
-  if (current === null) {
+function updateHostText(current$$1, workInProgress) {
+  if (current$$1 === null) {
     tryToClaimNextHydratableInstance(workInProgress);
   }
   var nextProps = workInProgress.pendingProps;
@@ -10142,29 +10960,125 @@ function updateHostText(current, workInProgress) {
   return null;
 }
 
+function resolveDefaultProps(Component, baseProps) {
+  if (Component && Component.defaultProps) {
+    // Resolve default props. Taken from ReactElement
+    var props = Object.assign({}, baseProps);
+    var defaultProps = Component.defaultProps;
+    for (var propName in defaultProps) {
+      if (props[propName] === undefined) {
+        props[propName] = defaultProps[propName];
+      }
+    }
+    return props;
+  }
+  return baseProps;
+}
+
 function mountIndeterminateComponent(
-  current,
+  current$$1,
   workInProgress,
+  Component,
+  updateExpirationTime,
   renderExpirationTime
 ) {
   invariant(
-    current === null,
+    current$$1 === null,
     "An indeterminate component should never have mounted. This error is " +
       "likely caused by a bug in React. Please file an issue."
   );
-  var fn = workInProgress.type;
+
   var props = workInProgress.pendingProps;
-  var unmaskedContext = getUnmaskedContext(workInProgress);
+  if (
+    typeof Component === "object" &&
+    Component !== null &&
+    typeof Component.then === "function"
+  ) {
+    // We can't start a User Timing measurement with correct label yet.
+    // Cancel and resume right after we know the tag.
+    cancelWorkTimer(workInProgress);
+    Component = readLazyComponentType(Component);
+    var resolvedTag = (workInProgress.tag = resolveLazyComponentTag(
+      workInProgress,
+      Component
+    ));
+    startWorkTimer(workInProgress);
+    var resolvedProps = resolveDefaultProps(Component, props);
+    var child = void 0;
+    switch (resolvedTag) {
+      case FunctionComponentLazy: {
+        child = updateFunctionComponent(
+          current$$1,
+          workInProgress,
+          Component,
+          resolvedProps,
+          renderExpirationTime
+        );
+        break;
+      }
+      case ClassComponentLazy: {
+        child = updateClassComponent(
+          current$$1,
+          workInProgress,
+          Component,
+          resolvedProps,
+          renderExpirationTime
+        );
+        break;
+      }
+      case ForwardRefLazy: {
+        child = updateForwardRef(
+          current$$1,
+          workInProgress,
+          Component,
+          resolvedProps,
+          renderExpirationTime
+        );
+        break;
+      }
+      case PureComponentLazy: {
+        child = updatePureComponent(
+          current$$1,
+          workInProgress,
+          Component,
+          resolvedProps,
+          updateExpirationTime,
+          renderExpirationTime
+        );
+        break;
+      }
+      default: {
+        // This message intentionally doesn't metion ForwardRef or PureComponent
+        // because the fact that it's a separate type of work is an
+        // implementation detail.
+        invariant(
+          false,
+          "Element type is invalid. Received a promise that resolves to: %s. " +
+            "Promise elements must resolve to a class or function.",
+          Component
+        );
+      }
+    }
+    workInProgress.memoizedProps = props;
+    return child;
+  }
+
+  var unmaskedContext = getUnmaskedContext(workInProgress, Component, false);
   var context = getMaskedContext(workInProgress, unmaskedContext);
 
+  prepareToReadContext(workInProgress, renderExpirationTime);
+
   var value = void 0;
 
   {
-    if (fn.prototype && typeof fn.prototype.render === "function") {
-      var componentName = getComponentName(workInProgress) || "Unknown";
+    if (
+      Component.prototype &&
+      typeof Component.prototype.render === "function"
+    ) {
+      var componentName = getComponentName(Component) || "Unknown";
 
       if (!didWarnAboutBadClass[componentName]) {
-        warning(
+        warningWithoutStack$1(
           false,
           "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
             "This is likely to cause errors. Change %s to extend React.Component instead.",
@@ -10179,8 +11093,8 @@ function mountIndeterminateComponent(
       ReactStrictModeWarnings.recordLegacyContextWarning(workInProgress, null);
     }
 
-    ReactCurrentOwner.current = workInProgress;
-    value = fn(props, context);
+    ReactCurrentOwner$3.current = workInProgress;
+    value = Component(props, context);
   }
   // React DevTools reads this flag.
   workInProgress.effectTag |= PerformedWork;
@@ -10191,11 +11105,20 @@ function mountIndeterminateComponent(
     typeof value.render === "function" &&
     value.$$typeof === undefined
   ) {
-    var Component = workInProgress.type;
-
     // Proceed under the assumption that this is a class instance
     workInProgress.tag = ClassComponent;
 
+    // Push context providers early to prevent context stack mismatches.
+    // During mounting we don't know the child context yet as the instance doesn't exist.
+    // We will invalidate the child context in finishClassComponent() right after rendering.
+    var hasContext = false;
+    if (isContextProvider(Component)) {
+      hasContext = true;
+      pushContextProvider(workInProgress);
+    } else {
+      hasContext = false;
+    }
+
     workInProgress.memoizedState =
       value.state !== null && value.state !== undefined ? value.state : null;
 
@@ -10203,42 +11126,38 @@ function mountIndeterminateComponent(
     if (typeof getDerivedStateFromProps === "function") {
       applyDerivedStateFromProps(
         workInProgress,
+        Component,
         getDerivedStateFromProps,
         props
       );
     }
 
-    // Push context providers early to prevent context stack mismatches.
-    // During mounting we don't know the child context yet as the instance doesn't exist.
-    // We will invalidate the child context in finishClassComponent() right after rendering.
-    var hasContext = pushContextProvider(workInProgress);
     adoptClassInstance(workInProgress, value);
-    mountClassInstance(workInProgress, renderExpirationTime);
+    mountClassInstance(workInProgress, Component, props, renderExpirationTime);
     return finishClassComponent(
-      current,
+      current$$1,
       workInProgress,
+      Component,
       true,
       hasContext,
       renderExpirationTime
     );
   } else {
-    // Proceed under the assumption that this is a functional component
-    workInProgress.tag = FunctionalComponent;
+    // Proceed under the assumption that this is a function component
+    workInProgress.tag = FunctionComponent;
     {
-      var _Component = workInProgress.type;
-
-      if (_Component) {
-        !!_Component.childContextTypes
-          ? warning(
+      if (Component) {
+        !!Component.childContextTypes
+          ? warningWithoutStack$1(
               false,
-              "%s(...): childContextTypes cannot be defined on a functional component.",
-              _Component.displayName || _Component.name || "Component"
+              "%s(...): childContextTypes cannot be defined on a function component.",
+              Component.displayName || Component.name || "Component"
             )
           : void 0;
       }
       if (workInProgress.ref !== null) {
         var info = "";
-        var ownerName = ReactDebugCurrentFiber.getCurrentFiberOwnerName();
+        var ownerName = getCurrentFiberOwnerNameInDevOrNull();
         if (ownerName) {
           info += "\n\nCheck the render method of `" + ownerName + "`.";
         }
@@ -10248,80 +11167,128 @@ function mountIndeterminateComponent(
         if (debugSource) {
           warningKey = debugSource.fileName + ":" + debugSource.lineNumber;
         }
-        if (!didWarnAboutStatelessRefs[warningKey]) {
-          didWarnAboutStatelessRefs[warningKey] = true;
-          warning(
+        if (!didWarnAboutFunctionRefs[warningKey]) {
+          didWarnAboutFunctionRefs[warningKey] = true;
+          warning$1(
             false,
-            "Stateless function components cannot be given refs. " +
-              "Attempts to access this ref will fail.%s%s",
-            info,
-            ReactDebugCurrentFiber.getCurrentFiberStackAddendum()
+            "Function components cannot be given refs. " +
+              "Attempts to access this ref will fail.%s",
+            info
           );
         }
       }
 
-      if (typeof fn.getDerivedStateFromProps === "function") {
-        var _componentName = getComponentName(workInProgress) || "Unknown";
+      if (typeof Component.getDerivedStateFromProps === "function") {
+        var _componentName = getComponentName(Component) || "Unknown";
 
-        if (!didWarnAboutGetDerivedStateOnFunctionalComponent[_componentName]) {
-          warning(
+        if (!didWarnAboutGetDerivedStateOnFunctionComponent[_componentName]) {
+          warningWithoutStack$1(
             false,
-            "%s: Stateless functional components do not support getDerivedStateFromProps.",
+            "%s: Function components do not support getDerivedStateFromProps.",
             _componentName
           );
-          didWarnAboutGetDerivedStateOnFunctionalComponent[
-            _componentName
-          ] = true;
+          didWarnAboutGetDerivedStateOnFunctionComponent[_componentName] = true;
+        }
+      }
+
+      if (
+        typeof Component.contextType === "object" &&
+        Component.contextType !== null
+      ) {
+        var _componentName2 = getComponentName(Component) || "Unknown";
+
+        if (!didWarnAboutContextTypeOnFunctionComponent[_componentName2]) {
+          warningWithoutStack$1(
+            false,
+            "%s: Function components do not support contextType.",
+            _componentName2
+          );
+          didWarnAboutContextTypeOnFunctionComponent[_componentName2] = true;
         }
       }
     }
-    reconcileChildren(current, workInProgress, value);
+    reconcileChildren(current$$1, workInProgress, value, renderExpirationTime);
     memoizeProps(workInProgress, props);
     return workInProgress.child;
   }
 }
 
-function updateTimeoutComponent(current, workInProgress, renderExpirationTime) {
-  if (enableSuspense) {
-    var nextProps = workInProgress.pendingProps;
-    var prevProps = workInProgress.memoizedProps;
+function updateSuspenseComponent(
+  current$$1,
+  workInProgress,
+  renderExpirationTime
+) {
+  var nextProps = workInProgress.pendingProps;
 
-    var prevDidTimeout = workInProgress.memoizedState;
+  // Check if we already attempted to render the normal state. If we did,
+  // and we timed out, render the placeholder state.
+  var alreadyCaptured = (workInProgress.effectTag & DidCapture) === NoEffect;
 
-    // Check if we already attempted to render the normal state. If we did,
-    // and we timed out, render the placeholder state.
-    var alreadyCaptured = (workInProgress.effectTag & DidCapture) === NoEffect;
-    var nextDidTimeout = !alreadyCaptured;
+  var nextDidTimeout = void 0;
+  if (current$$1 !== null && workInProgress.updateQueue !== null) {
+    // We're outside strict mode. Something inside this Placeholder boundary
+    // suspended during the last commit. Switch to the placholder.
+    workInProgress.updateQueue = null;
+    nextDidTimeout = true;
+  } else {
+    nextDidTimeout = !alreadyCaptured;
+  }
 
-    if (hasContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (nextProps === prevProps && nextDidTimeout === prevDidTimeout) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  if ((workInProgress.mode & StrictMode) !== NoEffect) {
+    if (nextDidTimeout) {
+      // If the timed-out view commits, schedule an update effect to record
+      // the committed time.
+      workInProgress.effectTag |= Update;
+    } else {
+      // The state node points to the time at which placeholder timed out.
+      // We can clear it once we switch back to the normal children.
+      workInProgress.stateNode = null;
     }
+  }
 
-    var render = nextProps.children;
-    var nextChildren = render(nextDidTimeout);
-    workInProgress.memoizedProps = nextProps;
-    workInProgress.memoizedState = nextDidTimeout;
-    reconcileChildren(current, workInProgress, nextChildren);
-    return workInProgress.child;
+  // If the `children` prop is a function, treat it like a render prop.
+  // TODO: This is temporary until we finalize a lower level API.
+  var children = nextProps.children;
+  var nextChildren = void 0;
+  if (typeof children === "function") {
+    nextChildren = children(nextDidTimeout);
   } else {
-    return null;
+    nextChildren = nextDidTimeout ? nextProps.fallback : children;
+  }
+
+  if (current$$1 !== null && nextDidTimeout !== workInProgress.memoizedState) {
+    // We're about to switch from the placeholder children to the normal
+    // children, or vice versa. These are two different conceptual sets that
+    // happen to be stored in the same set. Call this special function to
+    // force the new set not to match with the current set.
+    // TODO: The proper way to model this is by storing each set separately.
+    forceUnmountCurrentAndReconcile(
+      current$$1,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
+  } else {
+    reconcileChildren(
+      current$$1,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
   }
+  workInProgress.memoizedProps = nextProps;
+  workInProgress.memoizedState = nextDidTimeout;
+  return workInProgress.child;
 }
 
-function updatePortalComponent(current, workInProgress, renderExpirationTime) {
+function updatePortalComponent(
+  current$$1,
+  workInProgress,
+  renderExpirationTime
+) {
   pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
   var nextChildren = workInProgress.pendingProps;
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (workInProgress.memoizedProps === nextChildren) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-
-  if (current === null) {
+  if (current$$1 === null) {
     // Portals are special because we don't append the children during mount
     // but at commit. Therefore we need to track insertions which the normal
     // flow doesn't do during mount. This doesn't happen at the root because
@@ -10335,123 +11302,27 @@ function updatePortalComponent(current, workInProgress, renderExpirationTime) {
     );
     memoizeProps(workInProgress, nextChildren);
   } else {
-    reconcileChildren(current, workInProgress, nextChildren);
+    reconcileChildren(
+      current$$1,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
     memoizeProps(workInProgress, nextChildren);
   }
   return workInProgress.child;
 }
 
-function propagateContextChange(
+function updateContextProvider(
+  current$$1,
   workInProgress,
-  context,
-  changedBits,
   renderExpirationTime
 ) {
-  var fiber = workInProgress.child;
-  if (fiber !== null) {
-    // Set the return pointer of the child to the work-in-progress fiber.
-    fiber.return = workInProgress;
-  }
-  while (fiber !== null) {
-    var nextFiber = void 0;
-    // Visit this fiber.
-    switch (fiber.tag) {
-      case ContextConsumer:
-        // Check if the context matches.
-        var observedBits = fiber.stateNode | 0;
-        if (fiber.type === context && (observedBits & changedBits) !== 0) {
-          // Update the expiration time of all the ancestors, including
-          // the alternates.
-          var node = fiber;
-          while (node !== null) {
-            var alternate = node.alternate;
-            if (
-              node.expirationTime === NoWork ||
-              node.expirationTime > renderExpirationTime
-            ) {
-              node.expirationTime = renderExpirationTime;
-              if (
-                alternate !== null &&
-                (alternate.expirationTime === NoWork ||
-                  alternate.expirationTime > renderExpirationTime)
-              ) {
-                alternate.expirationTime = renderExpirationTime;
-              }
-            } else if (
-              alternate !== null &&
-              (alternate.expirationTime === NoWork ||
-                alternate.expirationTime > renderExpirationTime)
-            ) {
-              alternate.expirationTime = renderExpirationTime;
-            } else {
-              // Neither alternate was updated, which means the rest of the
-              // ancestor path already has sufficient priority.
-              break;
-            }
-            node = node.return;
-          }
-          // Don't scan deeper than a matching consumer. When we render the
-          // consumer, we'll continue scanning from that point. This way the
-          // scanning work is time-sliced.
-          nextFiber = null;
-        } else {
-          // Traverse down.
-          nextFiber = fiber.child;
-        }
-        break;
-      case ContextProvider:
-        // Don't scan deeper if this is a matching provider
-        nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
-        break;
-      default:
-        // Traverse down.
-        nextFiber = fiber.child;
-        break;
-    }
-    if (nextFiber !== null) {
-      // Set the return pointer of the child to the work-in-progress fiber.
-      nextFiber.return = fiber;
-    } else {
-      // No child. Traverse to next sibling.
-      nextFiber = fiber;
-      while (nextFiber !== null) {
-        if (nextFiber === workInProgress) {
-          // We're back to the root of this subtree. Exit.
-          nextFiber = null;
-          break;
-        }
-        var sibling = nextFiber.sibling;
-        if (sibling !== null) {
-          // Set the return pointer of the sibling to the work-in-progress fiber.
-          sibling.return = nextFiber.return;
-          nextFiber = sibling;
-          break;
-        }
-        // No more siblings. Traverse up.
-        nextFiber = nextFiber.return;
-      }
-    }
-    fiber = nextFiber;
-  }
-}
-
-function updateContextProvider(current, workInProgress, renderExpirationTime) {
   var providerType = workInProgress.type;
   var context = providerType._context;
 
   var newProps = workInProgress.pendingProps;
   var oldProps = workInProgress.memoizedProps;
-  var canBailOnProps = true;
-
-  if (hasContextChanged()) {
-    canBailOnProps = false;
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (oldProps === newProps) {
-    workInProgress.stateNode = 0;
-    pushProvider(workInProgress);
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
 
   var newValue = newProps.value;
   workInProgress.memoizedProps = newProps;
@@ -10465,132 +11336,82 @@ function updateContextProvider(current, workInProgress, renderExpirationTime) {
         newProps,
         "prop",
         "Context.Provider",
-        getCurrentFiberStackAddendum$1
+        getCurrentFiberStackInDev
       );
     }
   }
 
-  var changedBits = void 0;
-  if (oldProps === null) {
-    // Initial render
-    changedBits = MAX_SIGNED_31_BIT_INT;
-  } else {
-    if (oldProps.value === newProps.value) {
+  pushProvider(workInProgress, newValue);
+
+  if (oldProps !== null) {
+    var oldValue = oldProps.value;
+    var changedBits = calculateChangedBits(context, newValue, oldValue);
+    if (changedBits === 0) {
       // No change. Bailout early if children are the same.
-      if (oldProps.children === newProps.children && canBailOnProps) {
-        workInProgress.stateNode = 0;
-        pushProvider(workInProgress);
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      if (oldProps.children === newProps.children && !hasContextChanged()) {
+        return bailoutOnAlreadyFinishedWork(
+          current$$1,
+          workInProgress,
+          renderExpirationTime
+        );
       }
-      changedBits = 0;
     } else {
-      var oldValue = oldProps.value;
-      // Use Object.is to compare the new context value to the old value.
-      // Inlined Object.is polyfill.
-      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-      if (
-        (oldValue === newValue &&
-          (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
-        (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
-      ) {
-        // No change. Bailout early if children are the same.
-        if (oldProps.children === newProps.children && canBailOnProps) {
-          workInProgress.stateNode = 0;
-          pushProvider(workInProgress);
-          return bailoutOnAlreadyFinishedWork(current, workInProgress);
-        }
-        changedBits = 0;
-      } else {
-        changedBits =
-          typeof context._calculateChangedBits === "function"
-            ? context._calculateChangedBits(oldValue, newValue)
-            : MAX_SIGNED_31_BIT_INT;
-        {
-          !((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits)
-            ? warning(
-                false,
-                "calculateChangedBits: Expected the return value to be a " +
-                  "31-bit integer. Instead received: %s",
-                changedBits
-              )
-            : void 0;
-        }
-        changedBits |= 0;
-
-        if (changedBits === 0) {
-          // No change. Bailout early if children are the same.
-          if (oldProps.children === newProps.children && canBailOnProps) {
-            workInProgress.stateNode = 0;
-            pushProvider(workInProgress);
-            return bailoutOnAlreadyFinishedWork(current, workInProgress);
-          }
-        } else {
-          propagateContextChange(
-            workInProgress,
-            context,
-            changedBits,
-            renderExpirationTime
-          );
-        }
-      }
+      // The context value changed. Search for matching consumers and schedule
+      // them to update.
+      propagateContextChange(
+        workInProgress,
+        context,
+        changedBits,
+        renderExpirationTime
+      );
     }
   }
 
-  workInProgress.stateNode = changedBits;
-  pushProvider(workInProgress);
-
   var newChildren = newProps.children;
-  reconcileChildren(current, workInProgress, newChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    newChildren,
+    renderExpirationTime
+  );
   return workInProgress.child;
 }
 
-function updateContextConsumer(current, workInProgress, renderExpirationTime) {
-  var context = workInProgress.type;
-  var newProps = workInProgress.pendingProps;
-  var oldProps = workInProgress.memoizedProps;
-
-  var newValue = getContextCurrentValue(context);
-  var changedBits = getContextChangedBits(context);
-
-  if (hasContextChanged()) {
-    // Normally we can bail out on props equality but if context has changed
-    // we don't do the bailout and we have to reuse existing props instead.
-  } else if (changedBits === 0 && oldProps === newProps) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-  workInProgress.memoizedProps = newProps;
-
-  var observedBits = newProps.unstable_observedBits;
-  if (observedBits === undefined || observedBits === null) {
-    // Subscribe to all changes by default
-    observedBits = MAX_SIGNED_31_BIT_INT;
-  }
-  // Store the observedBits on the fiber's stateNode for quick access.
-  workInProgress.stateNode = observedBits;
-
-  if ((changedBits & observedBits) !== 0) {
-    // Context change propagation stops at matching consumers, for time-
-    // slicing. Continue the propagation here.
-    propagateContextChange(
-      workInProgress,
-      context,
-      changedBits,
-      renderExpirationTime
-    );
-  } else if (oldProps === newProps) {
-    // Skip over a memoized parent with a bitmask bailout even
-    // if we began working on it because of a deeper matching child.
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
-  // There is no bailout on `children` equality because we expect people
-  // to often pass a bound method as a child, but it may reference
-  // `this.state` or `this.props` (and thus needs to re-render on `setState`).
+var hasWarnedAboutUsingContextAsConsumer = false;
 
+function updateContextConsumer(
+  current$$1,
+  workInProgress,
+  renderExpirationTime
+) {
+  var context = workInProgress.type;
+  // The logic below for Context differs depending on PROD or DEV mode. In
+  // DEV mode, we create a separate object for Context.Consumer that acts
+  // like a proxy to Context. This proxy object adds unnecessary code in PROD
+  // so we use the old behaviour (Context.Consumer references Context) to
+  // reduce size and overhead. The separate object references context via
+  // a property called "_context", which also gives us the ability to check
+  // in DEV mode if this property exists or not and warn if it does not.
+  {
+    if (context._context === undefined) {
+      if (!hasWarnedAboutUsingContextAsConsumer) {
+        hasWarnedAboutUsingContextAsConsumer = true;
+        warning$1(
+          false,
+          "Rendering <Context> directly is not supported and will be removed in " +
+            "a future major release. Did you mean to render <Context.Consumer> instead?"
+        );
+      }
+    } else {
+      context = context._context;
+    }
+  }
+  var newProps = workInProgress.pendingProps;
   var render = newProps.children;
 
   {
     !(typeof render === "function")
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "A context consumer was rendered with multiple children, or a child " +
             "that isn't a function. A context consumer expects a single child " +
@@ -10600,17 +11421,25 @@ function updateContextConsumer(current, workInProgress, renderExpirationTime) {
       : void 0;
   }
 
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  var newValue = readContext(context, newProps.unstable_observedBits);
   var newChildren = void 0;
   {
-    ReactCurrentOwner.current = workInProgress;
-    ReactDebugCurrentFiber.setCurrentPhase("render");
+    ReactCurrentOwner$3.current = workInProgress;
+    setCurrentPhase("render");
     newChildren = render(newValue);
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+    setCurrentPhase(null);
   }
 
   // React DevTools reads this flag.
   workInProgress.effectTag |= PerformedWork;
-  reconcileChildren(current, workInProgress, newChildren);
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    newChildren,
+    renderExpirationTime
+  );
+  workInProgress.memoizedProps = newProps;
   return workInProgress.child;
 }
 
@@ -10633,59 +11462,39 @@ function updateContextConsumer(current, workInProgress, renderExpirationTime) {
   }
   */
 
-function bailoutOnAlreadyFinishedWork(current, workInProgress) {
+function bailoutOnAlreadyFinishedWork(
+  current$$1,
+  workInProgress,
+  renderExpirationTime
+) {
   cancelWorkTimer(workInProgress);
 
-  if (enableProfilerTimer) {
-    // Don't update "base" render times for bailouts.
-    stopBaseRenderTimerIfRunning();
-  }
-
-  // TODO: We should ideally be able to bail out early if the children have no
-  // more work to do. However, since we don't have a separation of this
-  // Fiber's priority and its children yet - we don't know without doing lots
-  // of the same work we do anyway. Once we have that separation we can just
-  // bail out here if the children has no more work at this priority level.
-  // if (workInProgress.priorityOfChildren <= priorityLevel) {
-  //   // If there are side-effects in these children that have not yet been
-  //   // committed we need to ensure that they get properly transferred up.
-  //   if (current && current.child !== workInProgress.child) {
-  //     reuseChildrenEffects(workInProgress, child);
-  //   }
-  //   return null;
-  // }
-
-  cloneChildFibers(current, workInProgress);
-  return workInProgress.child;
-}
-
-function bailoutOnLowPriority(current, workInProgress) {
-  cancelWorkTimer(workInProgress);
+  if (current$$1 !== null) {
+    // Reuse previous context list
+    workInProgress.firstContextDependency = current$$1.firstContextDependency;
+  }
 
   if (enableProfilerTimer) {
     // Don't update "base" render times for bailouts.
-    stopBaseRenderTimerIfRunning();
+    stopProfilerTimerIfRunning(workInProgress);
   }
 
-  // TODO: Handle HostComponent tags here as well and call pushHostContext()?
-  // See PR 8590 discussion for context
-  switch (workInProgress.tag) {
-    case HostRoot:
-      pushHostRootContext(workInProgress);
-      break;
-    case ClassComponent:
-      pushContextProvider(workInProgress);
-      break;
-    case HostPortal:
-      pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
-      break;
-    case ContextProvider:
-      pushProvider(workInProgress);
-      break;
+  // Check if the children have any pending work.
+  var childExpirationTime = workInProgress.childExpirationTime;
+  if (
+    childExpirationTime === NoWork ||
+    childExpirationTime > renderExpirationTime
+  ) {
+    // The children don't have any work either. We can skip them.
+    // TODO: Once we add back resuming, we should check if the children are
+    // a work-in-progress set. If so, we need to transfer their effects.
+    return null;
+  } else {
+    // This fiber doesn't have work, but its subtree does. Clone the child
+    // fibers and continue.
+    cloneChildFibers(current$$1, workInProgress);
+    return workInProgress.child;
   }
-  // TODO: What if this is currently in progress?
-  // How can that happen? How is this not being cloned?
-  return null;
 }
 
 // TODO: Delete memoizeProps/State and move to reconcile/bailout instead
@@ -10699,73 +11508,223 @@ function memoizeState(workInProgress, nextState) {
   // is handled by processUpdateQueue.
 }
 
-function beginWork(current, workInProgress, renderExpirationTime) {
-  if (enableProfilerTimer) {
-    if (workInProgress.mode & ProfileMode) {
-      markActualRenderTimeStarted(workInProgress);
+function beginWork(current$$1, workInProgress, renderExpirationTime) {
+  var updateExpirationTime = workInProgress.expirationTime;
+
+  if (current$$1 !== null) {
+    var oldProps = current$$1.memoizedProps;
+    var newProps = workInProgress.pendingProps;
+    if (
+      oldProps === newProps &&
+      !hasContextChanged() &&
+      (updateExpirationTime === NoWork ||
+        updateExpirationTime > renderExpirationTime)
+    ) {
+      // This fiber does not have any pending work. Bailout without entering
+      // the begin phase. There's still some bookkeeping we that needs to be done
+      // in this optimized path, mostly pushing stuff onto the stack.
+      switch (workInProgress.tag) {
+        case HostRoot:
+          pushHostRootContext(workInProgress);
+          resetHydrationState();
+          break;
+        case HostComponent:
+          pushHostContext(workInProgress);
+          break;
+        case ClassComponent: {
+          var Component = workInProgress.type;
+          if (isContextProvider(Component)) {
+            pushContextProvider(workInProgress);
+          }
+          break;
+        }
+        case ClassComponentLazy: {
+          var thenable = workInProgress.type;
+          var _Component = getResultFromResolvedThenable(thenable);
+          if (isContextProvider(_Component)) {
+            pushContextProvider(workInProgress);
+          }
+          break;
+        }
+        case HostPortal:
+          pushHostContainer(
+            workInProgress,
+            workInProgress.stateNode.containerInfo
+          );
+          break;
+        case ContextProvider: {
+          var newValue = workInProgress.memoizedProps.value;
+          pushProvider(workInProgress, newValue);
+          break;
+        }
+        case Profiler:
+          if (enableProfilerTimer) {
+            workInProgress.effectTag |= Update;
+          }
+          break;
+      }
+      return bailoutOnAlreadyFinishedWork(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      );
     }
   }
 
-  if (
-    workInProgress.expirationTime === NoWork ||
-    workInProgress.expirationTime > renderExpirationTime
-  ) {
-    return bailoutOnLowPriority(current, workInProgress);
-  }
+  // Before entering the begin phase, clear the expiration time.
+  workInProgress.expirationTime = NoWork;
 
   switch (workInProgress.tag) {
-    case IndeterminateComponent:
+    case IndeterminateComponent: {
+      var _Component2 = workInProgress.type;
       return mountIndeterminateComponent(
-        current,
+        current$$1,
         workInProgress,
+        _Component2,
+        updateExpirationTime,
         renderExpirationTime
       );
-    case FunctionalComponent:
-      return updateFunctionalComponent(current, workInProgress);
-    case ClassComponent:
+    }
+    case FunctionComponent: {
+      var _Component3 = workInProgress.type;
+      var unresolvedProps = workInProgress.pendingProps;
+      return updateFunctionComponent(
+        current$$1,
+        workInProgress,
+        _Component3,
+        unresolvedProps,
+        renderExpirationTime
+      );
+    }
+    case FunctionComponentLazy: {
+      var _thenable = workInProgress.type;
+      var _Component4 = getResultFromResolvedThenable(_thenable);
+      var _unresolvedProps = workInProgress.pendingProps;
+      var child = updateFunctionComponent(
+        current$$1,
+        workInProgress,
+        _Component4,
+        resolveDefaultProps(_Component4, _unresolvedProps),
+        renderExpirationTime
+      );
+      workInProgress.memoizedProps = _unresolvedProps;
+      return child;
+    }
+    case ClassComponent: {
+      var _Component5 = workInProgress.type;
+      var _unresolvedProps2 = workInProgress.pendingProps;
       return updateClassComponent(
-        current,
+        current$$1,
+        workInProgress,
+        _Component5,
+        _unresolvedProps2,
+        renderExpirationTime
+      );
+    }
+    case ClassComponentLazy: {
+      var _thenable2 = workInProgress.type;
+      var _Component6 = getResultFromResolvedThenable(_thenable2);
+      var _unresolvedProps3 = workInProgress.pendingProps;
+      var _child = updateClassComponent(
+        current$$1,
         workInProgress,
+        _Component6,
+        resolveDefaultProps(_Component6, _unresolvedProps3),
         renderExpirationTime
       );
+      workInProgress.memoizedProps = _unresolvedProps3;
+      return _child;
+    }
     case HostRoot:
-      return updateHostRoot(current, workInProgress, renderExpirationTime);
+      return updateHostRoot(current$$1, workInProgress, renderExpirationTime);
     case HostComponent:
-      return updateHostComponent(current, workInProgress, renderExpirationTime);
+      return updateHostComponent(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      );
     case HostText:
-      return updateHostText(current, workInProgress);
-    case TimeoutComponent:
-      return updateTimeoutComponent(
-        current,
+      return updateHostText(current$$1, workInProgress);
+    case SuspenseComponent:
+      return updateSuspenseComponent(
+        current$$1,
         workInProgress,
         renderExpirationTime
       );
     case HostPortal:
       return updatePortalComponent(
-        current,
+        current$$1,
         workInProgress,
         renderExpirationTime
       );
-    case ForwardRef:
-      return updateForwardRef(current, workInProgress);
+    case ForwardRef: {
+      var type = workInProgress.type;
+      return updateForwardRef(
+        current$$1,
+        workInProgress,
+        type,
+        workInProgress.pendingProps,
+        renderExpirationTime
+      );
+    }
+    case ForwardRefLazy: {
+      var _thenable3 = workInProgress.type;
+      var _Component7 = getResultFromResolvedThenable(_thenable3);
+      var _unresolvedProps4 = workInProgress.pendingProps;
+      var _child2 = updateForwardRef(
+        current$$1,
+        workInProgress,
+        _Component7,
+        resolveDefaultProps(_Component7, _unresolvedProps4),
+        renderExpirationTime
+      );
+      workInProgress.memoizedProps = _unresolvedProps4;
+      return _child2;
+    }
     case Fragment:
-      return updateFragment(current, workInProgress);
+      return updateFragment(current$$1, workInProgress, renderExpirationTime);
     case Mode:
-      return updateMode(current, workInProgress);
+      return updateMode(current$$1, workInProgress, renderExpirationTime);
     case Profiler:
-      return updateProfiler(current, workInProgress);
+      return updateProfiler(current$$1, workInProgress, renderExpirationTime);
     case ContextProvider:
       return updateContextProvider(
-        current,
+        current$$1,
         workInProgress,
         renderExpirationTime
       );
     case ContextConsumer:
       return updateContextConsumer(
-        current,
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      );
+    case PureComponent: {
+      var _type = workInProgress.type;
+      return updatePureComponent(
+        current$$1,
+        workInProgress,
+        _type,
+        workInProgress.pendingProps,
+        updateExpirationTime,
+        renderExpirationTime
+      );
+    }
+    case PureComponentLazy: {
+      var _thenable4 = workInProgress.type;
+      var _Component8 = getResultFromResolvedThenable(_thenable4);
+      var _unresolvedProps5 = workInProgress.pendingProps;
+      var _child3 = updatePureComponent(
+        current$$1,
         workInProgress,
+        _Component8,
+        resolveDefaultProps(_Component8, _unresolvedProps5),
+        updateExpirationTime,
         renderExpirationTime
       );
+      workInProgress.memoizedProps = _unresolvedProps5;
+      return _child3;
+    }
     default:
       invariant(
         false,
@@ -10827,13 +11786,36 @@ if (supportsMutation) {
   updateHostComponent$1 = function(
     current,
     workInProgress,
-    updatePayload,
     type,
-    oldProps,
     newProps,
-    rootContainerInstance,
-    currentHostContext
+    rootContainerInstance
   ) {
+    // If we have an alternate, that means this is an update and we need to
+    // schedule a side-effect to do the updates.
+    var oldProps = current.memoizedProps;
+    if (oldProps === newProps) {
+      // In mutation mode, this is sufficient for a bailout because
+      // we won't touch this node even if children changed.
+      return;
+    }
+
+    // If we get updated because one of our children updated, we don't
+    // have newProps so we'll have to reuse them.
+    // TODO: Split the update API as separate for the props vs. children.
+    // Even better would be if children weren't special cased at all tho.
+    var instance = workInProgress.stateNode;
+    var currentHostContext = getHostContext();
+    // TODO: Experiencing an error where oldProps is null. Suggests a host
+    // component is hitting the resume path. Figure out why. Possibly
+    // related to `hidden`.
+    var updatePayload = prepareUpdate(
+      instance,
+      type,
+      oldProps,
+      newProps,
+      rootContainerInstance,
+      currentHostContext
+    );
     // TODO: Type this specific to this type of component.
     workInProgress.updateQueue = updatePayload;
     // If the update payload indicates that there is a change or if there
@@ -10903,54 +11885,70 @@ if (supportsMutation) {
   updateHostComponent$1 = function(
     current,
     workInProgress,
-    updatePayload,
     type,
-    oldProps,
     newProps,
-    rootContainerInstance,
-    currentHostContext
+    rootContainerInstance
   ) {
+    var currentInstance = current.stateNode;
+    var oldProps = current.memoizedProps;
     // If there are no effects associated with this node, then none of our children had any updates.
     // This guarantees that we can reuse all of them.
     var childrenUnchanged = workInProgress.firstEffect === null;
-    var currentInstance = current.stateNode;
-    if (childrenUnchanged && updatePayload === null) {
+    if (childrenUnchanged && oldProps === newProps) {
       // No changes, just reuse the existing instance.
       // Note that this might release a previous clone.
       workInProgress.stateNode = currentInstance;
-    } else {
-      var recyclableInstance = workInProgress.stateNode;
-      var newInstance = cloneInstance(
-        currentInstance,
-        updatePayload,
+      return;
+    }
+    var recyclableInstance = workInProgress.stateNode;
+    var currentHostContext = getHostContext();
+    var updatePayload = null;
+    if (oldProps !== newProps) {
+      updatePayload = prepareUpdate(
+        recyclableInstance,
         type,
         oldProps,
         newProps,
-        workInProgress,
-        childrenUnchanged,
-        recyclableInstance
+        rootContainerInstance,
+        currentHostContext
       );
-      if (
-        finalizeInitialChildren(
-          newInstance,
-          type,
-          newProps,
-          rootContainerInstance,
-          currentHostContext
-        )
-      ) {
-        markUpdate(workInProgress);
-      }
-      workInProgress.stateNode = newInstance;
-      if (childrenUnchanged) {
-        // If there are no other effects in this tree, we need to flag this node as having one.
-        // Even though we're not going to use it for anything.
-        // Otherwise parents won't know that there are new children to propagate upwards.
-        markUpdate(workInProgress);
-      } else {
-        // If children might have changed, we have to add them all to the set.
-        appendAllChildren(newInstance, workInProgress);
-      }
+    }
+    if (childrenUnchanged && updatePayload === null) {
+      // No changes, just reuse the existing instance.
+      // Note that this might release a previous clone.
+      workInProgress.stateNode = currentInstance;
+      return;
+    }
+    var newInstance = cloneInstance(
+      currentInstance,
+      updatePayload,
+      type,
+      oldProps,
+      newProps,
+      workInProgress,
+      childrenUnchanged,
+      recyclableInstance
+    );
+    if (
+      finalizeInitialChildren(
+        newInstance,
+        type,
+        newProps,
+        rootContainerInstance,
+        currentHostContext
+      )
+    ) {
+      markUpdate(workInProgress);
+    }
+    workInProgress.stateNode = newInstance;
+    if (childrenUnchanged) {
+      // If there are no other effects in this tree, we need to flag this node as having one.
+      // Even though we're not going to use it for anything.
+      // Otherwise parents won't know that there are new children to propagate upwards.
+      markUpdate(workInProgress);
+    } else {
+      // If children might have changed, we have to add them all to the set.
+      appendAllChildren(newInstance, workInProgress);
     }
   };
   updateHostText$1 = function(current, workInProgress, oldText, newText) {
@@ -10977,12 +11975,9 @@ if (supportsMutation) {
   updateHostComponent$1 = function(
     current,
     workInProgress,
-    updatePayload,
     type,
-    oldProps,
     newProps,
-    rootContainerInstance,
-    currentHostContext
+    rootContainerInstance
   ) {
     // Noop
   };
@@ -10994,19 +11989,23 @@ if (supportsMutation) {
 function completeWork(current, workInProgress, renderExpirationTime) {
   var newProps = workInProgress.pendingProps;
 
-  if (enableProfilerTimer) {
-    if (workInProgress.mode & ProfileMode) {
-      recordElapsedActualRenderTime(workInProgress);
-    }
-  }
-
   switch (workInProgress.tag) {
-    case FunctionalComponent:
-      return null;
+    case FunctionComponent:
+    case FunctionComponentLazy:
+      break;
     case ClassComponent: {
-      // We are leaving this subtree, so pop context if any.
-      popContextProvider(workInProgress);
-      return null;
+      var Component = workInProgress.type;
+      if (isContextProvider(Component)) {
+        popContext(workInProgress);
+      }
+      break;
+    }
+    case ClassComponentLazy: {
+      var _Component = getResultFromResolvedThenable(workInProgress.type);
+      if (isContextProvider(_Component)) {
+        popContext(workInProgress);
+      }
+      break;
     }
     case HostRoot: {
       popHostContainer(workInProgress);
@@ -11025,43 +12024,19 @@ function completeWork(current, workInProgress, renderExpirationTime) {
         workInProgress.effectTag &= ~Placement;
       }
       updateHostContainer(workInProgress);
-      return null;
+      break;
     }
     case HostComponent: {
       popHostContext(workInProgress);
       var rootContainerInstance = getRootHostContainer();
       var type = workInProgress.type;
       if (current !== null && workInProgress.stateNode != null) {
-        // If we have an alternate, that means this is an update and we need to
-        // schedule a side-effect to do the updates.
-        var oldProps = current.memoizedProps;
-        // If we get updated because one of our children updated, we don't
-        // have newProps so we'll have to reuse them.
-        // TODO: Split the update API as separate for the props vs. children.
-        // Even better would be if children weren't special cased at all tho.
-        var instance = workInProgress.stateNode;
-        var currentHostContext = getHostContext();
-        // TODO: Experiencing an error where oldProps is null. Suggests a host
-        // component is hitting the resume path. Figure out why. Possibly
-        // related to `hidden`.
-        var updatePayload = prepareUpdate(
-          instance,
-          type,
-          oldProps,
-          newProps,
-          rootContainerInstance,
-          currentHostContext
-        );
-
         updateHostComponent$1(
           current,
           workInProgress,
-          updatePayload,
           type,
-          oldProps,
           newProps,
-          rootContainerInstance,
-          currentHostContext
+          rootContainerInstance
         );
 
         if (current.ref !== workInProgress.ref) {
@@ -11075,10 +12050,10 @@ function completeWork(current, workInProgress, renderExpirationTime) {
               "caused by a bug in React. Please file an issue."
           );
           // This can happen when we abort work.
-          return null;
+          break;
         }
 
-        var _currentHostContext = getHostContext();
+        var currentHostContext = getHostContext();
         // TODO: Move createInstance to beginWork and keep it on a context
         // "stack" as the parent. Then append children as we go in beginWork
         // or completeWork depending on we want to add then top->down or
@@ -11091,7 +12066,7 @@ function completeWork(current, workInProgress, renderExpirationTime) {
             prepareToHydrateHostInstance(
               workInProgress,
               rootContainerInstance,
-              _currentHostContext
+              currentHostContext
             )
           ) {
             // If changes to the hydrated node needs to be applied at the
@@ -11099,31 +12074,31 @@ function completeWork(current, workInProgress, renderExpirationTime) {
             markUpdate(workInProgress);
           }
         } else {
-          var _instance = createInstance(
+          var instance = createInstance(
             type,
             newProps,
             rootContainerInstance,
-            _currentHostContext,
+            currentHostContext,
             workInProgress
           );
 
-          appendAllChildren(_instance, workInProgress);
+          appendAllChildren(instance, workInProgress);
 
           // Certain renderers require commit-time effects for initial mount.
           // (eg DOM renderer supports auto-focus for certain elements).
           // Make sure such renderers get scheduled for later work.
           if (
             finalizeInitialChildren(
-              _instance,
+              instance,
               type,
               newProps,
               rootContainerInstance,
-              _currentHostContext
+              currentHostContext
             )
           ) {
             markUpdate(workInProgress);
           }
-          workInProgress.stateNode = _instance;
+          workInProgress.stateNode = instance;
         }
 
         if (workInProgress.ref !== null) {
@@ -11131,7 +12106,7 @@ function completeWork(current, workInProgress, renderExpirationTime) {
           markRef$1(workInProgress);
         }
       }
-      return null;
+      break;
     }
     case HostText: {
       var newText = newProps;
@@ -11148,10 +12123,9 @@ function completeWork(current, workInProgress, renderExpirationTime) {
               "caused by a bug in React. Please file an issue."
           );
           // This can happen when we abort work.
-          return null;
         }
         var _rootContainerInstance = getRootHostContainer();
-        var _currentHostContext2 = getHostContext();
+        var _currentHostContext = getHostContext();
         var _wasHydrated = popHydrationState(workInProgress);
         if (_wasHydrated) {
           if (prepareToHydrateHostTextInstance(workInProgress)) {
@@ -11161,33 +12135,37 @@ function completeWork(current, workInProgress, renderExpirationTime) {
           workInProgress.stateNode = createTextInstance(
             newText,
             _rootContainerInstance,
-            _currentHostContext2,
+            _currentHostContext,
             workInProgress
           );
         }
       }
-      return null;
+      break;
     }
     case ForwardRef:
-      return null;
-    case TimeoutComponent:
-      return null;
+    case ForwardRefLazy:
+      break;
+    case SuspenseComponent:
+      break;
     case Fragment:
-      return null;
+      break;
     case Mode:
-      return null;
+      break;
     case Profiler:
-      return null;
+      break;
     case HostPortal:
       popHostContainer(workInProgress);
       updateHostContainer(workInProgress);
-      return null;
+      break;
     case ContextProvider:
       // Pop provider fiber
       popProvider(workInProgress);
-      return null;
+      break;
     case ContextConsumer:
-      return null;
+      break;
+    case PureComponent:
+    case PureComponentLazy:
+      break;
     // Error cases
     case IndeterminateComponent:
       invariant(
@@ -11204,6 +12182,8 @@ function completeWork(current, workInProgress, renderExpirationTime) {
           "React. Please file an issue."
       );
   }
+
+  return null;
 }
 
 // Module provided by RN:
@@ -11257,11 +12237,6 @@ function logCapturedError(capturedError) {
   }
 
   var error = capturedError.error;
-  var suppressLogging = error && error.suppressReactErrorLogging;
-  if (suppressLogging) {
-    return;
-  }
-
   {
     var componentName = capturedError.componentName,
       componentStack = capturedError.componentStack,
@@ -11269,6 +12244,26 @@ function logCapturedError(capturedError) {
       errorBoundaryFound = capturedError.errorBoundaryFound,
       willRetry = capturedError.willRetry;
 
+    // Browsers support silencing uncaught errors by calling
+    // `preventDefault()` in window `error` handler.
+    // We record this information as an expando on the error.
+
+    if (error != null && error._suppressLogging) {
+      if (errorBoundaryFound && willRetry) {
+        // The error is recoverable and was silenced.
+        // Ignore it and don't print the stack addendum.
+        // This is handy for testing error boundaries without noise.
+        return;
+      }
+      // The error is fatal. Since the silencing might have
+      // been accidental, we'll surface it anyway.
+      // However, the browser would have silenced the original error
+      // so we'll print it first, and then print the stack addendum.
+      console.error(error);
+      // For a more detailed description of this block, see:
+      // https://github.com/facebook/react/pull/13384
+    }
+
     var componentNameMessage = componentName
       ? "The above error occurred in the <" + componentName + "> component:"
       : "The above error occurred in one of your React components:";
@@ -11307,9 +12302,7 @@ function logCapturedError(capturedError) {
   }
 }
 
-var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
-var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
-var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
+var emptyObject$1 = {};
 
 var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
 {
@@ -11320,11 +12313,11 @@ function logError(boundary, errorInfo) {
   var source = errorInfo.source;
   var stack = errorInfo.stack;
   if (stack === null && source !== null) {
-    stack = getStackAddendumByWorkInProgressFiber(source);
+    stack = getStackByFiberInDevAndProd(source);
   }
 
   var capturedError = {
-    componentName: source !== null ? getComponentName(source) : null,
+    componentName: source !== null ? getComponentName(source.type) : null,
     componentStack: stack !== null ? stack : "",
     error: errorInfo.value,
     errorBoundary: null,
@@ -11335,7 +12328,7 @@ function logError(boundary, errorInfo) {
 
   if (boundary !== null && boundary.tag === ClassComponent) {
     capturedError.errorBoundary = boundary.stateNode;
-    capturedError.errorBoundaryName = getComponentName(boundary);
+    capturedError.errorBoundaryName = getComponentName(boundary.type);
     capturedError.errorBoundaryFound = true;
     capturedError.willRetry = true;
   }
@@ -11343,49 +12336,50 @@ function logError(boundary, errorInfo) {
   try {
     logCapturedError(capturedError);
   } catch (e) {
-    // Prevent cycle if logCapturedError() throws.
-    // A cycle may still occur if logCapturedError renders a component that throws.
-    var suppressLogging = e && e.suppressReactErrorLogging;
-    if (!suppressLogging) {
-      console.error(e);
-    }
+    // This method must not throw, or React internal state will get messed up.
+    // If console.error is overridden, or logCapturedError() shows a dialog that throws,
+    // we want to report this error outside of the normal stack as a last resort.
+    // https://github.com/facebook/react/issues/13188
+    setTimeout(function() {
+      throw e;
+    });
   }
 }
 
-var callComponentWillUnmountWithTimer = function(current, instance) {
-  startPhaseTimer(current, "componentWillUnmount");
-  instance.props = current.memoizedProps;
-  instance.state = current.memoizedState;
+var callComponentWillUnmountWithTimer = function(current$$1, instance) {
+  startPhaseTimer(current$$1, "componentWillUnmount");
+  instance.props = current$$1.memoizedProps;
+  instance.state = current$$1.memoizedState;
   instance.componentWillUnmount();
   stopPhaseTimer();
 };
 
 // Capture errors so they don't interrupt unmounting.
-function safelyCallComponentWillUnmount(current, instance) {
+function safelyCallComponentWillUnmount(current$$1, instance) {
   {
-    invokeGuardedCallback$3(
+    invokeGuardedCallback(
       null,
       callComponentWillUnmountWithTimer,
       null,
-      current,
+      current$$1,
       instance
     );
-    if (hasCaughtError$1()) {
-      var unmountError = clearCaughtError$1();
-      captureCommitPhaseError(current, unmountError);
+    if (hasCaughtError()) {
+      var unmountError = clearCaughtError();
+      captureCommitPhaseError(current$$1, unmountError);
     }
   }
 }
 
-function safelyDetachRef(current) {
-  var ref = current.ref;
+function safelyDetachRef(current$$1) {
+  var ref = current$$1.ref;
   if (ref !== null) {
     if (typeof ref === "function") {
       {
-        invokeGuardedCallback$3(null, ref, null, null);
-        if (hasCaughtError$1()) {
-          var refError = clearCaughtError$1();
-          captureCommitPhaseError(current, refError);
+        invokeGuardedCallback(null, ref, null, null);
+        if (hasCaughtError()) {
+          var refError = clearCaughtError();
+          captureCommitPhaseError(current$$1, refError);
         }
       }
     } else {
@@ -11394,13 +12388,14 @@ function safelyDetachRef(current) {
   }
 }
 
-function commitBeforeMutationLifeCycles(current, finishedWork) {
+function commitBeforeMutationLifeCycles(current$$1, finishedWork) {
   switch (finishedWork.tag) {
-    case ClassComponent: {
+    case ClassComponent:
+    case ClassComponentLazy: {
       if (finishedWork.effectTag & Snapshot) {
-        if (current !== null) {
-          var prevProps = current.memoizedProps;
-          var prevState = current.memoizedState;
+        if (current$$1 !== null) {
+          var prevProps = current$$1.memoizedProps;
+          var prevState = current$$1.memoizedState;
           startPhaseTimer(finishedWork, "getSnapshotBeforeUpdate");
           var instance = finishedWork.stateNode;
           instance.props = finishedWork.memoizedProps;
@@ -11410,11 +12405,11 @@ function commitBeforeMutationLifeCycles(current, finishedWork) {
             var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
             if (snapshot === undefined && !didWarnSet.has(finishedWork.type)) {
               didWarnSet.add(finishedWork.type);
-              warning(
+              warningWithoutStack$1(
                 false,
                 "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
                   "must be returned. You have returned undefined.",
-                getComponentName(finishedWork)
+                getComponentName(finishedWork.type)
               );
             }
           }
@@ -11442,24 +12437,24 @@ function commitBeforeMutationLifeCycles(current, finishedWork) {
 
 function commitLifeCycles(
   finishedRoot,
-  current,
+  current$$1,
   finishedWork,
-  currentTime,
   committedExpirationTime
 ) {
   switch (finishedWork.tag) {
-    case ClassComponent: {
+    case ClassComponent:
+    case ClassComponentLazy: {
       var instance = finishedWork.stateNode;
       if (finishedWork.effectTag & Update) {
-        if (current === null) {
+        if (current$$1 === null) {
           startPhaseTimer(finishedWork, "componentDidMount");
           instance.props = finishedWork.memoizedProps;
           instance.state = finishedWork.memoizedState;
           instance.componentDidMount();
           stopPhaseTimer();
         } else {
-          var prevProps = current.memoizedProps;
-          var prevState = current.memoizedState;
+          var prevProps = current$$1.memoizedProps;
+          var prevState = current$$1.memoizedState;
           startPhaseTimer(finishedWork, "componentDidUpdate");
           instance.props = finishedWork.memoizedProps;
           instance.state = finishedWork.memoizedState;
@@ -11494,6 +12489,7 @@ function commitLifeCycles(
               _instance = getPublicInstance(finishedWork.child.stateNode);
               break;
             case ClassComponent:
+            case ClassComponentLazy:
               _instance = finishedWork.child.stateNode;
               break;
           }
@@ -11514,7 +12510,7 @@ function commitLifeCycles(
       // (eg DOM renderer may schedule auto-focus for inputs and form controls).
       // These effects should only be committed when components are first mounted,
       // aka when there is no current/alternate.
-      if (current === null && finishedWork.effectTag & Update) {
+      if (current$$1 === null && finishedWork.effectTag & Update) {
         var type = finishedWork.type;
         var props = finishedWork.memoizedProps;
       }
@@ -11530,11 +12526,47 @@ function commitLifeCycles(
       return;
     }
     case Profiler: {
-      // We have no life-cycles associated with Profiler.
+      if (enableProfilerTimer) {
+        var onRender = finishedWork.memoizedProps.onRender;
+
+        if (enableSchedulerTracing) {
+          onRender(
+            finishedWork.memoizedProps.id,
+            current$$1 === null ? "mount" : "update",
+            finishedWork.actualDuration,
+            finishedWork.treeBaseDuration,
+            finishedWork.actualStartTime,
+            getCommitTime(),
+            finishedRoot.memoizedInteractions
+          );
+        } else {
+          onRender(
+            finishedWork.memoizedProps.id,
+            current$$1 === null ? "mount" : "update",
+            finishedWork.actualDuration,
+            finishedWork.treeBaseDuration,
+            finishedWork.actualStartTime,
+            getCommitTime()
+          );
+        }
+      }
       return;
     }
-    case TimeoutComponent: {
-      // We have no life-cycles associated with Timeouts.
+    case SuspenseComponent: {
+      if ((finishedWork.mode & StrictMode) === NoEffect) {
+        // In loose mode, a placeholder times out by scheduling a synchronous
+        // update in the commit phase. Use `updateQueue` field to signal that
+        // the Timeout needs to switch to the placeholder. We don't need an
+        // entire queue. Any non-null value works.
+        // $FlowFixMe - Intentionally using a value other than an UpdateQueue.
+        finishedWork.updateQueue = emptyObject$1;
+        scheduleWork(finishedWork, Sync);
+      } else {
+        // In strict mode, the Update effect is used to record the time at
+        // which the placeholder timed out.
+        var currentTime = requestCurrentTime();
+        finishedWork.stateNode = { timedOutAt: currentTime };
+      }
       return;
     }
     default: {
@@ -11564,12 +12596,12 @@ function commitAttachRef(finishedWork) {
     } else {
       {
         if (!ref.hasOwnProperty("current")) {
-          warning(
+          warningWithoutStack$1(
             false,
             "Unexpected ref object provided for %s. " +
               "Use either a ref-setter function or React.createRef().%s",
-            getComponentName(finishedWork),
-            getStackAddendumByWorkInProgressFiber(finishedWork)
+            getComponentName(finishedWork.type),
+            getStackByFiberInDevAndProd(finishedWork)
           );
         }
       }
@@ -11579,8 +12611,8 @@ function commitAttachRef(finishedWork) {
   }
 }
 
-function commitDetachRef(current) {
-  var currentRef = current.ref;
+function commitDetachRef(current$$1) {
+  var currentRef = current$$1.ref;
   if (currentRef !== null) {
     if (typeof currentRef === "function") {
       currentRef(null);
@@ -11593,22 +12625,21 @@ function commitDetachRef(current) {
 // User-originating errors (lifecycles and refs) should not interrupt
 // deletion, so don't let them throw. Host-originating errors should
 // interrupt deletion, so it's okay
-function commitUnmount(current) {
-  if (typeof onCommitUnmount === "function") {
-    onCommitUnmount(current);
-  }
+function commitUnmount(current$$1) {
+  onCommitUnmount(current$$1);
 
-  switch (current.tag) {
-    case ClassComponent: {
-      safelyDetachRef(current);
-      var instance = current.stateNode;
+  switch (current$$1.tag) {
+    case ClassComponent:
+    case ClassComponentLazy: {
+      safelyDetachRef(current$$1);
+      var instance = current$$1.stateNode;
       if (typeof instance.componentWillUnmount === "function") {
-        safelyCallComponentWillUnmount(current, instance);
+        safelyCallComponentWillUnmount(current$$1, instance);
       }
       return;
     }
     case HostComponent: {
-      safelyDetachRef(current);
+      safelyDetachRef(current$$1);
       return;
     }
     case HostPortal: {
@@ -11616,9 +12647,9 @@ function commitUnmount(current) {
       // We are also not using this parent because
       // the portal will get pushed immediately.
       if (supportsMutation) {
-        unmountHostComponents(current);
+        unmountHostComponents(current$$1);
       } else if (supportsPersistence) {
-        emptyPortalContainer(current);
+        emptyPortalContainer(current$$1);
       }
       return;
     }
@@ -11659,26 +12690,26 @@ function commitNestedUnmounts(root) {
   }
 }
 
-function detachFiber(current) {
+function detachFiber(current$$1) {
   // Cut off the return pointers to disconnect it from the tree. Ideally, we
   // should clear the child pointer of the parent alternate to let this
   // get GC:ed but we don't know which for sure which parent is the current
   // one so we'll settle for GC:ing the subtree of this child. This child
   // itself will be GC:ed when the parent updates the next time.
-  current.return = null;
-  current.child = null;
-  if (current.alternate) {
-    current.alternate.child = null;
-    current.alternate.return = null;
+  current$$1.return = null;
+  current$$1.child = null;
+  if (current$$1.alternate) {
+    current$$1.alternate.child = null;
+    current$$1.alternate.return = null;
   }
 }
 
-function emptyPortalContainer(current) {
+function emptyPortalContainer(current$$1) {
   if (!supportsPersistence) {
     return;
   }
 
-  var portal = current.stateNode;
+  var portal = current$$1.stateNode;
   var containerInfo = portal.containerInfo;
 
   var emptyChildSet = createContainerChildSet(containerInfo);
@@ -11691,7 +12722,8 @@ function commitContainer(finishedWork) {
   }
 
   switch (finishedWork.tag) {
-    case ClassComponent: {
+    case ClassComponent:
+    case ClassComponentLazy: {
       return;
     }
     case HostComponent: {
@@ -11790,8 +12822,11 @@ function commitPlacement(finishedWork) {
 
   // Recursively insert all host nodes into the parent.
   var parentFiber = getHostParentFiber(finishedWork);
+
+  // Note: these two variables *must* always be updated together.
   var parent = void 0;
   var isContainer = void 0;
+
   switch (parentFiber.tag) {
     case HostComponent:
       parent = parentFiber.stateNode;
@@ -11859,13 +12894,15 @@ function commitPlacement(finishedWork) {
   }
 }
 
-function unmountHostComponents(current) {
-  // We only have the top Fiber that was inserted but we need recurse down its
-  var node = current;
+function unmountHostComponents(current$$1) {
+  // We only have the top Fiber that was deleted but we need recurse down its
+  var node = current$$1;
 
   // Each iteration, currentParent is populated with node's host parent if not
   // currentParentIsValid.
   var currentParentIsValid = false;
+
+  // Note: these two variables *must* always be updated together.
   var currentParent = void 0;
   var currentParentIsContainer = void 0;
 
@@ -11911,6 +12948,7 @@ function unmountHostComponents(current) {
       // When we go into a portal, it becomes the parent to remove from.
       // We will reassign it back when we pop the portal on the way up.
       currentParent = node.stateNode.containerInfo;
+      currentParentIsContainer = true;
       // Visit children because portals might contain host components.
       if (node.child !== null) {
         node.child.return = node;
@@ -11926,11 +12964,11 @@ function unmountHostComponents(current) {
         continue;
       }
     }
-    if (node === current) {
+    if (node === current$$1) {
       return;
     }
     while (node.sibling === null) {
-      if (node.return === null || node.return === current) {
+      if (node.return === null || node.return === current$$1) {
         return;
       }
       node = node.return;
@@ -11945,26 +12983,27 @@ function unmountHostComponents(current) {
   }
 }
 
-function commitDeletion(current) {
+function commitDeletion(current$$1) {
   if (supportsMutation) {
     // Recursively delete all host nodes from the parent.
     // Detach refs and call componentWillUnmount() on the whole subtree.
-    unmountHostComponents(current);
+    unmountHostComponents(current$$1);
   } else {
     // Detach refs and call componentWillUnmount() on the whole subtree.
-    commitNestedUnmounts(current);
+    commitNestedUnmounts(current$$1);
   }
-  detachFiber(current);
+  detachFiber(current$$1);
 }
 
-function commitWork(current, finishedWork) {
+function commitWork(current$$1, finishedWork) {
   if (!supportsMutation) {
     commitContainer(finishedWork);
     return;
   }
 
   switch (finishedWork.tag) {
-    case ClassComponent: {
+    case ClassComponent:
+    case ClassComponentLazy: {
       return;
     }
     case HostComponent: {
@@ -11975,7 +13014,8 @@ function commitWork(current, finishedWork) {
         // For hydration we reuse the update path but we treat the oldProps
         // as the newProps. The updatePayload will contain the real change in
         // this case.
-        var oldProps = current !== null ? current.memoizedProps : newProps;
+        var oldProps =
+          current$$1 !== null ? current$$1.memoizedProps : newProps;
         var type = finishedWork.type;
         // TODO: Type the updateQueue to be specific to host components.
         var updatePayload = finishedWork.updateQueue;
@@ -12004,7 +13044,7 @@ function commitWork(current, finishedWork) {
       // For hydration we reuse the update path but we treat the oldProps
       // as the newProps. The updatePayload will contain the real change in
       // this case.
-      var oldText = current !== null ? current.memoizedProps : newText;
+      var oldText = current$$1 !== null ? current$$1.memoizedProps : newText;
       commitTextUpdate(textInstance, oldText, newText);
       return;
     }
@@ -12012,20 +13052,9 @@ function commitWork(current, finishedWork) {
       return;
     }
     case Profiler: {
-      if (enableProfilerTimer) {
-        var onRender = finishedWork.memoizedProps.onRender;
-        onRender(
-          finishedWork.memoizedProps.id,
-          current === null ? "mount" : "update",
-          finishedWork.actualDuration,
-          finishedWork.treeBaseTime,
-          finishedWork.actualStartTime,
-          getCommitTime()
-        );
-      }
       return;
     }
-    case TimeoutComponent: {
+    case SuspenseComponent: {
       return;
     }
     default: {
@@ -12038,11 +13067,15 @@ function commitWork(current, finishedWork) {
   }
 }
 
-function commitResetTextContent(current) {
+function commitResetTextContent(current$$1) {
   if (!supportsMutation) {
     return;
   }
-  resetTextContent(current.stateNode);
+  resetTextContent(current$$1.stateNode);
+}
+
+function NoopComponent() {
+  return null;
 }
 
 function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
@@ -12063,28 +13096,22 @@ function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
 function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   var update = createUpdate(expirationTime);
   update.tag = CaptureUpdate;
-  var getDerivedStateFromCatch = fiber.type.getDerivedStateFromCatch;
-  if (
-    enableGetDerivedStateFromCatch &&
-    typeof getDerivedStateFromCatch === "function"
-  ) {
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if (typeof getDerivedStateFromError === "function") {
     var error = errorInfo.value;
     update.payload = function() {
-      return getDerivedStateFromCatch(error);
+      return getDerivedStateFromError(error);
     };
   }
 
   var inst = fiber.stateNode;
   if (inst !== null && typeof inst.componentDidCatch === "function") {
     update.callback = function callback() {
-      if (
-        !enableGetDerivedStateFromCatch ||
-        getDerivedStateFromCatch !== "function"
-      ) {
+      if (typeof getDerivedStateFromError !== "function") {
         // To preserve the preexisting retry behavior of error boundaries,
         // we keep track of which ones already failed during this batch.
         // This gets reset before we yield back to the browser.
-        // TODO: Warn in strict mode if getDerivedStateFromCatch is
+        // TODO: Warn in strict mode if getDerivedStateFromError is
         // not defined.
         markLegacyErrorBoundaryAsFailed(this);
       }
@@ -12094,28 +13121,32 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
       this.componentDidCatch(error, {
         componentStack: stack !== null ? stack : ""
       });
+      {
+        if (typeof getDerivedStateFromError !== "function") {
+          // If componentDidCatch is the only error boundary method defined,
+          // then it needs to call setState to recover from errors.
+          // If no state update is scheduled then the boundary will swallow the error.
+          !(fiber.expirationTime === Sync)
+            ? warningWithoutStack$1(
+                false,
+                "%s: Error boundaries should implement getDerivedStateFromError(). " +
+                  "In that method, return a state update to display an error message or fallback UI.",
+                getComponentName(fiber.type) || "Unknown"
+              )
+            : void 0;
+        }
+      }
     };
   }
   return update;
 }
 
-function schedulePing(finishedWork) {
-  // Once the promise resolves, we should try rendering the non-
-  // placeholder state again.
-  var currentTime = recalculateCurrentTime();
-  var expirationTime = computeExpirationForFiber(currentTime, finishedWork);
-  var recoveryUpdate = createUpdate(expirationTime);
-  enqueueUpdate(finishedWork, recoveryUpdate, expirationTime);
-  scheduleWork(finishedWork, expirationTime);
-}
-
 function throwException(
   root,
   returnFiber,
   sourceFiber,
   value,
-  renderExpirationTime,
-  currentTimeMs
+  renderExpirationTime
 ) {
   // The source fiber did not complete.
   sourceFiber.effectTag |= Incomplete;
@@ -12123,7 +13154,6 @@ function throwException(
   sourceFiber.firstEffect = sourceFiber.lastEffect = null;
 
   if (
-    enableSuspense &&
     value !== null &&
     typeof value === "object" &&
     typeof value.then === "function"
@@ -12131,111 +13161,181 @@ function throwException(
     // This is a thenable.
     var thenable = value;
 
-    // TODO: Should use the earliest known expiration time
-    var expirationTimeMs = expirationTimeToMs(renderExpirationTime);
-    var startTimeMs = expirationTimeMs - 5000;
-    var elapsedMs = currentTimeMs - startTimeMs;
-    if (elapsedMs < 0) {
-      elapsedMs = 0;
-    }
-    var remainingTimeMs = expirationTimeMs - currentTimeMs;
-
-    // Find the earliest timeout of all the timeouts in the ancestor path.
-    // TODO: Alternatively, we could store the earliest timeout on the context
-    // stack, rather than searching on every suspend.
+    // Find the earliest timeout threshold of all the placeholders in the
+    // ancestor path. We could avoid this traversal by storing the thresholds on
+    // the stack, but we choose not to because we only hit this path if we're
+    // IO-bound (i.e. if something suspends). Whereas the stack is used even in
+    // the non-IO- bound case.
     var _workInProgress = returnFiber;
     var earliestTimeoutMs = -1;
-    searchForEarliestTimeout: do {
-      if (_workInProgress.tag === TimeoutComponent) {
+    var startTimeMs = -1;
+    do {
+      if (_workInProgress.tag === SuspenseComponent) {
         var current = _workInProgress.alternate;
-        if (current !== null && current.memoizedState === true) {
-          // A parent Timeout already committed in a placeholder state. We
-          // need to handle this promise immediately. In other words, we
-          // should never suspend inside a tree that already expired.
-          earliestTimeoutMs = 0;
-          break searchForEarliestTimeout;
+        if (
+          current !== null &&
+          current.memoizedState === true &&
+          current.stateNode !== null
+        ) {
+          // Reached a placeholder that already timed out. Each timed out
+          // placeholder acts as the root of a new suspense boundary.
+
+          // Use the time at which the placeholder timed out as the start time
+          // for the current render.
+          var timedOutAt = current.stateNode.timedOutAt;
+          startTimeMs = expirationTimeToMs(timedOutAt);
+
+          // Do not search any further.
+          break;
         }
-        var timeoutPropMs = _workInProgress.pendingProps.ms;
+        var timeoutPropMs = _workInProgress.pendingProps.maxDuration;
         if (typeof timeoutPropMs === "number") {
           if (timeoutPropMs <= 0) {
             earliestTimeoutMs = 0;
-            break searchForEarliestTimeout;
           } else if (
             earliestTimeoutMs === -1 ||
             timeoutPropMs < earliestTimeoutMs
           ) {
             earliestTimeoutMs = timeoutPropMs;
           }
-        } else if (earliestTimeoutMs === -1) {
-          earliestTimeoutMs = remainingTimeMs;
         }
       }
       _workInProgress = _workInProgress.return;
     } while (_workInProgress !== null);
 
-    // Compute the remaining time until the timeout.
-    var msUntilTimeout = earliestTimeoutMs - elapsedMs;
+    // Schedule the nearest Suspense to re-render the timed out view.
+    _workInProgress = returnFiber;
+    do {
+      if (_workInProgress.tag === SuspenseComponent) {
+        var didTimeout = _workInProgress.memoizedState;
+        if (!didTimeout) {
+          // Found the nearest boundary.
+
+          // If the boundary is not in concurrent mode, we should not suspend, and
+          // likewise, when the promise resolves, we should ping synchronously.
+          var pingTime =
+            (_workInProgress.mode & ConcurrentMode) === NoEffect
+              ? Sync
+              : renderExpirationTime;
+
+          // Attach a listener to the promise to "ping" the root and retry.
+          var onResolveOrReject = retrySuspendedRoot.bind(
+            null,
+            root,
+            _workInProgress,
+            pingTime
+          );
+          if (enableSchedulerTracing) {
+            onResolveOrReject = tracing.unstable_wrap(onResolveOrReject);
+          }
+          thenable.then(onResolveOrReject, onResolveOrReject);
+
+          // If the boundary is outside of strict mode, we should *not* suspend
+          // the commit. Pretend as if the suspended component rendered null and
+          // keep rendering. In the commit phase, we'll schedule a subsequent
+          // synchronous update to re-render the Suspense.
+          //
+          // Note: It doesn't matter whether the component that suspended was
+          // inside a strict mode tree. If the Suspense is outside of it, we
+          // should *not* suspend the commit.
+          if ((_workInProgress.mode & StrictMode) === NoEffect) {
+            _workInProgress.effectTag |= Update;
+
+            // Unmount the source fiber's children
+            var nextChildren = null;
+            reconcileChildren(
+              sourceFiber.alternate,
+              sourceFiber,
+              nextChildren,
+              renderExpirationTime
+            );
+            sourceFiber.effectTag &= ~Incomplete;
+            if (sourceFiber.tag === IndeterminateComponent) {
+              // Let's just assume it's a function component. This fiber will
+              // be unmounted in the immediate next commit, anyway.
+              sourceFiber.tag = FunctionComponent;
+            }
+
+            if (
+              sourceFiber.tag === ClassComponent ||
+              sourceFiber.tag === ClassComponentLazy
+            ) {
+              // We're going to commit this fiber even though it didn't
+              // complete. But we shouldn't call any lifecycle methods or
+              // callbacks. Remove all lifecycle effect tags.
+              sourceFiber.effectTag &= ~LifecycleEffectMask;
+              if (sourceFiber.alternate === null) {
+                // We're about to mount a class component that doesn't have an
+                // instance. Turn this into a dummy function component instead,
+                // to prevent type errors. This is a bit weird but it's an edge
+                // case and we're about to synchronously delete this
+                // component, anyway.
+                sourceFiber.tag = FunctionComponent;
+                sourceFiber.type = NoopComponent;
+              }
+            }
 
-    if (renderExpirationTime === Never || msUntilTimeout > 0) {
-      // There's still time remaining.
-      markTimeout(root, thenable, msUntilTimeout, renderExpirationTime);
-      var onResolveOrReject = function() {
-        retrySuspendedRoot(root, renderExpirationTime);
-      };
-      thenable.then(onResolveOrReject, onResolveOrReject);
-      return;
-    } else {
-      // No time remaining. Need to fallback to placeholder.
-      // Find the nearest timeout that can be retried.
-      _workInProgress = returnFiber;
-      do {
-        switch (_workInProgress.tag) {
-          case HostRoot: {
-            // The root expired, but no fallback was provided. Throw a
-            // helpful error.
-            var message =
-              renderExpirationTime === Sync
-                ? "A synchronous update was suspended, but no fallback UI " +
-                  "was provided."
-                : "An update was suspended for longer than the timeout, " +
-                  "but no fallback UI was provided.";
-            value = new Error(message);
-            break;
+            // Exit without suspending.
+            return;
           }
-          case TimeoutComponent: {
-            if ((_workInProgress.effectTag & DidCapture) === NoEffect) {
-              _workInProgress.effectTag |= ShouldCapture;
-              var _onResolveOrReject = schedulePing.bind(null, _workInProgress);
-              thenable.then(_onResolveOrReject, _onResolveOrReject);
-              return;
+
+          // Confirmed that the boundary is in a strict mode tree. Continue with
+          // the normal suspend path.
+
+          var absoluteTimeoutMs = void 0;
+          if (earliestTimeoutMs === -1) {
+            // If no explicit threshold is given, default to an abitrarily large
+            // value. The actual size doesn't matter because the threshold for the
+            // whole tree will be clamped to the expiration time.
+            absoluteTimeoutMs = maxSigned31BitInt;
+          } else {
+            if (startTimeMs === -1) {
+              // This suspend happened outside of any already timed-out
+              // placeholders. We don't know exactly when the update was scheduled,
+              // but we can infer an approximate start time from the expiration
+              // time. First, find the earliest uncommitted expiration time in the
+              // tree, including work that is suspended. Then subtract the offset
+              // used to compute an async update's expiration time. This will cause
+              // high priority (interactive) work to expire earlier than necessary,
+              // but we can account for this by adjusting for the Just Noticeable
+              // Difference.
+              var earliestExpirationTime = findEarliestOutstandingPriorityLevel(
+                root,
+                renderExpirationTime
+              );
+              var earliestExpirationTimeMs = expirationTimeToMs(
+                earliestExpirationTime
+              );
+              startTimeMs = earliestExpirationTimeMs - LOW_PRIORITY_EXPIRATION;
             }
-            // Already captured during this render. Continue to the next
-            // Timeout ancestor.
-            break;
+            absoluteTimeoutMs = startTimeMs + earliestTimeoutMs;
           }
+
+          // Mark the earliest timeout in the suspended fiber's ancestor path.
+          // After completing the root, we'll take the largest of all the
+          // suspended fiber's timeouts and use it to compute a timeout for the
+          // whole tree.
+          renderDidSuspend(root, absoluteTimeoutMs, renderExpirationTime);
+
+          _workInProgress.effectTag |= ShouldCapture;
+          _workInProgress.expirationTime = renderExpirationTime;
+          return;
         }
-        _workInProgress = _workInProgress.return;
-      } while (_workInProgress !== null);
-    }
-  } else {
-    // This is an error.
-    markError(root);
-    if (
-      // Retry (at the same priority) one more time before handling the error.
-      // The retry will flush synchronously. (Unless we're already rendering
-      // synchronously, in which case move to the next check.)
-      (!root.didError && renderExpirationTime !== Sync) ||
-      // There's lower priority work. If so, it may have the effect of fixing
-      // the exception that was just thrown.
-      hasLowerPriorityWork(root, renderExpirationTime)
-    ) {
-      return;
-    }
+        // This boundary already captured during this render. Continue to the
+        // next boundary.
+      }
+      _workInProgress = _workInProgress.return;
+    } while (_workInProgress !== null);
+    // No boundary was found. Fallthrough to error mode.
+    value = new Error(
+      "An update was suspended, but no placeholder UI was provided."
+    );
   }
 
   // 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 = createCapturedValue(value, sourceFiber);
   var workInProgress = returnFiber;
   do {
@@ -12243,35 +13343,37 @@ function throwException(
       case HostRoot: {
         var _errorInfo = value;
         workInProgress.effectTag |= ShouldCapture;
+        workInProgress.expirationTime = renderExpirationTime;
         var update = createRootErrorUpdate(
           workInProgress,
           _errorInfo,
           renderExpirationTime
         );
-        enqueueCapturedUpdate(workInProgress, update, renderExpirationTime);
+        enqueueCapturedUpdate(workInProgress, update);
         return;
       }
       case ClassComponent:
+      case ClassComponentLazy:
         // Capture and retry
         var errorInfo = value;
         var ctor = workInProgress.type;
         var instance = workInProgress.stateNode;
         if (
           (workInProgress.effectTag & DidCapture) === NoEffect &&
-          ((typeof ctor.getDerivedStateFromCatch === "function" &&
-            enableGetDerivedStateFromCatch) ||
+          (typeof ctor.getDerivedStateFromError === "function" ||
             (instance !== null &&
               typeof instance.componentDidCatch === "function" &&
               !isAlreadyFailedLegacyErrorBoundary(instance)))
         ) {
           workInProgress.effectTag |= ShouldCapture;
+          workInProgress.expirationTime = renderExpirationTime;
           // Schedule the error boundary to re-render using updated state
           var _update = createClassErrorUpdate(
             workInProgress,
             errorInfo,
             renderExpirationTime
           );
-          enqueueCapturedUpdate(workInProgress, _update, renderExpirationTime);
+          enqueueCapturedUpdate(workInProgress, _update);
           return;
         }
         break;
@@ -12283,15 +13385,12 @@ function throwException(
 }
 
 function unwindWork(workInProgress, renderExpirationTime) {
-  if (enableProfilerTimer) {
-    if (workInProgress.mode & ProfileMode) {
-      recordElapsedActualRenderTime(workInProgress);
-    }
-  }
-
   switch (workInProgress.tag) {
     case ClassComponent: {
-      popContextProvider(workInProgress);
+      var Component = workInProgress.type;
+      if (isContextProvider(Component)) {
+        popContext(workInProgress);
+      }
       var effectTag = workInProgress.effectTag;
       if (effectTag & ShouldCapture) {
         workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
@@ -12299,9 +13398,11 @@ function unwindWork(workInProgress, renderExpirationTime) {
       }
       return null;
     }
-    case HostRoot: {
-      popHostContainer(workInProgress);
-      popTopLevelContextObject(workInProgress);
+    case ClassComponentLazy: {
+      var _Component = workInProgress.type._reactResult;
+      if (isContextProvider(_Component)) {
+        popContext(workInProgress);
+      }
       var _effectTag = workInProgress.effectTag;
       if (_effectTag & ShouldCapture) {
         workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
@@ -12309,14 +13410,26 @@ function unwindWork(workInProgress, renderExpirationTime) {
       }
       return null;
     }
+    case HostRoot: {
+      popHostContainer(workInProgress);
+      popTopLevelContextObject(workInProgress);
+      var _effectTag2 = workInProgress.effectTag;
+      invariant(
+        (_effectTag2 & DidCapture) === NoEffect,
+        "The root failed to unmount after an error. This is likely a bug in " +
+          "React. Please file an issue."
+      );
+      workInProgress.effectTag = (_effectTag2 & ~ShouldCapture) | DidCapture;
+      return workInProgress;
+    }
     case HostComponent: {
       popHostContext(workInProgress);
       return null;
     }
-    case TimeoutComponent: {
-      var _effectTag2 = workInProgress.effectTag;
-      if (_effectTag2 & ShouldCapture) {
-        workInProgress.effectTag = (_effectTag2 & ~ShouldCapture) | DidCapture;
+    case SuspenseComponent: {
+      var _effectTag3 = workInProgress.effectTag;
+      if (_effectTag3 & ShouldCapture) {
+        workInProgress.effectTag = (_effectTag3 & ~ShouldCapture) | DidCapture;
         return workInProgress;
       }
       return null;
@@ -12333,17 +13446,20 @@ function unwindWork(workInProgress, renderExpirationTime) {
 }
 
 function unwindInterruptedWork(interruptedWork) {
-  if (enableProfilerTimer) {
-    if (interruptedWork.mode & ProfileMode) {
-      // Resume in case we're picking up on work that was paused.
-      resumeActualRenderTimerIfPaused();
-      recordElapsedActualRenderTime(interruptedWork);
-    }
-  }
-
   switch (interruptedWork.tag) {
     case ClassComponent: {
-      popContextProvider(interruptedWork);
+      var childContextTypes = interruptedWork.type.childContextTypes;
+      if (childContextTypes !== null && childContextTypes !== undefined) {
+        popContext(interruptedWork);
+      }
+      break;
+    }
+    case ClassComponentLazy: {
+      var _childContextTypes =
+        interruptedWork.type._reactResult.childContextTypes;
+      if (_childContextTypes !== null && _childContextTypes !== undefined) {
+        popContext(interruptedWork);
+      }
       break;
     }
     case HostRoot: {
@@ -12366,15 +13482,30 @@ function unwindInterruptedWork(interruptedWork) {
   }
 }
 
-var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
-var hasCaughtError = ReactErrorUtils.hasCaughtError;
-var clearCaughtError = ReactErrorUtils.clearCaughtError;
+var Dispatcher = {
+  readContext: readContext
+};
+
+var ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner;
 
 var didWarnAboutStateTransition = void 0;
 var didWarnSetStateChildContext = void 0;
 var warnAboutUpdateOnUnmounted = void 0;
 var warnAboutInvalidUpdates = void 0;
 
+if (enableSchedulerTracing) {
+  // Provide explicit error message when production+profiling bundle of e.g. react-dom
+  // is used with production (non-profiling) bundle of schedule/tracing
+  invariant(
+    tracing.__interactionsRef != null &&
+      tracing.__interactionsRef.current != null,
+    "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) " +
+      "without also replacing the `schedule/tracing` module with `schedule/tracing-profiling`. " +
+      "Your bundler might have a setting for aliasing both modules. " +
+      "Learn more at http://fb.me/react-profiling"
+  );
+}
+
 {
   didWarnAboutStateTransition = false;
   didWarnSetStateChildContext = false;
@@ -12383,28 +13514,28 @@ var warnAboutInvalidUpdates = void 0;
   warnAboutUpdateOnUnmounted = function(fiber) {
     // We show the whole stack but dedupe on the top component's name because
     // the problematic code almost always lies inside that component.
-    var componentName = getComponentName(fiber) || "ReactClass";
+    var componentName = getComponentName(fiber.type) || "ReactClass";
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
-    warning(
+    warningWithoutStack$1(
       false,
       "Can't call setState (or forceUpdate) on an unmounted component. This " +
         "is a no-op, but it indicates a memory leak in your application. To " +
         "fix, cancel all subscriptions and asynchronous tasks in the " +
         "componentWillUnmount method.%s",
-      getStackAddendumByWorkInProgressFiber(fiber)
+      getStackByFiberInDevAndProd(fiber)
     );
     didWarnStateUpdateForUnmountedComponent[componentName] = true;
   };
 
   warnAboutInvalidUpdates = function(instance) {
-    switch (ReactDebugCurrentFiber.phase) {
+    switch (phase) {
       case "getChildContext":
         if (didWarnSetStateChildContext) {
           return;
         }
-        warning(
+        warningWithoutStack$1(
           false,
           "setState(...): Cannot call setState() inside getChildContext()"
         );
@@ -12414,12 +13545,10 @@ var warnAboutInvalidUpdates = void 0;
         if (didWarnAboutStateTransition) {
           return;
         }
-        warning(
+        warningWithoutStack$1(
           false,
           "Cannot update during an existing state transition (such as within " +
-            "`render` or another component's constructor). Render methods should " +
-            "be a pure function of props and state; constructor side-effects are " +
-            "an anti-pattern, but can be moved to `componentWillMount`."
+            "`render`). Render methods should be a pure function of props and state."
         );
         didWarnAboutStateTransition = true;
         break;
@@ -12427,14 +13556,6 @@ var warnAboutInvalidUpdates = void 0;
   };
 }
 
-// Represents the current time in ms.
-var originalStartTimeMs = now();
-var mostRecentCurrentTime = msToExpirationTime(0);
-var mostRecentCurrentTimeMs = originalStartTimeMs;
-
-// Used to ensure computeUniqueAsyncExpiration is monotonically increases.
-var lastUniqueAsyncExpiration = 0;
-
 // Represents the expiration time that incoming updates should use. (If this
 // is NoWork, use the default strategy: async updates in async mode, sync
 // updates in sync mode.)
@@ -12447,7 +13568,7 @@ var nextUnitOfWork = null;
 var nextRoot = null;
 // The time at which we're currently rendering work.
 var nextRenderExpirationTime = NoWork;
-var nextLatestTimeoutMs = -1;
+var nextLatestAbsoluteTimeoutMs = -1;
 var nextRenderDidError = false;
 
 // The next fiber with an effect that we're currently committing.
@@ -12484,7 +13605,7 @@ if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     // Restore the original state of the work-in-progress
     if (stashedWorkInProgressProperties === null) {
       // This should never happen. Don't throw because this code is DEV-only.
-      warning(
+      warningWithoutStack$1(
         false,
         "Could not replay rendering after an error. This is likely a bug in React. " +
           "Please file an issue."
@@ -12504,9 +13625,20 @@ if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
       case HostComponent:
         popHostContext(failedUnitOfWork);
         break;
-      case ClassComponent:
-        popContextProvider(failedUnitOfWork);
+      case ClassComponent: {
+        var Component = failedUnitOfWork.type;
+        if (isContextProvider(Component)) {
+          popContext(failedUnitOfWork);
+        }
+        break;
+      }
+      case ClassComponentLazy: {
+        var _Component = getResultFromResolvedThenable(failedUnitOfWork.type);
+        if (isContextProvider(_Component)) {
+          popContext(failedUnitOfWork);
+        }
         break;
+      }
       case HostPortal:
         popHostContainer(failedUnitOfWork);
         break;
@@ -12517,19 +13649,22 @@ if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     // Replay the begin phase.
     isReplayingFailedUnitOfWork = true;
     originalReplayError = thrownValue;
-    invokeGuardedCallback$2(null, workLoop, null, isYieldy);
+    invokeGuardedCallback(null, workLoop, null, isYieldy);
     isReplayingFailedUnitOfWork = false;
     originalReplayError = null;
     if (hasCaughtError()) {
-      clearCaughtError();
-
-      if (enableProfilerTimer) {
-        if (failedUnitOfWork.mode & ProfileMode) {
-          recordElapsedActualRenderTime(failedUnitOfWork);
+      var replayError = clearCaughtError();
+      if (replayError != null && thrownValue != null) {
+        try {
+          // Reading the expando property is intentionally
+          // inside `try` because it might be a getter or Proxy.
+          if (replayError._suppressLogging) {
+            // Also suppress logging for the original error.
+            thrownValue._suppressLogging = true;
+          }
+        } catch (inner) {
+          // Ignore.
         }
-
-        // Stop "base" render timer again (after the re-thrown error).
-        stopBaseRenderTimerIfRunning();
       }
     } else {
       // If the begin phase did not fail the second time, set this pointer
@@ -12558,7 +13693,7 @@ function resetStack() {
 
   nextRoot = null;
   nextRenderExpirationTime = NoWork;
-  nextLatestTimeoutMs = -1;
+  nextLatestAbsoluteTimeoutMs = -1;
   nextRenderDidError = false;
   nextUnitOfWork = null;
 }
@@ -12566,7 +13701,7 @@ function resetStack() {
 function commitAllHostEffects() {
   while (nextEffect !== null) {
     {
-      ReactDebugCurrentFiber.setCurrentFiber(nextEffect);
+      setCurrentFiber(nextEffect);
     }
     recordEffect();
 
@@ -12577,9 +13712,9 @@ function commitAllHostEffects() {
     }
 
     if (effectTag & Ref) {
-      var current = nextEffect.alternate;
-      if (current !== null) {
-        commitDetachRef(current);
+      var current$$1 = nextEffect.alternate;
+      if (current$$1 !== null) {
+        commitDetachRef(current$$1);
       }
     }
 
@@ -12625,53 +13760,52 @@ function commitAllHostEffects() {
   }
 
   {
-    ReactDebugCurrentFiber.resetCurrentFiber();
+    resetCurrentFiber();
   }
 }
 
 function commitBeforeMutationLifecycles() {
   while (nextEffect !== null) {
-    var effectTag = nextEffect.effectTag;
+    {
+      setCurrentFiber(nextEffect);
+    }
 
+    var effectTag = nextEffect.effectTag;
     if (effectTag & Snapshot) {
       recordEffect();
-      var current = nextEffect.alternate;
-      commitBeforeMutationLifeCycles(current, nextEffect);
+      var current$$1 = nextEffect.alternate;
+      commitBeforeMutationLifeCycles(current$$1, nextEffect);
     }
 
     // Don't cleanup effects yet;
     // This will be done by commitAllLifeCycles()
     nextEffect = nextEffect.nextEffect;
   }
+
+  {
+    resetCurrentFiber();
+  }
 }
 
-function commitAllLifeCycles(
-  finishedRoot,
-  currentTime,
-  committedExpirationTime
-) {
+function commitAllLifeCycles(finishedRoot, committedExpirationTime) {
   {
     ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings();
+    ReactStrictModeWarnings.flushLegacyContextWarning();
 
     if (warnAboutDeprecatedLifecycles) {
       ReactStrictModeWarnings.flushPendingDeprecationWarnings();
     }
-
-    if (warnAboutLegacyContextAPI) {
-      ReactStrictModeWarnings.flushLegacyContextWarning();
-    }
   }
   while (nextEffect !== null) {
     var effectTag = nextEffect.effectTag;
 
     if (effectTag & (Update | Callback)) {
       recordEffect();
-      var current = nextEffect.alternate;
+      var current$$1 = nextEffect.alternate;
       commitLifeCycles(
         finishedRoot,
-        current,
+        current$$1,
         nextEffect,
-        currentTime,
         committedExpirationTime
       );
     }
@@ -12730,12 +13864,26 @@ function commitRoot(root, finishedWork) {
   // Update the pending priority levels to account for the work that we are
   // about to commit. This needs to happen before calling the lifecycles, since
   // they may schedule additional updates.
-  var earliestRemainingTime = finishedWork.expirationTime;
-  var currentTime = recalculateCurrentTime();
-  markCommittedPriorityLevels(root, currentTime, earliestRemainingTime);
+  var updateExpirationTimeBeforeCommit = finishedWork.expirationTime;
+  var childExpirationTimeBeforeCommit = finishedWork.childExpirationTime;
+  var earliestRemainingTimeBeforeCommit =
+    updateExpirationTimeBeforeCommit === NoWork ||
+    (childExpirationTimeBeforeCommit !== NoWork &&
+      childExpirationTimeBeforeCommit < updateExpirationTimeBeforeCommit)
+      ? childExpirationTimeBeforeCommit
+      : updateExpirationTimeBeforeCommit;
+  markCommittedPriorityLevels(root, earliestRemainingTimeBeforeCommit);
+
+  var prevInteractions = null;
+  if (enableSchedulerTracing) {
+    // Restore any pending interactions at this point,
+    // So that cascading work triggered during the render phase will be accounted for.
+    prevInteractions = tracing.__interactionsRef.current;
+    tracing.__interactionsRef.current = root.memoizedInteractions;
+  }
 
   // Reset this to null before calling lifecycles
-  ReactCurrentOwner.current = null;
+  ReactCurrentOwner$2.current = null;
 
   var firstEffect = void 0;
   if (finishedWork.effectTag > PerformedWork) {
@@ -12763,7 +13911,7 @@ function commitRoot(root, finishedWork) {
     var didError = false;
     var error = void 0;
     {
-      invokeGuardedCallback$2(null, commitBeforeMutationLifecycles, null);
+      invokeGuardedCallback(null, commitBeforeMutationLifecycles, null);
       if (hasCaughtError()) {
         didError = true;
         error = clearCaughtError();
@@ -12799,7 +13947,7 @@ function commitRoot(root, finishedWork) {
     var _didError = false;
     var _error = void 0;
     {
-      invokeGuardedCallback$2(null, commitAllHostEffects, null);
+      invokeGuardedCallback(null, commitAllHostEffects, null);
       if (hasCaughtError()) {
         _didError = true;
         _error = clearCaughtError();
@@ -12838,12 +13986,11 @@ function commitRoot(root, finishedWork) {
     var _didError2 = false;
     var _error2 = void 0;
     {
-      invokeGuardedCallback$2(
+      invokeGuardedCallback(
         null,
         commitAllLifeCycles,
         null,
         root,
-        currentTime,
         committedExpirationTime
       );
       if (hasCaughtError()) {
@@ -12864,86 +14011,168 @@ function commitRoot(root, finishedWork) {
     }
   }
 
-  if (enableProfilerTimer) {
-    {
-      checkActualRenderTimeStackEmpty();
-    }
-    resetActualRenderTimer();
-  }
-
   isCommitting$1 = false;
   isWorking = false;
   stopCommitLifeCyclesTimer();
   stopCommitTimer();
-  if (typeof onCommitRoot === "function") {
-    onCommitRoot(finishedWork.stateNode);
-  }
+  onCommitRoot(finishedWork.stateNode);
   if (true && ReactFiberInstrumentation_1.debugTool) {
     ReactFiberInstrumentation_1.debugTool.onCommitWork(finishedWork);
   }
 
-  var expirationTime = root.expirationTime;
-  if (expirationTime === NoWork) {
+  var updateExpirationTimeAfterCommit = finishedWork.expirationTime;
+  var childExpirationTimeAfterCommit = finishedWork.childExpirationTime;
+  var earliestRemainingTimeAfterCommit =
+    updateExpirationTimeAfterCommit === NoWork ||
+    (childExpirationTimeAfterCommit !== NoWork &&
+      childExpirationTimeAfterCommit < updateExpirationTimeAfterCommit)
+      ? childExpirationTimeAfterCommit
+      : updateExpirationTimeAfterCommit;
+  if (earliestRemainingTimeAfterCommit === NoWork) {
     // If there's no remaining work, we can clear the set of already failed
     // error boundaries.
     legacyErrorBoundariesThatAlreadyFailed = null;
   }
-  onCommit(root, expirationTime);
+  onCommit(root, earliestRemainingTimeAfterCommit);
+
+  if (enableSchedulerTracing) {
+    tracing.__interactionsRef.current = prevInteractions;
+
+    var subscriber = void 0;
+
+    try {
+      subscriber = tracing.__subscriberRef.current;
+      if (subscriber !== null && root.memoizedInteractions.size > 0) {
+        var threadID = computeThreadID(
+          committedExpirationTime,
+          root.interactionThreadID
+        );
+        subscriber.onWorkStopped(root.memoizedInteractions, threadID);
+      }
+    } catch (error) {
+      // It's not safe for commitRoot() to throw.
+      // Store the error for now and we'll re-throw in finishRendering().
+      if (!hasUnhandledError) {
+        hasUnhandledError = true;
+        unhandledError = error;
+      }
+    } finally {
+      // Clear completed interactions from the pending Map.
+      // Unless the render was suspended or cascading work was scheduled,
+      // In which case– leave pending interactions until the subsequent render.
+      var pendingInteractionMap = root.pendingInteractionMap;
+      pendingInteractionMap.forEach(function(
+        scheduledInteractions,
+        scheduledExpirationTime
+      ) {
+        // Only decrement the pending interaction count if we're done.
+        // If there's still work at the current priority,
+        // That indicates that we are waiting for suspense data.
+        if (
+          earliestRemainingTimeAfterCommit === NoWork ||
+          scheduledExpirationTime < earliestRemainingTimeAfterCommit
+        ) {
+          pendingInteractionMap.delete(scheduledExpirationTime);
+
+          scheduledInteractions.forEach(function(interaction) {
+            interaction.__count--;
+
+            if (subscriber !== null && interaction.__count === 0) {
+              try {
+                subscriber.onInteractionScheduledWorkCompleted(interaction);
+              } catch (error) {
+                // It's not safe for commitRoot() to throw.
+                // Store the error for now and we'll re-throw in finishRendering().
+                if (!hasUnhandledError) {
+                  hasUnhandledError = true;
+                  unhandledError = error;
+                }
+              }
+            }
+          });
+        }
+      });
+    }
+  }
 }
 
-function resetExpirationTime(workInProgress, renderTime) {
-  if (renderTime !== Never && workInProgress.expirationTime === Never) {
+function resetChildExpirationTime(workInProgress, renderTime) {
+  if (renderTime !== Never && workInProgress.childExpirationTime === Never) {
     // The children of this component are hidden. Don't bubble their
     // expiration times.
     return;
   }
 
-  // Check for pending updates.
-  var newExpirationTime = NoWork;
-  switch (workInProgress.tag) {
-    case HostRoot:
-    case ClassComponent: {
-      var updateQueue = workInProgress.updateQueue;
-      if (updateQueue !== null) {
-        newExpirationTime = updateQueue.expirationTime;
-      }
-    }
-  }
-
-  // TODO: Calls need to visit stateNode
+  var newChildExpirationTime = NoWork;
 
   // Bubble up the earliest expiration time.
-  // (And "base" render timers if that feature flag is enabled)
   if (enableProfilerTimer && workInProgress.mode & ProfileMode) {
-    var treeBaseTime = workInProgress.selfBaseTime;
+    // We're in profiling mode.
+    // Let's use this same traversal to update the render durations.
+    var actualDuration = workInProgress.actualDuration;
+    var treeBaseDuration = workInProgress.selfBaseDuration;
+
+    // When a fiber is cloned, its actualDuration is reset to 0.
+    // This value will only be updated if work is done on the fiber (i.e. it doesn't bailout).
+    // When work is done, it should bubble to the parent's actualDuration.
+    // If the fiber has not been cloned though, (meaning no work was done),
+    // Then this value will reflect the amount of time spent working on a previous render.
+    // In that case it should not bubble.
+    // We determine whether it was cloned by comparing the child pointer.
+    var shouldBubbleActualDurations =
+      workInProgress.alternate === null ||
+      workInProgress.child !== workInProgress.alternate.child;
+
     var child = workInProgress.child;
     while (child !== null) {
-      treeBaseTime += child.treeBaseTime;
+      var childUpdateExpirationTime = child.expirationTime;
+      var childChildExpirationTime = child.childExpirationTime;
+      if (
+        newChildExpirationTime === NoWork ||
+        (childUpdateExpirationTime !== NoWork &&
+          childUpdateExpirationTime < newChildExpirationTime)
+      ) {
+        newChildExpirationTime = childUpdateExpirationTime;
+      }
       if (
-        child.expirationTime !== NoWork &&
-        (newExpirationTime === NoWork ||
-          newExpirationTime > child.expirationTime)
+        newChildExpirationTime === NoWork ||
+        (childChildExpirationTime !== NoWork &&
+          childChildExpirationTime < newChildExpirationTime)
       ) {
-        newExpirationTime = child.expirationTime;
+        newChildExpirationTime = childChildExpirationTime;
       }
+      if (shouldBubbleActualDurations) {
+        actualDuration += child.actualDuration;
+      }
+      treeBaseDuration += child.treeBaseDuration;
       child = child.sibling;
     }
-    workInProgress.treeBaseTime = treeBaseTime;
+    workInProgress.actualDuration = actualDuration;
+    workInProgress.treeBaseDuration = treeBaseDuration;
   } else {
     var _child = workInProgress.child;
     while (_child !== null) {
+      var _childUpdateExpirationTime = _child.expirationTime;
+      var _childChildExpirationTime = _child.childExpirationTime;
+      if (
+        newChildExpirationTime === NoWork ||
+        (_childUpdateExpirationTime !== NoWork &&
+          _childUpdateExpirationTime < newChildExpirationTime)
+      ) {
+        newChildExpirationTime = _childUpdateExpirationTime;
+      }
       if (
-        _child.expirationTime !== NoWork &&
-        (newExpirationTime === NoWork ||
-          newExpirationTime > _child.expirationTime)
+        newChildExpirationTime === NoWork ||
+        (_childChildExpirationTime !== NoWork &&
+          _childChildExpirationTime < newChildExpirationTime)
       ) {
-        newExpirationTime = _child.expirationTime;
+        newChildExpirationTime = _childChildExpirationTime;
       }
       _child = _child.sibling;
     }
   }
 
-  workInProgress.expirationTime = newExpirationTime;
+  workInProgress.childExpirationTime = newChildExpirationTime;
 }
 
 function completeUnitOfWork(workInProgress) {
@@ -12955,9 +14184,9 @@ function completeUnitOfWork(workInProgress) {
     // Ideally nothing should rely on this, but relying on it here
     // means that we don't need an additional field on the work in
     // progress.
-    var current = workInProgress.alternate;
+    var current$$1 = workInProgress.alternate;
     {
-      ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
+      setCurrentFiber(workInProgress);
     }
 
     var returnFiber = workInProgress.return;
@@ -12965,25 +14194,32 @@ function completeUnitOfWork(workInProgress) {
 
     if ((workInProgress.effectTag & Incomplete) === NoEffect) {
       // This fiber completed.
-      var next = completeWork(
-        current,
-        workInProgress,
-        nextRenderExpirationTime
-      );
-      stopWorkTimer(workInProgress);
-      resetExpirationTime(workInProgress, nextRenderExpirationTime);
-      {
-        ReactDebugCurrentFiber.resetCurrentFiber();
-      }
+      if (enableProfilerTimer) {
+        if (workInProgress.mode & ProfileMode) {
+          startProfilerTimer(workInProgress);
+        }
 
-      if (next !== null) {
-        stopWorkTimer(workInProgress);
-        if (true && ReactFiberInstrumentation_1.debugTool) {
-          ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
+        nextUnitOfWork = completeWork(
+          current$$1,
+          workInProgress,
+          nextRenderExpirationTime
+        );
+
+        if (workInProgress.mode & ProfileMode) {
+          // Update render duration assuming we didn't error.
+          stopProfilerTimerIfRunningAndRecordDelta(workInProgress, false);
         }
-        // If completing this work spawned new work, do that next. We'll come
-        // back here again.
-        return next;
+      } else {
+        nextUnitOfWork = completeWork(
+          current$$1,
+          workInProgress,
+          nextRenderExpirationTime
+        );
+      }
+      stopWorkTimer(workInProgress);
+      resetChildExpirationTime(workInProgress, nextRenderExpirationTime);
+      {
+        resetCurrentFiber();
       }
 
       if (
@@ -13039,10 +14275,15 @@ function completeUnitOfWork(workInProgress) {
         return null;
       }
     } else {
+      if (workInProgress.mode & ProfileMode) {
+        // Record the render duration for the fiber that errored.
+        stopProfilerTimerIfRunningAndRecordDelta(workInProgress, false);
+      }
+
       // This fiber did not complete because something threw. Pop values off
       // the stack without entering the complete phase. If this is a boundary,
       // capture values if possible.
-      var _next = unwindWork(workInProgress, nextRenderExpirationTime);
+      var next = unwindWork(workInProgress, nextRenderExpirationTime);
       // Because this fiber did not complete, don't reset its expiration time.
       if (workInProgress.effectTag & DidCapture) {
         // Restarting an error boundary
@@ -13052,20 +14293,34 @@ function completeUnitOfWork(workInProgress) {
       }
 
       {
-        ReactDebugCurrentFiber.resetCurrentFiber();
+        resetCurrentFiber();
       }
 
-      if (_next !== null) {
+      if (next !== null) {
         stopWorkTimer(workInProgress);
         if (true && ReactFiberInstrumentation_1.debugTool) {
           ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
         }
+
+        if (enableProfilerTimer) {
+          // Include the time spent working on failed children before continuing.
+          if (next.mode & ProfileMode) {
+            var actualDuration = next.actualDuration;
+            var child = next.child;
+            while (child !== null) {
+              actualDuration += child.actualDuration;
+              child = child.sibling;
+            }
+            next.actualDuration = actualDuration;
+          }
+        }
+
         // If completing this work spawned new work, do that next. We'll come
         // back here again.
         // Since we're restarting, remove anything that is not a host effect
         // from the effect tag.
-        _next.effectTag &= HostEffectMask;
-        return _next;
+        next.effectTag &= HostEffectMask;
+        return next;
       }
 
       if (returnFiber !== null) {
@@ -13102,12 +14357,12 @@ function performUnitOfWork(workInProgress) {
   // Ideally nothing should rely on this, but relying on it here
   // means that we don't need an additional field on the work in
   // progress.
-  var current = workInProgress.alternate;
+  var current$$1 = workInProgress.alternate;
 
   // See if beginning this work spawns more work.
   startWorkTimer(workInProgress);
   {
-    ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
+    setCurrentFiber(workInProgress);
   }
 
   if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
@@ -13120,22 +14375,21 @@ function performUnitOfWork(workInProgress) {
   var next = void 0;
   if (enableProfilerTimer) {
     if (workInProgress.mode & ProfileMode) {
-      startBaseRenderTimer();
+      startProfilerTimer(workInProgress);
     }
 
-    next = beginWork(current, workInProgress, nextRenderExpirationTime);
+    next = beginWork(current$$1, workInProgress, nextRenderExpirationTime);
 
     if (workInProgress.mode & ProfileMode) {
-      // Update "base" time if the render wasn't bailed out on.
-      recordElapsedBaseRenderTimeIfRunning(workInProgress);
-      stopBaseRenderTimerIfRunning();
+      // Record the render duration assuming we didn't bailout (or error).
+      stopProfilerTimerIfRunningAndRecordDelta(workInProgress, true);
     }
   } else {
-    next = beginWork(current, workInProgress, nextRenderExpirationTime);
+    next = beginWork(current$$1, workInProgress, nextRenderExpirationTime);
   }
 
   {
-    ReactDebugCurrentFiber.resetCurrentFiber();
+    resetCurrentFiber();
     if (isReplayingFailedUnitOfWork) {
       // Currently replaying a failed unit of work. This should be unreachable,
       // because the render phase is meant to be idempotent, and it should
@@ -13153,7 +14407,7 @@ function performUnitOfWork(workInProgress) {
     next = completeUnitOfWork(workInProgress);
   }
 
-  ReactCurrentOwner.current = null;
+  ReactCurrentOwner$2.current = null;
 
   return next;
 }
@@ -13169,22 +14423,17 @@ function workLoop(isYieldy) {
     while (nextUnitOfWork !== null && !shouldYield()) {
       nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
     }
-
-    if (enableProfilerTimer) {
-      // If we didn't finish, pause the "actual" render timer.
-      // We'll restart it when we resume work.
-      pauseActualRenderTimerIfRunning();
-    }
   }
 }
 
-function renderRoot(root, isYieldy) {
+function renderRoot(root, isYieldy, isExpired) {
   invariant(
     !isWorking,
     "renderRoot was called recursively. This error is likely caused " +
       "by a bug in React. Please file an issue."
   );
   isWorking = true;
+  ReactCurrentOwner$2.currentDispatcher = Dispatcher;
 
   var expirationTime = root.nextExpirationTimeToWorkOn;
 
@@ -13199,14 +14448,63 @@ function renderRoot(root, isYieldy) {
     resetStack();
     nextRoot = root;
     nextRenderExpirationTime = expirationTime;
-    nextLatestTimeoutMs = -1;
-    nextRenderDidError = false;
     nextUnitOfWork = createWorkInProgress(
       nextRoot.current,
       null,
       nextRenderExpirationTime
     );
     root.pendingCommitExpirationTime = NoWork;
+
+    if (enableSchedulerTracing) {
+      // Determine which interactions this batch of work currently includes,
+      // So that we can accurately attribute time spent working on it,
+      var interactions = new Set();
+      root.pendingInteractionMap.forEach(function(
+        scheduledInteractions,
+        scheduledExpirationTime
+      ) {
+        if (scheduledExpirationTime <= expirationTime) {
+          scheduledInteractions.forEach(function(interaction) {
+            return interactions.add(interaction);
+          });
+        }
+      });
+
+      // Store the current set of interactions on the FiberRoot for a few reasons:
+      // We can re-use it in hot functions like renderRoot() without having to recalculate it.
+      // We will also use it in commitWork() to pass to any Profiler onRender() hooks.
+      // This also provides DevTools with a way to access it when the onCommitRoot() hook is called.
+      root.memoizedInteractions = interactions;
+
+      if (interactions.size > 0) {
+        var subscriber = tracing.__subscriberRef.current;
+        if (subscriber !== null) {
+          var threadID = computeThreadID(
+            expirationTime,
+            root.interactionThreadID
+          );
+          try {
+            subscriber.onWorkStarted(interactions, threadID);
+          } catch (error) {
+            // Work thrown by an interaction tracing subscriber should be rethrown,
+            // But only once it's safe (to avoid leaveing the scheduler in an invalid state).
+            // Store the error for now and we'll re-throw in finishRendering().
+            if (!hasUnhandledError) {
+              hasUnhandledError = true;
+              unhandledError = error;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  var prevInteractions = null;
+  if (enableSchedulerTracing) {
+    // We're about to start new traced work.
+    // Restore pending interactions so cascading work triggered during the render phase will be accounted for.
+    prevInteractions = tracing.__interactionsRef.current;
+    tracing.__interactionsRef.current = root.memoizedInteractions;
   }
 
   var didFatal = false;
@@ -13217,11 +14515,6 @@ function renderRoot(root, isYieldy) {
     try {
       workLoop(isYieldy);
     } catch (thrownValue) {
-      if (enableProfilerTimer) {
-        // Stop "base" render timer in the event of an error.
-        stopBaseRenderTimerIfRunning();
-      }
-
       if (nextUnitOfWork === null) {
         // This is a fatal error.
         didFatal = true;
@@ -13259,70 +14552,158 @@ function renderRoot(root, isYieldy) {
           // for now.
           didFatal = true;
           onUncaughtError(thrownValue);
-          break;
+        } else {
+          throwException(
+            root,
+            returnFiber,
+            sourceFiber,
+            thrownValue,
+            nextRenderExpirationTime
+          );
+          nextUnitOfWork = completeUnitOfWork(sourceFiber);
+          continue;
         }
-        throwException(
-          root,
-          returnFiber,
-          sourceFiber,
-          thrownValue,
-          nextRenderExpirationTime,
-          mostRecentCurrentTimeMs
-        );
-        nextUnitOfWork = completeUnitOfWork(sourceFiber);
       }
     }
     break;
   } while (true);
 
+  if (enableSchedulerTracing) {
+    // Traced work is done for now; restore the previous interactions.
+    tracing.__interactionsRef.current = prevInteractions;
+  }
+
   // We're done performing work. Time to clean up.
   isWorking = false;
+  ReactCurrentOwner$2.currentDispatcher = null;
+  resetContextDependences();
 
   // Yield back to main thread.
   if (didFatal) {
-    var didCompleteRoot = false;
-    stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+    var _didCompleteRoot = false;
+    stopWorkLoopTimer(interruptedBy, _didCompleteRoot);
     interruptedBy = null;
     // There was a fatal error.
     {
       resetStackAfterFatalErrorInDev();
     }
+    // `nextRoot` points to the in-progress root. A non-null value indicates
+    // that we're in the middle of an async render. Set it to null to indicate
+    // there's no more work to be done in the current batch.
+    nextRoot = null;
     onFatal(root);
-  } else if (nextUnitOfWork === null) {
-    // We reached the root.
-    var rootWorkInProgress = root.current.alternate;
-    invariant(
-      rootWorkInProgress !== null,
-      "Finished root should have a work-in-progress. This error is likely " +
-        "caused by a bug in React. Please file an issue."
-    );
-    if ((rootWorkInProgress.effectTag & Incomplete) === NoEffect) {
-      var _didCompleteRoot = true;
-      stopWorkLoopTimer(interruptedBy, _didCompleteRoot);
-      interruptedBy = null;
-      // The root successfully completed.
-      onComplete(root, rootWorkInProgress, expirationTime);
-    } else {
-      // The root did not complete.
-      var _didCompleteRoot2 = false;
-      stopWorkLoopTimer(interruptedBy, _didCompleteRoot2);
-      interruptedBy = null;
-      markSuspendedPriorityLevel(root, expirationTime, nextRenderDidError);
+    return;
+  }
+
+  if (nextUnitOfWork !== null) {
+    // There's still remaining async work in this tree, but we ran out of time
+    // in the current frame. Yield back to the renderer. Unless we're
+    // interrupted by a higher priority update, we'll continue later from where
+    // we left off.
+    var _didCompleteRoot2 = false;
+    stopWorkLoopTimer(interruptedBy, _didCompleteRoot2);
+    interruptedBy = null;
+    onYield(root);
+    return;
+  }
+
+  // We completed the whole tree.
+  var didCompleteRoot = true;
+  stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+  var rootWorkInProgress = root.current.alternate;
+  invariant(
+    rootWorkInProgress !== null,
+    "Finished root should have a work-in-progress. This error is likely " +
+      "caused by a bug in React. Please file an issue."
+  );
+
+  // `nextRoot` points to the in-progress root. A non-null value indicates
+  // that we're in the middle of an async render. Set it to null to indicate
+  // there's no more work to be done in the current batch.
+  nextRoot = null;
+  interruptedBy = null;
+
+  if (nextRenderDidError) {
+    // There was an error
+    if (hasLowerPriorityWork(root, expirationTime)) {
+      // There's lower priority work. If so, it may have the effect of fixing
+      // the exception that was just thrown. Exit without committing. This is
+      // similar to a suspend, but without a timeout because we're not waiting
+      // for a promise to resolve. React will restart at the lower
+      // priority level.
+      markSuspendedPriorityLevel(root, expirationTime);
       var suspendedExpirationTime = expirationTime;
-      var newExpirationTime = root.expirationTime;
+      var rootExpirationTime = root.expirationTime;
       onSuspend(
         root,
+        rootWorkInProgress,
         suspendedExpirationTime,
-        newExpirationTime,
-        nextLatestTimeoutMs
+        rootExpirationTime,
+        -1 // Indicates no timeout
+      );
+      return;
+    } else if (
+      // There's no lower priority work, but we're rendering asynchronously.
+      // Synchronsouly attempt to render the same level one more time. This is
+      // similar to a suspend, but without a timeout because we're not waiting
+      // for a promise to resolve.
+      !root.didError &&
+      !isExpired
+    ) {
+      root.didError = true;
+      var _suspendedExpirationTime = (root.nextExpirationTimeToWorkOn = expirationTime);
+      var _rootExpirationTime = (root.expirationTime = Sync);
+      onSuspend(
+        root,
+        rootWorkInProgress,
+        _suspendedExpirationTime,
+        _rootExpirationTime,
+        -1 // Indicates no timeout
       );
+      return;
     }
-  } else {
-    var _didCompleteRoot3 = false;
-    stopWorkLoopTimer(interruptedBy, _didCompleteRoot3);
-    interruptedBy = null;
-    onYield(root);
   }
+
+  if (!isExpired && nextLatestAbsoluteTimeoutMs !== -1) {
+    // The tree was suspended.
+    var _suspendedExpirationTime2 = expirationTime;
+    markSuspendedPriorityLevel(root, _suspendedExpirationTime2);
+
+    // Find the earliest uncommitted expiration time in the tree, including
+    // work that is suspended. The timeout threshold cannot be longer than
+    // the overall expiration.
+    var earliestExpirationTime = findEarliestOutstandingPriorityLevel(
+      root,
+      expirationTime
+    );
+    var earliestExpirationTimeMs = expirationTimeToMs(earliestExpirationTime);
+    if (earliestExpirationTimeMs < nextLatestAbsoluteTimeoutMs) {
+      nextLatestAbsoluteTimeoutMs = earliestExpirationTimeMs;
+    }
+
+    // Subtract the current time from the absolute timeout to get the number
+    // of milliseconds until the timeout. In other words, convert an absolute
+    // timestamp to a relative time. This is the value that is passed
+    // to `setTimeout`.
+    var currentTimeMs = expirationTimeToMs(requestCurrentTime());
+    var msUntilTimeout = nextLatestAbsoluteTimeoutMs - currentTimeMs;
+    msUntilTimeout = msUntilTimeout < 0 ? 0 : msUntilTimeout;
+
+    // TODO: Account for the Just Noticeable Difference
+
+    var _rootExpirationTime2 = root.expirationTime;
+    onSuspend(
+      root,
+      rootWorkInProgress,
+      _suspendedExpirationTime2,
+      _rootExpirationTime2,
+      msUntilTimeout
+    );
+    return;
+  }
+
+  // Ready to commit.
+  onComplete(root, rootWorkInProgress, expirationTime);
 }
 
 function dispatch(sourceFiber, value, expirationTime) {
@@ -13335,16 +14716,17 @@ function dispatch(sourceFiber, value, expirationTime) {
   while (fiber !== null) {
     switch (fiber.tag) {
       case ClassComponent:
+      case ClassComponentLazy:
         var ctor = fiber.type;
         var instance = fiber.stateNode;
         if (
-          typeof ctor.getDerivedStateFromCatch === "function" ||
+          typeof ctor.getDerivedStateFromError === "function" ||
           (typeof instance.componentDidCatch === "function" &&
             !isAlreadyFailedLegacyErrorBoundary(instance))
         ) {
           var errorInfo = createCapturedValue(value, sourceFiber);
           var update = createClassErrorUpdate(fiber, errorInfo, expirationTime);
-          enqueueUpdate(fiber, update, expirationTime);
+          enqueueUpdate(fiber, update);
           scheduleWork(fiber, expirationTime);
           return;
         }
@@ -13352,7 +14734,7 @@ function dispatch(sourceFiber, value, expirationTime) {
       case HostRoot: {
         var _errorInfo = createCapturedValue(value, sourceFiber);
         var _update = createRootErrorUpdate(fiber, _errorInfo, expirationTime);
-        enqueueUpdate(fiber, _update, expirationTime);
+        enqueueUpdate(fiber, _update);
         scheduleWork(fiber, expirationTime);
         return;
       }
@@ -13370,7 +14752,7 @@ function dispatch(sourceFiber, value, expirationTime) {
       _errorInfo2,
       expirationTime
     );
-    enqueueUpdate(rootFiber, _update2, expirationTime);
+    enqueueUpdate(rootFiber, _update2);
     scheduleWork(rootFiber, expirationTime);
   }
 }
@@ -13379,45 +14761,9 @@ function captureCommitPhaseError(fiber, error) {
   return dispatch(fiber, error, Sync);
 }
 
-function computeAsyncExpiration(currentTime) {
-  // Given the current clock time, returns an expiration time. We use rounding
-  // to batch like updates together.
-  // Should complete within ~5000ms. 5250ms max.
-  var expirationMs = 5000;
-  var bucketSizeMs = 250;
-  return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
-}
-
-function computeInteractiveExpiration(currentTime) {
-  var expirationMs = void 0;
-  // We intentionally set a higher expiration time for interactive updates in
-  // dev than in production.
-  // If the main thread is being blocked so long that you hit the expiration,
-  // it's a problem that could be solved with better scheduling.
-  // People will be more likely to notice this and fix it with the long
-  // expiration time in development.
-  // In production we opt for better UX at the risk of masking scheduling
-  // problems, by expiring fast.
-  {
-    // Should complete within ~500ms. 600ms max.
-    expirationMs = 500;
-  }
-  var bucketSizeMs = 100;
-  return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
-}
-
-// Creates a unique async expiration time.
-function computeUniqueAsyncExpiration() {
-  var currentTime = recalculateCurrentTime();
-  var result = computeAsyncExpiration(currentTime);
-  if (result <= lastUniqueAsyncExpiration) {
-    // Since we assume the current time monotonically increases, we only hit
-    // this branch when computeUniqueAsyncExpiration is fired multiple times
-    // within a 200ms window (or whatever the async bucket size is).
-    result = lastUniqueAsyncExpiration + 1;
-  }
-  lastUniqueAsyncExpiration = result;
-  return lastUniqueAsyncExpiration;
+function computeThreadID(expirationTime, interactionThreadID) {
+  // Interaction threads are unique per root and expiration time.
+  return expirationTime * 1000 + interactionThreadID;
 }
 
 function computeExpirationForFiber(currentTime, fiber) {
@@ -13438,7 +14784,7 @@ function computeExpirationForFiber(currentTime, fiber) {
   } else {
     // No explicit expiration context was set, and we're not currently
     // performing work. Calculate a new expiration time.
-    if (fiber.mode & AsyncMode) {
+    if (fiber.mode & ConcurrentMode) {
       if (isBatchingInteractiveUpdates) {
         // This is an interactive update
         expirationTime = computeInteractiveExpiration(currentTime);
@@ -13446,6 +14792,11 @@ function computeExpirationForFiber(currentTime, fiber) {
         // This is an async update
         expirationTime = computeAsyncExpiration(currentTime);
       }
+      // If we're in the middle of rendering a tree, do not update at the same
+      // expiration time that is already rendering.
+      if (nextRoot !== null && expirationTime === nextRenderExpirationTime) {
+        expirationTime += 1;
+      }
     } else {
       // This is a sync update
       expirationTime = Sync;
@@ -13455,133 +14806,208 @@ function computeExpirationForFiber(currentTime, fiber) {
     // This is an interactive update. Keep track of the lowest pending
     // interactive expiration time. This allows us to synchronously flush
     // all interactive updates when needed.
-    if (
-      lowestPendingInteractiveExpirationTime === NoWork ||
-      expirationTime > lowestPendingInteractiveExpirationTime
-    ) {
-      lowestPendingInteractiveExpirationTime = expirationTime;
+    if (expirationTime > lowestPriorityPendingInteractiveExpirationTime) {
+      lowestPriorityPendingInteractiveExpirationTime = expirationTime;
     }
   }
   return expirationTime;
 }
 
-function markTimeout(root, thenable, timeoutMs, suspendedTime) {
+function renderDidSuspend(root, absoluteTimeoutMs, suspendedTime) {
   // Schedule the timeout.
-  if (timeoutMs >= 0 && nextLatestTimeoutMs < timeoutMs) {
-    nextLatestTimeoutMs = timeoutMs;
+  if (
+    absoluteTimeoutMs >= 0 &&
+    nextLatestAbsoluteTimeoutMs < absoluteTimeoutMs
+  ) {
+    nextLatestAbsoluteTimeoutMs = absoluteTimeoutMs;
   }
 }
 
-function markError(root) {
+function renderDidError() {
   nextRenderDidError = true;
 }
 
-function retrySuspendedRoot(root, suspendedTime) {
-  markPingedPriorityLevel(root, suspendedTime);
-  var retryTime = root.expirationTime;
-  if (retryTime !== NoWork) {
-    requestWork(root, retryTime);
+function retrySuspendedRoot(root, fiber, suspendedTime) {
+  var retryTime = void 0;
+
+  if (isPriorityLevelSuspended(root, suspendedTime)) {
+    // Ping at the original level
+    retryTime = suspendedTime;
+
+    markPingedPriorityLevel(root, retryTime);
+  } else {
+    // Suspense already timed out. Compute a new expiration time
+    var currentTime = requestCurrentTime();
+    retryTime = computeExpirationForFiber(currentTime, fiber);
+    markPendingPriorityLevel(root, retryTime);
+  }
+
+  // TODO: If the placeholder fiber has already rendered the primary children
+  // without suspending (that is, all of the promises have already resolved),
+  // we should not trigger another update here. One case this happens is when
+  // we are in sync mode and a single promise is thrown both on initial render
+  // and on update; we attach two .then(retrySuspendedRoot) callbacks and each
+  // one performs Sync work, rerendering the Suspense.
+
+  if ((fiber.mode & ConcurrentMode) !== NoContext) {
+    if (root === nextRoot && nextRenderExpirationTime === suspendedTime) {
+      // Received a ping at the same priority level at which we're currently
+      // rendering. Restart from the root.
+      nextRoot = null;
+    }
+  }
+
+  scheduleWorkToRoot(fiber, retryTime);
+  var rootExpirationTime = root.expirationTime;
+  if (rootExpirationTime !== NoWork) {
+    requestWork(root, rootExpirationTime);
   }
 }
 
-function scheduleWork(fiber, expirationTime) {
+function scheduleWorkToRoot(fiber, expirationTime) {
   recordScheduleUpdate();
 
   {
-    if (fiber.tag === ClassComponent) {
+    if (fiber.tag === ClassComponent || fiber.tag === ClassComponentLazy) {
       var instance = fiber.stateNode;
       warnAboutInvalidUpdates(instance);
     }
   }
 
-  var node = fiber;
-  while (node !== null) {
-    // Walk the parent path to the root and update each node's
-    // expiration time.
-    if (
-      node.expirationTime === NoWork ||
-      node.expirationTime > expirationTime
-    ) {
-      node.expirationTime = expirationTime;
-    }
-    if (node.alternate !== null) {
+  // Update the source fiber's expiration time
+  if (
+    fiber.expirationTime === NoWork ||
+    fiber.expirationTime > expirationTime
+  ) {
+    fiber.expirationTime = expirationTime;
+  }
+  var alternate = fiber.alternate;
+  if (
+    alternate !== null &&
+    (alternate.expirationTime === NoWork ||
+      alternate.expirationTime > expirationTime)
+  ) {
+    alternate.expirationTime = expirationTime;
+  }
+  // Walk the parent path to the root and update the child expiration time.
+  var node = fiber.return;
+  var root = null;
+  if (node === null && fiber.tag === HostRoot) {
+    root = fiber.stateNode;
+  } else {
+    while (node !== null) {
+      alternate = node.alternate;
       if (
-        node.alternate.expirationTime === NoWork ||
-        node.alternate.expirationTime > expirationTime
+        node.childExpirationTime === NoWork ||
+        node.childExpirationTime > expirationTime
       ) {
-        node.alternate.expirationTime = expirationTime;
-      }
-    }
-    if (node.return === null) {
-      if (node.tag === HostRoot) {
-        var root = node.stateNode;
-        if (
-          !isWorking &&
-          nextRenderExpirationTime !== NoWork &&
-          expirationTime < nextRenderExpirationTime
-        ) {
-          // This is an interruption. (Used for performance tracking.)
-          interruptedBy = fiber;
-          resetStack();
-        }
-        markPendingPriorityLevel(root, expirationTime);
+        node.childExpirationTime = expirationTime;
         if (
-          // If we're in the render phase, we don't need to schedule this root
-          // for an update, because we'll do it before we exit...
-          !isWorking ||
-          isCommitting$1 ||
-          // ...unless this is a different root than the one we're rendering.
-          nextRoot !== root
+          alternate !== null &&
+          (alternate.childExpirationTime === NoWork ||
+            alternate.childExpirationTime > expirationTime)
         ) {
-          var rootExpirationTime = root.expirationTime;
-          requestWork(root, rootExpirationTime);
-        }
-        if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
-          invariant(
-            false,
-            "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."
-          );
+          alternate.childExpirationTime = expirationTime;
         }
-      } else {
-        {
-          if (fiber.tag === ClassComponent) {
-            warnAboutUpdateOnUnmounted(fiber);
+      } else if (
+        alternate !== null &&
+        (alternate.childExpirationTime === NoWork ||
+          alternate.childExpirationTime > expirationTime)
+      ) {
+        alternate.childExpirationTime = expirationTime;
+      }
+      if (node.return === null && node.tag === HostRoot) {
+        root = node.stateNode;
+        break;
+      }
+      node = node.return;
+    }
+  }
+
+  if (root === null) {
+    if (
+      true &&
+      (fiber.tag === ClassComponent || fiber.tag === ClassComponentLazy)
+    ) {
+      warnAboutUpdateOnUnmounted(fiber);
+    }
+    return null;
+  }
+
+  if (enableSchedulerTracing) {
+    var interactions = tracing.__interactionsRef.current;
+    if (interactions.size > 0) {
+      var pendingInteractionMap = root.pendingInteractionMap;
+      var pendingInteractions = pendingInteractionMap.get(expirationTime);
+      if (pendingInteractions != null) {
+        interactions.forEach(function(interaction) {
+          if (!pendingInteractions.has(interaction)) {
+            // Update the pending async work count for previously unscheduled interaction.
+            interaction.__count++;
           }
-        }
-        return;
+
+          pendingInteractions.add(interaction);
+        });
+      } else {
+        pendingInteractionMap.set(expirationTime, new Set(interactions));
+
+        // Update the pending async work count for the current interactions.
+        interactions.forEach(function(interaction) {
+          interaction.__count++;
+        });
+      }
+
+      var subscriber = tracing.__subscriberRef.current;
+      if (subscriber !== null) {
+        var threadID = computeThreadID(
+          expirationTime,
+          root.interactionThreadID
+        );
+        subscriber.onWorkScheduled(interactions, threadID);
       }
     }
-    node = node.return;
   }
-}
 
-function recalculateCurrentTime() {
-  // Subtract initial time so it fits inside 32bits
-  mostRecentCurrentTimeMs = now() - originalStartTimeMs;
-  mostRecentCurrentTime = msToExpirationTime(mostRecentCurrentTimeMs);
-  return mostRecentCurrentTime;
+  return root;
 }
 
-function deferredUpdates(fn) {
-  var previousExpirationContext = expirationContext;
-  var currentTime = recalculateCurrentTime();
-  expirationContext = computeAsyncExpiration(currentTime);
-  try {
-    return fn();
-  } finally {
-    expirationContext = previousExpirationContext;
+function scheduleWork(fiber, expirationTime) {
+  var root = scheduleWorkToRoot(fiber, expirationTime);
+  if (root === null) {
+    return;
   }
-}
-function syncUpdates(fn, a, b, c, d) {
-  var previousExpirationContext = expirationContext;
-  expirationContext = Sync;
-  try {
-    return fn(a, b, c, d);
-  } finally {
-    expirationContext = previousExpirationContext;
+
+  if (
+    !isWorking &&
+    nextRenderExpirationTime !== NoWork &&
+    expirationTime < nextRenderExpirationTime
+  ) {
+    // This is an interruption. (Used for performance tracking.)
+    interruptedBy = fiber;
+    resetStack();
+  }
+  markPendingPriorityLevel(root, expirationTime);
+  if (
+    // If we're in the render phase, we don't need to schedule this root
+    // for an update, because we'll do it before we exit...
+    !isWorking ||
+    isCommitting$1 ||
+    // ...unless this is a different root than the one we're rendering.
+    nextRoot !== root
+  ) {
+    var rootExpirationTime = root.expirationTime;
+    requestWork(root, rootExpirationTime);
+  }
+  if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
+    // Reset this back to zero so subsequent updates don't throw.
+    nestedUpdateCount = 0;
+    invariant(
+      false,
+      "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."
+    );
   }
 }
 
@@ -13597,7 +15023,7 @@ var callbackID = void 0;
 var isRendering = false;
 var nextFlushedRoot = null;
 var nextFlushedExpirationTime = NoWork;
-var lowestPendingInteractiveExpirationTime = NoWork;
+var lowestPriorityPendingInteractiveExpirationTime = NoWork;
 var deadlineDidExpire = false;
 var hasUnhandledError = false;
 var unhandledError = null;
@@ -13609,13 +15035,23 @@ var isBatchingInteractiveUpdates = false;
 
 var completedBatches = null;
 
+var originalStartTimeMs = now();
+var currentRendererTime = msToExpirationTime(originalStartTimeMs);
+var currentSchedulerTime = currentRendererTime;
+
 // Use these to prevent an infinite loop of nested updates
-var NESTED_UPDATE_LIMIT = 1000;
+var NESTED_UPDATE_LIMIT = 50;
 var nestedUpdateCount = 0;
+var lastCommittedRootDuringThisBatch = null;
 
 var timeHeuristicForUnitOfWork = 1;
 
-function scheduleCallbackWithExpirationTime(expirationTime) {
+function recomputeCurrentRendererTime() {
+  var currentTimeMs = now() - originalStartTimeMs;
+  currentRendererTime = msToExpirationTime(currentTimeMs);
+}
+
+function scheduleCallbackWithExpirationTime(root, expirationTime) {
   if (callbackExpirationTime !== NoWork) {
     // A callback is already scheduled. Check its expiration time (timeout).
     if (expirationTime > callbackExpirationTime) {
@@ -13653,30 +15089,96 @@ function onComplete(root, finishedWork, expirationTime) {
   root.finishedWork = finishedWork;
 }
 
-function onSuspend(root, suspendedExpirationTime, expirationTime, timeoutMs) {
-  if (timeoutMs >= 0) {
-    var suspendedRoot = root;
-    setTimeout(function() {
-      retrySuspendedRoot(suspendedRoot, suspendedExpirationTime);
-    }, timeoutMs);
+function onSuspend(
+  root,
+  finishedWork,
+  suspendedExpirationTime,
+  rootExpirationTime,
+  msUntilTimeout
+) {
+  root.expirationTime = rootExpirationTime;
+  if (msUntilTimeout === 0 && !shouldYield()) {
+    // Don't wait an additional tick. Commit the tree immediately.
+    root.pendingCommitExpirationTime = suspendedExpirationTime;
+    root.finishedWork = finishedWork;
+  } else if (msUntilTimeout > 0) {
+    // Wait `msUntilTimeout` milliseconds before committing.
+    root.timeoutHandle = scheduleTimeout(
+      onTimeout.bind(null, root, finishedWork, suspendedExpirationTime),
+      msUntilTimeout
+    );
   }
-  root.expirationTime = expirationTime;
 }
 
 function onYield(root) {
   root.finishedWork = null;
 }
 
+function onTimeout(root, finishedWork, suspendedExpirationTime) {
+  // The root timed out. Commit it.
+  root.pendingCommitExpirationTime = suspendedExpirationTime;
+  root.finishedWork = finishedWork;
+  // Read the current time before entering the commit phase. We can be
+  // certain this won't cause tearing related to batching of event updates
+  // because we're at the top of a timer event.
+  recomputeCurrentRendererTime();
+  currentSchedulerTime = currentRendererTime;
+  flushRoot(root, suspendedExpirationTime);
+}
+
 function onCommit(root, expirationTime) {
   root.expirationTime = expirationTime;
   root.finishedWork = null;
 }
 
+function requestCurrentTime() {
+  // requestCurrentTime is called by the scheduler to compute an expiration
+  // time.
+  //
+  // Expiration times are computed by adding to the current time (the start
+  // time). However, if two updates are scheduled within the same event, we
+  // should treat their start times as simultaneous, even if the actual clock
+  // time has advanced between the first and second call.
+
+  // In other words, because expiration times determine how updates are batched,
+  // we want all updates of like priority that occur within the same event to
+  // receive the same expiration time. Otherwise we get tearing.
+  //
+  // We keep track of two separate times: the current "renderer" time and the
+  // current "scheduler" time. The renderer time can be updated whenever; it
+  // only exists to minimize the calls performance.now.
+  //
+  // But the scheduler time can only be updated if there's no pending work, or
+  // if we know for certain that we're not in the middle of an event.
+
+  if (isRendering) {
+    // We're already rendering. Return the most recently read time.
+    return currentSchedulerTime;
+  }
+  // Check if there's pending work.
+  findHighestPriorityRoot();
+  if (
+    nextFlushedExpirationTime === NoWork ||
+    nextFlushedExpirationTime === Never
+  ) {
+    // If there's no pending work, or if the pending work is offscreen, we can
+    // read the current time without risk of tearing.
+    recomputeCurrentRendererTime();
+    currentSchedulerTime = currentRendererTime;
+    return currentSchedulerTime;
+  }
+  // There's already pending work. We might be in the middle of a browser
+  // event. If we were to read the current time, it could cause multiple updates
+  // within the same event to receive different expiration times, leading to
+  // tearing. Return the last read time. During the next idle callback, the
+  // time will be updated.
+  return currentSchedulerTime;
+}
+
 // requestWork is called by the scheduler whenever a root receives an update.
 // It's up to the renderer to call renderRoot at some point in the future.
 function requestWork(root, expirationTime) {
   addRootToSchedule(root, expirationTime);
-
   if (isRendering) {
     // Prevent reentrancy. Remaining work will be scheduled at the end of
     // the currently rendering batch.
@@ -13690,7 +15192,7 @@ function requestWork(root, expirationTime) {
       // flush it now.
       nextFlushedRoot = root;
       nextFlushedExpirationTime = Sync;
-      performWorkOnRoot(root, Sync, false);
+      performWorkOnRoot(root, Sync, true);
     }
     return;
   }
@@ -13699,7 +15201,7 @@ function requestWork(root, expirationTime) {
   if (expirationTime === Sync) {
     performSyncWork();
   } else {
-    scheduleCallbackWithExpirationTime(expirationTime);
+    scheduleCallbackWithExpirationTime(root, expirationTime);
   }
 }
 
@@ -13783,30 +15285,38 @@ function findHighestPriorityRoot() {
         if (root === lastScheduledRoot) {
           break;
         }
+        if (highestPriorityWork === Sync) {
+          // Sync is highest priority by definition so
+          // we can stop searching.
+          break;
+        }
         previousScheduledRoot = root;
         root = root.nextScheduledRoot;
       }
     }
   }
 
-  // If the next root is the same as the previous root, this is a nested
-  // update. To prevent an infinite loop, increment the nested update count.
-  var previousFlushedRoot = nextFlushedRoot;
-  if (
-    previousFlushedRoot !== null &&
-    previousFlushedRoot === highestPriorityRoot &&
-    highestPriorityWork === Sync
-  ) {
-    nestedUpdateCount++;
-  } else {
-    // Reset whenever we switch roots.
-    nestedUpdateCount = 0;
-  }
   nextFlushedRoot = highestPriorityRoot;
   nextFlushedExpirationTime = highestPriorityWork;
 }
 
 function performAsyncWork(dl) {
+  if (dl.didTimeout) {
+    // The callback timed out. That means at least one update has expired.
+    // Iterate through the root schedule. If they contain expired work, set
+    // the next render expiration time to the current time. This has the effect
+    // of flushing all expired work in a single batch, instead of flushing each
+    // level one at a time.
+    if (firstScheduledRoot !== null) {
+      recomputeCurrentRendererTime();
+      var root = firstScheduledRoot;
+      do {
+        didExpireAtExpirationTime(root, currentRendererTime);
+        // The root schedule is circular, so this is never null.
+        root = root.nextScheduledRoot;
+      } while (root !== firstScheduledRoot);
+    }
+  }
   performWork(NoWork, dl);
 }
 
@@ -13817,32 +15327,35 @@ function performSyncWork() {
 function performWork(minExpirationTime, dl) {
   deadline = dl;
 
-  // Keep working on roots until there's no more work, or until the we reach
+  // Keep working on roots until there's no more work, or until we reach
   // the deadline.
   findHighestPriorityRoot();
 
-  if (enableProfilerTimer) {
-    resumeActualRenderTimerIfPaused();
-  }
+  if (deadline !== null) {
+    recomputeCurrentRendererTime();
+    currentSchedulerTime = currentRendererTime;
 
-  if (enableUserTimingAPI && deadline !== null) {
-    var didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-    var timeout = expirationTimeToMs(nextFlushedExpirationTime);
-    stopRequestCallbackTimer(didExpire, timeout);
-  }
+    if (enableUserTimingAPI) {
+      var didExpire = nextFlushedExpirationTime < currentRendererTime;
+      var timeout = expirationTimeToMs(nextFlushedExpirationTime);
+      stopRequestCallbackTimer(didExpire, timeout);
+    }
 
-  if (deadline !== null) {
     while (
       nextFlushedRoot !== null &&
       nextFlushedExpirationTime !== NoWork &&
       (minExpirationTime === NoWork ||
         minExpirationTime >= nextFlushedExpirationTime) &&
-      (!deadlineDidExpire ||
-        recalculateCurrentTime() >= nextFlushedExpirationTime)
+      (!deadlineDidExpire || currentRendererTime >= nextFlushedExpirationTime)
     ) {
-      recalculateCurrentTime();
-      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, true);
+      performWorkOnRoot(
+        nextFlushedRoot,
+        nextFlushedExpirationTime,
+        currentRendererTime >= nextFlushedExpirationTime
+      );
       findHighestPriorityRoot();
+      recomputeCurrentRendererTime();
+      currentSchedulerTime = currentRendererTime;
     }
   } else {
     while (
@@ -13851,7 +15364,7 @@ function performWork(minExpirationTime, dl) {
       (minExpirationTime === NoWork ||
         minExpirationTime >= nextFlushedExpirationTime)
     ) {
-      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, false);
+      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, true);
       findHighestPriorityRoot();
     }
   }
@@ -13866,7 +15379,10 @@ function performWork(minExpirationTime, dl) {
   }
   // If there's work left over, schedule a new callback.
   if (nextFlushedExpirationTime !== NoWork) {
-    scheduleCallbackWithExpirationTime(nextFlushedExpirationTime);
+    scheduleCallbackWithExpirationTime(
+      nextFlushedRoot,
+      nextFlushedExpirationTime
+    );
   }
 
   // Clean-up.
@@ -13887,14 +15403,14 @@ function flushRoot(root, expirationTime) {
   // including the given time.
   nextFlushedRoot = root;
   nextFlushedExpirationTime = expirationTime;
-  performWorkOnRoot(root, expirationTime, false);
+  performWorkOnRoot(root, expirationTime, true);
   // Flush any sync work that was scheduled by lifecycles
   performSyncWork();
-  finishRendering();
 }
 
 function finishRendering() {
   nestedUpdateCount = 0;
+  lastCommittedRootDuringThisBatch = null;
 
   if (completedBatches !== null) {
     var batches = completedBatches;
@@ -13920,7 +15436,7 @@ function finishRendering() {
   }
 }
 
-function performWorkOnRoot(root, expirationTime, isYieldy) {
+function performWorkOnRoot(root, expirationTime, isExpired) {
   invariant(
     !isRendering,
     "performWorkOnRoot was called recursively. This error is likely caused " +
@@ -13930,15 +15446,28 @@ function performWorkOnRoot(root, expirationTime, isYieldy) {
   isRendering = true;
 
   // Check if this is async work or sync/expired work.
-  if (!isYieldy) {
+  if (deadline === null || isExpired) {
     // Flush work without yielding.
+    // TODO: Non-yieldy work does not necessarily imply expired work. A renderer
+    // may want to perform some work without yielding, but also without
+    // requiring the root to complete (by triggering placeholders).
+
     var finishedWork = root.finishedWork;
     if (finishedWork !== null) {
       // This root is already complete. We can commit it.
       completeRoot(root, finishedWork, expirationTime);
     } else {
       root.finishedWork = null;
-      renderRoot(root, false);
+      // If this root previously suspended, clear its existing timeout, since
+      // we're about to try rendering again.
+      var timeoutHandle = root.timeoutHandle;
+      if (timeoutHandle !== noTimeout) {
+        root.timeoutHandle = noTimeout;
+        // $FlowFixMe Complains noTimeout is not a TimeoutID, despite the check above
+        cancelTimeout(timeoutHandle);
+      }
+      var isYieldy = false;
+      renderRoot(root, isYieldy, isExpired);
       finishedWork = root.finishedWork;
       if (finishedWork !== null) {
         // We've completed the root. Commit it.
@@ -13953,7 +15482,16 @@ function performWorkOnRoot(root, expirationTime, isYieldy) {
       completeRoot(root, _finishedWork, expirationTime);
     } else {
       root.finishedWork = null;
-      renderRoot(root, true);
+      // If this root previously suspended, clear its existing timeout, since
+      // we're about to try rendering again.
+      var _timeoutHandle = root.timeoutHandle;
+      if (_timeoutHandle !== noTimeout) {
+        root.timeoutHandle = noTimeout;
+        // $FlowFixMe Complains noTimeout is not a TimeoutID, despite the check above
+        cancelTimeout(_timeoutHandle);
+      }
+      var _isYieldy = true;
+      renderRoot(root, _isYieldy, isExpired);
       _finishedWork = root.finishedWork;
       if (_finishedWork !== null) {
         // We've completed the root. Check the deadline one more time
@@ -13965,12 +15503,6 @@ function performWorkOnRoot(root, expirationTime, isYieldy) {
           // There's no time left. Mark this root as complete. We'll come
           // back and commit it later.
           root.finishedWork = _finishedWork;
-
-          if (enableProfilerTimer) {
-            // If we didn't finish, pause the "actual" render timer.
-            // We'll restart it when we resume work.
-            pauseActualRenderTimerIfRunning();
-          }
         }
       }
     }
@@ -13999,16 +15531,31 @@ function completeRoot(root, finishedWork, expirationTime) {
 
   // Commit the root.
   root.finishedWork = null;
+
+  // Check if this is a nested update (a sync update scheduled during the
+  // commit phase).
+  if (root === lastCommittedRootDuringThisBatch) {
+    // If the next root is the same as the previous root, this is a nested
+    // update. To prevent an infinite loop, increment the nested update count.
+    nestedUpdateCount++;
+  } else {
+    // Reset whenever we switch roots.
+    lastCommittedRootDuringThisBatch = root;
+    nestedUpdateCount = 0;
+  }
   commitRoot(root, finishedWork);
 }
 
 // When working on async work, the reconciler asks the renderer if it should
 // yield execution. For DOM, we implement this with requestIdleCallback.
 function shouldYield() {
-  if (deadline === null || deadlineDidExpire) {
-    return false;
+  if (deadlineDidExpire) {
+    return true;
   }
-  if (deadline.timeRemaining() > timeHeuristicForUnitOfWork) {
+  if (
+    deadline === null ||
+    deadline.timeRemaining() > timeHeuristicForUnitOfWork
+  ) {
     // Disregard deadline.didTimeout. Only expired work should be flushed
     // during a timeout. This path is only hit for non-expired work.
     return false;
@@ -14047,38 +15594,6 @@ function batchedUpdates$1(fn, a) {
   }
 }
 
-// TODO: Batching should be implemented at the renderer level, not inside
-// the reconciler.
-function unbatchedUpdates(fn, a) {
-  if (isBatchingUpdates && !isUnbatchingUpdates) {
-    isUnbatchingUpdates = true;
-    try {
-      return fn(a);
-    } finally {
-      isUnbatchingUpdates = false;
-    }
-  }
-  return fn(a);
-}
-
-// TODO: Batching should be implemented at the renderer level, not within
-// the reconciler.
-function flushSync(fn, a) {
-  invariant(
-    !isRendering,
-    "flushSync was called from inside a lifecycle method. It cannot be " +
-      "called when React is already rendering."
-  );
-  var previousIsBatchingUpdates = isBatchingUpdates;
-  isBatchingUpdates = true;
-  try {
-    return syncUpdates(fn, a);
-  } finally {
-    isBatchingUpdates = previousIsBatchingUpdates;
-    performSyncWork();
-  }
-}
-
 function interactiveUpdates$1(fn, a, b) {
   if (isBatchingInteractiveUpdates) {
     return fn(a, b);
@@ -14090,11 +15605,11 @@ function interactiveUpdates$1(fn, a, b) {
   if (
     !isBatchingUpdates &&
     !isRendering &&
-    lowestPendingInteractiveExpirationTime !== NoWork
+    lowestPriorityPendingInteractiveExpirationTime !== NoWork
   ) {
     // Synchronously flush pending interactive updates.
-    performWork(lowestPendingInteractiveExpirationTime, null);
-    lowestPendingInteractiveExpirationTime = NoWork;
+    performWork(lowestPriorityPendingInteractiveExpirationTime, null);
+    lowestPriorityPendingInteractiveExpirationTime = NoWork;
   }
   var previousIsBatchingInteractiveUpdates = isBatchingInteractiveUpdates;
   var previousIsBatchingUpdates = isBatchingUpdates;
@@ -14112,23 +15627,13 @@ function interactiveUpdates$1(fn, a, b) {
 }
 
 function flushInteractiveUpdates$1() {
-  if (!isRendering && lowestPendingInteractiveExpirationTime !== NoWork) {
+  if (
+    !isRendering &&
+    lowestPriorityPendingInteractiveExpirationTime !== NoWork
+  ) {
     // Synchronously flush pending interactive updates.
-    performWork(lowestPendingInteractiveExpirationTime, null);
-    lowestPendingInteractiveExpirationTime = NoWork;
-  }
-}
-
-function flushControlled(fn) {
-  var previousIsBatchingUpdates = isBatchingUpdates;
-  isBatchingUpdates = true;
-  try {
-    syncUpdates(fn);
-  } finally {
-    isBatchingUpdates = previousIsBatchingUpdates;
-    if (!isBatchingUpdates && !isRendering) {
-      performWork(Sync, null);
-    }
+    performWork(lowestPriorityPendingInteractiveExpirationTime, null);
+    lowestPriorityPendingInteractiveExpirationTime = NoWork;
   }
 }
 
@@ -14136,38 +15641,47 @@ function flushControlled(fn) {
 // Might add PROFILE later.
 
 var didWarnAboutNestedUpdates = void 0;
+var didWarnAboutFindNodeInStrictMode = void 0;
 
 {
   didWarnAboutNestedUpdates = false;
+  didWarnAboutFindNodeInStrictMode = {};
 }
 
 function getContextForSubtree(parentComponent) {
   if (!parentComponent) {
-    return emptyObject;
+    return emptyContextObject;
   }
 
   var fiber = get$1(parentComponent);
   var parentContext = findCurrentUnmaskedContext(fiber);
-  return isContextProvider(fiber)
-    ? processChildContext(fiber, parentContext)
-    : parentContext;
+
+  if (fiber.tag === ClassComponent) {
+    var Component = fiber.type;
+    if (isContextProvider(Component)) {
+      return processChildContext(fiber, Component, parentContext);
+    }
+  } else if (fiber.tag === ClassComponentLazy) {
+    var _Component = getResultFromResolvedThenable(fiber.type);
+    if (isContextProvider(_Component)) {
+      return processChildContext(fiber, _Component, parentContext);
+    }
+  }
+
+  return parentContext;
 }
 
-function scheduleRootUpdate(current, element, expirationTime, callback) {
+function scheduleRootUpdate(current$$1, element, expirationTime, callback) {
   {
-    if (
-      ReactDebugCurrentFiber.phase === "render" &&
-      ReactDebugCurrentFiber.current !== null &&
-      !didWarnAboutNestedUpdates
-    ) {
+    if (phase === "render" && current !== null && !didWarnAboutNestedUpdates) {
       didWarnAboutNestedUpdates = true;
-      warning(
+      warningWithoutStack$1(
         false,
         "Render methods should be a pure function of props and state; " +
           "triggering nested component updates from render is not allowed. " +
           "If necessary, trigger nested updates in componentDidUpdate.\n\n" +
           "Check the render method of %s.",
-        getComponentName(ReactDebugCurrentFiber.current) || "Unknown"
+        getComponentName(current.type) || "Unknown"
       );
     }
   }
@@ -14180,7 +15694,7 @@ function scheduleRootUpdate(current, element, expirationTime, callback) {
   callback = callback === undefined ? null : callback;
   if (callback !== null) {
     !(typeof callback === "function")
-      ? warning(
+      ? warningWithoutStack$1(
           false,
           "render(...): Expected the last optional `callback` argument to be a " +
             "function. Instead received: %s.",
@@ -14189,9 +15703,9 @@ function scheduleRootUpdate(current, element, expirationTime, callback) {
       : void 0;
     update.callback = callback;
   }
-  enqueueUpdate(current, update, expirationTime);
+  enqueueUpdate(current$$1, update);
 
-  scheduleWork(current, expirationTime);
+  scheduleWork(current$$1, expirationTime);
   return expirationTime;
 }
 
@@ -14203,11 +15717,11 @@ function updateContainerAtExpirationTime(
   callback
 ) {
   // TODO: If this is a nested container, this won't be the root.
-  var current = container.current;
+  var current$$1 = container.current;
 
   {
     if (ReactFiberInstrumentation_1.debugTool) {
-      if (current.alternate === null) {
+      if (current$$1.alternate === null) {
         ReactFiberInstrumentation_1.debugTool.onMountContainer(container);
       } else if (element === null) {
         ReactFiberInstrumentation_1.debugTool.onUnmountContainer(container);
@@ -14224,7 +15738,7 @@ function updateContainerAtExpirationTime(
     container.pendingContext = context;
   }
 
-  return scheduleRootUpdate(current, element, expirationTime, callback);
+  return scheduleRootUpdate(current$$1, element, expirationTime, callback);
 }
 
 function findHostInstance$1(component) {
@@ -14247,14 +15761,72 @@ function findHostInstance$1(component) {
   return hostFiber.stateNode;
 }
 
-function createContainer(containerInfo, isAsync, hydrate) {
-  return createFiberRoot(containerInfo, isAsync, hydrate);
+function findHostInstanceWithWarning$1(component, methodName) {
+  {
+    var fiber = get$1(component);
+    if (fiber === undefined) {
+      if (typeof component.render === "function") {
+        invariant(false, "Unable to find node on an unmounted component.");
+      } else {
+        invariant(
+          false,
+          "Argument appears to not be a ReactComponent. Keys: %s",
+          Object.keys(component)
+        );
+      }
+    }
+    var hostFiber = findCurrentHostFiber(fiber);
+    if (hostFiber === null) {
+      return null;
+    }
+    if (hostFiber.mode & StrictMode) {
+      var componentName = getComponentName(fiber.type) || "Component";
+      if (!didWarnAboutFindNodeInStrictMode[componentName]) {
+        didWarnAboutFindNodeInStrictMode[componentName] = true;
+        if (fiber.mode & StrictMode) {
+          warningWithoutStack$1(
+            false,
+            "%s is deprecated in StrictMode. " +
+              "%s was passed an instance of %s which is inside StrictMode. " +
+              "Instead, add a ref directly to the element you want to reference." +
+              "\n%s" +
+              "\n\nLearn more about using refs safely here:" +
+              "\nhttps://fb.me/react-strict-mode-find-node",
+            methodName,
+            methodName,
+            componentName,
+            getStackByFiberInDevAndProd(hostFiber)
+          );
+        } else {
+          warningWithoutStack$1(
+            false,
+            "%s is deprecated in StrictMode. " +
+              "%s was passed an instance of %s which renders StrictMode children. " +
+              "Instead, add a ref directly to the element you want to reference." +
+              "\n%s" +
+              "\n\nLearn more about using refs safely here:" +
+              "\nhttps://fb.me/react-strict-mode-find-node",
+            methodName,
+            methodName,
+            componentName,
+            getStackByFiberInDevAndProd(hostFiber)
+          );
+        }
+      }
+    }
+    return hostFiber.stateNode;
+  }
+  return findHostInstance$1(component);
+}
+
+function createContainer(containerInfo, isConcurrent, hydrate) {
+  return createFiberRoot(containerInfo, isConcurrent, hydrate);
 }
 
 function updateContainer(element, container, parentComponent, callback) {
-  var current = container.current;
-  var currentTime = recalculateCurrentTime();
-  var expirationTime = computeExpirationForFiber(currentTime, current);
+  var current$$1 = container.current;
+  var currentTime = requestCurrentTime();
+  var expirationTime = computeExpirationForFiber(currentTime, current$$1);
   return updateContainerAtExpirationTime(
     element,
     container,
@@ -14277,14 +15849,6 @@ function getPublicRootInstance(container) {
   }
 }
 
-function findHostInstanceWithNoPortals(fiber) {
-  var hostFiber = findCurrentHostFiberWithNoPortals(fiber);
-  if (hostFiber === null) {
-    return null;
-  }
-  return hostFiber.stateNode;
-}
-
 function injectIntoDevTools(devToolsConfig) {
   var findFiberByHostInstance = devToolsConfig.findFiberByHostInstance;
 
@@ -14311,27 +15875,6 @@ function injectIntoDevTools(devToolsConfig) {
 // This file intentionally does *not* have the Flow annotation.
 // Don't add it. See `./inline-typed.js` for an explanation.
 
-var ReactNativeFiberRenderer = Object.freeze({
-  updateContainerAtExpirationTime: updateContainerAtExpirationTime,
-  createContainer: createContainer,
-  updateContainer: updateContainer,
-  flushRoot: flushRoot,
-  requestWork: requestWork,
-  computeUniqueAsyncExpiration: computeUniqueAsyncExpiration,
-  batchedUpdates: batchedUpdates$1,
-  unbatchedUpdates: unbatchedUpdates,
-  deferredUpdates: deferredUpdates,
-  syncUpdates: syncUpdates,
-  interactiveUpdates: interactiveUpdates$1,
-  flushInteractiveUpdates: flushInteractiveUpdates$1,
-  flushControlled: flushControlled,
-  flushSync: flushSync,
-  getPublicRootInstance: getPublicRootInstance,
-  findHostInstance: findHostInstance$1,
-  findHostInstanceWithNoPortals: findHostInstanceWithNoPortals,
-  injectIntoDevTools: injectIntoDevTools
-});
-
 function createPortal(
   children,
   containerInfo,
@@ -14353,7 +15896,7 @@ function createPortal(
 
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.4.1";
+var ReactVersion = "16.6.0-alpha.8af6728";
 
 // Modules provided by RN:
 var NativeMethodsMixin = function(findNodeHandle, findHostInstance) {
@@ -14393,7 +15936,7 @@ var NativeMethodsMixin = function(findNodeHandle, findHostInstance) {
     measure: function(callback) {
       UIManager.measure(
         findNodeHandle(this),
-        mountSafeCallback(this, callback)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
     },
 
@@ -14415,7 +15958,7 @@ var NativeMethodsMixin = function(findNodeHandle, findHostInstance) {
     measureInWindow: function(callback) {
       UIManager.measureInWindow(
         findNodeHandle(this),
-        mountSafeCallback(this, callback)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
     },
 
@@ -14435,8 +15978,8 @@ var NativeMethodsMixin = function(findNodeHandle, findHostInstance) {
       UIManager.measureLayout(
         findNodeHandle(this),
         relativeToNativeNode,
-        mountSafeCallback(this, onFail),
-        mountSafeCallback(this, onSuccess)
+        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
       );
     },
 
@@ -14645,7 +16188,7 @@ var ReactNativeComponent = function(findNodeHandle, findHostInstance) {
     ReactNativeComponent.prototype.measure = function measure(callback) {
       UIManager.measure(
         findNodeHandle(this),
-        mountSafeCallback(this, callback)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
     };
 
@@ -14668,7 +16211,7 @@ var ReactNativeComponent = function(findNodeHandle, findHostInstance) {
     ) {
       UIManager.measureInWindow(
         findNodeHandle(this),
-        mountSafeCallback(this, callback)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
     };
 
@@ -14687,8 +16230,8 @@ var ReactNativeComponent = function(findNodeHandle, findHostInstance) {
       UIManager.measureLayout(
         findNodeHandle(this),
         relativeToNativeNode,
-        mountSafeCallback(this, onFail),
-        mountSafeCallback(this, onSuccess)
+        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
       );
     };
 
@@ -14749,6 +16292,11 @@ var ReactNativeComponent = function(findNodeHandle, findHostInstance) {
 };
 
 // Module provided by RN:
+var emptyObject$2 = {};
+{
+  Object.freeze(emptyObject$2);
+}
+
 var getInspectorDataForViewTag = void 0;
 
 {
@@ -14779,9 +16327,9 @@ var getInspectorDataForViewTag = void 0;
   var getHostProps = function(fiber) {
     var host = findCurrentHostFiber(fiber);
     if (host) {
-      return host.memoizedProps || emptyObject;
+      return host.memoizedProps || emptyObject$2;
     }
-    return emptyObject;
+    return emptyObject$2;
   };
 
   var getHostNode = function(fiber, findNodeHandle) {
@@ -14803,7 +16351,7 @@ var getInspectorDataForViewTag = void 0;
   var createHierarchy = function(fiberHierarchy) {
     return fiberHierarchy.map(function(fiber) {
       return {
-        name: getComponentName(fiber),
+        name: getComponentName(fiber.type),
         getInspectorData: function(findNodeHandle) {
           return {
             measure: function(callback) {
@@ -14827,7 +16375,7 @@ var getInspectorDataForViewTag = void 0;
     if (!closestInstance) {
       return {
         hierarchy: [],
-        props: emptyObject,
+        props: emptyObject$2,
         selection: null,
         source: null
       };
@@ -14850,22 +16398,25 @@ var getInspectorDataForViewTag = void 0;
   };
 }
 
+// TODO: direct imports like some-package/src/* are bad. Fix me.
 // Module provided by RN:
+var ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 var findHostInstance = findHostInstance$1;
+var findHostInstanceWithWarning = findHostInstanceWithWarning$1;
 
 function findNodeHandle(componentOrHandle) {
   {
     var owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
       !owner.stateNode._warnedAboutRefsInRender
-        ? warning(
+        ? warningWithoutStack$1(
             false,
             "%s is accessing findNodeHandle inside its render(). " +
               "render() should be a pure function of props and state. It should " +
               "never access something that requires stale data from the previous " +
               "render, such as refs. Move this logic to componentDidMount and " +
               "componentDidUpdate instead.",
-            getComponentName(owner) || "A component"
+            getComponentName(owner.type) || "A component"
           )
         : void 0;
 
@@ -14885,7 +16436,14 @@ function findNodeHandle(componentOrHandle) {
   if (componentOrHandle.canonical && componentOrHandle.canonical._nativeTag) {
     return componentOrHandle.canonical._nativeTag;
   }
-  var hostInstance = findHostInstance(componentOrHandle);
+  var hostInstance = void 0;
+  {
+    hostInstance = findHostInstanceWithWarning(
+      componentOrHandle,
+      "findNodeHandle"
+    );
+  }
+
   if (hostInstance == null) {
     return hostInstance;
   }
@@ -14896,14 +16454,18 @@ function findNodeHandle(componentOrHandle) {
   return hostInstance._nativeTag;
 }
 
-injection$2.injectRenderer(ReactNativeFiberRenderer);
+setBatchingImplementation(
+  batchedUpdates$1,
+  interactiveUpdates$1,
+  flushInteractiveUpdates$1
+);
 
 function computeComponentStackForErrorReporting(reactTag) {
   var fiber = getInstanceFromTag(reactTag);
   if (!fiber) {
     return "";
   }
-  return getStackAddendumByWorkInProgressFiber(fiber);
+  return getStackByFiberInDevAndProd(fiber);
 }
 
 var roots = new Map();
@@ -14974,9 +16536,8 @@ var ReactNativeRenderer$3 =
 
 // TODO: decide on the top-level export form.
 // This is hacky but makes it work with both Rollup and Jest.
-var reactNativeRenderer = ReactNativeRenderer$3.default
-  ? ReactNativeRenderer$3.default
-  : ReactNativeRenderer$3;
+var reactNativeRenderer =
+  ReactNativeRenderer$3.default || ReactNativeRenderer$3;
 
 module.exports = reactNativeRenderer;
 
diff --git a/Libraries/Renderer/oss/ReactNativeRenderer-prod.js b/Libraries/Renderer/oss/ReactNativeRenderer-prod.js
index 24da20e3ba4278..3fcf1033033884 100644
--- a/Libraries/Renderer/oss/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/oss/ReactNativeRenderer-prod.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,78 +12,82 @@
 
 "use strict";
 require("InitializeCore");
-var invariant = require("fbjs/lib/invariant"),
-  ReactNativeViewConfigRegistry = require("ReactNativeViewConfigRegistry"),
+var ReactNativeViewConfigRegistry = require("ReactNativeViewConfigRegistry"),
   UIManager = require("UIManager"),
   RCTEventEmitter = require("RCTEventEmitter"),
   React = require("react"),
-  emptyObject = require("fbjs/lib/emptyObject"),
   deepDiffer = require("deepDiffer"),
   flattenStyle = require("flattenStyle"),
-  TextInputState = require("TextInputState"),
-  ExceptionsManager = require("ExceptionsManager");
-function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
-  this._hasCaughtError = !1;
-  this._caughtError = null;
+  TextInputState = require("TextInputState");
+var ExceptionsManager = require("ExceptionsManager");
+function invariant(condition, format, a, b, c, d, e, f) {
+  if (!condition) {
+    condition = void 0;
+    if (void 0 === format)
+      condition = Error(
+        "Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings."
+      );
+    else {
+      var args = [a, b, c, d, e, f],
+        argIndex = 0;
+      condition = Error(
+        format.replace(/%s/g, function() {
+          return args[argIndex++];
+        })
+      );
+      condition.name = "Invariant Violation";
+    }
+    condition.framesToPop = 1;
+    throw condition;
+  }
+}
+function invokeGuardedCallbackImpl(name, func, context, a, b, c, d, e, f) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
   try {
     func.apply(context, funcArgs);
   } catch (error) {
-    (this._caughtError = error), (this._hasCaughtError = !0);
+    this.onError(error);
   }
 }
-var ReactErrorUtils = {
-  _caughtError: null,
-  _hasCaughtError: !1,
-  _rethrowError: null,
-  _hasRethrowError: !1,
-  invokeGuardedCallback: function(name, func, context, a, b, c, d, e, f) {
-    invokeGuardedCallback.apply(ReactErrorUtils, arguments);
-  },
-  invokeGuardedCallbackAndCatchFirstError: function(
-    name,
-    func,
-    context,
-    a,
-    b,
-    c,
-    d,
-    e,
-    f
-  ) {
-    ReactErrorUtils.invokeGuardedCallback.apply(this, arguments);
-    if (ReactErrorUtils.hasCaughtError()) {
-      var error = ReactErrorUtils.clearCaughtError();
-      ReactErrorUtils._hasRethrowError ||
-        ((ReactErrorUtils._hasRethrowError = !0),
-        (ReactErrorUtils._rethrowError = error));
-    }
-  },
-  rethrowCaughtError: function() {
-    return rethrowCaughtError.apply(ReactErrorUtils, arguments);
-  },
-  hasCaughtError: function() {
-    return ReactErrorUtils._hasCaughtError;
-  },
-  clearCaughtError: function() {
-    if (ReactErrorUtils._hasCaughtError) {
-      var error = ReactErrorUtils._caughtError;
-      ReactErrorUtils._caughtError = null;
-      ReactErrorUtils._hasCaughtError = !1;
-      return error;
+var hasError = !1,
+  caughtError = null,
+  hasRethrowError = !1,
+  rethrowError = null,
+  reporter = {
+    onError: function(error) {
+      hasError = !0;
+      caughtError = error;
     }
-    invariant(
-      !1,
-      "clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue."
-    );
-  }
-};
-function rethrowCaughtError() {
-  if (ReactErrorUtils._hasRethrowError) {
-    var error = ReactErrorUtils._rethrowError;
-    ReactErrorUtils._rethrowError = null;
-    ReactErrorUtils._hasRethrowError = !1;
-    throw error;
+  };
+function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
+  hasError = !1;
+  caughtError = null;
+  invokeGuardedCallbackImpl.apply(reporter, arguments);
+}
+function invokeGuardedCallbackAndCatchFirstError(
+  name,
+  func,
+  context,
+  a,
+  b,
+  c,
+  d,
+  e,
+  f
+) {
+  invokeGuardedCallback.apply(this, arguments);
+  if (hasError) {
+    if (hasError) {
+      var error = caughtError;
+      hasError = !1;
+      caughtError = null;
+    } else
+      invariant(
+        !1,
+        "clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue."
+      ),
+        (error = void 0);
+    hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
 var eventPluginOrder = null,
@@ -165,12 +169,7 @@ var plugins = [],
 function executeDispatch(event, simulated, listener, inst) {
   simulated = event.type || "unknown-event";
   event.currentTarget = getNodeFromInstance(inst);
-  ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
-    simulated,
-    listener,
-    void 0,
-    event
-  );
+  invokeGuardedCallbackAndCatchFirstError(simulated, listener, void 0, event);
   event.currentTarget = null;
 }
 function executeDirectDispatch(event) {
@@ -294,7 +293,7 @@ function getListener(inst, registrationName) {
 }
 function getParent(inst) {
   do inst = inst.return;
-  while (inst && 5 !== inst.tag);
+  while (inst && 7 !== inst.tag);
   return inst ? inst : null;
 }
 function traverseTwoPhase(inst, fn, arg) {
@@ -347,9 +346,6 @@ function accumulateDirectDispatchesSingle(event) {
     }
   }
 }
-var shouldBeReleasedProperties = "dispatchConfig _targetInst nativeEvent isDefaultPrevented isPropagationStopped _dispatchListeners _dispatchInstances".split(
-  " "
-);
 function functionThatReturnsTrue() {
   return !0;
 }
@@ -407,12 +403,9 @@ Object.assign(SyntheticEvent.prototype, {
     var Interface = this.constructor.Interface,
       propName;
     for (propName in Interface) this[propName] = null;
-    for (
-      Interface = 0;
-      Interface < shouldBeReleasedProperties.length;
-      Interface++
-    )
-      this[shouldBeReleasedProperties[Interface]] = null;
+    this.nativeEvent = this._targetInst = this.dispatchConfig = null;
+    this.isPropagationStopped = this.isDefaultPrevented = functionThatReturnsFalse;
+    this._dispatchInstances = this._dispatchListeners = null;
   }
 });
 SyntheticEvent.Interface = {
@@ -458,7 +451,7 @@ function getPooledEvent(dispatchConfig, targetInst, nativeEvent, nativeInst) {
 function releasePooledEvent(event) {
   invariant(
     event instanceof this,
-    "Trying to release an event instance  into a pool of a different type."
+    "Trying to release an event instance into a pool of a different type."
   );
   event.destructor();
   10 > this.eventPool.length && this.eventPool.push(event);
@@ -615,7 +608,9 @@ function accumulate(current, next) {
     ? next
     : Array.isArray(current)
       ? current.concat(next)
-      : Array.isArray(next) ? [current].concat(next) : [current, next];
+      : Array.isArray(next)
+        ? [current].concat(next)
+        : [current, next];
 }
 var responderInst = null,
   trackedTouchCount = 0;
@@ -881,7 +876,9 @@ var eventTypes$1 = {
           ? eventTypes$1.responderStart
           : targetInst
             ? eventTypes$1.responderMove
-            : depthA ? eventTypes$1.responderEnd : null)
+            : depthA
+              ? eventTypes$1.responderEnd
+              : null)
       )
         (JSCompiler_temp$jscomp$0 = ResponderSyntheticEvent.getPooled(
           JSCompiler_temp$jscomp$0,
@@ -935,7 +932,9 @@ var eventTypes$1 = {
       if (
         (topLevelType = JSCompiler_temp$jscomp$0
           ? eventTypes$1.responderTerminate
-          : topLevelType ? eventTypes$1.responderRelease : null)
+          : topLevelType
+            ? eventTypes$1.responderRelease
+            : null)
       )
         (nativeEvent = ResponderSyntheticEvent.getPooled(
           topLevelType,
@@ -1000,59 +999,35 @@ injection.injectEventPluginsByName({
 });
 var instanceCache = {},
   instanceProps = {};
-function uncacheFiberNode(tag) {
-  delete instanceCache[tag];
-  delete instanceProps[tag];
-}
 function getInstanceFromTag(tag) {
   return instanceCache[tag] || null;
 }
-var ReactNativeComponentTree = {
-    precacheFiberNode: function(hostInst, tag) {
-      instanceCache[tag] = hostInst;
-    },
-    uncacheFiberNode: uncacheFiberNode,
-    getClosestInstanceFromNode: getInstanceFromTag,
-    getInstanceFromNode: getInstanceFromTag,
-    getNodeFromInstance: function(inst) {
-      var tag = inst.stateNode._nativeTag;
-      void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
-      invariant(tag, "All native instances should have a tag.");
-      return tag;
-    },
-    getFiberCurrentPropsFromNode: function(stateNode) {
-      return instanceProps[stateNode._nativeTag] || null;
-    },
-    updateFiberProps: function(tag, props) {
-      instanceProps[tag] = props;
-    }
-  },
-  restoreTarget = null,
+var restoreTarget = null,
   restoreQueue = null;
 function restoreStateOfTarget(target) {
   if ((target = getInstanceFromNode(target))) {
     invariant(
-      null,
-      "Fiber needs to be injected to handle a fiber target for controlled events. This error is likely caused by a bug in React. Please file an issue."
+      !1,
+      "setRestoreImplementation() needs to be called to handle a target for controlled events. This error is likely caused by a bug in React. Please file an issue."
     );
     var props = getFiberCurrentPropsFromNode(target.stateNode);
-    null.restoreControlledState(target.stateNode, target.type, props);
+    null(target.stateNode, target.type, props);
   }
 }
-function _batchedUpdates(fn, bookkeeping) {
+function _batchedUpdatesImpl(fn, bookkeeping) {
   return fn(bookkeeping);
 }
-function _flushInteractiveUpdates() {}
+function _flushInteractiveUpdatesImpl() {}
 var isBatching = !1;
 function batchedUpdates(fn, bookkeeping) {
   if (isBatching) return fn(bookkeeping);
   isBatching = !0;
   try {
-    return _batchedUpdates(fn, bookkeeping);
+    return _batchedUpdatesImpl(fn, bookkeeping);
   } finally {
     if (((isBatching = !1), null !== restoreTarget || null !== restoreQueue))
       if (
-        (_flushInteractiveUpdates(),
+        (_flushInteractiveUpdatesImpl(),
         restoreTarget &&
           ((bookkeeping = restoreTarget),
           (fn = restoreQueue),
@@ -1085,13 +1060,19 @@ function _receiveRootNodeIDEvent(rootNodeID, topLevelType, nativeEventParam) {
     null !== events && (eventQueue = accumulateInto(eventQueue, events));
     events = eventQueue;
     eventQueue = null;
-    events &&
+    if (
+      events &&
       (forEachAccumulated(events, executeDispatchesAndReleaseTopLevel),
       invariant(
         !eventQueue,
         "processEventQueue(): Additional events were enqueued while processing an event queue. Support for this has not yet been implemented."
       ),
-      ReactErrorUtils.rethrowCaughtError());
+      hasRethrowError)
+    )
+      throw ((events = rethrowError),
+      (hasRethrowError = !1),
+      (rethrowError = null),
+      events);
   });
 }
 RCTEventEmitter.register({
@@ -1134,10 +1115,16 @@ RCTEventEmitter.register({
     }
   }
 });
-getFiberCurrentPropsFromNode =
-  ReactNativeComponentTree.getFiberCurrentPropsFromNode;
-getInstanceFromNode = ReactNativeComponentTree.getInstanceFromNode;
-getNodeFromInstance = ReactNativeComponentTree.getNodeFromInstance;
+getFiberCurrentPropsFromNode = function(stateNode) {
+  return instanceProps[stateNode._nativeTag] || null;
+};
+getInstanceFromNode = getInstanceFromTag;
+getNodeFromInstance = function(inst) {
+  var tag = inst.stateNode._nativeTag;
+  void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
+  invariant(tag, "All native instances should have a tag.");
+  return tag;
+};
 ResponderEventPlugin.injection.injectGlobalResponderHandler({
   onChange: function(from, to, blockNativeResponder) {
     null !== to
@@ -1145,8 +1132,8 @@ ResponderEventPlugin.injection.injectGlobalResponderHandler({
       : UIManager.clearJSResponder();
   }
 });
-var ReactCurrentOwner =
-    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,
+var ReactSharedInternals =
+    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
   hasSymbol = "function" === typeof Symbol && Symbol.for,
   REACT_ELEMENT_TYPE = hasSymbol ? Symbol.for("react.element") : 60103,
   REACT_PORTAL_TYPE = hasSymbol ? Symbol.for("react.portal") : 60106,
@@ -1155,48 +1142,62 @@ var ReactCurrentOwner =
   REACT_PROFILER_TYPE = hasSymbol ? Symbol.for("react.profiler") : 60114,
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol.for("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol.for("react.context") : 60110,
-  REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol.for("react.async_mode") : 60111,
+  REACT_CONCURRENT_MODE_TYPE = hasSymbol
+    ? Symbol.for("react.concurrent_mode")
+    : 60111,
   REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for("react.forward_ref") : 60112,
-  REACT_TIMEOUT_TYPE = hasSymbol ? Symbol.for("react.timeout") : 60113,
+  REACT_SUSPENSE_TYPE = hasSymbol ? Symbol.for("react.suspense") : 60113,
+  REACT_PURE_TYPE = hasSymbol ? Symbol.for("react.pure") : 60115,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
-  if (null === maybeIterable || "undefined" === typeof maybeIterable)
-    return null;
+  if (null === maybeIterable || "object" !== typeof maybeIterable) return null;
   maybeIterable =
     (MAYBE_ITERATOR_SYMBOL && maybeIterable[MAYBE_ITERATOR_SYMBOL]) ||
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(fiber) {
-  var type = fiber.type;
-  if ("function" === typeof type) return type.displayName || type.name;
+function getWrappedName(outerType, innerType, wrapperName) {
+  innerType = innerType.displayName || innerType.name || "";
+  return (
+    outerType.displayName ||
+    ("" !== innerType ? wrapperName + "(" + innerType + ")" : wrapperName)
+  );
+}
+function getComponentName(type) {
+  if (null == type) return null;
+  if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
   switch (type) {
-    case REACT_ASYNC_MODE_TYPE:
-      return "AsyncMode";
-    case REACT_CONTEXT_TYPE:
-      return "Context.Consumer";
+    case REACT_CONCURRENT_MODE_TYPE:
+      return "ConcurrentMode";
     case REACT_FRAGMENT_TYPE:
-      return "ReactFragment";
+      return "Fragment";
     case REACT_PORTAL_TYPE:
-      return "ReactPortal";
+      return "Portal";
     case REACT_PROFILER_TYPE:
-      return "Profiler(" + fiber.pendingProps.id + ")";
-    case REACT_PROVIDER_TYPE:
-      return "Context.Provider";
+      return "Profiler";
     case REACT_STRICT_MODE_TYPE:
       return "StrictMode";
-    case REACT_TIMEOUT_TYPE:
-      return "Timeout";
+    case REACT_SUSPENSE_TYPE:
+      return "Suspense";
   }
-  if ("object" === typeof type && null !== type)
+  if ("object" === typeof type) {
     switch (type.$$typeof) {
+      case REACT_CONTEXT_TYPE:
+        return "Context.Consumer";
+      case REACT_PROVIDER_TYPE:
+        return "Context.Provider";
       case REACT_FORWARD_REF_TYPE:
-        return (
-          (fiber = type.render.displayName || type.render.name || ""),
-          "" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef"
-        );
+        return getWrappedName(type, type.render, "ForwardRef");
+      case REACT_PURE_TYPE:
+        return getWrappedName(type, type.render, "Pure");
     }
+    if (
+      "function" === typeof type.then &&
+      (type = 1 === type._reactStatus ? type._reactResult : null)
+    )
+      return getComponentName(type);
+  }
   return null;
 }
 function isFiberMountedImpl(fiber) {
@@ -1207,7 +1208,7 @@ function isFiberMountedImpl(fiber) {
     for (; node.return; )
       if (((node = node.return), 0 !== (node.effectTag & 2))) return 1;
   }
-  return 3 === node.tag ? 2 : 3;
+  return 5 === node.tag ? 2 : 3;
 }
 function assertIsMounted(fiber) {
   invariant(
@@ -1283,14 +1284,14 @@ function findCurrentFiberUsingSlowPath(fiber) {
       "Return fibers should always be each others' alternates. This error is likely caused by a bug in React. Please file an issue."
     );
   }
-  invariant(3 === a.tag, "Unable to find node on an unmounted component.");
+  invariant(5 === a.tag, "Unable to find node on an unmounted component.");
   return a.stateNode.current === a ? fiber : alternate;
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
   if (!parent) return null;
   for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
+    if (7 === node.tag || 8 === node.tag) return node;
     if (node.child) (node.child.return = node), (node = node.child);
     else {
       if (node === parent) break;
@@ -1304,26 +1305,7 @@ function findCurrentHostFiber(parent) {
   }
   return null;
 }
-function findCurrentHostFiberWithNoPortals(parent) {
-  parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child && 4 !== node.tag)
-      (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
-}
-var emptyObject$1 = {},
+var emptyObject = {},
   removedKeys = null,
   removedKeyCount = 0;
 function restoreDeletedValuesInNestedArray(
@@ -1341,23 +1323,23 @@ function restoreDeletedValuesInNestedArray(
   else if (node && 0 < removedKeyCount)
     for (i in removedKeys)
       if (removedKeys[i]) {
-        var _nextProp = node[i];
-        if (void 0 !== _nextProp) {
+        var nextProp = node[i];
+        if (void 0 !== nextProp) {
           var attributeConfig = validAttributes[i];
           if (attributeConfig) {
-            "function" === typeof _nextProp && (_nextProp = !0);
-            "undefined" === typeof _nextProp && (_nextProp = null);
+            "function" === typeof nextProp && (nextProp = !0);
+            "undefined" === typeof nextProp && (nextProp = null);
             if ("object" !== typeof attributeConfig)
-              updatePayload[i] = _nextProp;
+              updatePayload[i] = nextProp;
             else if (
               "function" === typeof attributeConfig.diff ||
               "function" === typeof attributeConfig.process
             )
-              (_nextProp =
+              (nextProp =
                 "function" === typeof attributeConfig.process
-                  ? attributeConfig.process(_nextProp)
-                  : _nextProp),
-                (updatePayload[i] = _nextProp);
+                  ? attributeConfig.process(nextProp)
+                  : nextProp),
+                (updatePayload[i] = nextProp);
             removedKeys[i] = !1;
             removedKeyCount--;
           }
@@ -1423,7 +1405,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!Array.isArray(nextProp))
     return diffProperties(
       updatePayload,
-      emptyObject$1,
+      emptyObject,
       nextProp,
       validAttributes
     );
@@ -1441,7 +1423,7 @@ function clearNestedProperty(updatePayload, prevProp, validAttributes) {
     return diffProperties(
       updatePayload,
       prevProp,
-      emptyObject$1,
+      emptyObject,
       validAttributes
     );
   for (var i = 0; i < prevProp.length; i++)
@@ -1541,18 +1523,13 @@ function diffProperties(updatePayload, prevProps, nextProps, validAttributes) {
               )))));
   return updatePayload;
 }
-function mountSafeCallback(context, callback) {
+function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   return function() {
-    if (callback) {
-      if ("boolean" === typeof context.__isMounted) {
-        if (!context.__isMounted) return;
-      } else if (
-        "function" === typeof context.isMounted &&
-        !context.isMounted()
-      )
-        return;
+    if (
+      callback &&
+      ("boolean" !== typeof context.__isMounted || context.__isMounted)
+    )
       return callback.apply(context, arguments);
-    }
   };
 }
 var ReactNativeFiberHostComponent = (function() {
@@ -1570,14 +1547,17 @@ var ReactNativeFiberHostComponent = (function() {
       TextInputState.focusTextInput(this._nativeTag);
     };
     ReactNativeFiberHostComponent.prototype.measure = function(callback) {
-      UIManager.measure(this._nativeTag, mountSafeCallback(this, callback));
+      UIManager.measure(
+        this._nativeTag,
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
+      );
     };
     ReactNativeFiberHostComponent.prototype.measureInWindow = function(
       callback
     ) {
       UIManager.measureInWindow(
         this._nativeTag,
-        mountSafeCallback(this, callback)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
     };
     ReactNativeFiberHostComponent.prototype.measureLayout = function(
@@ -1588,8 +1568,8 @@ var ReactNativeFiberHostComponent = (function() {
       UIManager.measureLayout(
         this._nativeTag,
         relativeToNativeNode,
-        mountSafeCallback(this, onFail),
-        mountSafeCallback(this, onSuccess)
+        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
       );
     };
     ReactNativeFiberHostComponent.prototype.setNativeProps = function(
@@ -1597,7 +1577,7 @@ var ReactNativeFiberHostComponent = (function() {
     ) {
       nativeProps = diffProperties(
         null,
-        emptyObject$1,
+        emptyObject,
         nativeProps,
         this.viewConfig.validAttributes
       );
@@ -1638,7 +1618,8 @@ function shim$1() {
     "The current renderer does not support hyration. This error is likely caused by a bug in React. Please file an issue."
   );
 }
-var nextReactTag = 3;
+var UPDATE_SIGNAL = {},
+  nextReactTag = 3;
 function allocateTag() {
   var tag = nextReactTag;
   1 === tag % 10 && (tag += 2);
@@ -1646,10 +1627,14 @@ function allocateTag() {
   return tag;
 }
 function recursivelyUncacheFiberNode(node) {
-  "number" === typeof node
-    ? uncacheFiberNode(node)
-    : (uncacheFiberNode(node._nativeTag),
-      node._children.forEach(recursivelyUncacheFiberNode));
+  if ("number" === typeof node)
+    delete instanceCache[node], delete instanceProps[node];
+  else {
+    var tag = node._nativeTag;
+    delete instanceCache[tag];
+    delete instanceProps[tag];
+    node._children.forEach(recursivelyUncacheFiberNode);
+  }
 }
 function finalizeInitialChildren(parentInstance) {
   if (0 === parentInstance._children.length) return !1;
@@ -1659,30 +1644,37 @@ function finalizeInitialChildren(parentInstance) {
   UIManager.setChildren(parentInstance._nativeTag, nativeTags);
   return !1;
 }
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
+var scheduleTimeout = setTimeout,
+  cancelTimeout = clearTimeout,
+  BEFORE_SLASH_RE = /^(.*)[\\\/]/;
+function getStackByFiberInDevAndProd(workInProgress) {
   var info = "";
   do {
     a: switch (workInProgress.tag) {
+      case 4:
       case 0:
       case 1:
       case 2:
-      case 5:
+      case 3:
+      case 7:
+      case 10:
         var owner = workInProgress._debugOwner,
-          source = workInProgress._debugSource;
-        var JSCompiler_inline_result = getComponentName(workInProgress);
-        var ownerName = null;
-        owner && (ownerName = getComponentName(owner));
-        owner = source;
-        JSCompiler_inline_result =
-          "\n    in " +
-          (JSCompiler_inline_result || "Unknown") +
-          (owner
-            ? " (at " +
-              owner.fileName.replace(/^.*[\\\/]/, "") +
+          source = workInProgress._debugSource,
+          name = getComponentName(workInProgress.type);
+        var JSCompiler_inline_result = null;
+        owner && (JSCompiler_inline_result = getComponentName(owner.type));
+        owner = name;
+        name = "";
+        source
+          ? (name =
+              " (at " +
+              source.fileName.replace(BEFORE_SLASH_RE, "") +
               ":" +
-              owner.lineNumber +
-              ")"
-            : ownerName ? " (created by " + ownerName + ")" : "");
+              source.lineNumber +
+              ")")
+          : JSCompiler_inline_result &&
+            (name = " (created by " + JSCompiler_inline_result + ")");
+        JSCompiler_inline_result = "\n    in " + (owner || "Unknown") + name;
         break a;
       default:
         JSCompiler_inline_result = "";
@@ -1695,9 +1687,6 @@ function getStackAddendumByWorkInProgressFiber(workInProgress) {
 new Set();
 var valueStack = [],
   index = -1;
-function createCursor(defaultValue) {
-  return { current: defaultValue };
-}
 function pop(cursor) {
   0 > index ||
     ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
@@ -1707,17 +1696,13 @@ function push(cursor, value) {
   valueStack[index] = cursor.current;
   cursor.current = value;
 }
-var contextStackCursor = createCursor(emptyObject),
-  didPerformWorkStackCursor = createCursor(!1),
-  previousContext = emptyObject;
-function getUnmaskedContext(workInProgress) {
-  return isContextProvider(workInProgress)
-    ? previousContext
-    : contextStackCursor.current;
-}
+var emptyContextObject = {},
+  contextStackCursor = { current: emptyContextObject },
+  didPerformWorkStackCursor = { current: !1 },
+  previousContext = emptyContextObject;
 function getMaskedContext(workInProgress, unmaskedContext) {
   var contextTypes = workInProgress.type.contextTypes;
-  if (!contextTypes) return emptyObject;
+  if (!contextTypes) return emptyContextObject;
   var instance = workInProgress.stateNode;
   if (
     instance &&
@@ -1733,12 +1718,13 @@ function getMaskedContext(workInProgress, unmaskedContext) {
     (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
   return context;
 }
-function isContextProvider(fiber) {
-  return 2 === fiber.tag && null != fiber.type.childContextTypes;
+function isContextProvider(type) {
+  type = type.childContextTypes;
+  return null !== type && void 0 !== type;
 }
-function popContextProvider(fiber) {
-  isContextProvider(fiber) &&
-    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+function popContext(fiber) {
+  pop(didPerformWorkStackCursor, fiber);
+  pop(contextStackCursor, fiber);
 }
 function popTopLevelContextObject(fiber) {
   pop(didPerformWorkStackCursor, fiber);
@@ -1746,32 +1732,31 @@ function popTopLevelContextObject(fiber) {
 }
 function pushTopLevelContextObject(fiber, context, didChange) {
   invariant(
-    contextStackCursor.current === emptyObject,
+    contextStackCursor.current === emptyContextObject,
     "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
   );
   push(contextStackCursor, context, fiber);
   push(didPerformWorkStackCursor, didChange, fiber);
 }
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode,
-    childContextTypes = fiber.type.childContextTypes;
+function processChildContext(fiber, type, parentContext) {
+  var instance = fiber.stateNode;
+  fiber = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
     invariant(
-      contextKey in childContextTypes,
+      contextKey in fiber,
       '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
+      getComponentName(type) || "Unknown",
       contextKey
     );
   return Object.assign({}, parentContext, instance);
 }
 function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) return !1;
   var instance = workInProgress.stateNode;
   instance =
     (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
+    emptyContextObject;
   previousContext = contextStackCursor.current;
   push(contextStackCursor, instance, workInProgress);
   push(
@@ -1781,21 +1766,45 @@ function pushContextProvider(workInProgress) {
   );
   return !0;
 }
-function invalidateContextProvider(workInProgress, didChange) {
+function invalidateContextProvider(workInProgress, type, didChange) {
   var instance = workInProgress.stateNode;
   invariant(
     instance,
     "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
   );
-  if (didChange) {
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    push(contextStackCursor, mergedContext, workInProgress);
-  } else pop(didPerformWorkStackCursor, workInProgress);
+  didChange
+    ? ((type = processChildContext(workInProgress, type, previousContext)),
+      (instance.__reactInternalMemoizedMergedChildContext = type),
+      pop(didPerformWorkStackCursor, workInProgress),
+      pop(contextStackCursor, workInProgress),
+      push(contextStackCursor, type, workInProgress))
+    : pop(didPerformWorkStackCursor, workInProgress);
   push(didPerformWorkStackCursor, didChange, workInProgress);
 }
+var onCommitFiberRoot = null,
+  onCommitFiberUnmount = null;
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {}
+  };
+}
+function injectInternals(internals) {
+  if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) return !1;
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled || !hook.supportsFiber) return !0;
+  try {
+    var rendererID = hook.inject(internals);
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {}
+  return !0;
+}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -1803,14 +1812,28 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.index = 0;
   this.ref = null;
   this.pendingProps = pendingProps;
-  this.memoizedState = this.updateQueue = this.memoizedProps = null;
+  this.firstContextDependency = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
   this.effectTag = 0;
   this.lastEffect = this.firstEffect = this.nextEffect = null;
-  this.expirationTime = 0;
+  this.childExpirationTime = this.expirationTime = 0;
   this.alternate = null;
 }
-function createWorkInProgress(current, pendingProps, expirationTime) {
+function shouldConstruct(Component) {
+  Component = Component.prototype;
+  return !(!Component || !Component.isReactComponent);
+}
+function resolveLazyComponentTag(fiber, Component) {
+  if ("function" === typeof Component)
+    return shouldConstruct(Component) ? 3 : 1;
+  if (void 0 !== Component && null !== Component) {
+    fiber = Component.$$typeof;
+    if (fiber === REACT_FORWARD_REF_TYPE) return 14;
+    if (fiber === REACT_PURE_TYPE) return 18;
+  }
+  return 4;
+}
+function createWorkInProgress(current, pendingProps) {
   var workInProgress = current.alternate;
   null === workInProgress
     ? ((workInProgress = new FiberNode(
@@ -1828,11 +1851,13 @@ function createWorkInProgress(current, pendingProps, expirationTime) {
       (workInProgress.nextEffect = null),
       (workInProgress.firstEffect = null),
       (workInProgress.lastEffect = null));
-  workInProgress.expirationTime = expirationTime;
+  workInProgress.childExpirationTime = current.childExpirationTime;
+  workInProgress.expirationTime = current.expirationTime;
   workInProgress.child = current.child;
   workInProgress.memoizedProps = current.memoizedProps;
   workInProgress.memoizedState = current.memoizedState;
   workInProgress.updateQueue = current.updateQueue;
+  workInProgress.firstContextDependency = current.firstContextDependency;
   workInProgress.sibling = current.sibling;
   workInProgress.index = current.index;
   workInProgress.ref = current.ref;
@@ -1842,11 +1867,11 @@ function createFiberFromElement(element, mode, expirationTime) {
   var type = element.type,
     key = element.key;
   element = element.props;
-  if ("function" === typeof type)
-    var fiberTag = type.prototype && type.prototype.isReactComponent ? 2 : 0;
-  else if ("string" === typeof type) fiberTag = 5;
+  var fiberTag = void 0;
+  if ("function" === typeof type) fiberTag = shouldConstruct(type) ? 2 : 4;
+  else if ("string" === typeof type) fiberTag = 7;
   else
-    switch (type) {
+    a: switch (type) {
       case REACT_FRAGMENT_TYPE:
         return createFiberFromFragment(
           element.children,
@@ -1854,12 +1879,12 @@ function createFiberFromElement(element, mode, expirationTime) {
           expirationTime,
           key
         );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = 11;
+      case REACT_CONCURRENT_MODE_TYPE:
+        fiberTag = 10;
         mode |= 3;
         break;
       case REACT_STRICT_MODE_TYPE:
-        fiberTag = 11;
+        fiberTag = 10;
         mode |= 2;
         break;
       case REACT_PROFILER_TYPE:
@@ -1869,34 +1894,36 @@ function createFiberFromElement(element, mode, expirationTime) {
           (type.expirationTime = expirationTime),
           type
         );
-      case REACT_TIMEOUT_TYPE:
+      case REACT_SUSPENSE_TYPE:
         fiberTag = 16;
-        mode |= 2;
         break;
       default:
-        a: {
-          switch ("object" === typeof type && null !== type
-            ? type.$$typeof
-            : null) {
+        if ("object" === typeof type && null !== type)
+          switch (type.$$typeof) {
             case REACT_PROVIDER_TYPE:
-              fiberTag = 13;
+              fiberTag = 12;
               break a;
             case REACT_CONTEXT_TYPE:
-              fiberTag = 12;
+              fiberTag = 11;
               break a;
             case REACT_FORWARD_REF_TYPE:
-              fiberTag = 14;
+              fiberTag = 13;
+              break a;
+            case REACT_PURE_TYPE:
+              fiberTag = 17;
               break a;
             default:
-              invariant(
-                !1,
-                "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",
-                null == type ? type : typeof type,
-                ""
-              );
+              if ("function" === typeof type.then) {
+                fiberTag = 4;
+                break a;
+              }
           }
-          fiberTag = void 0;
-        }
+        invariant(
+          !1,
+          "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",
+          null == type ? type : typeof type,
+          ""
+        );
     }
   mode = new FiberNode(fiberTag, element, key, mode);
   mode.type = type;
@@ -1904,18 +1931,18 @@ function createFiberFromElement(element, mode, expirationTime) {
   return mode;
 }
 function createFiberFromFragment(elements, mode, expirationTime, key) {
-  elements = new FiberNode(10, elements, key, mode);
+  elements = new FiberNode(9, elements, key, mode);
   elements.expirationTime = expirationTime;
   return elements;
 }
 function createFiberFromText(content, mode, expirationTime) {
-  content = new FiberNode(6, content, null, mode);
+  content = new FiberNode(8, content, null, mode);
   content.expirationTime = expirationTime;
   return content;
 }
 function createFiberFromPortal(portal, mode, expirationTime) {
   mode = new FiberNode(
-    4,
+    6,
     null !== portal.children ? portal.children : [],
     portal.key,
     mode
@@ -1928,60 +1955,6 @@ function createFiberFromPortal(portal, mode, expirationTime) {
   };
   return mode;
 }
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
-  containerInfo = {
-    current: isAsync,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    earliestPendingTime: 0,
-    latestPendingTime: 0,
-    earliestSuspendedTime: 0,
-    latestSuspendedTime: 0,
-    latestPingedTime: 0,
-    didError: !1,
-    pendingCommitExpirationTime: 0,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    nextExpirationTimeToWorkOn: 0,
-    expirationTime: 0,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
-  return (isAsync.stateNode = containerInfo);
-}
-var onCommitFiberRoot = null,
-  onCommitFiberUnmount = null;
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {}
-  };
-}
-function injectInternals(internals) {
-  if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) return !1;
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled || !hook.supportsFiber) return !0;
-  try {
-    var rendererID = hook.inject(internals);
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {}
-  return !0;
-}
-function onCommitRoot(root) {
-  "function" === typeof onCommitFiberRoot && onCommitFiberRoot(root);
-}
-function onCommitUnmount(fiber) {
-  "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
-}
 function markPendingPriorityLevel(root, expirationTime) {
   root.didError = !1;
   var earliestPendingTime = root.earliestPendingTime;
@@ -1991,30 +1964,67 @@ function markPendingPriorityLevel(root, expirationTime) {
       ? (root.earliestPendingTime = expirationTime)
       : root.latestPendingTime < expirationTime &&
         (root.latestPendingTime = expirationTime);
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(expirationTime, root);
+}
+function markSuspendedPriorityLevel(root, suspendedTime) {
+  root.didError = !1;
+  var latestPingedTime = root.latestPingedTime;
+  0 !== latestPingedTime &&
+    latestPingedTime <= suspendedTime &&
+    (root.latestPingedTime = 0);
+  latestPingedTime = root.earliestPendingTime;
+  var latestPendingTime = root.latestPendingTime;
+  latestPingedTime === suspendedTime
+    ? (root.earliestPendingTime =
+        latestPendingTime === suspendedTime
+          ? (root.latestPendingTime = 0)
+          : latestPendingTime)
+    : latestPendingTime === suspendedTime &&
+      (root.latestPendingTime = latestPingedTime);
+  latestPingedTime = root.earliestSuspendedTime;
+  latestPendingTime = root.latestSuspendedTime;
+  0 === latestPingedTime
+    ? (root.earliestSuspendedTime = root.latestSuspendedTime = suspendedTime)
+    : latestPingedTime > suspendedTime
+      ? (root.earliestSuspendedTime = suspendedTime)
+      : latestPendingTime < suspendedTime &&
+        (root.latestSuspendedTime = suspendedTime);
+  findNextExpirationTimeToWorkOn(suspendedTime, root);
+}
+function findEarliestOutstandingPriorityLevel(root, renderExpirationTime) {
+  var earliestPendingTime = root.earliestPendingTime;
+  root = root.earliestSuspendedTime;
+  if (
+    0 === renderExpirationTime ||
+    (0 !== earliestPendingTime && earliestPendingTime < renderExpirationTime)
+  )
+    renderExpirationTime = earliestPendingTime;
+  if (0 === renderExpirationTime || (0 !== root && root < renderExpirationTime))
+    renderExpirationTime = root;
+  return renderExpirationTime;
 }
-function findNextPendingPriorityLevel(root) {
+function findNextExpirationTimeToWorkOn(completedExpirationTime, root) {
   var earliestSuspendedTime = root.earliestSuspendedTime,
-    earliestPendingTime = root.earliestPendingTime;
-  if (0 === earliestSuspendedTime)
-    var nextExpirationTimeToWorkOn = (earliestSuspendedTime = earliestPendingTime);
-  else
-    0 !== earliestPendingTime
-      ? ((nextExpirationTimeToWorkOn = earliestPendingTime),
-        (earliestSuspendedTime =
-          earliestSuspendedTime < earliestPendingTime
-            ? earliestSuspendedTime
-            : earliestPendingTime))
-      : (nextExpirationTimeToWorkOn = earliestSuspendedTime =
-          root.latestPingedTime);
-  root.didError && (earliestSuspendedTime = 1);
-  root.nextExpirationTimeToWorkOn = nextExpirationTimeToWorkOn;
-  root.expirationTime = earliestSuspendedTime;
+    latestSuspendedTime = root.latestSuspendedTime,
+    earliestPendingTime = root.earliestPendingTime,
+    latestPingedTime = root.latestPingedTime;
+  earliestPendingTime =
+    0 !== earliestPendingTime ? earliestPendingTime : latestPingedTime;
+  0 === earliestPendingTime &&
+    (0 === completedExpirationTime ||
+      latestSuspendedTime > completedExpirationTime) &&
+    (earliestPendingTime = latestSuspendedTime);
+  completedExpirationTime = earliestPendingTime;
+  0 !== completedExpirationTime &&
+    0 !== earliestSuspendedTime &&
+    earliestSuspendedTime < completedExpirationTime &&
+    (completedExpirationTime = earliestSuspendedTime);
+  root.nextExpirationTimeToWorkOn = earliestPendingTime;
+  root.expirationTime = completedExpirationTime;
 }
 var hasForceUpdate = !1;
 function createUpdateQueue(baseState) {
   return {
-    expirationTime: 0,
     baseState: baseState,
     firstUpdate: null,
     lastUpdate: null,
@@ -2028,7 +2038,6 @@ function createUpdateQueue(baseState) {
 }
 function cloneUpdateQueue(currentQueue) {
   return {
-    expirationTime: currentQueue.expirationTime,
     baseState: currentQueue.baseState,
     firstUpdate: currentQueue.firstUpdate,
     lastUpdate: currentQueue.lastUpdate,
@@ -2050,14 +2059,12 @@ function createUpdate(expirationTime) {
     nextEffect: null
   };
 }
-function appendUpdateToQueue(queue, update, expirationTime) {
+function appendUpdateToQueue(queue, update) {
   null === queue.lastUpdate
     ? (queue.firstUpdate = queue.lastUpdate = update)
     : ((queue.lastUpdate.next = update), (queue.lastUpdate = update));
-  if (0 === queue.expirationTime || queue.expirationTime > expirationTime)
-    queue.expirationTime = expirationTime;
 }
-function enqueueUpdate(fiber, update, expirationTime) {
+function enqueueUpdate(fiber, update) {
   var alternate = fiber.alternate;
   if (null === alternate) {
     var queue1 = fiber.updateQueue;
@@ -2079,14 +2086,13 @@ function enqueueUpdate(fiber, update, expirationTime) {
         : null === queue2 &&
           (queue2 = alternate.updateQueue = cloneUpdateQueue(queue1));
   null === queue2 || queue1 === queue2
-    ? appendUpdateToQueue(queue1, update, expirationTime)
+    ? appendUpdateToQueue(queue1, update)
     : null === queue1.lastUpdate || null === queue2.lastUpdate
-      ? (appendUpdateToQueue(queue1, update, expirationTime),
-        appendUpdateToQueue(queue2, update, expirationTime))
-      : (appendUpdateToQueue(queue1, update, expirationTime),
-        (queue2.lastUpdate = update));
+      ? (appendUpdateToQueue(queue1, update),
+        appendUpdateToQueue(queue2, update))
+      : (appendUpdateToQueue(queue1, update), (queue2.lastUpdate = update));
 }
-function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
+function enqueueCapturedUpdate(workInProgress, update) {
   var workInProgressQueue = workInProgress.updateQueue;
   workInProgressQueue =
     null === workInProgressQueue
@@ -2098,11 +2104,6 @@ function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
     ? (workInProgressQueue.firstCapturedUpdate = workInProgressQueue.lastCapturedUpdate = update)
     : ((workInProgressQueue.lastCapturedUpdate.next = update),
       (workInProgressQueue.lastCapturedUpdate = update));
-  if (
-    0 === workInProgressQueue.expirationTime ||
-    workInProgressQueue.expirationTime > renderExpirationTime
-  )
-    workInProgressQueue.expirationTime = renderExpirationTime;
 }
 function ensureWorkInProgressQueueIsAClone(workInProgress, queue) {
   var current = workInProgress.alternate;
@@ -2150,95 +2151,83 @@ function processUpdateQueue(
   renderExpirationTime
 ) {
   hasForceUpdate = !1;
-  if (
-    !(0 === queue.expirationTime || queue.expirationTime > renderExpirationTime)
-  ) {
-    queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
-    for (
-      var newBaseState = queue.baseState,
-        newFirstUpdate = null,
-        newExpirationTime = 0,
-        update = queue.firstUpdate,
-        resultState = newBaseState;
-      null !== update;
+  queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
+  for (
+    var newBaseState = queue.baseState,
+      newFirstUpdate = null,
+      newExpirationTime = 0,
+      update = queue.firstUpdate,
+      resultState = newBaseState;
+    null !== update;
 
-    ) {
-      var updateExpirationTime = update.expirationTime;
-      if (updateExpirationTime > renderExpirationTime) {
-        if (
-          (null === newFirstUpdate &&
-            ((newFirstUpdate = update), (newBaseState = resultState)),
-          0 === newExpirationTime || newExpirationTime > updateExpirationTime)
-        )
-          newExpirationTime = updateExpirationTime;
-      } else
-        (resultState = getStateFromUpdate(
-          workInProgress,
-          queue,
-          update,
-          resultState,
-          props,
-          instance
-        )),
-          null !== update.callback &&
-            ((workInProgress.effectTag |= 32),
-            (update.nextEffect = null),
-            null === queue.lastEffect
-              ? (queue.firstEffect = queue.lastEffect = update)
-              : ((queue.lastEffect.nextEffect = update),
-                (queue.lastEffect = update)));
-      update = update.next;
-    }
-    updateExpirationTime = null;
-    for (update = queue.firstCapturedUpdate; null !== update; ) {
-      var _updateExpirationTime = update.expirationTime;
-      if (_updateExpirationTime > renderExpirationTime) {
-        if (
-          (null === updateExpirationTime &&
-            ((updateExpirationTime = update),
-            null === newFirstUpdate && (newBaseState = resultState)),
-          0 === newExpirationTime || newExpirationTime > _updateExpirationTime)
-        )
-          newExpirationTime = _updateExpirationTime;
-      } else
-        (resultState = getStateFromUpdate(
-          workInProgress,
-          queue,
-          update,
-          resultState,
-          props,
-          instance
-        )),
-          null !== update.callback &&
-            ((workInProgress.effectTag |= 32),
-            (update.nextEffect = null),
-            null === queue.lastCapturedEffect
-              ? (queue.firstCapturedEffect = queue.lastCapturedEffect = update)
-              : ((queue.lastCapturedEffect.nextEffect = update),
-                (queue.lastCapturedEffect = update)));
-      update = update.next;
-    }
-    null === newFirstUpdate && (queue.lastUpdate = null);
-    null === updateExpirationTime
-      ? (queue.lastCapturedUpdate = null)
-      : (workInProgress.effectTag |= 32);
-    null === newFirstUpdate &&
-      null === updateExpirationTime &&
-      (newBaseState = resultState);
-    queue.baseState = newBaseState;
-    queue.firstUpdate = newFirstUpdate;
-    queue.firstCapturedUpdate = updateExpirationTime;
-    queue.expirationTime = newExpirationTime;
-    workInProgress.memoizedState = resultState;
+  ) {
+    var updateExpirationTime = update.expirationTime;
+    if (updateExpirationTime > renderExpirationTime) {
+      if (
+        (null === newFirstUpdate &&
+          ((newFirstUpdate = update), (newBaseState = resultState)),
+        0 === newExpirationTime || newExpirationTime > updateExpirationTime)
+      )
+        newExpirationTime = updateExpirationTime;
+    } else
+      (resultState = getStateFromUpdate(
+        workInProgress,
+        queue,
+        update,
+        resultState,
+        props,
+        instance
+      )),
+        null !== update.callback &&
+          ((workInProgress.effectTag |= 32),
+          (update.nextEffect = null),
+          null === queue.lastEffect
+            ? (queue.firstEffect = queue.lastEffect = update)
+            : ((queue.lastEffect.nextEffect = update),
+              (queue.lastEffect = update)));
+    update = update.next;
   }
-}
-function callCallback(callback, context) {
-  invariant(
-    "function" === typeof callback,
-    "Invalid argument passed as callback. Expected a function. Instead received: %s",
-    callback
-  );
-  callback.call(context);
+  updateExpirationTime = null;
+  for (update = queue.firstCapturedUpdate; null !== update; ) {
+    var _updateExpirationTime = update.expirationTime;
+    if (_updateExpirationTime > renderExpirationTime) {
+      if (
+        (null === updateExpirationTime &&
+          ((updateExpirationTime = update),
+          null === newFirstUpdate && (newBaseState = resultState)),
+        0 === newExpirationTime || newExpirationTime > _updateExpirationTime)
+      )
+        newExpirationTime = _updateExpirationTime;
+    } else
+      (resultState = getStateFromUpdate(
+        workInProgress,
+        queue,
+        update,
+        resultState,
+        props,
+        instance
+      )),
+        null !== update.callback &&
+          ((workInProgress.effectTag |= 32),
+          (update.nextEffect = null),
+          null === queue.lastCapturedEffect
+            ? (queue.firstCapturedEffect = queue.lastCapturedEffect = update)
+            : ((queue.lastCapturedEffect.nextEffect = update),
+              (queue.lastCapturedEffect = update)));
+    update = update.next;
+  }
+  null === newFirstUpdate && (queue.lastUpdate = null);
+  null === updateExpirationTime
+    ? (queue.lastCapturedUpdate = null)
+    : (workInProgress.effectTag |= 32);
+  null === newFirstUpdate &&
+    null === updateExpirationTime &&
+    (newBaseState = resultState);
+  queue.baseState = newBaseState;
+  queue.firstUpdate = newFirstUpdate;
+  queue.firstCapturedUpdate = updateExpirationTime;
+  workInProgress.expirationTime = newExpirationTime;
+  workInProgress.memoizedState = resultState;
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
   null !== finishedQueue.firstCapturedUpdate &&
@@ -2246,60 +2235,76 @@ function commitUpdateQueue(finishedWork, finishedQueue, instance) {
       ((finishedQueue.lastUpdate.next = finishedQueue.firstCapturedUpdate),
       (finishedQueue.lastUpdate = finishedQueue.lastCapturedUpdate)),
     (finishedQueue.firstCapturedUpdate = finishedQueue.lastCapturedUpdate = null));
-  finishedWork = finishedQueue.firstEffect;
-  for (
-    finishedQueue.firstEffect = finishedQueue.lastEffect = null;
-    null !== finishedWork;
-
-  ) {
-    var _callback3 = finishedWork.callback;
-    null !== _callback3 &&
-      ((finishedWork.callback = null), callCallback(_callback3, instance));
-    finishedWork = finishedWork.nextEffect;
+  commitUpdateEffects(finishedQueue.firstEffect, instance);
+  finishedQueue.firstEffect = finishedQueue.lastEffect = null;
+  commitUpdateEffects(finishedQueue.firstCapturedEffect, instance);
+  finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
+}
+function commitUpdateEffects(effect, instance) {
+  for (; null !== effect; ) {
+    var _callback3 = effect.callback;
+    if (null !== _callback3) {
+      effect.callback = null;
+      var context = instance;
+      invariant(
+        "function" === typeof _callback3,
+        "Invalid argument passed as callback. Expected a function. Instead received: %s",
+        _callback3
+      );
+      _callback3.call(context);
+    }
+    effect = effect.nextEffect;
   }
-  finishedWork = finishedQueue.firstCapturedEffect;
-  for (
-    finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
-    null !== finishedWork;
-
-  )
-    (finishedQueue = finishedWork.callback),
-      null !== finishedQueue &&
-        ((finishedWork.callback = null), callCallback(finishedQueue, instance)),
-      (finishedWork = finishedWork.nextEffect);
 }
 function createCapturedValue(value, source) {
   return {
     value: value,
     source: source,
-    stack: getStackAddendumByWorkInProgressFiber(source)
+    stack: getStackByFiberInDevAndProd(source)
   };
 }
-var providerCursor = createCursor(null),
-  valueCursor = createCursor(null),
-  changedBitsCursor = createCursor(0);
-function pushProvider(providerFiber) {
+var valueCursor = { current: null },
+  currentlyRenderingFiber = null,
+  lastContextDependency = null,
+  lastContextWithAllBitsObserved = null;
+function pushProvider(providerFiber, nextValue) {
   var context = providerFiber.type._context;
-  push(changedBitsCursor, context._changedBits, providerFiber);
   push(valueCursor, context._currentValue, providerFiber);
-  push(providerCursor, providerFiber, providerFiber);
-  context._currentValue = providerFiber.pendingProps.value;
-  context._changedBits = providerFiber.stateNode;
+  context._currentValue = nextValue;
 }
 function popProvider(providerFiber) {
-  var changedBits = changedBitsCursor.current,
-    currentValue = valueCursor.current;
-  pop(providerCursor, providerFiber);
+  var currentValue = valueCursor.current;
   pop(valueCursor, providerFiber);
-  pop(changedBitsCursor, providerFiber);
-  providerFiber = providerFiber.type._context;
-  providerFiber._currentValue = currentValue;
-  providerFiber._changedBits = changedBits;
+  providerFiber.type._context._currentValue = currentValue;
+}
+function prepareToReadContext(workInProgress) {
+  currentlyRenderingFiber = workInProgress;
+  lastContextWithAllBitsObserved = lastContextDependency = null;
+  workInProgress.firstContextDependency = null;
+}
+function readContext(context, observedBits) {
+  if (
+    lastContextWithAllBitsObserved !== context &&
+    !1 !== observedBits &&
+    0 !== observedBits
+  ) {
+    if ("number" !== typeof observedBits || 1073741823 === observedBits)
+      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
+    observedBits = { context: context, observedBits: observedBits, next: null };
+    null === lastContextDependency
+      ? (invariant(
+          null !== currentlyRenderingFiber,
+          "Context.unstable_read(): Context can only be read while React is rendering, e.g. inside the render method or getDerivedStateFromProps."
+        ),
+        (currentlyRenderingFiber.firstContextDependency = lastContextDependency = observedBits))
+      : (lastContextDependency = lastContextDependency.next = observedBits);
+  }
+  return context._currentValue;
 }
 var NO_CONTEXT = {},
-  contextStackCursor$1 = createCursor(NO_CONTEXT),
-  contextFiberStackCursor = createCursor(NO_CONTEXT),
-  rootInstanceStackCursor = createCursor(NO_CONTEXT);
+  contextStackCursor$1 = { current: NO_CONTEXT },
+  contextFiberStackCursor = { current: NO_CONTEXT },
+  rootInstanceStackCursor = { current: NO_CONTEXT };
 function requiredContext(c) {
   invariant(
     c !== NO_CONTEXT,
@@ -2319,6 +2324,24 @@ function popHostContainer(fiber) {
   pop(contextFiberStackCursor, fiber);
   pop(rootInstanceStackCursor, fiber);
 }
+function pushHostContext(fiber) {
+  requiredContext(rootInstanceStackCursor.current);
+  var context = requiredContext(contextStackCursor$1.current);
+  var nextContext = fiber.type;
+  nextContext =
+    "AndroidTextInput" === nextContext ||
+    "RCTMultilineTextInputView" === nextContext ||
+    "RCTSinglelineTextInputView" === nextContext ||
+    "RCTText" === nextContext ||
+    "RCTVirtualText" === nextContext;
+  nextContext =
+    context.isInAParentText !== nextContext
+      ? { isInAParentText: nextContext }
+      : context;
+  context !== nextContext &&
+    (push(contextFiberStackCursor, fiber, fiber),
+    push(contextStackCursor$1, nextContext, fiber));
+}
 function popHostContext(fiber) {
   contextFiberStackCursor.current === fiber &&
     (pop(contextStackCursor$1, fiber), pop(contextFiberStackCursor, fiber));
@@ -2347,22 +2370,24 @@ function shallowEqual(objA, objB) {
       return !1;
   return !0;
 }
+var emptyRefsObject = new React.Component().refs;
 function applyDerivedStateFromProps(
   workInProgress,
+  ctor,
   getDerivedStateFromProps,
   nextProps
 ) {
-  var prevState = workInProgress.memoizedState;
-  getDerivedStateFromProps = getDerivedStateFromProps(nextProps, prevState);
-  prevState =
+  ctor = workInProgress.memoizedState;
+  getDerivedStateFromProps = getDerivedStateFromProps(nextProps, ctor);
+  getDerivedStateFromProps =
     null === getDerivedStateFromProps || void 0 === getDerivedStateFromProps
-      ? prevState
-      : Object.assign({}, prevState, getDerivedStateFromProps);
-  workInProgress.memoizedState = prevState;
-  workInProgress = workInProgress.updateQueue;
-  null !== workInProgress &&
+      ? ctor
+      : Object.assign({}, ctor, getDerivedStateFromProps);
+  workInProgress.memoizedState = getDerivedStateFromProps;
+  nextProps = workInProgress.updateQueue;
+  null !== nextProps &&
     0 === workInProgress.expirationTime &&
-    (workInProgress.baseState = prevState);
+    (nextProps.baseState = getDerivedStateFromProps);
 }
 var classComponentUpdater = {
   isMounted: function(component) {
@@ -2372,49 +2397,49 @@ var classComponentUpdater = {
   },
   enqueueSetState: function(inst, payload, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.tag = 1;
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   }
 };
 function checkShouldComponentUpdate(
   workInProgress,
+  ctor,
   oldProps,
   newProps,
   oldState,
   newState,
-  newContext
+  nextContext
 ) {
-  var instance = workInProgress.stateNode;
-  workInProgress = workInProgress.type;
-  return "function" === typeof instance.shouldComponentUpdate
-    ? instance.shouldComponentUpdate(newProps, newState, newContext)
-    : workInProgress.prototype && workInProgress.prototype.isPureReactComponent
+  workInProgress = workInProgress.stateNode;
+  return "function" === typeof workInProgress.shouldComponentUpdate
+    ? workInProgress.shouldComponentUpdate(newProps, newState, nextContext)
+    : ctor.prototype && ctor.prototype.isPureReactComponent
       ? !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
       : !0;
 }
@@ -2422,38 +2447,46 @@ function callComponentWillReceiveProps(
   workInProgress,
   instance,
   newProps,
-  newContext
+  nextContext
 ) {
   workInProgress = instance.state;
   "function" === typeof instance.componentWillReceiveProps &&
-    instance.componentWillReceiveProps(newProps, newContext);
+    instance.componentWillReceiveProps(newProps, nextContext);
   "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
-    instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    instance.UNSAFE_componentWillReceiveProps(newProps, nextContext);
   instance.state !== workInProgress &&
     classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
 }
-function mountClassInstance(workInProgress, renderExpirationTime) {
-  var ctor = workInProgress.type,
-    instance = workInProgress.stateNode,
-    props = workInProgress.pendingProps,
-    unmaskedContext = getUnmaskedContext(workInProgress);
-  instance.props = props;
+function mountClassInstance(
+  workInProgress,
+  ctor,
+  newProps,
+  renderExpirationTime
+) {
+  var instance = workInProgress.stateNode;
+  instance.props = newProps;
   instance.state = workInProgress.memoizedState;
-  instance.refs = emptyObject;
-  instance.context = getMaskedContext(workInProgress, unmaskedContext);
-  unmaskedContext = workInProgress.updateQueue;
-  null !== unmaskedContext &&
+  instance.refs = emptyRefsObject;
+  var contextType = ctor.contextType;
+  "object" === typeof contextType && null !== contextType
+    ? (instance.context = contextType.unstable_read())
+    : ((contextType = isContextProvider(ctor)
+        ? previousContext
+        : contextStackCursor.current),
+      (instance.context = getMaskedContext(workInProgress, contextType)));
+  contextType = workInProgress.updateQueue;
+  null !== contextType &&
     (processUpdateQueue(
       workInProgress,
-      unmaskedContext,
-      props,
+      contextType,
+      newProps,
       instance,
       renderExpirationTime
     ),
     (instance.state = workInProgress.memoizedState));
-  unmaskedContext = workInProgress.type.getDerivedStateFromProps;
-  "function" === typeof unmaskedContext &&
-    (applyDerivedStateFromProps(workInProgress, unmaskedContext, props),
+  contextType = ctor.getDerivedStateFromProps;
+  "function" === typeof contextType &&
+    (applyDerivedStateFromProps(workInProgress, ctor, contextType, newProps),
     (instance.state = workInProgress.memoizedState));
   "function" === typeof ctor.getDerivedStateFromProps ||
     "function" === typeof instance.getSnapshotBeforeUpdate ||
@@ -2466,12 +2499,12 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
       instance.UNSAFE_componentWillMount(),
     ctor !== instance.state &&
       classComponentUpdater.enqueueReplaceState(instance, instance.state, null),
-    (unmaskedContext = workInProgress.updateQueue),
-    null !== unmaskedContext &&
+    (contextType = workInProgress.updateQueue),
+    null !== contextType &&
       (processUpdateQueue(
         workInProgress,
-        unmaskedContext,
-        props,
+        contextType,
+        newProps,
         instance,
         renderExpirationTime
       ),
@@ -2479,8 +2512,8 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.effectTag |= 4);
 }
-var isArray$1 = Array.isArray;
-function coerceRef(returnFiber, current, element) {
+var isArray = Array.isArray;
+function coerceRef(returnFiber, current$$1, element) {
   returnFiber = element.ref;
   if (
     null !== returnFiber &&
@@ -2492,8 +2525,8 @@ function coerceRef(returnFiber, current, element) {
       var inst = void 0;
       element &&
         (invariant(
-          2 === element.tag,
-          "Stateless function components cannot have refs."
+          2 === element.tag || 3 === element.tag,
+          "Function components cannot have refs."
         ),
         (inst = element.stateNode));
       invariant(
@@ -2503,26 +2536,27 @@ function coerceRef(returnFiber, current, element) {
       );
       var stringRef = "" + returnFiber;
       if (
-        null !== current &&
-        null !== current.ref &&
-        "function" === typeof current.ref &&
-        current.ref._stringRef === stringRef
+        null !== current$$1 &&
+        null !== current$$1.ref &&
+        "function" === typeof current$$1.ref &&
+        current$$1.ref._stringRef === stringRef
       )
-        return current.ref;
-      current = function(value) {
-        var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
+        return current$$1.ref;
+      current$$1 = function(value) {
+        var refs = inst.refs;
+        refs === emptyRefsObject && (refs = inst.refs = {});
         null === value ? delete refs[stringRef] : (refs[stringRef] = value);
       };
-      current._stringRef = stringRef;
-      return current;
+      current$$1._stringRef = stringRef;
+      return current$$1;
     }
     invariant(
       "string" === typeof returnFiber,
-      "Expected ref to be a function or a string."
+      "Expected ref to be a function, a string, an object returned by React.createRef(), or null."
     );
     invariant(
       element._owner,
-      "Element ref was specified as a string (%s) but no owner was set. This could happen for one of the following reasons:\n1. You may be adding a ref to a functional component\n2. You may be adding a ref to a component that was not created inside a component's render method\n3. You have multiple copies of React loaded\nSee https://fb.me/react-refs-must-have-owner for more information.",
+      "Element ref was specified as a string (%s) but no owner was set. This could happen for one of the following reasons:\n1. You may be adding a ref to a function component\n2. You may be adding a ref to a component that was not created inside a component's render method\n3. You have multiple copies of React loaded\nSee https://fb.me/react-refs-must-have-owner for more information.",
       returnFiber
     );
   }
@@ -2592,26 +2626,31 @@ function ChildReconciler(shouldTrackSideEffects) {
       (newFiber.effectTag = 2);
     return newFiber;
   }
-  function updateTextNode(returnFiber, current, textContent, expirationTime) {
-    if (null === current || 6 !== current.tag)
+  function updateTextNode(
+    returnFiber,
+    current$$1,
+    textContent,
+    expirationTime
+  ) {
+    if (null === current$$1 || 8 !== current$$1.tag)
       return (
-        (current = createFiberFromText(
+        (current$$1 = createFiberFromText(
           textContent,
           returnFiber.mode,
           expirationTime
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, textContent, expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, textContent, expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
-  function updateElement(returnFiber, current, element, expirationTime) {
-    if (null !== current && current.type === element.type)
+  function updateElement(returnFiber, current$$1, element, expirationTime) {
+    if (null !== current$$1 && current$$1.type === element.type)
       return (
-        (expirationTime = useFiber(current, element.props, expirationTime)),
-        (expirationTime.ref = coerceRef(returnFiber, current, element)),
+        (expirationTime = useFiber(current$$1, element.props, expirationTime)),
+        (expirationTime.ref = coerceRef(returnFiber, current$$1, element)),
         (expirationTime.return = returnFiber),
         expirationTime
       );
@@ -2620,45 +2659,51 @@ function ChildReconciler(shouldTrackSideEffects) {
       returnFiber.mode,
       expirationTime
     );
-    expirationTime.ref = coerceRef(returnFiber, current, element);
+    expirationTime.ref = coerceRef(returnFiber, current$$1, element);
     expirationTime.return = returnFiber;
     return expirationTime;
   }
-  function updatePortal(returnFiber, current, portal, expirationTime) {
+  function updatePortal(returnFiber, current$$1, portal, expirationTime) {
     if (
-      null === current ||
-      4 !== current.tag ||
-      current.stateNode.containerInfo !== portal.containerInfo ||
-      current.stateNode.implementation !== portal.implementation
+      null === current$$1 ||
+      6 !== current$$1.tag ||
+      current$$1.stateNode.containerInfo !== portal.containerInfo ||
+      current$$1.stateNode.implementation !== portal.implementation
     )
       return (
-        (current = createFiberFromPortal(
+        (current$$1 = createFiberFromPortal(
           portal,
           returnFiber.mode,
           expirationTime
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, portal.children || [], expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, portal.children || [], expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
-  function updateFragment(returnFiber, current, fragment, expirationTime, key) {
-    if (null === current || 10 !== current.tag)
+  function updateFragment(
+    returnFiber,
+    current$$1,
+    fragment,
+    expirationTime,
+    key
+  ) {
+    if (null === current$$1 || 9 !== current$$1.tag)
       return (
-        (current = createFiberFromFragment(
+        (current$$1 = createFiberFromFragment(
           fragment,
           returnFiber.mode,
           expirationTime,
           key
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, fragment, expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, fragment, expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
   function createChild(returnFiber, newChild, expirationTime) {
     if ("string" === typeof newChild || "number" === typeof newChild)
@@ -2695,7 +2740,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2735,7 +2780,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ? updatePortal(returnFiber, oldFiber, newChild, expirationTime)
             : null;
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(
@@ -2803,7 +2848,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             )
           );
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(
@@ -3020,7 +3065,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ) {
               if (isUnkeyedTopLevelFragment.key === isObject)
                 if (
-                  10 === isUnkeyedTopLevelFragment.tag
+                  9 === isUnkeyedTopLevelFragment.tag
                     ? newChild.type === REACT_FRAGMENT_TYPE
                     : isUnkeyedTopLevelFragment.type === newChild.type
                 ) {
@@ -3085,7 +3130,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ) {
               if (currentFirstChild.key === isUnkeyedTopLevelFragment)
                 if (
-                  4 === currentFirstChild.tag &&
+                  6 === currentFirstChild.tag &&
                   currentFirstChild.stateNode.containerInfo ===
                     newChild.containerInfo &&
                   currentFirstChild.stateNode.implementation ===
@@ -3123,7 +3168,7 @@ function ChildReconciler(shouldTrackSideEffects) {
     if ("string" === typeof newChild || "number" === typeof newChild)
       return (
         (newChild = "" + newChild),
-        null !== currentFirstChild && 6 === currentFirstChild.tag
+        null !== currentFirstChild && 8 === currentFirstChild.tag
           ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
             (currentFirstChild = useFiber(
               currentFirstChild,
@@ -3142,7 +3187,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             (returnFiber = currentFirstChild)),
         placeSingleChild(returnFiber)
       );
-    if (isArray$1(newChild))
+    if (isArray(newChild))
       return reconcileChildrenArray(
         returnFiber,
         currentFirstChild,
@@ -3160,7 +3205,8 @@ function ChildReconciler(shouldTrackSideEffects) {
     if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
       switch (returnFiber.tag) {
         case 2:
-        case 1:
+        case 3:
+        case 0:
           (expirationTime = returnFiber.type),
             invariant(
               !1,
@@ -3178,12 +3224,12 @@ var reconcileChildFibers = ChildReconciler(!0),
   isHydrating = !1;
 function tryHydrate(fiber, nextInstance) {
   switch (fiber.tag) {
-    case 5:
+    case 7:
       return (
         (nextInstance = shim$1(nextInstance, fiber.type, fiber.pendingProps)),
         null !== nextInstance ? ((fiber.stateNode = nextInstance), !0) : !1
       );
-    case 6:
+    case 8:
       return (
         (nextInstance = shim$1(nextInstance, fiber.pendingProps)),
         null !== nextInstance ? ((fiber.stateNode = nextInstance), !0) : !1
@@ -3206,7 +3252,7 @@ function tryToClaimNextHydratableInstance(fiber$jscomp$0) {
           return;
         }
         var returnFiber = hydrationParentFiber,
-          fiber = new FiberNode(5, null, null, 0);
+          fiber = new FiberNode(7, null, null, 0);
         fiber.type = "DELETED";
         fiber.stateNode = firstAttemptedInstance;
         fiber.return = returnFiber;
@@ -3224,22 +3270,47 @@ function tryToClaimNextHydratableInstance(fiber$jscomp$0) {
         (hydrationParentFiber = fiber$jscomp$0);
   }
 }
-function reconcileChildren(current, workInProgress, nextChildren) {
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    workInProgress.expirationTime
-  );
+function readLazyComponentType(thenable) {
+  switch (thenable._reactStatus) {
+    case 1:
+      return thenable._reactResult;
+    case 2:
+      throw thenable._reactResult;
+    case 0:
+      throw thenable;
+    default:
+      throw ((thenable._reactStatus = 0),
+      thenable.then(
+        function(resolvedValue) {
+          if (0 === thenable._reactStatus) {
+            thenable._reactStatus = 1;
+            if ("object" === typeof resolvedValue && null !== resolvedValue) {
+              var defaultExport = resolvedValue.default;
+              resolvedValue =
+                void 0 !== defaultExport && null !== defaultExport
+                  ? defaultExport
+                  : resolvedValue;
+            }
+            thenable._reactResult = resolvedValue;
+          }
+        },
+        function(error) {
+          0 === thenable._reactStatus &&
+            ((thenable._reactStatus = 2), (thenable._reactResult = error));
+        }
+      ),
+      thenable);
+  }
 }
-function reconcileChildrenAtExpirationTime(
-  current,
+var ReactCurrentOwner$3 = ReactSharedInternals.ReactCurrentOwner;
+function reconcileChildren(
+  current$$1,
   workInProgress,
   nextChildren,
   renderExpirationTime
 ) {
   workInProgress.child =
-    null === current
+    null === current$$1
       ? mountChildFibers(
           workInProgress,
           null,
@@ -3248,54 +3319,393 @@ function reconcileChildrenAtExpirationTime(
         )
       : reconcileChildFibers(
           workInProgress,
-          current.child,
+          current$$1.child,
           nextChildren,
           renderExpirationTime
         );
 }
-function markRef(current, workInProgress) {
+function updateForwardRef(
+  current$$1,
+  workInProgress,
+  type,
+  nextProps,
+  renderExpirationTime
+) {
+  type = type.render;
   var ref = workInProgress.ref;
   if (
-    (null === current && null !== ref) ||
-    (null !== current && current.ref !== ref)
+    !didPerformWorkStackCursor.current &&
+    workInProgress.memoizedProps === nextProps &&
+    ref === (null !== current$$1 ? current$$1.ref : null)
   )
-    workInProgress.effectTag |= 128;
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
+  type = type(nextProps, ref);
+  reconcileChildren(current$$1, workInProgress, type, renderExpirationTime);
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
 }
-function finishClassComponent(
-  current,
+function updatePureComponent(
+  current$$1,
   workInProgress,
-  shouldUpdate,
+  Component,
+  nextProps,
+  updateExpirationTime,
+  renderExpirationTime
+) {
+  var render = Component.render,
+    ref = workInProgress.ref;
+  if (
+    null !== current$$1 &&
+    (0 === updateExpirationTime ||
+      updateExpirationTime > renderExpirationTime) &&
+    ((updateExpirationTime = current$$1.memoizedProps),
+    (Component = Component.compare),
+    (Component = null !== Component ? Component : shallowEqual),
+    workInProgress.ref === current$$1.ref &&
+      Component(updateExpirationTime, nextProps))
+  )
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  render = render(nextProps, ref);
+  workInProgress.effectTag |= 1;
+  reconcileChildren(current$$1, workInProgress, render, renderExpirationTime);
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
+}
+function markRef(current$$1, workInProgress) {
+  var ref = workInProgress.ref;
+  if (
+    (null === current$$1 && null !== ref) ||
+    (null !== current$$1 && current$$1.ref !== ref)
+  )
+    workInProgress.effectTag |= 128;
+}
+function updateFunctionComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
+  var unmaskedContext = isContextProvider(Component)
+    ? previousContext
+    : contextStackCursor.current;
+  unmaskedContext = getMaskedContext(workInProgress, unmaskedContext);
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  Component = Component(nextProps, unmaskedContext);
+  workInProgress.effectTag |= 1;
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    Component,
+    renderExpirationTime
+  );
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
+}
+function updateClassComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
+  if (isContextProvider(Component)) {
+    var hasContext = !0;
+    pushContextProvider(workInProgress);
+  } else hasContext = !1;
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  if (null === current$$1)
+    if (null === workInProgress.stateNode) {
+      var isLegacyContextConsumer = !1,
+        unmaskedContext = emptyContextObject;
+      var context = Component.contextType;
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((unmaskedContext = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (isLegacyContextConsumer = Component.contextTypes),
+          (context = (isLegacyContextConsumer =
+            null !== isLegacyContextConsumer &&
+            void 0 !== isLegacyContextConsumer)
+            ? getMaskedContext(workInProgress, unmaskedContext)
+            : emptyContextObject));
+      var instance = new Component(nextProps, context);
+      workInProgress.memoizedState =
+        null !== instance.state && void 0 !== instance.state
+          ? instance.state
+          : null;
+      instance.updater = classComponentUpdater;
+      workInProgress.stateNode = instance;
+      instance._reactInternalFiber = workInProgress;
+      isLegacyContextConsumer &&
+        ((isLegacyContextConsumer = workInProgress.stateNode),
+        (isLegacyContextConsumer.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
+        (isLegacyContextConsumer.__reactInternalMemoizedMaskedChildContext = context));
+      mountClassInstance(
+        workInProgress,
+        Component,
+        nextProps,
+        renderExpirationTime
+      );
+      nextProps = !0;
+    } else {
+      unmaskedContext = workInProgress.stateNode;
+      isLegacyContextConsumer = workInProgress.memoizedProps;
+      unmaskedContext.props = isLegacyContextConsumer;
+      var oldContext = unmaskedContext.context;
+      context = Component.contextType;
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((context = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (context = getMaskedContext(workInProgress, context)));
+      var getDerivedStateFromProps = Component.getDerivedStateFromProps;
+      (instance =
+        "function" === typeof getDerivedStateFromProps ||
+        "function" === typeof unmaskedContext.getSnapshotBeforeUpdate) ||
+        ("function" !==
+          typeof unmaskedContext.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof unmaskedContext.componentWillReceiveProps) ||
+        ((isLegacyContextConsumer !== nextProps || oldContext !== context) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            unmaskedContext,
+            nextProps,
+            context
+          ));
+      hasForceUpdate = !1;
+      var oldState = workInProgress.memoizedState;
+      oldContext = unmaskedContext.state = oldState;
+      var updateQueue = workInProgress.updateQueue;
+      null !== updateQueue &&
+        (processUpdateQueue(
+          workInProgress,
+          updateQueue,
+          nextProps,
+          unmaskedContext,
+          renderExpirationTime
+        ),
+        (oldContext = workInProgress.memoizedState));
+      isLegacyContextConsumer !== nextProps ||
+      oldState !== oldContext ||
+      didPerformWorkStackCursor.current ||
+      hasForceUpdate
+        ? ("function" === typeof getDerivedStateFromProps &&
+            (applyDerivedStateFromProps(
+              workInProgress,
+              Component,
+              getDerivedStateFromProps,
+              nextProps
+            ),
+            (oldContext = workInProgress.memoizedState)),
+          (isLegacyContextConsumer =
+            hasForceUpdate ||
+            checkShouldComponentUpdate(
+              workInProgress,
+              Component,
+              isLegacyContextConsumer,
+              nextProps,
+              oldState,
+              oldContext,
+              context
+            ))
+            ? (instance ||
+                ("function" !==
+                  typeof unmaskedContext.UNSAFE_componentWillMount &&
+                  "function" !== typeof unmaskedContext.componentWillMount) ||
+                ("function" === typeof unmaskedContext.componentWillMount &&
+                  unmaskedContext.componentWillMount(),
+                "function" ===
+                  typeof unmaskedContext.UNSAFE_componentWillMount &&
+                  unmaskedContext.UNSAFE_componentWillMount()),
+              "function" === typeof unmaskedContext.componentDidMount &&
+                (workInProgress.effectTag |= 4))
+            : ("function" === typeof unmaskedContext.componentDidMount &&
+                (workInProgress.effectTag |= 4),
+              (workInProgress.memoizedProps = nextProps),
+              (workInProgress.memoizedState = oldContext)),
+          (unmaskedContext.props = nextProps),
+          (unmaskedContext.state = oldContext),
+          (unmaskedContext.context = context),
+          (nextProps = isLegacyContextConsumer))
+        : ("function" === typeof unmaskedContext.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          (nextProps = !1));
+    }
+  else
+    (unmaskedContext = workInProgress.stateNode),
+      (isLegacyContextConsumer = workInProgress.memoizedProps),
+      (unmaskedContext.props = isLegacyContextConsumer),
+      (oldContext = unmaskedContext.context),
+      (context = Component.contextType),
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((context = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (context = getMaskedContext(workInProgress, context))),
+      (getDerivedStateFromProps = Component.getDerivedStateFromProps),
+      (instance =
+        "function" === typeof getDerivedStateFromProps ||
+        "function" === typeof unmaskedContext.getSnapshotBeforeUpdate) ||
+        ("function" !==
+          typeof unmaskedContext.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof unmaskedContext.componentWillReceiveProps) ||
+        ((isLegacyContextConsumer !== nextProps || oldContext !== context) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            unmaskedContext,
+            nextProps,
+            context
+          )),
+      (hasForceUpdate = !1),
+      (oldContext = workInProgress.memoizedState),
+      (oldState = unmaskedContext.state = oldContext),
+      (updateQueue = workInProgress.updateQueue),
+      null !== updateQueue &&
+        (processUpdateQueue(
+          workInProgress,
+          updateQueue,
+          nextProps,
+          unmaskedContext,
+          renderExpirationTime
+        ),
+        (oldState = workInProgress.memoizedState)),
+      isLegacyContextConsumer !== nextProps ||
+      oldContext !== oldState ||
+      didPerformWorkStackCursor.current ||
+      hasForceUpdate
+        ? ("function" === typeof getDerivedStateFromProps &&
+            (applyDerivedStateFromProps(
+              workInProgress,
+              Component,
+              getDerivedStateFromProps,
+              nextProps
+            ),
+            (oldState = workInProgress.memoizedState)),
+          (getDerivedStateFromProps =
+            hasForceUpdate ||
+            checkShouldComponentUpdate(
+              workInProgress,
+              Component,
+              isLegacyContextConsumer,
+              nextProps,
+              oldContext,
+              oldState,
+              context
+            ))
+            ? (instance ||
+                ("function" !==
+                  typeof unmaskedContext.UNSAFE_componentWillUpdate &&
+                  "function" !== typeof unmaskedContext.componentWillUpdate) ||
+                ("function" === typeof unmaskedContext.componentWillUpdate &&
+                  unmaskedContext.componentWillUpdate(
+                    nextProps,
+                    oldState,
+                    context
+                  ),
+                "function" ===
+                  typeof unmaskedContext.UNSAFE_componentWillUpdate &&
+                  unmaskedContext.UNSAFE_componentWillUpdate(
+                    nextProps,
+                    oldState,
+                    context
+                  )),
+              "function" === typeof unmaskedContext.componentDidUpdate &&
+                (workInProgress.effectTag |= 4),
+              "function" === typeof unmaskedContext.getSnapshotBeforeUpdate &&
+                (workInProgress.effectTag |= 256))
+            : ("function" !== typeof unmaskedContext.componentDidUpdate ||
+                (isLegacyContextConsumer === current$$1.memoizedProps &&
+                  oldContext === current$$1.memoizedState) ||
+                (workInProgress.effectTag |= 4),
+              "function" !== typeof unmaskedContext.getSnapshotBeforeUpdate ||
+                (isLegacyContextConsumer === current$$1.memoizedProps &&
+                  oldContext === current$$1.memoizedState) ||
+                (workInProgress.effectTag |= 256),
+              (workInProgress.memoizedProps = nextProps),
+              (workInProgress.memoizedState = oldState)),
+          (unmaskedContext.props = nextProps),
+          (unmaskedContext.state = oldState),
+          (unmaskedContext.context = context),
+          (nextProps = getDerivedStateFromProps))
+        : ("function" !== typeof unmaskedContext.componentDidUpdate ||
+            (isLegacyContextConsumer === current$$1.memoizedProps &&
+              oldContext === current$$1.memoizedState) ||
+            (workInProgress.effectTag |= 4),
+          "function" !== typeof unmaskedContext.getSnapshotBeforeUpdate ||
+            (isLegacyContextConsumer === current$$1.memoizedProps &&
+              oldContext === current$$1.memoizedState) ||
+            (workInProgress.effectTag |= 256),
+          (nextProps = !1));
+  return finishClassComponent(
+    current$$1,
+    workInProgress,
+    Component,
+    nextProps,
+    hasContext,
+    renderExpirationTime
+  );
+}
+function finishClassComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  shouldUpdate,
   hasContext,
   renderExpirationTime
 ) {
-  markRef(current, workInProgress);
+  markRef(current$$1, workInProgress);
   var didCaptureError = 0 !== (workInProgress.effectTag & 64);
   if (!shouldUpdate && !didCaptureError)
     return (
-      hasContext && invalidateContextProvider(workInProgress, !1),
-      bailoutOnAlreadyFinishedWork(current, workInProgress)
+      hasContext && invalidateContextProvider(workInProgress, Component, !1),
+      bailoutOnAlreadyFinishedWork(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      )
     );
   shouldUpdate = workInProgress.stateNode;
-  ReactCurrentOwner.current = workInProgress;
-  var nextChildren = didCaptureError ? null : shouldUpdate.render();
+  ReactCurrentOwner$3.current = workInProgress;
+  var nextChildren =
+    didCaptureError && "function" !== typeof Component.getDerivedStateFromError
+      ? null
+      : shouldUpdate.render();
   workInProgress.effectTag |= 1;
-  didCaptureError &&
-    (reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      null,
-      renderExpirationTime
-    ),
-    (workInProgress.child = null));
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    renderExpirationTime
-  );
+  null !== current$$1 && didCaptureError
+    ? ((workInProgress.child = reconcileChildFibers(
+        workInProgress,
+        current$$1.child,
+        null,
+        renderExpirationTime
+      )),
+      (workInProgress.child = reconcileChildFibers(
+        workInProgress,
+        null,
+        nextChildren,
+        renderExpirationTime
+      )))
+    : reconcileChildren(
+        current$$1,
+        workInProgress,
+        nextChildren,
+        renderExpirationTime
+      );
   workInProgress.memoizedState = shouldUpdate.state;
   workInProgress.memoizedProps = shouldUpdate.props;
-  hasContext && invalidateContextProvider(workInProgress, !0);
+  hasContext && invalidateContextProvider(workInProgress, Component, !0);
   return workInProgress.child;
 }
 function pushHostRootContext(workInProgress) {
@@ -3310,625 +3720,606 @@ function pushHostRootContext(workInProgress) {
       pushTopLevelContextObject(workInProgress, root.context, !1);
   pushHostContainer(workInProgress, root.containerInfo);
 }
-function propagateContextChange(
+function resolveDefaultProps(Component, baseProps) {
+  if (Component && Component.defaultProps) {
+    baseProps = Object.assign({}, baseProps);
+    Component = Component.defaultProps;
+    for (var propName in Component)
+      void 0 === baseProps[propName] &&
+        (baseProps[propName] = Component[propName]);
+  }
+  return baseProps;
+}
+function bailoutOnAlreadyFinishedWork(
+  current$$1,
   workInProgress,
-  context,
-  changedBits,
   renderExpirationTime
 ) {
-  var fiber = workInProgress.child;
-  null !== fiber && (fiber.return = workInProgress);
-  for (; null !== fiber; ) {
-    switch (fiber.tag) {
-      case 12:
-        var nextFiber = fiber.stateNode | 0;
-        if (fiber.type === context && 0 !== (nextFiber & changedBits)) {
-          for (nextFiber = fiber; null !== nextFiber; ) {
-            var alternate = nextFiber.alternate;
-            if (
-              0 === nextFiber.expirationTime ||
-              nextFiber.expirationTime > renderExpirationTime
-            )
-              (nextFiber.expirationTime = renderExpirationTime),
-                null !== alternate &&
-                  (0 === alternate.expirationTime ||
-                    alternate.expirationTime > renderExpirationTime) &&
-                  (alternate.expirationTime = renderExpirationTime);
-            else if (
-              null !== alternate &&
-              (0 === alternate.expirationTime ||
-                alternate.expirationTime > renderExpirationTime)
-            )
-              alternate.expirationTime = renderExpirationTime;
-            else break;
-            nextFiber = nextFiber.return;
-          }
-          nextFiber = null;
-        } else nextFiber = fiber.child;
-        break;
-      case 13:
-        nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
-        break;
-      default:
-        nextFiber = fiber.child;
-    }
-    if (null !== nextFiber) nextFiber.return = fiber;
-    else
-      for (nextFiber = fiber; null !== nextFiber; ) {
-        if (nextFiber === workInProgress) {
-          nextFiber = null;
-          break;
-        }
-        fiber = nextFiber.sibling;
-        if (null !== fiber) {
-          fiber.return = nextFiber.return;
-          nextFiber = fiber;
-          break;
-        }
-        nextFiber = nextFiber.return;
-      }
-    fiber = nextFiber;
-  }
-}
-function updateContextProvider(current, workInProgress, renderExpirationTime) {
-  var context = workInProgress.type._context,
-    newProps = workInProgress.pendingProps,
-    oldProps = workInProgress.memoizedProps,
-    canBailOnProps = !0;
-  if (didPerformWorkStackCursor.current) canBailOnProps = !1;
-  else if (oldProps === newProps)
-    return (
-      (workInProgress.stateNode = 0),
-      pushProvider(workInProgress),
-      bailoutOnAlreadyFinishedWork(current, workInProgress)
-    );
-  var newValue = newProps.value;
-  workInProgress.memoizedProps = newProps;
-  if (null === oldProps) newValue = 1073741823;
-  else if (oldProps.value === newProps.value) {
-    if (oldProps.children === newProps.children && canBailOnProps)
-      return (
-        (workInProgress.stateNode = 0),
-        pushProvider(workInProgress),
-        bailoutOnAlreadyFinishedWork(current, workInProgress)
-      );
-    newValue = 0;
-  } else {
-    var oldValue = oldProps.value;
-    if (
-      (oldValue === newValue &&
-        (0 !== oldValue || 1 / oldValue === 1 / newValue)) ||
-      (oldValue !== oldValue && newValue !== newValue)
-    ) {
-      if (oldProps.children === newProps.children && canBailOnProps)
-        return (
-          (workInProgress.stateNode = 0),
-          pushProvider(workInProgress),
-          bailoutOnAlreadyFinishedWork(current, workInProgress)
-        );
-      newValue = 0;
-    } else if (
-      ((newValue =
-        "function" === typeof context._calculateChangedBits
-          ? context._calculateChangedBits(oldValue, newValue)
-          : 1073741823),
-      (newValue |= 0),
-      0 === newValue)
-    ) {
-      if (oldProps.children === newProps.children && canBailOnProps)
-        return (
-          (workInProgress.stateNode = 0),
-          pushProvider(workInProgress),
-          bailoutOnAlreadyFinishedWork(current, workInProgress)
-        );
-    } else
-      propagateContextChange(
-        workInProgress,
-        context,
-        newValue,
-        renderExpirationTime
-      );
-  }
-  workInProgress.stateNode = newValue;
-  pushProvider(workInProgress);
-  reconcileChildren(current, workInProgress, newProps.children);
-  return workInProgress.child;
-}
-function bailoutOnAlreadyFinishedWork(current, workInProgress) {
+  null !== current$$1 &&
+    (workInProgress.firstContextDependency = current$$1.firstContextDependency);
+  var childExpirationTime = workInProgress.childExpirationTime;
+  if (0 === childExpirationTime || childExpirationTime > renderExpirationTime)
+    return null;
   invariant(
-    null === current || workInProgress.child === current.child,
+    null === current$$1 || workInProgress.child === current$$1.child,
     "Resuming work not yet implemented."
   );
   if (null !== workInProgress.child) {
-    current = workInProgress.child;
-    var newChild = createWorkInProgress(
-      current,
-      current.pendingProps,
-      current.expirationTime
+    current$$1 = workInProgress.child;
+    renderExpirationTime = createWorkInProgress(
+      current$$1,
+      current$$1.pendingProps,
+      current$$1.expirationTime
     );
-    workInProgress.child = newChild;
-    for (newChild.return = workInProgress; null !== current.sibling; )
-      (current = current.sibling),
-        (newChild = newChild.sibling = createWorkInProgress(
-          current,
-          current.pendingProps,
-          current.expirationTime
+    workInProgress.child = renderExpirationTime;
+    for (
+      renderExpirationTime.return = workInProgress;
+      null !== current$$1.sibling;
+
+    )
+      (current$$1 = current$$1.sibling),
+        (renderExpirationTime = renderExpirationTime.sibling = createWorkInProgress(
+          current$$1,
+          current$$1.pendingProps,
+          current$$1.expirationTime
         )),
-        (newChild.return = workInProgress);
-    newChild.sibling = null;
+        (renderExpirationTime.return = workInProgress);
+    renderExpirationTime.sibling = null;
   }
   return workInProgress.child;
 }
-function beginWork(current, workInProgress, renderExpirationTime) {
+function beginWork(current$$1, workInProgress, renderExpirationTime) {
+  var updateExpirationTime = workInProgress.expirationTime;
   if (
-    0 === workInProgress.expirationTime ||
-    workInProgress.expirationTime > renderExpirationTime
+    null !== current$$1 &&
+    current$$1.memoizedProps === workInProgress.pendingProps &&
+    !didPerformWorkStackCursor.current &&
+    (0 === updateExpirationTime || updateExpirationTime > renderExpirationTime)
   ) {
     switch (workInProgress.tag) {
-      case 3:
+      case 5:
         pushHostRootContext(workInProgress);
         break;
+      case 7:
+        pushHostContext(workInProgress);
+        break;
       case 2:
-        pushContextProvider(workInProgress);
+        isContextProvider(workInProgress.type) &&
+          pushContextProvider(workInProgress);
         break;
-      case 4:
+      case 3:
+        isContextProvider(workInProgress.type._reactResult) &&
+          pushContextProvider(workInProgress);
+        break;
+      case 6:
         pushHostContainer(
           workInProgress,
           workInProgress.stateNode.containerInfo
         );
         break;
-      case 13:
-        pushProvider(workInProgress);
+      case 12:
+        pushProvider(workInProgress, workInProgress.memoizedProps.value);
     }
-    return null;
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
   }
+  workInProgress.expirationTime = 0;
   switch (workInProgress.tag) {
-    case 0:
+    case 4:
+      var Component = workInProgress.type;
       invariant(
-        null === current,
+        null === current$$1,
         "An indeterminate component should never have mounted. This error is likely caused by a bug in React. Please file an issue."
       );
-      var fn = workInProgress.type,
-        props = workInProgress.pendingProps,
-        unmaskedContext = getUnmaskedContext(workInProgress);
-      unmaskedContext = getMaskedContext(workInProgress, unmaskedContext);
-      fn = fn(props, unmaskedContext);
-      workInProgress.effectTag |= 1;
-      "object" === typeof fn &&
-      null !== fn &&
-      "function" === typeof fn.render &&
-      void 0 === fn.$$typeof
-        ? ((unmaskedContext = workInProgress.type),
-          (workInProgress.tag = 2),
-          (workInProgress.memoizedState =
-            null !== fn.state && void 0 !== fn.state ? fn.state : null),
-          (unmaskedContext = unmaskedContext.getDerivedStateFromProps),
-          "function" === typeof unmaskedContext &&
-            applyDerivedStateFromProps(workInProgress, unmaskedContext, props),
-          (props = pushContextProvider(workInProgress)),
-          (fn.updater = classComponentUpdater),
-          (workInProgress.stateNode = fn),
-          (fn._reactInternalFiber = workInProgress),
-          mountClassInstance(workInProgress, renderExpirationTime),
-          (current = finishClassComponent(
-            current,
+      var props = workInProgress.pendingProps;
+      if (
+        "object" === typeof Component &&
+        null !== Component &&
+        "function" === typeof Component.then
+      ) {
+        Component = readLazyComponentType(Component);
+        var resolvedTag = (workInProgress.tag = resolveLazyComponentTag(
             workInProgress,
-            !0,
-            props,
-            renderExpirationTime
-          )))
-        : ((workInProgress.tag = 1),
-          reconcileChildren(current, workInProgress, fn),
-          (workInProgress.memoizedProps = props),
-          (current = workInProgress.child));
-      return current;
-    case 1:
-      return (
-        (props = workInProgress.type),
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime
-          ? ((fn = getUnmaskedContext(workInProgress)),
-            (fn = getMaskedContext(workInProgress, fn)),
-            (props = props(renderExpirationTime, fn)),
-            (workInProgress.effectTag |= 1),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
-      );
-    case 2:
-      props = pushContextProvider(workInProgress);
-      if (null === current)
-        if (null === workInProgress.stateNode) {
-          var props$jscomp$0 = workInProgress.pendingProps,
-            ctor = workInProgress.type;
-          fn = getUnmaskedContext(workInProgress);
-          var needsContext =
-            2 === workInProgress.tag &&
-            null != workInProgress.type.contextTypes;
-          unmaskedContext = needsContext
-            ? getMaskedContext(workInProgress, fn)
-            : emptyObject;
-          props$jscomp$0 = new ctor(props$jscomp$0, unmaskedContext);
-          workInProgress.memoizedState =
-            null !== props$jscomp$0.state && void 0 !== props$jscomp$0.state
-              ? props$jscomp$0.state
-              : null;
-          props$jscomp$0.updater = classComponentUpdater;
-          workInProgress.stateNode = props$jscomp$0;
-          props$jscomp$0._reactInternalFiber = workInProgress;
-          needsContext &&
-            ((needsContext = workInProgress.stateNode),
-            (needsContext.__reactInternalMemoizedUnmaskedChildContext = fn),
-            (needsContext.__reactInternalMemoizedMaskedChildContext = unmaskedContext));
-          mountClassInstance(workInProgress, renderExpirationTime);
-          fn = !0;
-        } else {
-          ctor = workInProgress.type;
-          fn = workInProgress.stateNode;
-          needsContext = workInProgress.memoizedProps;
-          unmaskedContext = workInProgress.pendingProps;
-          fn.props = needsContext;
-          var oldContext = fn.context;
-          props$jscomp$0 = getUnmaskedContext(workInProgress);
-          props$jscomp$0 = getMaskedContext(workInProgress, props$jscomp$0);
-          var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
-          (ctor =
-            "function" === typeof getDerivedStateFromProps ||
-            "function" === typeof fn.getSnapshotBeforeUpdate) ||
-            ("function" !== typeof fn.UNSAFE_componentWillReceiveProps &&
-              "function" !== typeof fn.componentWillReceiveProps) ||
-            ((needsContext !== unmaskedContext ||
-              oldContext !== props$jscomp$0) &&
-              callComponentWillReceiveProps(
-                workInProgress,
-                fn,
-                unmaskedContext,
-                props$jscomp$0
-              ));
-          hasForceUpdate = !1;
-          var oldState = workInProgress.memoizedState;
-          oldContext = fn.state = oldState;
-          var updateQueue = workInProgress.updateQueue;
-          null !== updateQueue &&
-            (processUpdateQueue(
+            Component
+          )),
+          resolvedProps = resolveDefaultProps(Component, props),
+          child = void 0;
+        switch (resolvedTag) {
+          case 1:
+            child = updateFunctionComponent(
+              current$$1,
               workInProgress,
-              updateQueue,
-              unmaskedContext,
-              fn,
+              Component,
+              resolvedProps,
               renderExpirationTime
-            ),
-            (oldContext = workInProgress.memoizedState));
-          needsContext !== unmaskedContext ||
-          oldState !== oldContext ||
-          didPerformWorkStackCursor.current ||
-          hasForceUpdate
-            ? ("function" === typeof getDerivedStateFromProps &&
-                (applyDerivedStateFromProps(
-                  workInProgress,
-                  getDerivedStateFromProps,
-                  unmaskedContext
-                ),
-                (oldContext = workInProgress.memoizedState)),
-              (needsContext =
-                hasForceUpdate ||
-                checkShouldComponentUpdate(
-                  workInProgress,
-                  needsContext,
-                  unmaskedContext,
-                  oldState,
-                  oldContext,
-                  props$jscomp$0
-                ))
-                ? (ctor ||
-                    ("function" !== typeof fn.UNSAFE_componentWillMount &&
-                      "function" !== typeof fn.componentWillMount) ||
-                    ("function" === typeof fn.componentWillMount &&
-                      fn.componentWillMount(),
-                    "function" === typeof fn.UNSAFE_componentWillMount &&
-                      fn.UNSAFE_componentWillMount()),
-                  "function" === typeof fn.componentDidMount &&
-                    (workInProgress.effectTag |= 4))
-                : ("function" === typeof fn.componentDidMount &&
-                    (workInProgress.effectTag |= 4),
-                  (workInProgress.memoizedProps = unmaskedContext),
-                  (workInProgress.memoizedState = oldContext)),
-              (fn.props = unmaskedContext),
-              (fn.state = oldContext),
-              (fn.context = props$jscomp$0),
-              (fn = needsContext))
-            : ("function" === typeof fn.componentDidMount &&
-                (workInProgress.effectTag |= 4),
-              (fn = !1));
-        }
-      else
-        (ctor = workInProgress.type),
-          (fn = workInProgress.stateNode),
-          (unmaskedContext = workInProgress.memoizedProps),
-          (needsContext = workInProgress.pendingProps),
-          (fn.props = unmaskedContext),
-          (oldContext = fn.context),
-          (props$jscomp$0 = getUnmaskedContext(workInProgress)),
-          (props$jscomp$0 = getMaskedContext(workInProgress, props$jscomp$0)),
-          (getDerivedStateFromProps = ctor.getDerivedStateFromProps),
-          (ctor =
-            "function" === typeof getDerivedStateFromProps ||
-            "function" === typeof fn.getSnapshotBeforeUpdate) ||
-            ("function" !== typeof fn.UNSAFE_componentWillReceiveProps &&
-              "function" !== typeof fn.componentWillReceiveProps) ||
-            ((unmaskedContext !== needsContext ||
-              oldContext !== props$jscomp$0) &&
-              callComponentWillReceiveProps(
-                workInProgress,
-                fn,
-                needsContext,
-                props$jscomp$0
-              )),
-          (hasForceUpdate = !1),
-          (oldContext = workInProgress.memoizedState),
-          (oldState = fn.state = oldContext),
-          (updateQueue = workInProgress.updateQueue),
-          null !== updateQueue &&
-            (processUpdateQueue(
+            );
+            break;
+          case 3:
+            child = updateClassComponent(
+              current$$1,
               workInProgress,
-              updateQueue,
-              needsContext,
-              fn,
+              Component,
+              resolvedProps,
               renderExpirationTime
-            ),
-            (oldState = workInProgress.memoizedState)),
-          unmaskedContext !== needsContext ||
-          oldContext !== oldState ||
-          didPerformWorkStackCursor.current ||
-          hasForceUpdate
-            ? ("function" === typeof getDerivedStateFromProps &&
-                (applyDerivedStateFromProps(
+            );
+            break;
+          case 14:
+            child = updateForwardRef(
+              current$$1,
+              workInProgress,
+              Component,
+              resolvedProps,
+              renderExpirationTime
+            );
+            break;
+          case 18:
+            child = updatePureComponent(
+              current$$1,
+              workInProgress,
+              Component,
+              resolvedProps,
+              updateExpirationTime,
+              renderExpirationTime
+            );
+            break;
+          default:
+            invariant(
+              !1,
+              "Element type is invalid. Received a promise that resolves to: %s. Promise elements must resolve to a class or function.",
+              Component
+            );
+        }
+        workInProgress.memoizedProps = props;
+        workInProgress = child;
+      } else
+        (updateExpirationTime = getMaskedContext(
+          workInProgress,
+          contextStackCursor.current
+        )),
+          prepareToReadContext(workInProgress, renderExpirationTime),
+          (updateExpirationTime = Component(props, updateExpirationTime)),
+          (workInProgress.effectTag |= 1),
+          "object" === typeof updateExpirationTime &&
+          null !== updateExpirationTime &&
+          "function" === typeof updateExpirationTime.render &&
+          void 0 === updateExpirationTime.$$typeof
+            ? ((workInProgress.tag = 2),
+              isContextProvider(Component)
+                ? ((resolvedTag = !0), pushContextProvider(workInProgress))
+                : (resolvedTag = !1),
+              (workInProgress.memoizedState =
+                null !== updateExpirationTime.state &&
+                void 0 !== updateExpirationTime.state
+                  ? updateExpirationTime.state
+                  : null),
+              (resolvedProps = Component.getDerivedStateFromProps),
+              "function" === typeof resolvedProps &&
+                applyDerivedStateFromProps(
                   workInProgress,
-                  getDerivedStateFromProps,
-                  needsContext
+                  Component,
+                  resolvedProps,
+                  props
                 ),
-                (oldState = workInProgress.memoizedState)),
-              (getDerivedStateFromProps =
-                hasForceUpdate ||
-                checkShouldComponentUpdate(
-                  workInProgress,
-                  unmaskedContext,
-                  needsContext,
-                  oldContext,
-                  oldState,
-                  props$jscomp$0
-                ))
-                ? (ctor ||
-                    ("function" !== typeof fn.UNSAFE_componentWillUpdate &&
-                      "function" !== typeof fn.componentWillUpdate) ||
-                    ("function" === typeof fn.componentWillUpdate &&
-                      fn.componentWillUpdate(
-                        needsContext,
-                        oldState,
-                        props$jscomp$0
-                      ),
-                    "function" === typeof fn.UNSAFE_componentWillUpdate &&
-                      fn.UNSAFE_componentWillUpdate(
-                        needsContext,
-                        oldState,
-                        props$jscomp$0
-                      )),
-                  "function" === typeof fn.componentDidUpdate &&
-                    (workInProgress.effectTag |= 4),
-                  "function" === typeof fn.getSnapshotBeforeUpdate &&
-                    (workInProgress.effectTag |= 256))
-                : ("function" !== typeof fn.componentDidUpdate ||
-                    (unmaskedContext === current.memoizedProps &&
-                      oldContext === current.memoizedState) ||
-                    (workInProgress.effectTag |= 4),
-                  "function" !== typeof fn.getSnapshotBeforeUpdate ||
-                    (unmaskedContext === current.memoizedProps &&
-                      oldContext === current.memoizedState) ||
-                    (workInProgress.effectTag |= 256),
-                  (workInProgress.memoizedProps = needsContext),
-                  (workInProgress.memoizedState = oldState)),
-              (fn.props = needsContext),
-              (fn.state = oldState),
-              (fn.context = props$jscomp$0),
-              (fn = getDerivedStateFromProps))
-            : ("function" !== typeof fn.componentDidUpdate ||
-                (unmaskedContext === current.memoizedProps &&
-                  oldContext === current.memoizedState) ||
-                (workInProgress.effectTag |= 4),
-              "function" !== typeof fn.getSnapshotBeforeUpdate ||
-                (unmaskedContext === current.memoizedProps &&
-                  oldContext === current.memoizedState) ||
-                (workInProgress.effectTag |= 256),
-              (fn = !1));
-      return finishClassComponent(
-        current,
+              (updateExpirationTime.updater = classComponentUpdater),
+              (workInProgress.stateNode = updateExpirationTime),
+              (updateExpirationTime._reactInternalFiber = workInProgress),
+              mountClassInstance(
+                workInProgress,
+                Component,
+                props,
+                renderExpirationTime
+              ),
+              (workInProgress = finishClassComponent(
+                current$$1,
+                workInProgress,
+                Component,
+                !0,
+                resolvedTag,
+                renderExpirationTime
+              )))
+            : ((workInProgress.tag = 0),
+              reconcileChildren(
+                current$$1,
+                workInProgress,
+                updateExpirationTime,
+                renderExpirationTime
+              ),
+              (workInProgress.memoizedProps = props),
+              (workInProgress = workInProgress.child));
+      return workInProgress;
+    case 0:
+      return updateFunctionComponent(
+        current$$1,
         workInProgress,
-        fn,
-        props,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        renderExpirationTime
+      );
+    case 1:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateFunctionComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
+    case 2:
+      return updateClassComponent(
+        current$$1,
+        workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
         renderExpirationTime
       );
     case 3:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateClassComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
+    case 5:
       return (
         pushHostRootContext(workInProgress),
-        (props = workInProgress.updateQueue),
-        null !== props
-          ? ((fn = workInProgress.memoizedState),
-            (fn = null !== fn ? fn.element : null),
-            processUpdateQueue(
+        (Component = workInProgress.updateQueue),
+        invariant(
+          null !== Component,
+          "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
+        ),
+        (props = workInProgress.memoizedState),
+        (props = null !== props ? props.element : null),
+        processUpdateQueue(
+          workInProgress,
+          Component,
+          workInProgress.pendingProps,
+          null,
+          renderExpirationTime
+        ),
+        (Component = workInProgress.memoizedState.element),
+        Component === props
+          ? (workInProgress = bailoutOnAlreadyFinishedWork(
+              current$$1,
               workInProgress,
-              props,
-              workInProgress.pendingProps,
-              null,
+              renderExpirationTime
+            ))
+          : (reconcileChildren(
+              current$$1,
+              workInProgress,
+              Component,
               renderExpirationTime
             ),
-            (renderExpirationTime = workInProgress.memoizedState.element),
-            renderExpirationTime === fn
-              ? (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))
-              : (reconcileChildren(
-                  current,
-                  workInProgress,
-                  renderExpirationTime
-                ),
-                (current = workInProgress.child)))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+            (workInProgress = workInProgress.child)),
+        workInProgress
       );
-    case 5:
+    case 7:
       return (
-        requiredContext(rootInstanceStackCursor.current),
-        (renderExpirationTime = requiredContext(contextStackCursor$1.current)),
-        (props = workInProgress.type),
-        (props =
-          "AndroidTextInput" === props ||
-          "RCTMultilineTextInputView" === props ||
-          "RCTSinglelineTextInputView" === props ||
-          "RCTText" === props ||
-          "RCTVirtualText" === props),
-        (props =
-          renderExpirationTime.isInAParentText !== props
-            ? { isInAParentText: props }
-            : renderExpirationTime),
-        renderExpirationTime !== props &&
-          (push(contextFiberStackCursor, workInProgress, workInProgress),
-          push(contextStackCursor$1, props, workInProgress)),
-        null === current && tryToClaimNextHydratableInstance(workInProgress),
-        (props = workInProgress.memoizedProps),
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current || props !== renderExpirationTime
-          ? ((props = renderExpirationTime.children),
-            markRef(current, workInProgress),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        pushHostContext(workInProgress),
+        null === current$$1 && tryToClaimNextHydratableInstance(workInProgress),
+        (Component = workInProgress.pendingProps),
+        (props = Component.children),
+        markRef(current$$1, workInProgress),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        (workInProgress = workInProgress.child),
+        workInProgress
       );
-    case 6:
+    case 8:
       return (
-        null === current && tryToClaimNextHydratableInstance(workInProgress),
+        null === current$$1 && tryToClaimNextHydratableInstance(workInProgress),
         (workInProgress.memoizedProps = workInProgress.pendingProps),
         null
       );
     case 16:
-      return null;
-    case 4:
+      return (
+        (Component = workInProgress.pendingProps),
+        (props = 0 === (workInProgress.effectTag & 64)),
+        null !== current$$1 && null !== workInProgress.updateQueue
+          ? ((workInProgress.updateQueue = null), (props = !0))
+          : (props = !props),
+        0 !== (workInProgress.mode & 2) &&
+          (props
+            ? (workInProgress.effectTag |= 4)
+            : (workInProgress.stateNode = null)),
+        (updateExpirationTime = Component.children),
+        (updateExpirationTime =
+          "function" === typeof updateExpirationTime
+            ? updateExpirationTime(props)
+            : props
+              ? Component.fallback
+              : updateExpirationTime),
+        null !== current$$1 && props !== workInProgress.memoizedState
+          ? ((workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              current$$1.child,
+              null,
+              renderExpirationTime
+            )),
+            (workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              null,
+              updateExpirationTime,
+              renderExpirationTime
+            )))
+          : reconcileChildren(
+              current$$1,
+              workInProgress,
+              updateExpirationTime,
+              renderExpirationTime
+            ),
+        (workInProgress.memoizedProps = Component),
+        (workInProgress.memoizedState = props),
+        workInProgress.child
+      );
+    case 6:
       return (
         pushHostContainer(
           workInProgress,
           workInProgress.stateNode.containerInfo
         ),
-        (props = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== props
-          ? (null === current
-              ? (workInProgress.child = reconcileChildFibers(
-                  workInProgress,
-                  null,
-                  props,
-                  renderExpirationTime
-                ))
-              : reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = props),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps),
+        null === current$$1
+          ? (workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              null,
+              Component,
+              renderExpirationTime
+            ))
+          : reconcileChildren(
+              current$$1,
+              workInProgress,
+              Component,
+              renderExpirationTime
+            ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
+      );
+    case 13:
+      return updateForwardRef(
+        current$$1,
+        workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        renderExpirationTime
       );
     case 14:
       return (
-        (props = workInProgress.type.render),
-        (renderExpirationTime = workInProgress.pendingProps),
-        (fn = workInProgress.ref),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime ||
-        fn !== (null !== current ? current.ref : null)
-          ? ((props = props(renderExpirationTime, fn)),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateForwardRef(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
       );
-    case 10:
+    case 9:
       return (
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime
-          ? (reconcileChildren(current, workInProgress, renderExpirationTime),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
-    case 11:
+    case 10:
       return (
-        (renderExpirationTime = workInProgress.pendingProps.children),
-        didPerformWorkStackCursor.current ||
-        (null !== renderExpirationTime &&
-          workInProgress.memoizedProps !== renderExpirationTime)
-          ? (reconcileChildren(current, workInProgress, renderExpirationTime),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps.children),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
     case 15:
       return (
-        (renderExpirationTime = workInProgress.pendingProps),
-        workInProgress.memoizedProps === renderExpirationTime
-          ? (current = bailoutOnAlreadyFinishedWork(current, workInProgress))
-          : (reconcileChildren(
-              current,
-              workInProgress,
-              renderExpirationTime.children
-            ),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child)),
-        current
+        (Component = workInProgress.pendingProps),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component.children,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
-    case 13:
-      return updateContextProvider(
-        current,
+    case 12:
+      a: {
+        Component = workInProgress.type._context;
+        props = workInProgress.pendingProps;
+        resolvedTag = workInProgress.memoizedProps;
+        updateExpirationTime = props.value;
+        workInProgress.memoizedProps = props;
+        pushProvider(workInProgress, updateExpirationTime);
+        if (null !== resolvedTag)
+          if (
+            ((resolvedProps = resolvedTag.value),
+            (updateExpirationTime =
+              (resolvedProps === updateExpirationTime &&
+                (0 !== resolvedProps ||
+                  1 / resolvedProps === 1 / updateExpirationTime)) ||
+              (resolvedProps !== resolvedProps &&
+                updateExpirationTime !== updateExpirationTime)
+                ? 0
+                : ("function" === typeof Component._calculateChangedBits
+                    ? Component._calculateChangedBits(
+                        resolvedProps,
+                        updateExpirationTime
+                      )
+                    : 1073741823) | 0),
+            0 === updateExpirationTime)
+          ) {
+            if (
+              resolvedTag.children === props.children &&
+              !didPerformWorkStackCursor.current
+            ) {
+              workInProgress = bailoutOnAlreadyFinishedWork(
+                current$$1,
+                workInProgress,
+                renderExpirationTime
+              );
+              break a;
+            }
+          } else
+            for (
+              resolvedTag = workInProgress.child,
+                null !== resolvedTag && (resolvedTag.return = workInProgress);
+              null !== resolvedTag;
+
+            ) {
+              resolvedProps = resolvedTag.firstContextDependency;
+              if (null !== resolvedProps) {
+                do {
+                  if (
+                    resolvedProps.context === Component &&
+                    0 !== (resolvedProps.observedBits & updateExpirationTime)
+                  ) {
+                    if (2 === resolvedTag.tag || 3 === resolvedTag.tag)
+                      (child = createUpdate(renderExpirationTime)),
+                        (child.tag = 2),
+                        enqueueUpdate(resolvedTag, child);
+                    if (
+                      0 === resolvedTag.expirationTime ||
+                      resolvedTag.expirationTime > renderExpirationTime
+                    )
+                      resolvedTag.expirationTime = renderExpirationTime;
+                    child = resolvedTag.alternate;
+                    null !== child &&
+                      (0 === child.expirationTime ||
+                        child.expirationTime > renderExpirationTime) &&
+                      (child.expirationTime = renderExpirationTime);
+                    for (var node = resolvedTag.return; null !== node; ) {
+                      child = node.alternate;
+                      if (
+                        0 === node.childExpirationTime ||
+                        node.childExpirationTime > renderExpirationTime
+                      )
+                        (node.childExpirationTime = renderExpirationTime),
+                          null !== child &&
+                            (0 === child.childExpirationTime ||
+                              child.childExpirationTime >
+                                renderExpirationTime) &&
+                            (child.childExpirationTime = renderExpirationTime);
+                      else if (
+                        null !== child &&
+                        (0 === child.childExpirationTime ||
+                          child.childExpirationTime > renderExpirationTime)
+                      )
+                        child.childExpirationTime = renderExpirationTime;
+                      else break;
+                      node = node.return;
+                    }
+                  }
+                  child = resolvedTag.child;
+                  resolvedProps = resolvedProps.next;
+                } while (null !== resolvedProps);
+              } else
+                child =
+                  12 === resolvedTag.tag
+                    ? resolvedTag.type === workInProgress.type
+                      ? null
+                      : resolvedTag.child
+                    : resolvedTag.child;
+              if (null !== child) child.return = resolvedTag;
+              else
+                for (child = resolvedTag; null !== child; ) {
+                  if (child === workInProgress) {
+                    child = null;
+                    break;
+                  }
+                  resolvedTag = child.sibling;
+                  if (null !== resolvedTag) {
+                    resolvedTag.return = child.return;
+                    child = resolvedTag;
+                    break;
+                  }
+                  child = child.return;
+                }
+              resolvedTag = child;
+            }
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props.children,
+          renderExpirationTime
+        );
+        workInProgress = workInProgress.child;
+      }
+      return workInProgress;
+    case 11:
+      return (
+        (updateExpirationTime = workInProgress.type),
+        (Component = workInProgress.pendingProps),
+        (props = Component.children),
+        prepareToReadContext(workInProgress, renderExpirationTime),
+        (updateExpirationTime = readContext(
+          updateExpirationTime,
+          Component.unstable_observedBits
+        )),
+        (props = props(updateExpirationTime)),
+        (workInProgress.effectTag |= 1),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
+      );
+    case 17:
+      return updatePureComponent(
+        current$$1,
         workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        updateExpirationTime,
         renderExpirationTime
       );
-    case 12:
-      a: if (
-        ((fn = workInProgress.type),
-        (unmaskedContext = workInProgress.pendingProps),
-        (needsContext = workInProgress.memoizedProps),
-        (props = fn._currentValue),
-        (props$jscomp$0 = fn._changedBits),
-        didPerformWorkStackCursor.current ||
-          0 !== props$jscomp$0 ||
-          needsContext !== unmaskedContext)
-      ) {
-        workInProgress.memoizedProps = unmaskedContext;
-        ctor = unmaskedContext.unstable_observedBits;
-        if (void 0 === ctor || null === ctor) ctor = 1073741823;
-        workInProgress.stateNode = ctor;
-        if (0 !== (props$jscomp$0 & ctor))
-          propagateContextChange(
-            workInProgress,
-            fn,
-            props$jscomp$0,
-            renderExpirationTime
-          );
-        else if (needsContext === unmaskedContext) {
-          current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-          break a;
-        }
-        renderExpirationTime = unmaskedContext.children;
-        renderExpirationTime = renderExpirationTime(props);
-        workInProgress.effectTag |= 1;
-        reconcileChildren(current, workInProgress, renderExpirationTime);
-        current = workInProgress.child;
-      } else current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-      return current;
+    case 18:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updatePureComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          updateExpirationTime,
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
     default:
       invariant(
         !1,
@@ -3940,244 +4331,101 @@ var updateHostContainer = void 0,
   updateHostComponent$1 = void 0,
   updateHostText$1 = void 0;
 updateHostContainer = function() {};
-updateHostComponent$1 = function(current, workInProgress, updatePayload) {
-  if ((workInProgress.updateQueue = updatePayload))
-    workInProgress.effectTag |= 4;
+updateHostComponent$1 = function(current, workInProgress, type, newProps) {
+  current.memoizedProps !== newProps &&
+    (requiredContext(contextStackCursor$1.current),
+    (workInProgress.updateQueue = UPDATE_SIGNAL)) &&
+    (workInProgress.effectTag |= 4);
 };
 updateHostText$1 = function(current, workInProgress, oldText, newText) {
   oldText !== newText && (workInProgress.effectTag |= 4);
 };
-function completeWork(current, workInProgress) {
-  var newProps = workInProgress.pendingProps;
-  switch (workInProgress.tag) {
-    case 1:
-      return null;
-    case 2:
-      return popContextProvider(workInProgress), null;
-    case 3:
-      popHostContainer(workInProgress);
-      popTopLevelContextObject(workInProgress);
-      newProps = workInProgress.stateNode;
-      newProps.pendingContext &&
-        ((newProps.context = newProps.pendingContext),
-        (newProps.pendingContext = null));
-      if (null === current || null === current.child)
-        workInProgress.effectTag &= -3;
-      updateHostContainer(workInProgress);
-      return null;
-    case 5:
-      popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-          rootInstanceStackCursor.current
-        ),
-        type = workInProgress.type;
-      if (null !== current && null != workInProgress.stateNode) {
-        var oldProps = current.memoizedProps,
-          currentHostContext = requiredContext(contextStackCursor$1.current);
-        updateHostComponent$1(
-          current,
-          workInProgress,
-          emptyObject,
-          type,
-          oldProps,
-          newProps,
-          rootContainerInstance,
-          currentHostContext
-        );
-        current.ref !== workInProgress.ref && (workInProgress.effectTag |= 128);
-      } else {
-        if (!newProps)
-          return (
-            invariant(
-              null !== workInProgress.stateNode,
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            null
-          );
-        current = requiredContext(contextStackCursor$1.current);
-        oldProps = allocateTag();
-        currentHostContext = ReactNativeViewConfigRegistry.get(type);
-        invariant(
-          "RCTView" !== type || !current.isInAParentText,
-          "Nesting of <View> within <Text> is not currently supported."
-        );
-        var updatePayload = diffProperties(
-          null,
-          emptyObject$1,
-          newProps,
-          currentHostContext.validAttributes
-        );
-        UIManager.createView(
-          oldProps,
-          currentHostContext.uiViewClassName,
-          rootContainerInstance,
-          updatePayload
-        );
-        currentHostContext = new ReactNativeFiberHostComponent(
-          oldProps,
-          currentHostContext
-        );
-        instanceCache[oldProps] = workInProgress;
-        instanceProps[oldProps] = newProps;
-        a: for (oldProps = workInProgress.child; null !== oldProps; ) {
-          if (5 === oldProps.tag || 6 === oldProps.tag)
-            currentHostContext._children.push(oldProps.stateNode);
-          else if (4 !== oldProps.tag && null !== oldProps.child) {
-            oldProps.child.return = oldProps;
-            oldProps = oldProps.child;
-            continue;
-          }
-          if (oldProps === workInProgress) break;
-          for (; null === oldProps.sibling; ) {
-            if (null === oldProps.return || oldProps.return === workInProgress)
-              break a;
-            oldProps = oldProps.return;
-          }
-          oldProps.sibling.return = oldProps.return;
-          oldProps = oldProps.sibling;
-        }
-        finalizeInitialChildren(
-          currentHostContext,
-          type,
-          newProps,
-          rootContainerInstance,
-          current
-        ) && (workInProgress.effectTag |= 4);
-        workInProgress.stateNode = currentHostContext;
-        null !== workInProgress.ref && (workInProgress.effectTag |= 128);
-      }
-      return null;
-    case 6:
-      if (current && null != workInProgress.stateNode)
-        updateHostText$1(
-          current,
-          workInProgress,
-          current.memoizedProps,
-          newProps
-        );
-      else {
-        if ("string" !== typeof newProps)
-          return (
-            invariant(
-              null !== workInProgress.stateNode,
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            null
-          );
-        rootContainerInstance = requiredContext(
-          rootInstanceStackCursor.current
-        );
-        type = requiredContext(contextStackCursor$1.current);
-        invariant(
-          type.isInAParentText,
-          "Text strings must be rendered within a <Text> component."
-        );
-        type = allocateTag();
-        UIManager.createView(type, "RCTRawText", rootContainerInstance, {
-          text: newProps
-        });
-        instanceCache[type] = workInProgress;
-        workInProgress.stateNode = type;
-      }
-      return null;
-    case 14:
-      return null;
-    case 16:
-      return null;
-    case 10:
-      return null;
-    case 11:
-      return null;
-    case 15:
-      return null;
-    case 4:
-      return (
-        popHostContainer(workInProgress),
-        updateHostContainer(workInProgress),
-        null
-      );
-    case 13:
-      return popProvider(workInProgress), null;
-    case 12:
-      return null;
-    case 0:
-      invariant(
-        !1,
-        "An indeterminate component should have become determinate before completing. This error is likely caused by a bug in React. Please file an issue."
-      );
-    default:
-      invariant(
-        !1,
-        "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
-      );
-  }
+function logCapturedError(capturedError) {
+  var componentStack = capturedError.componentStack,
+    error = capturedError.error;
+  if (error instanceof Error) {
+    capturedError = error.message;
+    var name = error.name;
+    try {
+      error.message =
+        (capturedError ? name + ": " + capturedError : name) +
+        "\n\nThis error is located at:" +
+        componentStack;
+    } catch (e) {}
+  } else
+    error =
+      "string" === typeof error
+        ? Error(error + "\n\nThis error is located at:" + componentStack)
+        : Error("Unspecified error at:" + componentStack);
+  ExceptionsManager.handleException(error, !1);
 }
+var emptyObject$1 = {};
 function logError(boundary, errorInfo) {
   var source = errorInfo.source,
     stack = errorInfo.stack;
   null === stack &&
     null !== source &&
-    (stack = getStackAddendumByWorkInProgressFiber(source));
-  null !== source && getComponentName(source);
-  source = null !== stack ? stack : "";
-  errorInfo = errorInfo.value;
-  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
+    (stack = getStackByFiberInDevAndProd(source));
+  errorInfo = {
+    componentName: null !== source ? getComponentName(source.type) : null,
+    componentStack: null !== stack ? stack : "",
+    error: errorInfo.value,
+    errorBoundary: null,
+    errorBoundaryName: null,
+    errorBoundaryFound: !1,
+    willRetry: !1
+  };
+  null !== boundary &&
+    2 === boundary.tag &&
+    ((errorInfo.errorBoundary = boundary.stateNode),
+    (errorInfo.errorBoundaryName = getComponentName(boundary.type)),
+    (errorInfo.errorBoundaryFound = !0),
+    (errorInfo.willRetry = !0));
   try {
-    if (errorInfo instanceof Error) {
-      var message = errorInfo.message,
-        name = errorInfo.name;
-      var errorToHandle = errorInfo;
-      try {
-        errorToHandle.message =
-          (message ? name + ": " + message : name) +
-          "\n\nThis error is located at:" +
-          source;
-      } catch (e) {}
-    } else
-      errorToHandle =
-        "string" === typeof errorInfo
-          ? Error(errorInfo + "\n\nThis error is located at:" + source)
-          : Error("Unspecified error at:" + source);
-    ExceptionsManager.handleException(errorToHandle, !1);
+    logCapturedError(errorInfo);
   } catch (e) {
-    (e && e.suppressReactErrorLogging) || console.error(e);
+    setTimeout(function() {
+      throw e;
+    });
   }
 }
-function safelyDetachRef(current) {
-  var ref = current.ref;
+function safelyDetachRef(current$$1) {
+  var ref = current$$1.ref;
   if (null !== ref)
     if ("function" === typeof ref)
       try {
         ref(null);
       } catch (refError) {
-        captureCommitPhaseError(current, refError);
+        captureCommitPhaseError(current$$1, refError);
       }
     else ref.current = null;
 }
-function commitUnmount(current) {
-  "function" === typeof onCommitUnmount && onCommitUnmount(current);
-  switch (current.tag) {
+function commitUnmount(current$$1) {
+  "function" === typeof onCommitFiberUnmount &&
+    onCommitFiberUnmount(current$$1);
+  switch (current$$1.tag) {
     case 2:
-      safelyDetachRef(current);
-      var instance = current.stateNode;
+    case 3:
+      safelyDetachRef(current$$1);
+      var instance = current$$1.stateNode;
       if ("function" === typeof instance.componentWillUnmount)
         try {
-          (instance.props = current.memoizedProps),
-            (instance.state = current.memoizedState),
+          (instance.props = current$$1.memoizedProps),
+            (instance.state = current$$1.memoizedState),
             instance.componentWillUnmount();
         } catch (unmountError) {
-          captureCommitPhaseError(current, unmountError);
+          captureCommitPhaseError(current$$1, unmountError);
         }
       break;
-    case 5:
-      safelyDetachRef(current);
+    case 7:
+      safelyDetachRef(current$$1);
       break;
-    case 4:
-      unmountHostComponents(current);
+    case 6:
+      unmountHostComponents(current$$1);
   }
 }
 function isHostParent(fiber) {
-  return 5 === fiber.tag || 3 === fiber.tag || 4 === fiber.tag;
+  return 7 === fiber.tag || 5 === fiber.tag || 6 === fiber.tag;
 }
 function commitPlacement(finishedWork) {
   a: {
@@ -4196,15 +4444,15 @@ function commitPlacement(finishedWork) {
   }
   var isContainer = (parent = void 0);
   switch (parentFiber.tag) {
-    case 5:
+    case 7:
       parent = parentFiber.stateNode;
       isContainer = !1;
       break;
-    case 3:
+    case 5:
       parent = parentFiber.stateNode.containerInfo;
       isContainer = !0;
       break;
-    case 4:
+    case 6:
       parent = parentFiber.stateNode.containerInfo;
       isContainer = !0;
       break;
@@ -4226,11 +4474,11 @@ function commitPlacement(finishedWork) {
     parentFiber.sibling.return = parentFiber.return;
     for (
       parentFiber = parentFiber.sibling;
-      5 !== parentFiber.tag && 6 !== parentFiber.tag;
+      7 !== parentFiber.tag && 8 !== parentFiber.tag;
 
     ) {
       if (parentFiber.effectTag & 2) continue b;
-      if (null === parentFiber.child || 4 === parentFiber.tag) continue b;
+      if (null === parentFiber.child || 6 === parentFiber.tag) continue b;
       else
         (parentFiber.child.return = parentFiber),
           (parentFiber = parentFiber.child);
@@ -4241,7 +4489,7 @@ function commitPlacement(finishedWork) {
     }
   }
   for (var node = finishedWork; ; ) {
-    if (5 === node.tag || 6 === node.tag)
+    if (7 === node.tag || 8 === node.tag)
       if (parentFiber)
         if (isContainer)
           invariant(
@@ -4310,7 +4558,7 @@ function commitPlacement(finishedWork) {
                   [index.length - 1],
                   []
                 )));
-    else if (4 !== node.tag && null !== node.child) {
+    else if (6 !== node.tag && null !== node.child) {
       node.child.return = node;
       node = node.child;
       continue;
@@ -4324,9 +4572,9 @@ function commitPlacement(finishedWork) {
     node = node.sibling;
   }
 }
-function unmountHostComponents(current) {
+function unmountHostComponents(current$$1) {
   for (
-    var node = current,
+    var node = current$$1,
       currentParentIsValid = !1,
       currentParent = void 0,
       currentParentIsContainer = void 0;
@@ -4341,15 +4589,15 @@ function unmountHostComponents(current) {
           "Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue."
         );
         switch (currentParentIsValid.tag) {
-          case 5:
+          case 7:
             currentParent = currentParentIsValid.stateNode;
             currentParentIsContainer = !1;
             break a;
-          case 3:
+          case 5:
             currentParent = currentParentIsValid.stateNode.containerInfo;
             currentParentIsContainer = !0;
             break a;
-          case 4:
+          case 6:
             currentParent = currentParentIsValid.stateNode.containerInfo;
             currentParentIsContainer = !0;
             break a;
@@ -4358,11 +4606,11 @@ function unmountHostComponents(current) {
       }
       currentParentIsValid = !0;
     }
-    if (5 === node.tag || 6 === node.tag) {
+    if (7 === node.tag || 8 === node.tag) {
       a: for (var root = node, node$jscomp$0 = root; ; )
         if (
           (commitUnmount(node$jscomp$0),
-          null !== node$jscomp$0.child && 4 !== node$jscomp$0.tag)
+          null !== node$jscomp$0.child && 6 !== node$jscomp$0.tag)
         )
           (node$jscomp$0.child.return = node$jscomp$0),
             (node$jscomp$0 = node$jscomp$0.child);
@@ -4390,8 +4638,9 @@ function unmountHostComponents(current) {
         UIManager.manageChildren(root._nativeTag, [], [], [], [], [child]);
       }
     } else if (
-      (4 === node.tag
-        ? (currentParent = node.stateNode.containerInfo)
+      (6 === node.tag
+        ? ((currentParent = node.stateNode.containerInfo),
+          (currentParentIsContainer = !0))
         : commitUnmount(node),
       null !== node.child)
     ) {
@@ -4399,25 +4648,26 @@ function unmountHostComponents(current) {
       node = node.child;
       continue;
     }
-    if (node === current) break;
+    if (node === current$$1) break;
     for (; null === node.sibling; ) {
-      if (null === node.return || node.return === current) return;
+      if (null === node.return || node.return === current$$1) return;
       node = node.return;
-      4 === node.tag && (currentParentIsValid = !1);
+      6 === node.tag && (currentParentIsValid = !1);
     }
     node.sibling.return = node.return;
     node = node.sibling;
   }
 }
-function commitWork(current, finishedWork) {
+function commitWork(current$$1, finishedWork) {
   switch (finishedWork.tag) {
     case 2:
+    case 3:
       break;
-    case 5:
+    case 7:
       var instance = finishedWork.stateNode;
       if (null != instance) {
         var newProps = finishedWork.memoizedProps;
-        current = null !== current ? current.memoizedProps : newProps;
+        current$$1 = null !== current$$1 ? current$$1.memoizedProps : newProps;
         var updatePayload = finishedWork.updateQueue;
         finishedWork.updateQueue = null;
         null !== updatePayload &&
@@ -4425,7 +4675,7 @@ function commitWork(current, finishedWork) {
           (instanceProps[instance._nativeTag] = newProps),
           (newProps = diffProperties(
             null,
-            current,
+            current$$1,
             newProps,
             finishedWork.validAttributes
           )),
@@ -4437,7 +4687,7 @@ function commitWork(current, finishedWork) {
             ));
       }
       break;
-    case 6:
+    case 8:
       invariant(
         null !== finishedWork.stateNode,
         "This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue."
@@ -4446,7 +4696,7 @@ function commitWork(current, finishedWork) {
         text: finishedWork.memoizedProps
       });
       break;
-    case 3:
+    case 5:
       break;
     case 15:
       break;
@@ -4459,6 +4709,9 @@ function commitWork(current, finishedWork) {
       );
   }
 }
+function NoopComponent() {
+  return null;
+}
 function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime = createUpdate(expirationTime);
   expirationTime.tag = 3;
@@ -4473,13 +4726,21 @@ function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
 function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime = createUpdate(expirationTime);
   expirationTime.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error$jscomp$0 = errorInfo.value;
+    expirationTime.payload = function() {
+      return getDerivedStateFromError(error$jscomp$0);
+    };
+  }
   var inst = fiber.stateNode;
   null !== inst &&
     "function" === typeof inst.componentDidCatch &&
     (expirationTime.callback = function() {
-      null === legacyErrorBoundariesThatAlreadyFailed
-        ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-        : legacyErrorBoundariesThatAlreadyFailed.add(this);
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this));
       var error = errorInfo.value,
         stack = errorInfo.stack;
       logError(fiber, errorInfo);
@@ -4492,7 +4753,7 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
 function unwindWork(workInProgress) {
   switch (workInProgress.tag) {
     case 2:
-      popContextProvider(workInProgress);
+      isContextProvider(workInProgress.type) && popContext(workInProgress);
       var effectTag = workInProgress.effectTag;
       return effectTag & 1024
         ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4500,8 +4761,8 @@ function unwindWork(workInProgress) {
         : null;
     case 3:
       return (
-        popHostContainer(workInProgress),
-        popTopLevelContextObject(workInProgress),
+        isContextProvider(workInProgress.type._reactResult) &&
+          popContext(workInProgress),
         (effectTag = workInProgress.effectTag),
         effectTag & 1024
           ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4509,6 +4770,18 @@ function unwindWork(workInProgress) {
           : null
       );
     case 5:
+      return (
+        popHostContainer(workInProgress),
+        popTopLevelContextObject(workInProgress),
+        (effectTag = workInProgress.effectTag),
+        invariant(
+          0 === (effectTag & 64),
+          "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
+        ),
+        (workInProgress.effectTag = (effectTag & -1025) | 64),
+        workInProgress
+      );
+    case 7:
       return popHostContext(workInProgress), null;
     case 16:
       return (
@@ -4518,24 +4791,21 @@ function unwindWork(workInProgress) {
             workInProgress)
           : null
       );
-    case 4:
+    case 6:
       return popHostContainer(workInProgress), null;
-    case 13:
+    case 12:
       return popProvider(workInProgress), null;
     default:
       return null;
   }
 }
-var originalStartTimeMs = now$1(),
-  mostRecentCurrentTime = 2,
-  mostRecentCurrentTimeMs = originalStartTimeMs,
-  lastUniqueAsyncExpiration = 0,
-  expirationContext = 0,
+var Dispatcher = { readContext: readContext },
+  ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
   isWorking = !1,
   nextUnitOfWork = null,
   nextRoot = null,
   nextRenderExpirationTime = 0,
-  nextLatestTimeoutMs = -1,
+  nextLatestAbsoluteTimeoutMs = -1,
   nextRenderDidError = !1,
   nextEffect = null,
   isCommitting$1 = !1,
@@ -4550,91 +4820,260 @@ function resetStack() {
       var interruptedWork$jscomp$0 = interruptedWork;
       switch (interruptedWork$jscomp$0.tag) {
         case 2:
-          popContextProvider(interruptedWork$jscomp$0);
+          var childContextTypes =
+            interruptedWork$jscomp$0.type.childContextTypes;
+          null !== childContextTypes &&
+            void 0 !== childContextTypes &&
+            popContext(interruptedWork$jscomp$0);
           break;
         case 3:
+          childContextTypes =
+            interruptedWork$jscomp$0.type._reactResult.childContextTypes;
+          null !== childContextTypes &&
+            void 0 !== childContextTypes &&
+            popContext(interruptedWork$jscomp$0);
+          break;
+        case 5:
           popHostContainer(interruptedWork$jscomp$0);
           popTopLevelContextObject(interruptedWork$jscomp$0);
           break;
-        case 5:
+        case 7:
           popHostContext(interruptedWork$jscomp$0);
           break;
-        case 4:
+        case 6:
           popHostContainer(interruptedWork$jscomp$0);
           break;
-        case 13:
+        case 12:
           popProvider(interruptedWork$jscomp$0);
       }
       interruptedWork = interruptedWork.return;
     }
   nextRoot = null;
   nextRenderExpirationTime = 0;
-  nextLatestTimeoutMs = -1;
+  nextLatestAbsoluteTimeoutMs = -1;
   nextRenderDidError = !1;
   nextUnitOfWork = null;
 }
-function completeUnitOfWork(workInProgress$jscomp$0) {
+function completeUnitOfWork(workInProgress) {
   for (;;) {
-    var current = workInProgress$jscomp$0.alternate,
-      returnFiber = workInProgress$jscomp$0.return,
-      siblingFiber = workInProgress$jscomp$0.sibling;
-    if (0 === (workInProgress$jscomp$0.effectTag & 512)) {
-      current = completeWork(
-        current,
-        workInProgress$jscomp$0,
-        nextRenderExpirationTime
-      );
-      var workInProgress = workInProgress$jscomp$0;
+    var current$$1 = workInProgress.alternate,
+      returnFiber = workInProgress.return,
+      siblingFiber = workInProgress.sibling;
+    if (0 === (workInProgress.effectTag & 512)) {
+      var current = current$$1;
+      current$$1 = workInProgress;
+      var newProps = current$$1.pendingProps;
+      switch (current$$1.tag) {
+        case 0:
+        case 1:
+          break;
+        case 2:
+          isContextProvider(current$$1.type) && popContext(current$$1);
+          break;
+        case 3:
+          isContextProvider(current$$1.type._reactResult) &&
+            popContext(current$$1);
+          break;
+        case 5:
+          popHostContainer(current$$1);
+          popTopLevelContextObject(current$$1);
+          newProps = current$$1.stateNode;
+          newProps.pendingContext &&
+            ((newProps.context = newProps.pendingContext),
+            (newProps.pendingContext = null));
+          if (null === current || null === current.child)
+            current$$1.effectTag &= -3;
+          updateHostContainer(current$$1);
+          break;
+        case 7:
+          popHostContext(current$$1);
+          var rootContainerInstance = requiredContext(
+              rootInstanceStackCursor.current
+            ),
+            type = current$$1.type;
+          if (null !== current && null != current$$1.stateNode)
+            updateHostComponent$1(
+              current,
+              current$$1,
+              type,
+              newProps,
+              rootContainerInstance
+            ),
+              current.ref !== current$$1.ref && (current$$1.effectTag |= 128);
+          else if (newProps) {
+            current = requiredContext(contextStackCursor$1.current);
+            var internalInstanceHandle = current$$1,
+              tag = allocateTag(),
+              viewConfig = ReactNativeViewConfigRegistry.get(type);
+            invariant(
+              "RCTView" !== type || !current.isInAParentText,
+              "Nesting of <View> within <Text> is not currently supported."
+            );
+            var updatePayload = diffProperties(
+              null,
+              emptyObject,
+              newProps,
+              viewConfig.validAttributes
+            );
+            UIManager.createView(
+              tag,
+              viewConfig.uiViewClassName,
+              rootContainerInstance,
+              updatePayload
+            );
+            viewConfig = new ReactNativeFiberHostComponent(tag, viewConfig);
+            instanceCache[tag] = internalInstanceHandle;
+            instanceProps[tag] = newProps;
+            a: for (
+              internalInstanceHandle = viewConfig,
+                tag = current$$1,
+                updatePayload = tag.child;
+              null !== updatePayload;
+
+            ) {
+              if (7 === updatePayload.tag || 8 === updatePayload.tag)
+                internalInstanceHandle._children.push(updatePayload.stateNode);
+              else if (
+                6 !== updatePayload.tag &&
+                null !== updatePayload.child
+              ) {
+                updatePayload.child.return = updatePayload;
+                updatePayload = updatePayload.child;
+                continue;
+              }
+              if (updatePayload === tag) break;
+              for (; null === updatePayload.sibling; ) {
+                if (
+                  null === updatePayload.return ||
+                  updatePayload.return === tag
+                )
+                  break a;
+                updatePayload = updatePayload.return;
+              }
+              updatePayload.sibling.return = updatePayload.return;
+              updatePayload = updatePayload.sibling;
+            }
+            finalizeInitialChildren(
+              viewConfig,
+              type,
+              newProps,
+              rootContainerInstance,
+              current
+            ) && (current$$1.effectTag |= 4);
+            current$$1.stateNode = viewConfig;
+            null !== current$$1.ref && (current$$1.effectTag |= 128);
+          } else
+            invariant(
+              null !== current$$1.stateNode,
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          break;
+        case 8:
+          current && null != current$$1.stateNode
+            ? updateHostText$1(
+                current,
+                current$$1,
+                current.memoizedProps,
+                newProps
+              )
+            : ("string" !== typeof newProps &&
+                invariant(
+                  null !== current$$1.stateNode,
+                  "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+                ),
+              (current = requiredContext(rootInstanceStackCursor.current)),
+              (type = requiredContext(contextStackCursor$1.current)),
+              (rootContainerInstance = current$$1),
+              invariant(
+                type.isInAParentText,
+                "Text strings must be rendered within a <Text> component."
+              ),
+              (type = allocateTag()),
+              UIManager.createView(type, "RCTRawText", current, {
+                text: newProps
+              }),
+              (instanceCache[type] = current$$1),
+              (rootContainerInstance.stateNode = type));
+          break;
+        case 13:
+        case 14:
+          break;
+        case 16:
+          break;
+        case 9:
+          break;
+        case 10:
+          break;
+        case 15:
+          break;
+        case 6:
+          popHostContainer(current$$1);
+          updateHostContainer(current$$1);
+          break;
+        case 12:
+          popProvider(current$$1);
+          break;
+        case 11:
+          break;
+        case 17:
+        case 18:
+          break;
+        case 4:
+          invariant(
+            !1,
+            "An indeterminate component should have become determinate before completing. This error is likely caused by a bug in React. Please file an issue."
+          );
+        default:
+          invariant(
+            !1,
+            "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
+          );
+      }
+      nextUnitOfWork = null;
+      current$$1 = workInProgress;
       if (
         1073741823 === nextRenderExpirationTime ||
-        1073741823 !== workInProgress.expirationTime
+        1073741823 !== current$$1.childExpirationTime
       ) {
-        var newExpirationTime = 0;
-        switch (workInProgress.tag) {
-          case 3:
-          case 2:
-            var updateQueue = workInProgress.updateQueue;
-            null !== updateQueue &&
-              (newExpirationTime = updateQueue.expirationTime);
+        newProps = 0;
+        for (
+          rootContainerInstance = current$$1.child;
+          null !== rootContainerInstance;
+
+        ) {
+          type = rootContainerInstance.expirationTime;
+          current = rootContainerInstance.childExpirationTime;
+          if (0 === newProps || (0 !== type && type < newProps))
+            newProps = type;
+          if (0 === newProps || (0 !== current && current < newProps))
+            newProps = current;
+          rootContainerInstance = rootContainerInstance.sibling;
         }
-        for (updateQueue = workInProgress.child; null !== updateQueue; )
-          0 !== updateQueue.expirationTime &&
-            (0 === newExpirationTime ||
-              newExpirationTime > updateQueue.expirationTime) &&
-            (newExpirationTime = updateQueue.expirationTime),
-            (updateQueue = updateQueue.sibling);
-        workInProgress.expirationTime = newExpirationTime;
+        current$$1.childExpirationTime = newProps;
       }
-      if (null !== current) return current;
       null !== returnFiber &&
         0 === (returnFiber.effectTag & 512) &&
         (null === returnFiber.firstEffect &&
-          (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
-        null !== workInProgress$jscomp$0.lastEffect &&
+          (returnFiber.firstEffect = workInProgress.firstEffect),
+        null !== workInProgress.lastEffect &&
           (null !== returnFiber.lastEffect &&
-            (returnFiber.lastEffect.nextEffect =
-              workInProgress$jscomp$0.firstEffect),
-          (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
-        1 < workInProgress$jscomp$0.effectTag &&
+            (returnFiber.lastEffect.nextEffect = workInProgress.firstEffect),
+          (returnFiber.lastEffect = workInProgress.lastEffect)),
+        1 < workInProgress.effectTag &&
           (null !== returnFiber.lastEffect
-            ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
-            : (returnFiber.firstEffect = workInProgress$jscomp$0),
-          (returnFiber.lastEffect = workInProgress$jscomp$0)));
+            ? (returnFiber.lastEffect.nextEffect = workInProgress)
+            : (returnFiber.firstEffect = workInProgress),
+          (returnFiber.lastEffect = workInProgress)));
     } else {
-      workInProgress$jscomp$0 = unwindWork(
-        workInProgress$jscomp$0,
-        nextRenderExpirationTime
-      );
-      if (null !== workInProgress$jscomp$0)
-        return (
-          (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
-        );
+      workInProgress = unwindWork(workInProgress, nextRenderExpirationTime);
+      if (null !== workInProgress)
+        return (workInProgress.effectTag &= 511), workInProgress;
       null !== returnFiber &&
         ((returnFiber.firstEffect = returnFiber.lastEffect = null),
         (returnFiber.effectTag |= 512));
     }
     if (null !== siblingFiber) return siblingFiber;
-    if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+    if (null !== returnFiber) workInProgress = returnFiber;
     else break;
   }
   return null;
@@ -4646,15 +5085,16 @@ function performUnitOfWork(workInProgress) {
     nextRenderExpirationTime
   );
   null === next && (next = completeUnitOfWork(workInProgress));
-  ReactCurrentOwner.current = null;
+  ReactCurrentOwner$2.current = null;
   return next;
 }
-function renderRoot(root$jscomp$0, isYieldy) {
+function renderRoot(root$jscomp$0, isYieldy, isExpired) {
   invariant(
     !isWorking,
     "renderRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
   );
   isWorking = !0;
+  ReactCurrentOwner$2.currentDispatcher = Dispatcher;
   var expirationTime = root$jscomp$0.nextExpirationTimeToWorkOn;
   if (
     expirationTime !== nextRenderExpirationTime ||
@@ -4664,8 +5104,6 @@ function renderRoot(root$jscomp$0, isYieldy) {
     resetStack(),
       (nextRoot = root$jscomp$0),
       (nextRenderExpirationTime = expirationTime),
-      (nextLatestTimeoutMs = -1),
-      (nextRenderDidError = !1),
       (nextUnitOfWork = createWorkInProgress(
         nextRoot.current,
         null,
@@ -4689,110 +5127,216 @@ function renderRoot(root$jscomp$0, isYieldy) {
           null !== nextUnitOfWork,
           "Failed to replay rendering after an error. This is likely caused by a bug in React. Please file an issue with a reproducing case to help us find it."
         );
-        isYieldy = nextUnitOfWork;
-        var returnFiber = isYieldy.return;
-        if (null === returnFiber) {
-          didFatal = !0;
-          onUncaughtError(thrownValue);
-          break;
-        }
-        a: {
-          var root = root$jscomp$0,
-            returnFiber$jscomp$0 = returnFiber,
-            sourceFiber = isYieldy,
-            value = thrownValue;
-          returnFiber = nextRenderExpirationTime;
-          sourceFiber.effectTag |= 512;
-          sourceFiber.firstEffect = sourceFiber.lastEffect = null;
-          nextRenderDidError = !0;
-          if (
-            (root.didError || 1 === returnFiber) &&
-            (returnFiber === root.latestPendingTime ||
-              returnFiber === root.latestSuspendedTime)
-          ) {
-            value = createCapturedValue(value, sourceFiber);
+        var sourceFiber = nextUnitOfWork,
+          returnFiber = sourceFiber.return;
+        if (null === returnFiber) (didFatal = !0), onUncaughtError(thrownValue);
+        else {
+          a: {
+            var root = root$jscomp$0,
+              returnFiber$jscomp$0 = returnFiber,
+              sourceFiber$jscomp$0 = sourceFiber,
+              value = thrownValue;
+            returnFiber = nextRenderExpirationTime;
+            sourceFiber$jscomp$0.effectTag |= 512;
+            sourceFiber$jscomp$0.firstEffect = sourceFiber$jscomp$0.lastEffect = null;
+            if (
+              null !== value &&
+              "object" === typeof value &&
+              "function" === typeof value.then
+            ) {
+              var thenable = value;
+              value = returnFiber$jscomp$0;
+              var earliestTimeoutMs = -1,
+                startTimeMs = -1;
+              do {
+                if (16 === value.tag) {
+                  var current = value.alternate;
+                  if (
+                    null !== current &&
+                    !0 === current.memoizedState &&
+                    null !== current.stateNode
+                  ) {
+                    startTimeMs = 10 * (current.stateNode.timedOutAt - 2);
+                    break;
+                  }
+                  current = value.pendingProps.maxDuration;
+                  if ("number" === typeof current)
+                    if (0 >= current) earliestTimeoutMs = 0;
+                    else if (
+                      -1 === earliestTimeoutMs ||
+                      current < earliestTimeoutMs
+                    )
+                      earliestTimeoutMs = current;
+                }
+                value = value.return;
+              } while (null !== value);
+              value = returnFiber$jscomp$0;
+              do {
+                if (16 === value.tag && !value.memoizedState) {
+                  returnFiber$jscomp$0 = retrySuspendedRoot.bind(
+                    null,
+                    root,
+                    value,
+                    0 === (value.mode & 1) ? 1 : returnFiber
+                  );
+                  thenable.then(returnFiber$jscomp$0, returnFiber$jscomp$0);
+                  if (0 === (value.mode & 2)) {
+                    value.effectTag |= 4;
+                    reconcileChildren(
+                      sourceFiber$jscomp$0.alternate,
+                      sourceFiber$jscomp$0,
+                      null,
+                      returnFiber
+                    );
+                    sourceFiber$jscomp$0.effectTag &= -513;
+                    4 === sourceFiber$jscomp$0.tag &&
+                      (sourceFiber$jscomp$0.tag = 0);
+                    if (
+                      2 === sourceFiber$jscomp$0.tag ||
+                      3 === sourceFiber$jscomp$0.tag
+                    )
+                      (sourceFiber$jscomp$0.effectTag &= -421),
+                        null === sourceFiber$jscomp$0.alternate &&
+                          ((sourceFiber$jscomp$0.tag = 0),
+                          (sourceFiber$jscomp$0.type = NoopComponent));
+                    break a;
+                  }
+                  -1 === earliestTimeoutMs
+                    ? (root = 1073741823)
+                    : (-1 === startTimeMs &&
+                        (startTimeMs =
+                          10 *
+                            (findEarliestOutstandingPriorityLevel(
+                              root,
+                              returnFiber
+                            ) -
+                              2) -
+                          5e3),
+                      (root = startTimeMs + earliestTimeoutMs));
+                  0 <= root &&
+                    nextLatestAbsoluteTimeoutMs < root &&
+                    (nextLatestAbsoluteTimeoutMs = root);
+                  value.effectTag |= 1024;
+                  value.expirationTime = returnFiber;
+                  break a;
+                }
+                value = value.return;
+              } while (null !== value);
+              value = Error(
+                "An update was suspended, but no placeholder UI was provided."
+              );
+            }
+            nextRenderDidError = !0;
+            value = createCapturedValue(value, sourceFiber$jscomp$0);
             root = returnFiber$jscomp$0;
             do {
               switch (root.tag) {
-                case 3:
+                case 5:
+                  sourceFiber$jscomp$0 = value;
                   root.effectTag |= 1024;
-                  value = createRootErrorUpdate(root, value, returnFiber);
-                  enqueueCapturedUpdate(root, value, returnFiber);
+                  root.expirationTime = returnFiber;
+                  returnFiber = createRootErrorUpdate(
+                    root,
+                    sourceFiber$jscomp$0,
+                    returnFiber
+                  );
+                  enqueueCapturedUpdate(root, returnFiber);
                   break a;
                 case 2:
+                case 3:
                   if (
-                    ((returnFiber$jscomp$0 = value),
-                    (sourceFiber = root.stateNode),
+                    ((sourceFiber$jscomp$0 = value),
+                    (returnFiber$jscomp$0 = root.type),
+                    (thenable = root.stateNode),
                     0 === (root.effectTag & 64) &&
-                      null !== sourceFiber &&
-                      "function" === typeof sourceFiber.componentDidCatch &&
-                      (null === legacyErrorBoundariesThatAlreadyFailed ||
-                        !legacyErrorBoundariesThatAlreadyFailed.has(
-                          sourceFiber
-                        )))
+                      ("function" ===
+                        typeof returnFiber$jscomp$0.getDerivedStateFromError ||
+                        (null !== thenable &&
+                          "function" === typeof thenable.componentDidCatch &&
+                          (null === legacyErrorBoundariesThatAlreadyFailed ||
+                            !legacyErrorBoundariesThatAlreadyFailed.has(
+                              thenable
+                            )))))
                   ) {
                     root.effectTag |= 1024;
-                    value = createClassErrorUpdate(
+                    root.expirationTime = returnFiber;
+                    returnFiber = createClassErrorUpdate(
                       root,
-                      returnFiber$jscomp$0,
+                      sourceFiber$jscomp$0,
                       returnFiber
                     );
-                    enqueueCapturedUpdate(root, value, returnFiber);
+                    enqueueCapturedUpdate(root, returnFiber);
                     break a;
                   }
               }
               root = root.return;
             } while (null !== root);
           }
+          nextUnitOfWork = completeUnitOfWork(sourceFiber);
+          continue;
         }
-        nextUnitOfWork = completeUnitOfWork(isYieldy);
       }
     }
     break;
   } while (1);
   isWorking = !1;
-  didFatal
-    ? (root$jscomp$0.finishedWork = null)
-    : null === nextUnitOfWork
-      ? ((didFatal = root$jscomp$0.current.alternate),
-        invariant(
-          null !== didFatal,
-          "Finished root should have a work-in-progress. This error is likely caused by a bug in React. Please file an issue."
-        ),
-        0 === (didFatal.effectTag & 512)
-          ? ((root$jscomp$0.pendingCommitExpirationTime = expirationTime),
-            (root$jscomp$0.finishedWork = didFatal))
-          : (!nextRenderDidError ||
-            (expirationTime !== root$jscomp$0.latestPendingTime &&
-              expirationTime !== root$jscomp$0.latestSuspendedTime)
-              ? ((didFatal = root$jscomp$0.earliestPendingTime),
-                (isYieldy = root$jscomp$0.latestPendingTime),
-                didFatal === expirationTime
-                  ? (root$jscomp$0.earliestPendingTime =
-                      isYieldy === expirationTime
-                        ? (root$jscomp$0.latestPendingTime = 0)
-                        : isYieldy)
-                  : isYieldy === expirationTime &&
-                    (root$jscomp$0.latestPendingTime = didFatal),
-                (didFatal = root$jscomp$0.latestSuspendedTime),
-                didFatal === expirationTime &&
-                  (root$jscomp$0.latestPingedTime = 0),
-                (isYieldy = root$jscomp$0.earliestSuspendedTime),
-                0 === isYieldy
-                  ? (root$jscomp$0.earliestSuspendedTime = root$jscomp$0.latestSuspendedTime = expirationTime)
-                  : isYieldy > expirationTime
-                    ? (root$jscomp$0.earliestSuspendedTime = expirationTime)
-                    : didFatal < expirationTime &&
-                      (root$jscomp$0.latestSuspendedTime = expirationTime))
-              : (root$jscomp$0.didError = !0),
-            findNextPendingPriorityLevel(root$jscomp$0),
-            onSuspend(
-              root$jscomp$0,
-              expirationTime,
-              root$jscomp$0.expirationTime,
-              nextLatestTimeoutMs
-            )))
-      : (root$jscomp$0.finishedWork = null);
+  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = ReactCurrentOwner$2.currentDispatcher = null;
+  if (didFatal) (nextRoot = null), (root$jscomp$0.finishedWork = null);
+  else if (null !== nextUnitOfWork) root$jscomp$0.finishedWork = null;
+  else {
+    isYieldy = root$jscomp$0.current.alternate;
+    invariant(
+      null !== isYieldy,
+      "Finished root should have a work-in-progress. This error is likely caused by a bug in React. Please file an issue."
+    );
+    nextRoot = null;
+    if (nextRenderDidError) {
+      didFatal = root$jscomp$0.latestPendingTime;
+      sourceFiber = root$jscomp$0.latestSuspendedTime;
+      returnFiber = root$jscomp$0.latestPingedTime;
+      if (
+        (0 !== didFatal && didFatal > expirationTime) ||
+        (0 !== sourceFiber && sourceFiber > expirationTime) ||
+        (0 !== returnFiber && returnFiber > expirationTime)
+      ) {
+        markSuspendedPriorityLevel(root$jscomp$0, expirationTime);
+        onSuspend(
+          root$jscomp$0,
+          isYieldy,
+          expirationTime,
+          root$jscomp$0.expirationTime,
+          -1
+        );
+        return;
+      }
+      if (!root$jscomp$0.didError && !isExpired) {
+        root$jscomp$0.didError = !0;
+        expirationTime = root$jscomp$0.nextExpirationTimeToWorkOn = expirationTime;
+        isExpired = root$jscomp$0.expirationTime = 1;
+        onSuspend(root$jscomp$0, isYieldy, expirationTime, isExpired, -1);
+        return;
+      }
+    }
+    isExpired || -1 === nextLatestAbsoluteTimeoutMs
+      ? ((root$jscomp$0.pendingCommitExpirationTime = expirationTime),
+        (root$jscomp$0.finishedWork = isYieldy))
+      : (markSuspendedPriorityLevel(root$jscomp$0, expirationTime),
+        (isExpired =
+          10 *
+          (findEarliestOutstandingPriorityLevel(root$jscomp$0, expirationTime) -
+            2)),
+        isExpired < nextLatestAbsoluteTimeoutMs &&
+          (nextLatestAbsoluteTimeoutMs = isExpired),
+        (isExpired = 10 * (requestCurrentTime() - 2)),
+        (isExpired = nextLatestAbsoluteTimeoutMs - isExpired),
+        onSuspend(
+          root$jscomp$0,
+          isYieldy,
+          expirationTime,
+          root$jscomp$0.expirationTime,
+          0 > isExpired ? 0 : isExpired
+        ));
+  }
 }
 function captureCommitPhaseError(fiber, error) {
   var JSCompiler_inline_result;
@@ -4808,101 +5352,135 @@ function captureCommitPhaseError(fiber, error) {
     ) {
       switch (JSCompiler_inline_result.tag) {
         case 2:
+        case 3:
           var instance = JSCompiler_inline_result.stateNode;
           if (
             "function" ===
-              typeof JSCompiler_inline_result.type.getDerivedStateFromCatch ||
+              typeof JSCompiler_inline_result.type.getDerivedStateFromError ||
             ("function" === typeof instance.componentDidCatch &&
               (null === legacyErrorBoundariesThatAlreadyFailed ||
                 !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
           ) {
             fiber = createCapturedValue(error, fiber);
             fiber = createClassErrorUpdate(JSCompiler_inline_result, fiber, 1);
-            enqueueUpdate(JSCompiler_inline_result, fiber, 1);
+            enqueueUpdate(JSCompiler_inline_result, fiber);
             scheduleWork(JSCompiler_inline_result, 1);
             JSCompiler_inline_result = void 0;
             break a;
           }
           break;
-        case 3:
+        case 5:
           fiber = createCapturedValue(error, fiber);
           fiber = createRootErrorUpdate(JSCompiler_inline_result, fiber, 1);
-          enqueueUpdate(JSCompiler_inline_result, fiber, 1);
+          enqueueUpdate(JSCompiler_inline_result, fiber);
           scheduleWork(JSCompiler_inline_result, 1);
           JSCompiler_inline_result = void 0;
           break a;
       }
       JSCompiler_inline_result = JSCompiler_inline_result.return;
     }
-    3 === fiber.tag &&
+    5 === fiber.tag &&
       ((JSCompiler_inline_result = createCapturedValue(error, fiber)),
       (JSCompiler_inline_result = createRootErrorUpdate(
         fiber,
         JSCompiler_inline_result,
         1
       )),
-      enqueueUpdate(fiber, JSCompiler_inline_result, 1),
+      enqueueUpdate(fiber, JSCompiler_inline_result),
       scheduleWork(fiber, 1));
     JSCompiler_inline_result = void 0;
   }
   return JSCompiler_inline_result;
 }
 function computeExpirationForFiber(currentTime, fiber) {
-  currentTime =
-    0 !== expirationContext
-      ? expirationContext
-      : isWorking
-        ? isCommitting$1 ? 1 : nextRenderExpirationTime
-        : fiber.mode & 1
-          ? isBatchingInteractiveUpdates
-            ? 2 + 10 * ((((currentTime - 2 + 15) / 10) | 0) + 1)
-            : 2 + 25 * ((((currentTime - 2 + 500) / 25) | 0) + 1)
-          : 1;
+  isWorking
+    ? (currentTime = isCommitting$1 ? 1 : nextRenderExpirationTime)
+    : fiber.mode & 1
+      ? ((currentTime = isBatchingInteractiveUpdates
+          ? 2 + 10 * ((((currentTime - 2 + 15) / 10) | 0) + 1)
+          : 2 + 25 * ((((currentTime - 2 + 500) / 25) | 0) + 1)),
+        null !== nextRoot &&
+          currentTime === nextRenderExpirationTime &&
+          (currentTime += 1))
+      : (currentTime = 1);
   isBatchingInteractiveUpdates &&
-    (0 === lowestPendingInteractiveExpirationTime ||
-      currentTime > lowestPendingInteractiveExpirationTime) &&
-    (lowestPendingInteractiveExpirationTime = currentTime);
+    currentTime > lowestPriorityPendingInteractiveExpirationTime &&
+    (lowestPriorityPendingInteractiveExpirationTime = currentTime);
   return currentTime;
 }
-function scheduleWork(fiber, expirationTime) {
-  for (; null !== fiber; ) {
-    if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
-      fiber.expirationTime = expirationTime;
-    null !== fiber.alternate &&
-      (0 === fiber.alternate.expirationTime ||
-        fiber.alternate.expirationTime > expirationTime) &&
-      (fiber.alternate.expirationTime = expirationTime);
-    if (null === fiber.return)
-      if (3 === fiber.tag) {
-        var root = fiber.stateNode;
-        !isWorking &&
-          0 !== nextRenderExpirationTime &&
-          expirationTime < nextRenderExpirationTime &&
-          resetStack();
-        markPendingPriorityLevel(root, expirationTime);
-        (isWorking && !isCommitting$1 && nextRoot === root) ||
-          requestWork(root, root.expirationTime);
-        nestedUpdateCount > NESTED_UPDATE_LIMIT &&
-          invariant(
-            !1,
-            "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."
-          );
-      } else break;
-    fiber = fiber.return;
-  }
-}
-function recalculateCurrentTime() {
-  mostRecentCurrentTimeMs = now$1() - originalStartTimeMs;
-  return (mostRecentCurrentTime = ((mostRecentCurrentTimeMs / 10) | 0) + 2);
+function retrySuspendedRoot(root, fiber, suspendedTime) {
+  var retryTime = root.earliestSuspendedTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
+  if (
+    0 !== retryTime &&
+    suspendedTime >= retryTime &&
+    suspendedTime <= latestSuspendedTime
+  ) {
+    latestSuspendedTime = retryTime = suspendedTime;
+    root.didError = !1;
+    var latestPingedTime = root.latestPingedTime;
+    if (0 === latestPingedTime || latestPingedTime < latestSuspendedTime)
+      root.latestPingedTime = latestSuspendedTime;
+    findNextExpirationTimeToWorkOn(latestSuspendedTime, root);
+  } else
+    (retryTime = requestCurrentTime()),
+      (retryTime = computeExpirationForFiber(retryTime, fiber)),
+      markPendingPriorityLevel(root, retryTime);
+  0 !== (fiber.mode & 1) &&
+    root === nextRoot &&
+    nextRenderExpirationTime === suspendedTime &&
+    (nextRoot = null);
+  scheduleWorkToRoot(fiber, retryTime);
+  fiber = root.expirationTime;
+  0 !== fiber && requestWork(root, fiber);
+}
+function scheduleWorkToRoot(fiber, expirationTime) {
+  if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
+    fiber.expirationTime = expirationTime;
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    (0 === alternate.expirationTime ||
+      alternate.expirationTime > expirationTime) &&
+    (alternate.expirationTime = expirationTime);
+  var node = fiber.return,
+    root = null;
+  if (null === node && 5 === fiber.tag) root = fiber.stateNode;
+  else
+    for (; null !== node; ) {
+      alternate = node.alternate;
+      if (
+        0 === node.childExpirationTime ||
+        node.childExpirationTime > expirationTime
+      )
+        node.childExpirationTime = expirationTime;
+      null !== alternate &&
+        (0 === alternate.childExpirationTime ||
+          alternate.childExpirationTime > expirationTime) &&
+        (alternate.childExpirationTime = expirationTime);
+      if (null === node.return && 5 === node.tag) {
+        root = node.stateNode;
+        break;
+      }
+      node = node.return;
+    }
+  return null === root ? null : root;
 }
-function syncUpdates(fn, a, b, c, d) {
-  var previousExpirationContext = expirationContext;
-  expirationContext = 1;
-  try {
-    return fn(a, b, c, d);
-  } finally {
-    expirationContext = previousExpirationContext;
-  }
+function scheduleWork(fiber, expirationTime) {
+  fiber = scheduleWorkToRoot(fiber, expirationTime);
+  null !== fiber &&
+    (!isWorking &&
+      0 !== nextRenderExpirationTime &&
+      expirationTime < nextRenderExpirationTime &&
+      resetStack(),
+    markPendingPriorityLevel(fiber, expirationTime),
+    (isWorking && !isCommitting$1 && nextRoot === fiber) ||
+      requestWork(fiber, fiber.expirationTime),
+    nestedUpdateCount > NESTED_UPDATE_LIMIT &&
+      ((nestedUpdateCount = 0),
+      invariant(
+        !1,
+        "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 firstScheduledRoot = null,
   lastScheduledRoot = null,
@@ -4911,7 +5489,7 @@ var firstScheduledRoot = null,
   isRendering = !1,
   nextFlushedRoot = null,
   nextFlushedExpirationTime = 0,
-  lowestPendingInteractiveExpirationTime = 0,
+  lowestPriorityPendingInteractiveExpirationTime = 0,
   deadlineDidExpire = !1,
   hasUnhandledError = !1,
   unhandledError = null,
@@ -4920,38 +5498,68 @@ var firstScheduledRoot = null,
   isUnbatchingUpdates = !1,
   isBatchingInteractiveUpdates = !1,
   completedBatches = null,
-  NESTED_UPDATE_LIMIT = 1e3,
+  originalStartTimeMs = now$1(),
+  currentRendererTime = ((originalStartTimeMs / 10) | 0) + 2,
+  currentSchedulerTime = currentRendererTime,
+  NESTED_UPDATE_LIMIT = 50,
   nestedUpdateCount = 0,
+  lastCommittedRootDuringThisBatch = null,
   timeHeuristicForUnitOfWork = 1;
-function scheduleCallbackWithExpirationTime(expirationTime) {
+function recomputeCurrentRendererTime() {
+  currentRendererTime = (((now$1() - originalStartTimeMs) / 10) | 0) + 2;
+}
+function scheduleCallbackWithExpirationTime(root, expirationTime) {
   if (0 !== callbackExpirationTime) {
     if (expirationTime > callbackExpirationTime) return;
-    if (null !== callbackID) {
-      var callbackID$jscomp$0 = callbackID;
-      scheduledCallback = null;
-      clearTimeout(callbackID$jscomp$0);
-    }
+    null !== callbackID &&
+      ((root = callbackID), (scheduledCallback = null), clearTimeout(root));
   }
   callbackExpirationTime = expirationTime;
   now$1();
   scheduledCallback = performAsyncWork;
   callbackID = setTimeout(setTimeoutCallback, 1);
 }
-function onSuspend(root, suspendedExpirationTime, expirationTime, timeoutMs) {
-  0 <= timeoutMs &&
-    setTimeout(function() {
-      var latestSuspendedTime = root.latestSuspendedTime;
-      0 !== latestSuspendedTime &&
-        latestSuspendedTime <= suspendedExpirationTime &&
-        ((latestSuspendedTime = root.latestPingedTime),
-        0 === latestSuspendedTime ||
-          latestSuspendedTime < suspendedExpirationTime) &&
-        (root.latestPingedTime = suspendedExpirationTime);
-      findNextPendingPriorityLevel(root);
-      latestSuspendedTime = root.expirationTime;
-      0 !== latestSuspendedTime && requestWork(root, latestSuspendedTime);
-    }, timeoutMs);
-  root.expirationTime = expirationTime;
+function onSuspend(
+  root,
+  finishedWork,
+  suspendedExpirationTime,
+  rootExpirationTime,
+  msUntilTimeout
+) {
+  root.expirationTime = rootExpirationTime;
+  0 !== msUntilTimeout || shouldYield()
+    ? 0 < msUntilTimeout &&
+      (root.timeoutHandle = scheduleTimeout(
+        onTimeout.bind(null, root, finishedWork, suspendedExpirationTime),
+        msUntilTimeout
+      ))
+    : ((root.pendingCommitExpirationTime = suspendedExpirationTime),
+      (root.finishedWork = finishedWork));
+}
+function onTimeout(root, finishedWork, suspendedExpirationTime) {
+  root.pendingCommitExpirationTime = suspendedExpirationTime;
+  root.finishedWork = finishedWork;
+  recomputeCurrentRendererTime();
+  currentSchedulerTime = currentRendererTime;
+  invariant(
+    !isRendering,
+    "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
+  );
+  nextFlushedRoot = root;
+  nextFlushedExpirationTime = suspendedExpirationTime;
+  performWorkOnRoot(root, suspendedExpirationTime, !0);
+  performWork(1, null);
+}
+function requestCurrentTime() {
+  if (isRendering) return currentSchedulerTime;
+  findHighestPriorityRoot();
+  if (
+    0 === nextFlushedExpirationTime ||
+    1073741823 === nextFlushedExpirationTime
+  )
+    recomputeCurrentRendererTime(),
+      (currentSchedulerTime = currentRendererTime);
+  return currentSchedulerTime;
 }
 function requestWork(root, expirationTime) {
   if (null === root.nextScheduledRoot)
@@ -4974,10 +5582,10 @@ function requestWork(root, expirationTime) {
       ? isUnbatchingUpdates &&
         ((nextFlushedRoot = root),
         (nextFlushedExpirationTime = 1),
-        performWorkOnRoot(root, 1, !1))
+        performWorkOnRoot(root, 1, !0))
       : 1 === expirationTime
         ? performWork(1, null)
-        : scheduleCallbackWithExpirationTime(expirationTime));
+        : scheduleCallbackWithExpirationTime(root, expirationTime));
 }
 function findHighestPriorityRoot() {
   var highestPriorityWork = 0,
@@ -5019,20 +5627,26 @@ function findHighestPriorityRoot() {
           (highestPriorityWork = remainingExpirationTime),
             (highestPriorityRoot = root);
         if (root === lastScheduledRoot) break;
+        if (1 === highestPriorityWork) break;
         previousScheduledRoot = root;
         root = root.nextScheduledRoot;
       }
     }
-  previousScheduledRoot = nextFlushedRoot;
-  null !== previousScheduledRoot &&
-  previousScheduledRoot === highestPriorityRoot &&
-  1 === highestPriorityWork
-    ? nestedUpdateCount++
-    : (nestedUpdateCount = 0);
   nextFlushedRoot = highestPriorityRoot;
   nextFlushedExpirationTime = highestPriorityWork;
 }
 function performAsyncWork(dl) {
+  if (dl.didTimeout && null !== firstScheduledRoot) {
+    recomputeCurrentRendererTime();
+    var root = firstScheduledRoot;
+    do {
+      var expirationTime = root.expirationTime;
+      0 !== expirationTime &&
+        currentRendererTime >= expirationTime &&
+        (root.nextExpirationTimeToWorkOn = currentRendererTime);
+      root = root.nextScheduledRoot;
+    } while (root !== firstScheduledRoot);
+  }
   performWork(0, dl);
 }
 function performWork(minExpirationTime, dl) {
@@ -5040,18 +5654,23 @@ function performWork(minExpirationTime, dl) {
   findHighestPriorityRoot();
   if (null !== deadline)
     for (
-      ;
+      recomputeCurrentRendererTime(),
+        currentSchedulerTime = currentRendererTime;
       null !== nextFlushedRoot &&
       0 !== nextFlushedExpirationTime &&
       (0 === minExpirationTime ||
         minExpirationTime >= nextFlushedExpirationTime) &&
-      (!deadlineDidExpire ||
-        recalculateCurrentTime() >= nextFlushedExpirationTime);
+      (!deadlineDidExpire || currentRendererTime >= nextFlushedExpirationTime);
 
     )
-      recalculateCurrentTime(),
-        performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !0),
-        findHighestPriorityRoot();
+      performWorkOnRoot(
+        nextFlushedRoot,
+        nextFlushedExpirationTime,
+        currentRendererTime >= nextFlushedExpirationTime
+      ),
+        findHighestPriorityRoot(),
+        recomputeCurrentRendererTime(),
+        (currentSchedulerTime = currentRendererTime);
   else
     for (
       ;
@@ -5061,22 +5680,25 @@ function performWork(minExpirationTime, dl) {
         minExpirationTime >= nextFlushedExpirationTime);
 
     )
-      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !1),
+      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !0),
         findHighestPriorityRoot();
   null !== deadline && ((callbackExpirationTime = 0), (callbackID = null));
   0 !== nextFlushedExpirationTime &&
-    scheduleCallbackWithExpirationTime(nextFlushedExpirationTime);
+    scheduleCallbackWithExpirationTime(
+      nextFlushedRoot,
+      nextFlushedExpirationTime
+    );
   deadline = null;
   deadlineDidExpire = !1;
-  finishRendering();
-}
-function finishRendering() {
   nestedUpdateCount = 0;
-  if (null !== completedBatches) {
-    var batches = completedBatches;
-    completedBatches = null;
-    for (var i = 0; i < batches.length; i++) {
-      var batch = batches[i];
+  lastCommittedRootDuringThisBatch = null;
+  if (null !== completedBatches)
+    for (
+      minExpirationTime = completedBatches, completedBatches = null, dl = 0;
+      dl < minExpirationTime.length;
+      dl++
+    ) {
+      var batch = minExpirationTime[dl];
       try {
         batch._onComplete();
       } catch (error) {
@@ -5084,37 +5706,44 @@ function finishRendering() {
           ((hasUnhandledError = !0), (unhandledError = error));
       }
     }
-  }
   if (hasUnhandledError)
-    throw ((batches = unhandledError),
+    throw ((minExpirationTime = unhandledError),
     (unhandledError = null),
     (hasUnhandledError = !1),
-    batches);
+    minExpirationTime);
 }
-function performWorkOnRoot(root, expirationTime, isYieldy) {
+function performWorkOnRoot(root, expirationTime, isExpired) {
   invariant(
     !isRendering,
     "performWorkOnRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
   );
   isRendering = !0;
-  isYieldy
-    ? ((isYieldy = root.finishedWork),
-      null !== isYieldy
-        ? completeRoot(root, isYieldy, expirationTime)
+  if (null === deadline || isExpired) {
+    var finishedWork = root.finishedWork;
+    null !== finishedWork
+      ? completeRoot(root, finishedWork, expirationTime)
+      : ((root.finishedWork = null),
+        (finishedWork = root.timeoutHandle),
+        -1 !== finishedWork &&
+          ((root.timeoutHandle = -1), cancelTimeout(finishedWork)),
+        renderRoot(root, !1, isExpired),
+        (finishedWork = root.finishedWork),
+        null !== finishedWork &&
+          completeRoot(root, finishedWork, expirationTime));
+  } else
+    (finishedWork = root.finishedWork),
+      null !== finishedWork
+        ? completeRoot(root, finishedWork, expirationTime)
         : ((root.finishedWork = null),
-          renderRoot(root, !0),
-          (isYieldy = root.finishedWork),
-          null !== isYieldy &&
+          (finishedWork = root.timeoutHandle),
+          -1 !== finishedWork &&
+            ((root.timeoutHandle = -1), cancelTimeout(finishedWork)),
+          renderRoot(root, !0, isExpired),
+          (finishedWork = root.finishedWork),
+          null !== finishedWork &&
             (shouldYield()
-              ? (root.finishedWork = isYieldy)
-              : completeRoot(root, isYieldy, expirationTime))))
-    : ((isYieldy = root.finishedWork),
-      null !== isYieldy
-        ? completeRoot(root, isYieldy, expirationTime)
-        : ((root.finishedWork = null),
-          renderRoot(root, !1),
-          (isYieldy = root.finishedWork),
-          null !== isYieldy && completeRoot(root, isYieldy, expirationTime)));
+              ? (root.finishedWork = finishedWork)
+              : completeRoot(root, finishedWork, expirationTime)));
   isRendering = !1;
 }
 function completeRoot(root, finishedWork$jscomp$0, expirationTime) {
@@ -5132,6 +5761,9 @@ function completeRoot(root, finishedWork$jscomp$0, expirationTime) {
     return;
   }
   root.finishedWork = null;
+  root === lastCommittedRootDuringThisBatch
+    ? nestedUpdateCount++
+    : ((lastCommittedRootDuringThisBatch = root), (nestedUpdateCount = 0));
   isCommitting$1 = isWorking = !0;
   invariant(
     root.current !== finishedWork$jscomp$0,
@@ -5144,34 +5776,39 @@ function completeRoot(root, finishedWork$jscomp$0, expirationTime) {
   );
   root.pendingCommitExpirationTime = 0;
   firstBatch = finishedWork$jscomp$0.expirationTime;
-  recalculateCurrentTime();
+  var childExpirationTimeBeforeCommit =
+    finishedWork$jscomp$0.childExpirationTime;
+  firstBatch =
+    0 === firstBatch ||
+    (0 !== childExpirationTimeBeforeCommit &&
+      childExpirationTimeBeforeCommit < firstBatch)
+      ? childExpirationTimeBeforeCommit
+      : firstBatch;
   root.didError = !1;
-  if (0 === firstBatch)
-    (root.earliestPendingTime = 0),
+  0 === firstBatch
+    ? ((root.earliestPendingTime = 0),
       (root.latestPendingTime = 0),
       (root.earliestSuspendedTime = 0),
       (root.latestSuspendedTime = 0),
-      (root.latestPingedTime = 0);
-  else {
-    var latestPendingTime = root.latestPendingTime;
-    0 !== latestPendingTime &&
-      (latestPendingTime < firstBatch
-        ? (root.earliestPendingTime = root.latestPendingTime = 0)
-        : root.earliestPendingTime < firstBatch &&
-          (root.earliestPendingTime = root.latestPendingTime));
-    latestPendingTime = root.earliestSuspendedTime;
-    0 === latestPendingTime
-      ? markPendingPriorityLevel(root, firstBatch)
-      : firstBatch > root.latestSuspendedTime
-        ? ((root.earliestSuspendedTime = 0),
-          (root.latestSuspendedTime = 0),
-          (root.latestPingedTime = 0),
-          markPendingPriorityLevel(root, firstBatch))
-        : firstBatch < latestPendingTime &&
-          markPendingPriorityLevel(root, firstBatch);
-  }
-  findNextPendingPriorityLevel(root);
-  ReactCurrentOwner.current = null;
+      (root.latestPingedTime = 0))
+    : ((childExpirationTimeBeforeCommit = root.latestPendingTime),
+      0 !== childExpirationTimeBeforeCommit &&
+        (childExpirationTimeBeforeCommit < firstBatch
+          ? (root.earliestPendingTime = root.latestPendingTime = 0)
+          : root.earliestPendingTime < firstBatch &&
+            (root.earliestPendingTime = root.latestPendingTime)),
+      (childExpirationTimeBeforeCommit = root.earliestSuspendedTime),
+      0 === childExpirationTimeBeforeCommit
+        ? markPendingPriorityLevel(root, firstBatch)
+        : firstBatch > root.latestSuspendedTime
+          ? ((root.earliestSuspendedTime = 0),
+            (root.latestSuspendedTime = 0),
+            (root.latestPingedTime = 0),
+            markPendingPriorityLevel(root, firstBatch))
+          : firstBatch < childExpirationTimeBeforeCommit &&
+            markPendingPriorityLevel(root, firstBatch));
+  findNextExpirationTimeToWorkOn(0, root);
+  ReactCurrentOwner$2.current = null;
   1 < finishedWork$jscomp$0.effectTag
     ? null !== finishedWork$jscomp$0.lastEffect
       ? ((finishedWork$jscomp$0.lastEffect.nextEffect = finishedWork$jscomp$0),
@@ -5179,46 +5816,49 @@ function completeRoot(root, finishedWork$jscomp$0, expirationTime) {
       : (firstBatch = finishedWork$jscomp$0)
     : (firstBatch = finishedWork$jscomp$0.firstEffect);
   for (nextEffect = firstBatch; null !== nextEffect; ) {
-    latestPendingTime = !1;
+    childExpirationTimeBeforeCommit = !1;
     var error = void 0;
     try {
       for (; null !== nextEffect; ) {
         if (nextEffect.effectTag & 256) {
-          var current = nextEffect.alternate,
-            finishedWork = nextEffect;
-          switch (finishedWork.tag) {
-            case 2:
-              if (finishedWork.effectTag & 256 && null !== current) {
-                var prevProps = current.memoizedProps,
-                  prevState = current.memoizedState,
-                  instance = finishedWork.stateNode;
-                instance.props = finishedWork.memoizedProps;
-                instance.state = finishedWork.memoizedState;
-                var snapshot = instance.getSnapshotBeforeUpdate(
-                  prevProps,
-                  prevState
+          var current$$1 = nextEffect.alternate;
+          a: {
+            var finishedWork = nextEffect;
+            switch (finishedWork.tag) {
+              case 2:
+              case 3:
+                if (finishedWork.effectTag & 256 && null !== current$$1) {
+                  var prevProps = current$$1.memoizedProps,
+                    prevState = current$$1.memoizedState,
+                    instance = finishedWork.stateNode;
+                  instance.props = finishedWork.memoizedProps;
+                  instance.state = finishedWork.memoizedState;
+                  var snapshot = instance.getSnapshotBeforeUpdate(
+                    prevProps,
+                    prevState
+                  );
+                  instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+                }
+                break a;
+              case 5:
+              case 7:
+              case 8:
+              case 6:
+                break a;
+              default:
+                invariant(
+                  !1,
+                  "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
                 );
-                instance.__reactInternalSnapshotBeforeUpdate = snapshot;
-              }
-              break;
-            case 3:
-            case 5:
-            case 6:
-            case 4:
-              break;
-            default:
-              invariant(
-                !1,
-                "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-              );
+            }
           }
         }
         nextEffect = nextEffect.nextEffect;
       }
     } catch (e) {
-      (latestPendingTime = !0), (error = e);
+      (childExpirationTimeBeforeCommit = !0), (error = e);
     }
-    latestPendingTime &&
+    childExpirationTimeBeforeCommit &&
       (invariant(
         null !== nextEffect,
         "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
@@ -5227,15 +5867,15 @@ function completeRoot(root, finishedWork$jscomp$0, expirationTime) {
       null !== nextEffect && (nextEffect = nextEffect.nextEffect));
   }
   for (nextEffect = firstBatch; null !== nextEffect; ) {
-    current = !1;
+    current$$1 = !1;
     prevProps = void 0;
     try {
       for (; null !== nextEffect; ) {
         var effectTag = nextEffect.effectTag;
         if (effectTag & 128) {
-          var current$jscomp$0 = nextEffect.alternate;
-          if (null !== current$jscomp$0) {
-            var currentRef = current$jscomp$0.ref;
+          var current$$1$jscomp$0 = nextEffect.alternate;
+          if (null !== current$$1$jscomp$0) {
+            var currentRef = current$$1$jscomp$0.ref;
             null !== currentRef &&
               ("function" === typeof currentRef
                 ? currentRef(null)
@@ -5267,9 +5907,9 @@ function completeRoot(root, finishedWork$jscomp$0, expirationTime) {
         nextEffect = nextEffect.nextEffect;
       }
     } catch (e) {
-      (current = !0), (prevProps = e);
+      (current$$1 = !0), (prevProps = e);
     }
-    current &&
+    current$$1 &&
       (invariant(
         null !== nextEffect,
         "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
@@ -5280,68 +5920,82 @@ function completeRoot(root, finishedWork$jscomp$0, expirationTime) {
   root.current = finishedWork$jscomp$0;
   for (nextEffect = firstBatch; null !== nextEffect; ) {
     effectTag = !1;
-    current$jscomp$0 = void 0;
+    current$$1$jscomp$0 = void 0;
     try {
       for (currentRef = expirationTime; null !== nextEffect; ) {
         var effectTag$jscomp$0 = nextEffect.effectTag;
         if (effectTag$jscomp$0 & 36) {
-          var current$jscomp$1 = nextEffect.alternate;
-          current = nextEffect;
+          var current$$1$jscomp$1 = nextEffect.alternate;
+          current$$1 = nextEffect;
           prevProps = currentRef;
-          switch (current.tag) {
+          switch (current$$1.tag) {
             case 2:
-              var instance$jscomp$0 = current.stateNode;
-              if (current.effectTag & 4)
-                if (null === current$jscomp$1)
-                  (instance$jscomp$0.props = current.memoizedProps),
-                    (instance$jscomp$0.state = current.memoizedState),
+            case 3:
+              var instance$jscomp$0 = current$$1.stateNode;
+              if (current$$1.effectTag & 4)
+                if (null === current$$1$jscomp$1)
+                  (instance$jscomp$0.props = current$$1.memoizedProps),
+                    (instance$jscomp$0.state = current$$1.memoizedState),
                     instance$jscomp$0.componentDidMount();
                 else {
-                  var prevProps$jscomp$0 = current$jscomp$1.memoizedProps,
-                    prevState$jscomp$0 = current$jscomp$1.memoizedState;
-                  instance$jscomp$0.props = current.memoizedProps;
-                  instance$jscomp$0.state = current.memoizedState;
+                  var prevProps$jscomp$0 = current$$1$jscomp$1.memoizedProps,
+                    prevState$jscomp$0 = current$$1$jscomp$1.memoizedState;
+                  instance$jscomp$0.props = current$$1.memoizedProps;
+                  instance$jscomp$0.state = current$$1.memoizedState;
                   instance$jscomp$0.componentDidUpdate(
                     prevProps$jscomp$0,
                     prevState$jscomp$0,
                     instance$jscomp$0.__reactInternalSnapshotBeforeUpdate
                   );
                 }
-              var updateQueue = current.updateQueue;
+              var updateQueue = current$$1.updateQueue;
               null !== updateQueue &&
-                ((instance$jscomp$0.props = current.memoizedProps),
-                (instance$jscomp$0.state = current.memoizedState),
+                ((instance$jscomp$0.props = current$$1.memoizedProps),
+                (instance$jscomp$0.state = current$$1.memoizedState),
                 commitUpdateQueue(
-                  current,
+                  current$$1,
                   updateQueue,
                   instance$jscomp$0,
                   prevProps
                 ));
               break;
-            case 3:
-              var _updateQueue = current.updateQueue;
+            case 5:
+              var _updateQueue = current$$1.updateQueue;
               if (null !== _updateQueue) {
                 prevState = null;
-                if (null !== current.child)
-                  switch (current.child.tag) {
-                    case 5:
-                      prevState = current.child.stateNode;
+                if (null !== current$$1.child)
+                  switch (current$$1.child.tag) {
+                    case 7:
+                      prevState = current$$1.child.stateNode;
                       break;
                     case 2:
-                      prevState = current.child.stateNode;
+                    case 3:
+                      prevState = current$$1.child.stateNode;
                   }
-                commitUpdateQueue(current, _updateQueue, prevState, prevProps);
+                commitUpdateQueue(
+                  current$$1,
+                  _updateQueue,
+                  prevState,
+                  prevProps
+                );
               }
               break;
-            case 5:
+            case 7:
               break;
-            case 6:
+            case 8:
               break;
-            case 4:
+            case 6:
               break;
             case 15:
               break;
             case 16:
+              if (0 === (current$$1.mode & 2))
+                (current$$1.updateQueue = emptyObject$1),
+                  scheduleWork(current$$1, 1);
+              else {
+                var currentTime = requestCurrentTime();
+                current$$1.stateNode = { timedOutAt: currentTime };
+              }
               break;
             default:
               invariant(
@@ -5351,18 +6005,19 @@ function completeRoot(root, finishedWork$jscomp$0, expirationTime) {
           }
         }
         if (effectTag$jscomp$0 & 128) {
-          current = void 0;
           var ref = nextEffect.ref;
           if (null !== ref) {
             var instance$jscomp$1 = nextEffect.stateNode;
             switch (nextEffect.tag) {
-              case 5:
-                current = instance$jscomp$1;
+              case 7:
+                var instanceToUse = instance$jscomp$1;
                 break;
               default:
-                current = instance$jscomp$1;
+                instanceToUse = instance$jscomp$1;
             }
-            "function" === typeof ref ? ref(current) : (ref.current = current);
+            "function" === typeof ref
+              ? ref(instanceToUse)
+              : (ref.current = instanceToUse);
           }
         }
         var next = nextEffect.nextEffect;
@@ -5370,31 +6025,37 @@ function completeRoot(root, finishedWork$jscomp$0, expirationTime) {
         nextEffect = next;
       }
     } catch (e) {
-      (effectTag = !0), (current$jscomp$0 = e);
+      (effectTag = !0), (current$$1$jscomp$0 = e);
     }
     effectTag &&
       (invariant(
         null !== nextEffect,
         "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
       ),
-      captureCommitPhaseError(nextEffect, current$jscomp$0),
+      captureCommitPhaseError(nextEffect, current$$1$jscomp$0),
       null !== nextEffect && (nextEffect = nextEffect.nextEffect));
   }
   isWorking = isCommitting$1 = !1;
-  "function" === typeof onCommitRoot &&
-    onCommitRoot(finishedWork$jscomp$0.stateNode);
-  finishedWork$jscomp$0 = root.expirationTime;
+  "function" === typeof onCommitFiberRoot &&
+    onCommitFiberRoot(finishedWork$jscomp$0.stateNode);
+  effectTag$jscomp$0 = finishedWork$jscomp$0.expirationTime;
+  finishedWork$jscomp$0 = finishedWork$jscomp$0.childExpirationTime;
+  finishedWork$jscomp$0 =
+    0 === effectTag$jscomp$0 ||
+    (0 !== finishedWork$jscomp$0 && finishedWork$jscomp$0 < effectTag$jscomp$0)
+      ? finishedWork$jscomp$0
+      : effectTag$jscomp$0;
   0 === finishedWork$jscomp$0 &&
     (legacyErrorBoundariesThatAlreadyFailed = null);
   root.expirationTime = finishedWork$jscomp$0;
   root.finishedWork = null;
 }
 function shouldYield() {
-  return null === deadline ||
-    deadlineDidExpire ||
-    deadline.timeRemaining() > timeHeuristicForUnitOfWork
-    ? !1
-    : (deadlineDidExpire = !0);
+  return deadlineDidExpire
+    ? !0
+    : null === deadline || deadline.timeRemaining() > timeHeuristicForUnitOfWork
+      ? !1
+      : (deadlineDidExpire = !0);
 }
 function onUncaughtError(error) {
   invariant(
@@ -5404,51 +6065,54 @@ function onUncaughtError(error) {
   nextFlushedRoot.expirationTime = 0;
   hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
 }
-function updateContainerAtExpirationTime(
-  element,
-  container,
-  parentComponent,
-  expirationTime,
-  callback
-) {
-  var current = container.current;
-  if (parentComponent) {
-    parentComponent = parentComponent._reactInternalFiber;
-    var parentContext;
-    b: {
-      invariant(
-        2 === isFiberMountedImpl(parentComponent) && 2 === parentComponent.tag,
-        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-      );
-      for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
-        if (isContextProvider(parentContext)) {
-          parentContext =
-            parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
-          break b;
-        }
-        parentContext = parentContext.return;
-        invariant(
-          parentContext,
-          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-        );
+function getContextForSubtree(parentComponent) {
+  if (!parentComponent) return emptyContextObject;
+  parentComponent = parentComponent._reactInternalFiber;
+  a: {
+    invariant(
+      2 === isFiberMountedImpl(parentComponent) &&
+        (2 === parentComponent.tag || 3 === parentComponent.tag),
+      "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+    );
+    var parentContext = parentComponent;
+    do {
+      switch (parentContext.tag) {
+        case 5:
+          parentContext = parentContext.stateNode.context;
+          break a;
+        case 2:
+          if (isContextProvider(parentContext.type)) {
+            parentContext =
+              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
+            break a;
+          }
+          break;
+        case 3:
+          if (isContextProvider(parentContext.type._reactResult)) {
+            parentContext =
+              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
+            break a;
+          }
       }
-      parentContext = parentContext.stateNode.context;
-    }
-    parentComponent = isContextProvider(parentComponent)
-      ? processChildContext(parentComponent, parentContext)
-      : parentContext;
-  } else parentComponent = emptyObject;
-  null === container.context
-    ? (container.context = parentComponent)
-    : (container.pendingContext = parentComponent);
-  container = callback;
-  callback = createUpdate(expirationTime);
-  callback.payload = { element: element };
-  container = void 0 === container ? null : container;
-  null !== container && (callback.callback = container);
-  enqueueUpdate(current, callback, expirationTime);
-  scheduleWork(current, expirationTime);
-  return expirationTime;
+      parentContext = parentContext.return;
+    } while (null !== parentContext);
+    invariant(
+      !1,
+      "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+    );
+    parentContext = void 0;
+  }
+  if (2 === parentComponent.tag) {
+    var Component = parentComponent.type;
+    if (isContextProvider(Component))
+      return processChildContext(parentComponent, Component, parentContext);
+  } else if (
+    3 === parentComponent.tag &&
+    ((Component = parentComponent.type._reactResult),
+    isContextProvider(Component))
+  )
+    return processChildContext(parentComponent, Component, parentContext);
+  return parentContext;
 }
 function findHostInstance$1(component) {
   var fiber = component._reactInternalFiber;
@@ -5464,158 +6128,23 @@ function findHostInstance$1(component) {
   return null === component ? null : component.stateNode;
 }
 function updateContainer(element, container, parentComponent, callback) {
-  var current = container.current,
-    currentTime = recalculateCurrentTime();
-  current = computeExpirationForFiber(currentTime, current);
-  return updateContainerAtExpirationTime(
-    element,
-    container,
-    parentComponent,
-    current,
-    callback
-  );
-}
-function getPublicRootInstance(container) {
-  container = container.current;
-  if (!container.child) return null;
-  switch (container.child.tag) {
-    case 5:
-      return container.child.stateNode;
-    default:
-      return container.child.stateNode;
-  }
-}
-function injectIntoDevTools(devToolsConfig) {
-  var findFiberByHostInstance = devToolsConfig.findFiberByHostInstance;
-  return injectInternals(
-    Object.assign({}, devToolsConfig, {
-      findHostInstanceByFiber: function(fiber) {
-        fiber = findCurrentHostFiber(fiber);
-        return null === fiber ? null : fiber.stateNode;
-      },
-      findFiberByHostInstance: function(instance) {
-        return findFiberByHostInstance
-          ? findFiberByHostInstance(instance)
-          : null;
-      }
-    })
-  );
+  var current$$1 = container.current,
+    currentTime = requestCurrentTime();
+  current$$1 = computeExpirationForFiber(currentTime, current$$1);
+  currentTime = container.current;
+  parentComponent = getContextForSubtree(parentComponent);
+  null === container.context
+    ? (container.context = parentComponent)
+    : (container.pendingContext = parentComponent);
+  container = callback;
+  callback = createUpdate(current$$1);
+  callback.payload = { element: element };
+  container = void 0 === container ? null : container;
+  null !== container && (callback.callback = container);
+  enqueueUpdate(currentTime, callback);
+  scheduleWork(currentTime, current$$1);
+  return current$$1;
 }
-var ReactNativeFiberRenderer = {
-  updateContainerAtExpirationTime: updateContainerAtExpirationTime,
-  createContainer: function(containerInfo, isAsync, hydrate) {
-    return createFiberRoot(containerInfo, isAsync, hydrate);
-  },
-  updateContainer: updateContainer,
-  flushRoot: function(root, expirationTime) {
-    invariant(
-      !isRendering,
-      "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
-    );
-    nextFlushedRoot = root;
-    nextFlushedExpirationTime = expirationTime;
-    performWorkOnRoot(root, expirationTime, !1);
-    performWork(1, null);
-    finishRendering();
-  },
-  requestWork: requestWork,
-  computeUniqueAsyncExpiration: function() {
-    var result =
-      2 + 25 * ((((recalculateCurrentTime() - 2 + 500) / 25) | 0) + 1);
-    result <= lastUniqueAsyncExpiration &&
-      (result = lastUniqueAsyncExpiration + 1);
-    return (lastUniqueAsyncExpiration = result);
-  },
-  batchedUpdates: function(fn, a) {
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      return fn(a);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates) ||
-        isRendering ||
-        performWork(1, null);
-    }
-  },
-  unbatchedUpdates: function(fn, a) {
-    if (isBatchingUpdates && !isUnbatchingUpdates) {
-      isUnbatchingUpdates = !0;
-      try {
-        return fn(a);
-      } finally {
-        isUnbatchingUpdates = !1;
-      }
-    }
-    return fn(a);
-  },
-  deferredUpdates: function(fn) {
-    var previousExpirationContext = expirationContext;
-    expirationContext =
-      2 + 25 * ((((recalculateCurrentTime() - 2 + 500) / 25) | 0) + 1);
-    try {
-      return fn();
-    } finally {
-      expirationContext = previousExpirationContext;
-    }
-  },
-  syncUpdates: syncUpdates,
-  interactiveUpdates: function(fn, a, b) {
-    if (isBatchingInteractiveUpdates) return fn(a, b);
-    isBatchingUpdates ||
-      isRendering ||
-      0 === lowestPendingInteractiveExpirationTime ||
-      (performWork(lowestPendingInteractiveExpirationTime, null),
-      (lowestPendingInteractiveExpirationTime = 0));
-    var previousIsBatchingInteractiveUpdates = isBatchingInteractiveUpdates,
-      previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = isBatchingInteractiveUpdates = !0;
-    try {
-      return fn(a, b);
-    } finally {
-      (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
-        (isBatchingUpdates = previousIsBatchingUpdates) ||
-          isRendering ||
-          performWork(1, null);
-    }
-  },
-  flushInteractiveUpdates: function() {
-    isRendering ||
-      0 === lowestPendingInteractiveExpirationTime ||
-      (performWork(lowestPendingInteractiveExpirationTime, null),
-      (lowestPendingInteractiveExpirationTime = 0));
-  },
-  flushControlled: function(fn) {
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      syncUpdates(fn);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates) ||
-        isRendering ||
-        performWork(1, null);
-    }
-  },
-  flushSync: function(fn, a) {
-    invariant(
-      !isRendering,
-      "flushSync was called from inside a lifecycle method. It cannot be called when React is already rendering."
-    );
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      return syncUpdates(fn, a);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates), performWork(1, null);
-    }
-  },
-  getPublicRootInstance: getPublicRootInstance,
-  findHostInstance: findHostInstance$1,
-  findHostInstanceWithNoPortals: function(fiber) {
-    fiber = findCurrentHostFiberWithNoPortals(fiber);
-    return null === fiber ? null : fiber.stateNode;
-  },
-  injectIntoDevTools: injectIntoDevTools
-};
 function createPortal(children, containerInfo, implementation) {
   var key =
     3 < arguments.length && void 0 !== arguments[3] ? arguments[3] : null;
@@ -5663,8 +6192,23 @@ function findNodeHandle(componentOrHandle) {
       ? componentOrHandle.canonical._nativeTag
       : componentOrHandle._nativeTag;
 }
-_batchedUpdates = ReactNativeFiberRenderer.batchedUpdates;
-_flushInteractiveUpdates = ReactNativeFiberRenderer.flushInteractiveUpdates;
+_batchedUpdatesImpl = function(fn, a) {
+  var previousIsBatchingUpdates = isBatchingUpdates;
+  isBatchingUpdates = !0;
+  try {
+    return fn(a);
+  } finally {
+    (isBatchingUpdates = previousIsBatchingUpdates) ||
+      isRendering ||
+      performWork(1, null);
+  }
+};
+_flushInteractiveUpdatesImpl = function() {
+  isRendering ||
+    0 === lowestPriorityPendingInteractiveExpirationTime ||
+    (performWork(lowestPriorityPendingInteractiveExpirationTime, null),
+    (lowestPriorityPendingInteractiveExpirationTime = 0));
+};
 var roots = new Map(),
   ReactNativeRenderer = {
     NativeComponent: (function(findNodeHandle, findHostInstance) {
@@ -5692,13 +6236,13 @@ var roots = new Map(),
         ReactNativeComponent.prototype.measure = function(callback) {
           UIManager.measure(
             findNodeHandle(this),
-            mountSafeCallback(this, callback)
+            mountSafeCallback_NOT_REALLY_SAFE(this, callback)
           );
         };
         ReactNativeComponent.prototype.measureInWindow = function(callback) {
           UIManager.measureInWindow(
             findNodeHandle(this),
-            mountSafeCallback(this, callback)
+            mountSafeCallback_NOT_REALLY_SAFE(this, callback)
           );
         };
         ReactNativeComponent.prototype.measureLayout = function(
@@ -5709,8 +6253,8 @@ var roots = new Map(),
           UIManager.measureLayout(
             findNodeHandle(this),
             relativeToNativeNode,
-            mountSafeCallback(this, onFail),
-            mountSafeCallback(this, onSuccess)
+            mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+            mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
           );
         };
         ReactNativeComponent.prototype.setNativeProps = function(nativeProps) {
@@ -5723,7 +6267,7 @@ var roots = new Map(),
               maybeInstance.viewConfig || maybeInstance.canonical.viewConfig;
             nativeProps = diffProperties(
               null,
-              emptyObject$1,
+              emptyObject,
               nativeProps,
               viewConfig.validAttributes
             );
@@ -5741,11 +6285,43 @@ var roots = new Map(),
     findNodeHandle: findNodeHandle,
     render: function(element, containerTag, callback) {
       var root = roots.get(containerTag);
-      root ||
-        ((root = createFiberRoot(containerTag, !1, !1)),
-        roots.set(containerTag, root));
+      if (!root) {
+        root = new FiberNode(5, null, null, 0);
+        var root$jscomp$0 = {
+          current: root,
+          containerInfo: containerTag,
+          pendingChildren: null,
+          earliestPendingTime: 0,
+          latestPendingTime: 0,
+          earliestSuspendedTime: 0,
+          latestSuspendedTime: 0,
+          latestPingedTime: 0,
+          didError: !1,
+          pendingCommitExpirationTime: 0,
+          finishedWork: null,
+          timeoutHandle: -1,
+          context: null,
+          pendingContext: null,
+          hydrate: !1,
+          nextExpirationTimeToWorkOn: 0,
+          expirationTime: 0,
+          firstBatch: null,
+          nextScheduledRoot: null
+        };
+        root = root.stateNode = root$jscomp$0;
+        roots.set(containerTag, root);
+      }
       updateContainer(element, root, null, callback);
-      return getPublicRootInstance(root);
+      a: if (((element = root.current), element.child))
+        switch (element.child.tag) {
+          case 7:
+            element = element.child.stateNode;
+            break a;
+          default:
+            element = element.child.stateNode;
+        }
+      else element = null;
+      return element;
     },
     unmountComponentAtNode: function(containerTag) {
       var root = roots.get(containerTag);
@@ -5773,21 +6349,21 @@ var roots = new Map(),
           measure: function(callback) {
             UIManager.measure(
               findNodeHandle(this),
-              mountSafeCallback(this, callback)
+              mountSafeCallback_NOT_REALLY_SAFE(this, callback)
             );
           },
           measureInWindow: function(callback) {
             UIManager.measureInWindow(
               findNodeHandle(this),
-              mountSafeCallback(this, callback)
+              mountSafeCallback_NOT_REALLY_SAFE(this, callback)
             );
           },
           measureLayout: function(relativeToNativeNode, onSuccess, onFail) {
             UIManager.measureLayout(
               findNodeHandle(this),
               relativeToNativeNode,
-              mountSafeCallback(this, onFail),
-              mountSafeCallback(this, onSuccess)
+              mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+              mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
             );
           },
           setNativeProps: function(nativeProps) {
@@ -5799,7 +6375,7 @@ var roots = new Map(),
               var viewConfig = maybeInstance.viewConfig;
               nativeProps = diffProperties(
                 null,
-                emptyObject$1,
+                emptyObject,
                 nativeProps,
                 viewConfig.validAttributes
               );
@@ -5821,21 +6397,34 @@ var roots = new Map(),
       })(findNodeHandle, findHostInstance$1),
       computeComponentStackForErrorReporting: function(reactTag) {
         return (reactTag = getInstanceFromTag(reactTag))
-          ? getStackAddendumByWorkInProgressFiber(reactTag)
+          ? getStackByFiberInDevAndProd(reactTag)
           : "";
       }
     }
   };
-injectIntoDevTools({
+(function(devToolsConfig) {
+  var findFiberByHostInstance = devToolsConfig.findFiberByHostInstance;
+  return injectInternals(
+    Object.assign({}, devToolsConfig, {
+      findHostInstanceByFiber: function(fiber) {
+        fiber = findCurrentHostFiber(fiber);
+        return null === fiber ? null : fiber.stateNode;
+      },
+      findFiberByHostInstance: function(instance) {
+        return findFiberByHostInstance
+          ? findFiberByHostInstance(instance)
+          : null;
+      }
+    })
+  );
+})({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.4.1",
+  version: "16.6.0-alpha.8af6728",
   rendererPackageName: "react-native-renderer"
 });
 var ReactNativeRenderer$2 = { default: ReactNativeRenderer },
   ReactNativeRenderer$3 =
     (ReactNativeRenderer$2 && ReactNativeRenderer) || ReactNativeRenderer$2;
-module.exports = ReactNativeRenderer$3.default
-  ? ReactNativeRenderer$3.default
-  : ReactNativeRenderer$3;
+module.exports = ReactNativeRenderer$3.default || ReactNativeRenderer$3;
diff --git a/Libraries/Renderer/oss/ReactNativeRenderer-profiling.js b/Libraries/Renderer/oss/ReactNativeRenderer-profiling.js
index 1e2d9749c9e59a..3a9645d82e6bb4 100644
--- a/Libraries/Renderer/oss/ReactNativeRenderer-profiling.js
+++ b/Libraries/Renderer/oss/ReactNativeRenderer-profiling.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,78 +12,83 @@
 
 "use strict";
 require("InitializeCore");
-var invariant = require("fbjs/lib/invariant"),
-  ReactNativeViewConfigRegistry = require("ReactNativeViewConfigRegistry"),
+var ReactNativeViewConfigRegistry = require("ReactNativeViewConfigRegistry"),
   UIManager = require("UIManager"),
   RCTEventEmitter = require("RCTEventEmitter"),
   React = require("react"),
-  emptyObject = require("fbjs/lib/emptyObject"),
   deepDiffer = require("deepDiffer"),
   flattenStyle = require("flattenStyle"),
   TextInputState = require("TextInputState"),
+  tracing = require("scheduler/tracing"),
   ExceptionsManager = require("ExceptionsManager");
-function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
-  this._hasCaughtError = !1;
-  this._caughtError = null;
+function invariant(condition, format, a, b, c, d, e, f) {
+  if (!condition) {
+    condition = void 0;
+    if (void 0 === format)
+      condition = Error(
+        "Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings."
+      );
+    else {
+      var args = [a, b, c, d, e, f],
+        argIndex = 0;
+      condition = Error(
+        format.replace(/%s/g, function() {
+          return args[argIndex++];
+        })
+      );
+      condition.name = "Invariant Violation";
+    }
+    condition.framesToPop = 1;
+    throw condition;
+  }
+}
+function invokeGuardedCallbackImpl(name, func, context, a, b, c, d, e, f) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
   try {
     func.apply(context, funcArgs);
   } catch (error) {
-    (this._caughtError = error), (this._hasCaughtError = !0);
+    this.onError(error);
   }
 }
-var ReactErrorUtils = {
-  _caughtError: null,
-  _hasCaughtError: !1,
-  _rethrowError: null,
-  _hasRethrowError: !1,
-  invokeGuardedCallback: function(name, func, context, a, b, c, d, e, f) {
-    invokeGuardedCallback.apply(ReactErrorUtils, arguments);
-  },
-  invokeGuardedCallbackAndCatchFirstError: function(
-    name,
-    func,
-    context,
-    a,
-    b,
-    c,
-    d,
-    e,
-    f
-  ) {
-    ReactErrorUtils.invokeGuardedCallback.apply(this, arguments);
-    if (ReactErrorUtils.hasCaughtError()) {
-      var error = ReactErrorUtils.clearCaughtError();
-      ReactErrorUtils._hasRethrowError ||
-        ((ReactErrorUtils._hasRethrowError = !0),
-        (ReactErrorUtils._rethrowError = error));
-    }
-  },
-  rethrowCaughtError: function() {
-    return rethrowCaughtError.apply(ReactErrorUtils, arguments);
-  },
-  hasCaughtError: function() {
-    return ReactErrorUtils._hasCaughtError;
-  },
-  clearCaughtError: function() {
-    if (ReactErrorUtils._hasCaughtError) {
-      var error = ReactErrorUtils._caughtError;
-      ReactErrorUtils._caughtError = null;
-      ReactErrorUtils._hasCaughtError = !1;
-      return error;
+var hasError = !1,
+  caughtError = null,
+  hasRethrowError = !1,
+  rethrowError = null,
+  reporter = {
+    onError: function(error) {
+      hasError = !0;
+      caughtError = error;
     }
-    invariant(
-      !1,
-      "clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue."
-    );
-  }
-};
-function rethrowCaughtError() {
-  if (ReactErrorUtils._hasRethrowError) {
-    var error = ReactErrorUtils._rethrowError;
-    ReactErrorUtils._rethrowError = null;
-    ReactErrorUtils._hasRethrowError = !1;
-    throw error;
+  };
+function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
+  hasError = !1;
+  caughtError = null;
+  invokeGuardedCallbackImpl.apply(reporter, arguments);
+}
+function invokeGuardedCallbackAndCatchFirstError(
+  name,
+  func,
+  context,
+  a,
+  b,
+  c,
+  d,
+  e,
+  f
+) {
+  invokeGuardedCallback.apply(this, arguments);
+  if (hasError) {
+    if (hasError) {
+      var error = caughtError;
+      hasError = !1;
+      caughtError = null;
+    } else
+      invariant(
+        !1,
+        "clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue."
+      ),
+        (error = void 0);
+    hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
 var eventPluginOrder = null,
@@ -165,12 +170,7 @@ var plugins = [],
 function executeDispatch(event, simulated, listener, inst) {
   simulated = event.type || "unknown-event";
   event.currentTarget = getNodeFromInstance(inst);
-  ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
-    simulated,
-    listener,
-    void 0,
-    event
-  );
+  invokeGuardedCallbackAndCatchFirstError(simulated, listener, void 0, event);
   event.currentTarget = null;
 }
 function executeDirectDispatch(event) {
@@ -294,7 +294,7 @@ function getListener(inst, registrationName) {
 }
 function getParent(inst) {
   do inst = inst.return;
-  while (inst && 5 !== inst.tag);
+  while (inst && 7 !== inst.tag);
   return inst ? inst : null;
 }
 function traverseTwoPhase(inst, fn, arg) {
@@ -347,9 +347,6 @@ function accumulateDirectDispatchesSingle(event) {
     }
   }
 }
-var shouldBeReleasedProperties = "dispatchConfig _targetInst nativeEvent isDefaultPrevented isPropagationStopped _dispatchListeners _dispatchInstances".split(
-  " "
-);
 function functionThatReturnsTrue() {
   return !0;
 }
@@ -407,12 +404,9 @@ Object.assign(SyntheticEvent.prototype, {
     var Interface = this.constructor.Interface,
       propName;
     for (propName in Interface) this[propName] = null;
-    for (
-      Interface = 0;
-      Interface < shouldBeReleasedProperties.length;
-      Interface++
-    )
-      this[shouldBeReleasedProperties[Interface]] = null;
+    this.nativeEvent = this._targetInst = this.dispatchConfig = null;
+    this.isPropagationStopped = this.isDefaultPrevented = functionThatReturnsFalse;
+    this._dispatchInstances = this._dispatchListeners = null;
   }
 });
 SyntheticEvent.Interface = {
@@ -458,7 +452,7 @@ function getPooledEvent(dispatchConfig, targetInst, nativeEvent, nativeInst) {
 function releasePooledEvent(event) {
   invariant(
     event instanceof this,
-    "Trying to release an event instance  into a pool of a different type."
+    "Trying to release an event instance into a pool of a different type."
   );
   event.destructor();
   10 > this.eventPool.length && this.eventPool.push(event);
@@ -615,7 +609,9 @@ function accumulate(current, next) {
     ? next
     : Array.isArray(current)
       ? current.concat(next)
-      : Array.isArray(next) ? [current].concat(next) : [current, next];
+      : Array.isArray(next)
+        ? [current].concat(next)
+        : [current, next];
 }
 var responderInst = null,
   trackedTouchCount = 0;
@@ -881,7 +877,9 @@ var eventTypes$1 = {
           ? eventTypes$1.responderStart
           : targetInst
             ? eventTypes$1.responderMove
-            : depthA ? eventTypes$1.responderEnd : null)
+            : depthA
+              ? eventTypes$1.responderEnd
+              : null)
       )
         (JSCompiler_temp$jscomp$0 = ResponderSyntheticEvent.getPooled(
           JSCompiler_temp$jscomp$0,
@@ -935,7 +933,9 @@ var eventTypes$1 = {
       if (
         (topLevelType = JSCompiler_temp$jscomp$0
           ? eventTypes$1.responderTerminate
-          : topLevelType ? eventTypes$1.responderRelease : null)
+          : topLevelType
+            ? eventTypes$1.responderRelease
+            : null)
       )
         (nativeEvent = ResponderSyntheticEvent.getPooled(
           topLevelType,
@@ -1000,59 +1000,35 @@ injection.injectEventPluginsByName({
 });
 var instanceCache = {},
   instanceProps = {};
-function uncacheFiberNode(tag) {
-  delete instanceCache[tag];
-  delete instanceProps[tag];
-}
 function getInstanceFromTag(tag) {
   return instanceCache[tag] || null;
 }
-var ReactNativeComponentTree = {
-    precacheFiberNode: function(hostInst, tag) {
-      instanceCache[tag] = hostInst;
-    },
-    uncacheFiberNode: uncacheFiberNode,
-    getClosestInstanceFromNode: getInstanceFromTag,
-    getInstanceFromNode: getInstanceFromTag,
-    getNodeFromInstance: function(inst) {
-      var tag = inst.stateNode._nativeTag;
-      void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
-      invariant(tag, "All native instances should have a tag.");
-      return tag;
-    },
-    getFiberCurrentPropsFromNode: function(stateNode) {
-      return instanceProps[stateNode._nativeTag] || null;
-    },
-    updateFiberProps: function(tag, props) {
-      instanceProps[tag] = props;
-    }
-  },
-  restoreTarget = null,
+var restoreTarget = null,
   restoreQueue = null;
 function restoreStateOfTarget(target) {
   if ((target = getInstanceFromNode(target))) {
     invariant(
-      null,
-      "Fiber needs to be injected to handle a fiber target for controlled events. This error is likely caused by a bug in React. Please file an issue."
+      !1,
+      "setRestoreImplementation() needs to be called to handle a target for controlled events. This error is likely caused by a bug in React. Please file an issue."
     );
     var props = getFiberCurrentPropsFromNode(target.stateNode);
-    null.restoreControlledState(target.stateNode, target.type, props);
+    null(target.stateNode, target.type, props);
   }
 }
-function _batchedUpdates(fn, bookkeeping) {
+function _batchedUpdatesImpl(fn, bookkeeping) {
   return fn(bookkeeping);
 }
-function _flushInteractiveUpdates() {}
+function _flushInteractiveUpdatesImpl() {}
 var isBatching = !1;
 function batchedUpdates(fn, bookkeeping) {
   if (isBatching) return fn(bookkeeping);
   isBatching = !0;
   try {
-    return _batchedUpdates(fn, bookkeeping);
+    return _batchedUpdatesImpl(fn, bookkeeping);
   } finally {
     if (((isBatching = !1), null !== restoreTarget || null !== restoreQueue))
       if (
-        (_flushInteractiveUpdates(),
+        (_flushInteractiveUpdatesImpl(),
         restoreTarget &&
           ((bookkeeping = restoreTarget),
           (fn = restoreQueue),
@@ -1085,13 +1061,19 @@ function _receiveRootNodeIDEvent(rootNodeID, topLevelType, nativeEventParam) {
     null !== events && (eventQueue = accumulateInto(eventQueue, events));
     events = eventQueue;
     eventQueue = null;
-    events &&
+    if (
+      events &&
       (forEachAccumulated(events, executeDispatchesAndReleaseTopLevel),
       invariant(
         !eventQueue,
         "processEventQueue(): Additional events were enqueued while processing an event queue. Support for this has not yet been implemented."
       ),
-      ReactErrorUtils.rethrowCaughtError());
+      hasRethrowError)
+    )
+      throw ((events = rethrowError),
+      (hasRethrowError = !1),
+      (rethrowError = null),
+      events);
   });
 }
 RCTEventEmitter.register({
@@ -1134,10 +1116,16 @@ RCTEventEmitter.register({
     }
   }
 });
-getFiberCurrentPropsFromNode =
-  ReactNativeComponentTree.getFiberCurrentPropsFromNode;
-getInstanceFromNode = ReactNativeComponentTree.getInstanceFromNode;
-getNodeFromInstance = ReactNativeComponentTree.getNodeFromInstance;
+getFiberCurrentPropsFromNode = function(stateNode) {
+  return instanceProps[stateNode._nativeTag] || null;
+};
+getInstanceFromNode = getInstanceFromTag;
+getNodeFromInstance = function(inst) {
+  var tag = inst.stateNode._nativeTag;
+  void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
+  invariant(tag, "All native instances should have a tag.");
+  return tag;
+};
 ResponderEventPlugin.injection.injectGlobalResponderHandler({
   onChange: function(from, to, blockNativeResponder) {
     null !== to
@@ -1145,8 +1133,8 @@ ResponderEventPlugin.injection.injectGlobalResponderHandler({
       : UIManager.clearJSResponder();
   }
 });
-var ReactCurrentOwner =
-    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,
+var ReactSharedInternals =
+    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
   hasSymbol = "function" === typeof Symbol && Symbol.for,
   REACT_ELEMENT_TYPE = hasSymbol ? Symbol.for("react.element") : 60103,
   REACT_PORTAL_TYPE = hasSymbol ? Symbol.for("react.portal") : 60106,
@@ -1155,48 +1143,62 @@ var ReactCurrentOwner =
   REACT_PROFILER_TYPE = hasSymbol ? Symbol.for("react.profiler") : 60114,
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol.for("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol.for("react.context") : 60110,
-  REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol.for("react.async_mode") : 60111,
+  REACT_CONCURRENT_MODE_TYPE = hasSymbol
+    ? Symbol.for("react.concurrent_mode")
+    : 60111,
   REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for("react.forward_ref") : 60112,
-  REACT_TIMEOUT_TYPE = hasSymbol ? Symbol.for("react.timeout") : 60113,
+  REACT_SUSPENSE_TYPE = hasSymbol ? Symbol.for("react.suspense") : 60113,
+  REACT_PURE_TYPE = hasSymbol ? Symbol.for("react.pure") : 60115,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
-  if (null === maybeIterable || "undefined" === typeof maybeIterable)
-    return null;
+  if (null === maybeIterable || "object" !== typeof maybeIterable) return null;
   maybeIterable =
     (MAYBE_ITERATOR_SYMBOL && maybeIterable[MAYBE_ITERATOR_SYMBOL]) ||
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(fiber) {
-  var type = fiber.type;
-  if ("function" === typeof type) return type.displayName || type.name;
+function getWrappedName(outerType, innerType, wrapperName) {
+  innerType = innerType.displayName || innerType.name || "";
+  return (
+    outerType.displayName ||
+    ("" !== innerType ? wrapperName + "(" + innerType + ")" : wrapperName)
+  );
+}
+function getComponentName(type) {
+  if (null == type) return null;
+  if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
   switch (type) {
-    case REACT_ASYNC_MODE_TYPE:
-      return "AsyncMode";
-    case REACT_CONTEXT_TYPE:
-      return "Context.Consumer";
+    case REACT_CONCURRENT_MODE_TYPE:
+      return "ConcurrentMode";
     case REACT_FRAGMENT_TYPE:
-      return "ReactFragment";
+      return "Fragment";
     case REACT_PORTAL_TYPE:
-      return "ReactPortal";
+      return "Portal";
     case REACT_PROFILER_TYPE:
-      return "Profiler(" + fiber.pendingProps.id + ")";
-    case REACT_PROVIDER_TYPE:
-      return "Context.Provider";
+      return "Profiler";
     case REACT_STRICT_MODE_TYPE:
       return "StrictMode";
-    case REACT_TIMEOUT_TYPE:
-      return "Timeout";
+    case REACT_SUSPENSE_TYPE:
+      return "Suspense";
   }
-  if ("object" === typeof type && null !== type)
+  if ("object" === typeof type) {
     switch (type.$$typeof) {
+      case REACT_CONTEXT_TYPE:
+        return "Context.Consumer";
+      case REACT_PROVIDER_TYPE:
+        return "Context.Provider";
       case REACT_FORWARD_REF_TYPE:
-        return (
-          (fiber = type.render.displayName || type.render.name || ""),
-          "" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef"
-        );
+        return getWrappedName(type, type.render, "ForwardRef");
+      case REACT_PURE_TYPE:
+        return getWrappedName(type, type.render, "Pure");
     }
+    if (
+      "function" === typeof type.then &&
+      (type = 1 === type._reactStatus ? type._reactResult : null)
+    )
+      return getComponentName(type);
+  }
   return null;
 }
 function isFiberMountedImpl(fiber) {
@@ -1207,7 +1209,7 @@ function isFiberMountedImpl(fiber) {
     for (; node.return; )
       if (((node = node.return), 0 !== (node.effectTag & 2))) return 1;
   }
-  return 3 === node.tag ? 2 : 3;
+  return 5 === node.tag ? 2 : 3;
 }
 function assertIsMounted(fiber) {
   invariant(
@@ -1283,14 +1285,14 @@ function findCurrentFiberUsingSlowPath(fiber) {
       "Return fibers should always be each others' alternates. This error is likely caused by a bug in React. Please file an issue."
     );
   }
-  invariant(3 === a.tag, "Unable to find node on an unmounted component.");
+  invariant(5 === a.tag, "Unable to find node on an unmounted component.");
   return a.stateNode.current === a ? fiber : alternate;
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
   if (!parent) return null;
   for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
+    if (7 === node.tag || 8 === node.tag) return node;
     if (node.child) (node.child.return = node), (node = node.child);
     else {
       if (node === parent) break;
@@ -1304,26 +1306,7 @@ function findCurrentHostFiber(parent) {
   }
   return null;
 }
-function findCurrentHostFiberWithNoPortals(parent) {
-  parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child && 4 !== node.tag)
-      (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
-}
-var emptyObject$1 = {},
+var emptyObject = {},
   removedKeys = null,
   removedKeyCount = 0;
 function restoreDeletedValuesInNestedArray(
@@ -1341,23 +1324,23 @@ function restoreDeletedValuesInNestedArray(
   else if (node && 0 < removedKeyCount)
     for (i in removedKeys)
       if (removedKeys[i]) {
-        var _nextProp = node[i];
-        if (void 0 !== _nextProp) {
+        var nextProp = node[i];
+        if (void 0 !== nextProp) {
           var attributeConfig = validAttributes[i];
           if (attributeConfig) {
-            "function" === typeof _nextProp && (_nextProp = !0);
-            "undefined" === typeof _nextProp && (_nextProp = null);
+            "function" === typeof nextProp && (nextProp = !0);
+            "undefined" === typeof nextProp && (nextProp = null);
             if ("object" !== typeof attributeConfig)
-              updatePayload[i] = _nextProp;
+              updatePayload[i] = nextProp;
             else if (
               "function" === typeof attributeConfig.diff ||
               "function" === typeof attributeConfig.process
             )
-              (_nextProp =
+              (nextProp =
                 "function" === typeof attributeConfig.process
-                  ? attributeConfig.process(_nextProp)
-                  : _nextProp),
-                (updatePayload[i] = _nextProp);
+                  ? attributeConfig.process(nextProp)
+                  : nextProp),
+                (updatePayload[i] = nextProp);
             removedKeys[i] = !1;
             removedKeyCount--;
           }
@@ -1423,7 +1406,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!Array.isArray(nextProp))
     return diffProperties(
       updatePayload,
-      emptyObject$1,
+      emptyObject,
       nextProp,
       validAttributes
     );
@@ -1441,7 +1424,7 @@ function clearNestedProperty(updatePayload, prevProp, validAttributes) {
     return diffProperties(
       updatePayload,
       prevProp,
-      emptyObject$1,
+      emptyObject,
       validAttributes
     );
   for (var i = 0; i < prevProp.length; i++)
@@ -1541,18 +1524,13 @@ function diffProperties(updatePayload, prevProps, nextProps, validAttributes) {
               )))));
   return updatePayload;
 }
-function mountSafeCallback(context, callback) {
+function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   return function() {
-    if (callback) {
-      if ("boolean" === typeof context.__isMounted) {
-        if (!context.__isMounted) return;
-      } else if (
-        "function" === typeof context.isMounted &&
-        !context.isMounted()
-      )
-        return;
+    if (
+      callback &&
+      ("boolean" !== typeof context.__isMounted || context.__isMounted)
+    )
       return callback.apply(context, arguments);
-    }
   };
 }
 var ReactNativeFiberHostComponent = (function() {
@@ -1570,14 +1548,17 @@ var ReactNativeFiberHostComponent = (function() {
       TextInputState.focusTextInput(this._nativeTag);
     };
     ReactNativeFiberHostComponent.prototype.measure = function(callback) {
-      UIManager.measure(this._nativeTag, mountSafeCallback(this, callback));
+      UIManager.measure(
+        this._nativeTag,
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
+      );
     };
     ReactNativeFiberHostComponent.prototype.measureInWindow = function(
       callback
     ) {
       UIManager.measureInWindow(
         this._nativeTag,
-        mountSafeCallback(this, callback)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
     };
     ReactNativeFiberHostComponent.prototype.measureLayout = function(
@@ -1588,8 +1569,8 @@ var ReactNativeFiberHostComponent = (function() {
       UIManager.measureLayout(
         this._nativeTag,
         relativeToNativeNode,
-        mountSafeCallback(this, onFail),
-        mountSafeCallback(this, onSuccess)
+        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
       );
     };
     ReactNativeFiberHostComponent.prototype.setNativeProps = function(
@@ -1597,7 +1578,7 @@ var ReactNativeFiberHostComponent = (function() {
     ) {
       nativeProps = diffProperties(
         null,
-        emptyObject$1,
+        emptyObject,
         nativeProps,
         this.viewConfig.validAttributes
       );
@@ -1638,7 +1619,8 @@ function shim$1() {
     "The current renderer does not support hyration. This error is likely caused by a bug in React. Please file an issue."
   );
 }
-var nextReactTag = 3;
+var UPDATE_SIGNAL = {},
+  nextReactTag = 3;
 function allocateTag() {
   var tag = nextReactTag;
   1 === tag % 10 && (tag += 2);
@@ -1646,10 +1628,14 @@ function allocateTag() {
   return tag;
 }
 function recursivelyUncacheFiberNode(node) {
-  "number" === typeof node
-    ? uncacheFiberNode(node)
-    : (uncacheFiberNode(node._nativeTag),
-      node._children.forEach(recursivelyUncacheFiberNode));
+  if ("number" === typeof node)
+    delete instanceCache[node], delete instanceProps[node];
+  else {
+    var tag = node._nativeTag;
+    delete instanceCache[tag];
+    delete instanceProps[tag];
+    node._children.forEach(recursivelyUncacheFiberNode);
+  }
 }
 function finalizeInitialChildren(parentInstance) {
   if (0 === parentInstance._children.length) return !1;
@@ -1659,30 +1645,37 @@ function finalizeInitialChildren(parentInstance) {
   UIManager.setChildren(parentInstance._nativeTag, nativeTags);
   return !1;
 }
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
+var scheduleTimeout = setTimeout,
+  cancelTimeout = clearTimeout,
+  BEFORE_SLASH_RE = /^(.*)[\\\/]/;
+function getStackByFiberInDevAndProd(workInProgress) {
   var info = "";
   do {
     a: switch (workInProgress.tag) {
+      case 4:
       case 0:
       case 1:
       case 2:
-      case 5:
+      case 3:
+      case 7:
+      case 10:
         var owner = workInProgress._debugOwner,
-          source = workInProgress._debugSource;
-        var JSCompiler_inline_result = getComponentName(workInProgress);
-        var ownerName = null;
-        owner && (ownerName = getComponentName(owner));
-        owner = source;
-        JSCompiler_inline_result =
-          "\n    in " +
-          (JSCompiler_inline_result || "Unknown") +
-          (owner
-            ? " (at " +
-              owner.fileName.replace(/^.*[\\\/]/, "") +
+          source = workInProgress._debugSource,
+          name = getComponentName(workInProgress.type);
+        var JSCompiler_inline_result = null;
+        owner && (JSCompiler_inline_result = getComponentName(owner.type));
+        owner = name;
+        name = "";
+        source
+          ? (name =
+              " (at " +
+              source.fileName.replace(BEFORE_SLASH_RE, "") +
               ":" +
-              owner.lineNumber +
-              ")"
-            : ownerName ? " (created by " + ownerName + ")" : "");
+              source.lineNumber +
+              ")")
+          : JSCompiler_inline_result &&
+            (name = " (created by " + JSCompiler_inline_result + ")");
+        JSCompiler_inline_result = "\n    in " + (owner || "Unknown") + name;
         break a;
       default:
         JSCompiler_inline_result = "";
@@ -1695,9 +1688,6 @@ function getStackAddendumByWorkInProgressFiber(workInProgress) {
 new Set();
 var valueStack = [],
   index = -1;
-function createCursor(defaultValue) {
-  return { current: defaultValue };
-}
 function pop(cursor) {
   0 > index ||
     ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
@@ -1707,17 +1697,13 @@ function push(cursor, value) {
   valueStack[index] = cursor.current;
   cursor.current = value;
 }
-var contextStackCursor = createCursor(emptyObject),
-  didPerformWorkStackCursor = createCursor(!1),
-  previousContext = emptyObject;
-function getUnmaskedContext(workInProgress) {
-  return isContextProvider(workInProgress)
-    ? previousContext
-    : contextStackCursor.current;
-}
+var emptyContextObject = {},
+  contextStackCursor = { current: emptyContextObject },
+  didPerformWorkStackCursor = { current: !1 },
+  previousContext = emptyContextObject;
 function getMaskedContext(workInProgress, unmaskedContext) {
   var contextTypes = workInProgress.type.contextTypes;
-  if (!contextTypes) return emptyObject;
+  if (!contextTypes) return emptyContextObject;
   var instance = workInProgress.stateNode;
   if (
     instance &&
@@ -1733,12 +1719,13 @@ function getMaskedContext(workInProgress, unmaskedContext) {
     (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
   return context;
 }
-function isContextProvider(fiber) {
-  return 2 === fiber.tag && null != fiber.type.childContextTypes;
+function isContextProvider(type) {
+  type = type.childContextTypes;
+  return null !== type && void 0 !== type;
 }
-function popContextProvider(fiber) {
-  isContextProvider(fiber) &&
-    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+function popContext(fiber) {
+  pop(didPerformWorkStackCursor, fiber);
+  pop(contextStackCursor, fiber);
 }
 function popTopLevelContextObject(fiber) {
   pop(didPerformWorkStackCursor, fiber);
@@ -1746,32 +1733,31 @@ function popTopLevelContextObject(fiber) {
 }
 function pushTopLevelContextObject(fiber, context, didChange) {
   invariant(
-    contextStackCursor.current === emptyObject,
+    contextStackCursor.current === emptyContextObject,
     "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
   );
   push(contextStackCursor, context, fiber);
   push(didPerformWorkStackCursor, didChange, fiber);
 }
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode,
-    childContextTypes = fiber.type.childContextTypes;
+function processChildContext(fiber, type, parentContext) {
+  var instance = fiber.stateNode;
+  fiber = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
     invariant(
-      contextKey in childContextTypes,
+      contextKey in fiber,
       '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
+      getComponentName(type) || "Unknown",
       contextKey
     );
   return Object.assign({}, parentContext, instance);
 }
 function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) return !1;
   var instance = workInProgress.stateNode;
   instance =
     (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
+    emptyContextObject;
   previousContext = contextStackCursor.current;
   push(contextStackCursor, instance, workInProgress);
   push(
@@ -1781,21 +1767,46 @@ function pushContextProvider(workInProgress) {
   );
   return !0;
 }
-function invalidateContextProvider(workInProgress, didChange) {
+function invalidateContextProvider(workInProgress, type, didChange) {
   var instance = workInProgress.stateNode;
   invariant(
     instance,
     "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
   );
-  if (didChange) {
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    push(contextStackCursor, mergedContext, workInProgress);
-  } else pop(didPerformWorkStackCursor, workInProgress);
+  didChange
+    ? ((type = processChildContext(workInProgress, type, previousContext)),
+      (instance.__reactInternalMemoizedMergedChildContext = type),
+      pop(didPerformWorkStackCursor, workInProgress),
+      pop(contextStackCursor, workInProgress),
+      push(contextStackCursor, type, workInProgress))
+    : pop(didPerformWorkStackCursor, workInProgress);
   push(didPerformWorkStackCursor, didChange, workInProgress);
 }
+var onCommitFiberRoot = null,
+  onCommitFiberUnmount = null;
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {}
+  };
+}
+var isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__;
+function injectInternals(internals) {
+  if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) return !1;
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled || !hook.supportsFiber) return !0;
+  try {
+    var rendererID = hook.inject(internals);
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {}
+  return !0;
+}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -1803,15 +1814,31 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.index = 0;
   this.ref = null;
   this.pendingProps = pendingProps;
-  this.memoizedState = this.updateQueue = this.memoizedProps = null;
+  this.firstContextDependency = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
   this.effectTag = 0;
   this.lastEffect = this.firstEffect = this.nextEffect = null;
-  this.expirationTime = 0;
+  this.childExpirationTime = this.expirationTime = 0;
   this.alternate = null;
-  this.treeBaseTime = this.selfBaseTime = this.actualStartTime = this.actualDuration = 0;
+  this.actualDuration = 0;
+  this.actualStartTime = -1;
+  this.treeBaseDuration = this.selfBaseDuration = 0;
+}
+function shouldConstruct(Component) {
+  Component = Component.prototype;
+  return !(!Component || !Component.isReactComponent);
+}
+function resolveLazyComponentTag(fiber, Component) {
+  if ("function" === typeof Component)
+    return shouldConstruct(Component) ? 3 : 1;
+  if (void 0 !== Component && null !== Component) {
+    fiber = Component.$$typeof;
+    if (fiber === REACT_FORWARD_REF_TYPE) return 14;
+    if (fiber === REACT_PURE_TYPE) return 18;
+  }
+  return 4;
 }
-function createWorkInProgress(current, pendingProps, expirationTime) {
+function createWorkInProgress(current, pendingProps) {
   var workInProgress = current.alternate;
   null === workInProgress
     ? ((workInProgress = new FiberNode(
@@ -1830,28 +1857,30 @@ function createWorkInProgress(current, pendingProps, expirationTime) {
       (workInProgress.firstEffect = null),
       (workInProgress.lastEffect = null),
       (workInProgress.actualDuration = 0),
-      (workInProgress.actualStartTime = 0));
-  workInProgress.expirationTime = expirationTime;
+      (workInProgress.actualStartTime = -1));
+  workInProgress.childExpirationTime = current.childExpirationTime;
+  workInProgress.expirationTime = current.expirationTime;
   workInProgress.child = current.child;
   workInProgress.memoizedProps = current.memoizedProps;
   workInProgress.memoizedState = current.memoizedState;
   workInProgress.updateQueue = current.updateQueue;
+  workInProgress.firstContextDependency = current.firstContextDependency;
   workInProgress.sibling = current.sibling;
   workInProgress.index = current.index;
   workInProgress.ref = current.ref;
-  workInProgress.selfBaseTime = current.selfBaseTime;
-  workInProgress.treeBaseTime = current.treeBaseTime;
+  workInProgress.selfBaseDuration = current.selfBaseDuration;
+  workInProgress.treeBaseDuration = current.treeBaseDuration;
   return workInProgress;
 }
 function createFiberFromElement(element, mode, expirationTime) {
   var type = element.type,
     key = element.key;
   element = element.props;
-  if ("function" === typeof type)
-    var fiberTag = type.prototype && type.prototype.isReactComponent ? 2 : 0;
-  else if ("string" === typeof type) fiberTag = 5;
+  var fiberTag = void 0;
+  if ("function" === typeof type) fiberTag = shouldConstruct(type) ? 2 : 4;
+  else if ("string" === typeof type) fiberTag = 7;
   else
-    switch (type) {
+    a: switch (type) {
       case REACT_FRAGMENT_TYPE:
         return createFiberFromFragment(
           element.children,
@@ -1859,12 +1888,12 @@ function createFiberFromElement(element, mode, expirationTime) {
           expirationTime,
           key
         );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = 11;
+      case REACT_CONCURRENT_MODE_TYPE:
+        fiberTag = 10;
         mode |= 3;
         break;
       case REACT_STRICT_MODE_TYPE:
-        fiberTag = 11;
+        fiberTag = 10;
         mode |= 2;
         break;
       case REACT_PROFILER_TYPE:
@@ -1874,34 +1903,36 @@ function createFiberFromElement(element, mode, expirationTime) {
           (type.expirationTime = expirationTime),
           type
         );
-      case REACT_TIMEOUT_TYPE:
+      case REACT_SUSPENSE_TYPE:
         fiberTag = 16;
-        mode |= 2;
         break;
       default:
-        a: {
-          switch ("object" === typeof type && null !== type
-            ? type.$$typeof
-            : null) {
+        if ("object" === typeof type && null !== type)
+          switch (type.$$typeof) {
             case REACT_PROVIDER_TYPE:
-              fiberTag = 13;
+              fiberTag = 12;
               break a;
             case REACT_CONTEXT_TYPE:
-              fiberTag = 12;
+              fiberTag = 11;
               break a;
             case REACT_FORWARD_REF_TYPE:
-              fiberTag = 14;
+              fiberTag = 13;
+              break a;
+            case REACT_PURE_TYPE:
+              fiberTag = 17;
               break a;
             default:
-              invariant(
-                !1,
-                "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",
-                null == type ? type : typeof type,
-                ""
-              );
+              if ("function" === typeof type.then) {
+                fiberTag = 4;
+                break a;
+              }
           }
-          fiberTag = void 0;
-        }
+        invariant(
+          !1,
+          "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",
+          null == type ? type : typeof type,
+          ""
+        );
     }
   mode = new FiberNode(fiberTag, element, key, mode);
   mode.type = type;
@@ -1909,18 +1940,18 @@ function createFiberFromElement(element, mode, expirationTime) {
   return mode;
 }
 function createFiberFromFragment(elements, mode, expirationTime, key) {
-  elements = new FiberNode(10, elements, key, mode);
+  elements = new FiberNode(9, elements, key, mode);
   elements.expirationTime = expirationTime;
   return elements;
 }
 function createFiberFromText(content, mode, expirationTime) {
-  content = new FiberNode(6, content, null, mode);
+  content = new FiberNode(8, content, null, mode);
   content.expirationTime = expirationTime;
   return content;
 }
 function createFiberFromPortal(portal, mode, expirationTime) {
   mode = new FiberNode(
-    4,
+    6,
     null !== portal.children ? portal.children : [],
     portal.key,
     mode
@@ -1933,60 +1964,6 @@ function createFiberFromPortal(portal, mode, expirationTime) {
   };
   return mode;
 }
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
-  containerInfo = {
-    current: isAsync,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    earliestPendingTime: 0,
-    latestPendingTime: 0,
-    earliestSuspendedTime: 0,
-    latestSuspendedTime: 0,
-    latestPingedTime: 0,
-    didError: !1,
-    pendingCommitExpirationTime: 0,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    nextExpirationTimeToWorkOn: 0,
-    expirationTime: 0,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
-  return (isAsync.stateNode = containerInfo);
-}
-var onCommitFiberRoot = null,
-  onCommitFiberUnmount = null;
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {}
-  };
-}
-function injectInternals(internals) {
-  if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) return !1;
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled || !hook.supportsFiber) return !0;
-  try {
-    var rendererID = hook.inject(internals);
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {}
-  return !0;
-}
-function onCommitRoot(root) {
-  "function" === typeof onCommitFiberRoot && onCommitFiberRoot(root);
-}
-function onCommitUnmount(fiber) {
-  "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
-}
 function markPendingPriorityLevel(root, expirationTime) {
   root.didError = !1;
   var earliestPendingTime = root.earliestPendingTime;
@@ -1996,30 +1973,106 @@ function markPendingPriorityLevel(root, expirationTime) {
       ? (root.earliestPendingTime = expirationTime)
       : root.latestPendingTime < expirationTime &&
         (root.latestPendingTime = expirationTime);
-  findNextPendingPriorityLevel(root);
+  findNextExpirationTimeToWorkOn(expirationTime, root);
+}
+function markCommittedPriorityLevels(root, earliestRemainingTime) {
+  root.didError = !1;
+  if (0 === earliestRemainingTime)
+    (root.earliestPendingTime = 0),
+      (root.latestPendingTime = 0),
+      (root.earliestSuspendedTime = 0),
+      (root.latestSuspendedTime = 0),
+      (root.latestPingedTime = 0);
+  else {
+    var latestPendingTime = root.latestPendingTime;
+    0 !== latestPendingTime &&
+      (latestPendingTime < earliestRemainingTime
+        ? (root.earliestPendingTime = root.latestPendingTime = 0)
+        : root.earliestPendingTime < earliestRemainingTime &&
+          (root.earliestPendingTime = root.latestPendingTime));
+    latestPendingTime = root.earliestSuspendedTime;
+    0 === latestPendingTime
+      ? markPendingPriorityLevel(root, earliestRemainingTime)
+      : earliestRemainingTime > root.latestSuspendedTime
+        ? ((root.earliestSuspendedTime = 0),
+          (root.latestSuspendedTime = 0),
+          (root.latestPingedTime = 0),
+          markPendingPriorityLevel(root, earliestRemainingTime))
+        : earliestRemainingTime < latestPendingTime &&
+          markPendingPriorityLevel(root, earliestRemainingTime);
+  }
+  findNextExpirationTimeToWorkOn(0, root);
+}
+function hasLowerPriorityWork(root, erroredExpirationTime) {
+  var latestPendingTime = root.latestPendingTime,
+    latestSuspendedTime = root.latestSuspendedTime;
+  root = root.latestPingedTime;
+  return (
+    (0 !== latestPendingTime && latestPendingTime > erroredExpirationTime) ||
+    (0 !== latestSuspendedTime &&
+      latestSuspendedTime > erroredExpirationTime) ||
+    (0 !== root && root > erroredExpirationTime)
+  );
+}
+function markSuspendedPriorityLevel(root, suspendedTime) {
+  root.didError = !1;
+  var latestPingedTime = root.latestPingedTime;
+  0 !== latestPingedTime &&
+    latestPingedTime <= suspendedTime &&
+    (root.latestPingedTime = 0);
+  latestPingedTime = root.earliestPendingTime;
+  var latestPendingTime = root.latestPendingTime;
+  latestPingedTime === suspendedTime
+    ? (root.earliestPendingTime =
+        latestPendingTime === suspendedTime
+          ? (root.latestPendingTime = 0)
+          : latestPendingTime)
+    : latestPendingTime === suspendedTime &&
+      (root.latestPendingTime = latestPingedTime);
+  latestPingedTime = root.earliestSuspendedTime;
+  latestPendingTime = root.latestSuspendedTime;
+  0 === latestPingedTime
+    ? (root.earliestSuspendedTime = root.latestSuspendedTime = suspendedTime)
+    : latestPingedTime > suspendedTime
+      ? (root.earliestSuspendedTime = suspendedTime)
+      : latestPendingTime < suspendedTime &&
+        (root.latestSuspendedTime = suspendedTime);
+  findNextExpirationTimeToWorkOn(suspendedTime, root);
+}
+function findEarliestOutstandingPriorityLevel(root, renderExpirationTime) {
+  var earliestPendingTime = root.earliestPendingTime;
+  root = root.earliestSuspendedTime;
+  if (
+    0 === renderExpirationTime ||
+    (0 !== earliestPendingTime && earliestPendingTime < renderExpirationTime)
+  )
+    renderExpirationTime = earliestPendingTime;
+  if (0 === renderExpirationTime || (0 !== root && root < renderExpirationTime))
+    renderExpirationTime = root;
+  return renderExpirationTime;
 }
-function findNextPendingPriorityLevel(root) {
+function findNextExpirationTimeToWorkOn(completedExpirationTime, root) {
   var earliestSuspendedTime = root.earliestSuspendedTime,
-    earliestPendingTime = root.earliestPendingTime;
-  if (0 === earliestSuspendedTime)
-    var nextExpirationTimeToWorkOn = (earliestSuspendedTime = earliestPendingTime);
-  else
-    0 !== earliestPendingTime
-      ? ((nextExpirationTimeToWorkOn = earliestPendingTime),
-        (earliestSuspendedTime =
-          earliestSuspendedTime < earliestPendingTime
-            ? earliestSuspendedTime
-            : earliestPendingTime))
-      : (nextExpirationTimeToWorkOn = earliestSuspendedTime =
-          root.latestPingedTime);
-  root.didError && (earliestSuspendedTime = 1);
-  root.nextExpirationTimeToWorkOn = nextExpirationTimeToWorkOn;
-  root.expirationTime = earliestSuspendedTime;
+    latestSuspendedTime = root.latestSuspendedTime,
+    earliestPendingTime = root.earliestPendingTime,
+    latestPingedTime = root.latestPingedTime;
+  earliestPendingTime =
+    0 !== earliestPendingTime ? earliestPendingTime : latestPingedTime;
+  0 === earliestPendingTime &&
+    (0 === completedExpirationTime ||
+      latestSuspendedTime > completedExpirationTime) &&
+    (earliestPendingTime = latestSuspendedTime);
+  completedExpirationTime = earliestPendingTime;
+  0 !== completedExpirationTime &&
+    0 !== earliestSuspendedTime &&
+    earliestSuspendedTime < completedExpirationTime &&
+    (completedExpirationTime = earliestSuspendedTime);
+  root.nextExpirationTimeToWorkOn = earliestPendingTime;
+  root.expirationTime = completedExpirationTime;
 }
 var hasForceUpdate = !1;
 function createUpdateQueue(baseState) {
   return {
-    expirationTime: 0,
     baseState: baseState,
     firstUpdate: null,
     lastUpdate: null,
@@ -2033,7 +2086,6 @@ function createUpdateQueue(baseState) {
 }
 function cloneUpdateQueue(currentQueue) {
   return {
-    expirationTime: currentQueue.expirationTime,
     baseState: currentQueue.baseState,
     firstUpdate: currentQueue.firstUpdate,
     lastUpdate: currentQueue.lastUpdate,
@@ -2055,14 +2107,12 @@ function createUpdate(expirationTime) {
     nextEffect: null
   };
 }
-function appendUpdateToQueue(queue, update, expirationTime) {
+function appendUpdateToQueue(queue, update) {
   null === queue.lastUpdate
     ? (queue.firstUpdate = queue.lastUpdate = update)
     : ((queue.lastUpdate.next = update), (queue.lastUpdate = update));
-  if (0 === queue.expirationTime || queue.expirationTime > expirationTime)
-    queue.expirationTime = expirationTime;
 }
-function enqueueUpdate(fiber, update, expirationTime) {
+function enqueueUpdate(fiber, update) {
   var alternate = fiber.alternate;
   if (null === alternate) {
     var queue1 = fiber.updateQueue;
@@ -2084,14 +2134,13 @@ function enqueueUpdate(fiber, update, expirationTime) {
         : null === queue2 &&
           (queue2 = alternate.updateQueue = cloneUpdateQueue(queue1));
   null === queue2 || queue1 === queue2
-    ? appendUpdateToQueue(queue1, update, expirationTime)
+    ? appendUpdateToQueue(queue1, update)
     : null === queue1.lastUpdate || null === queue2.lastUpdate
-      ? (appendUpdateToQueue(queue1, update, expirationTime),
-        appendUpdateToQueue(queue2, update, expirationTime))
-      : (appendUpdateToQueue(queue1, update, expirationTime),
-        (queue2.lastUpdate = update));
+      ? (appendUpdateToQueue(queue1, update),
+        appendUpdateToQueue(queue2, update))
+      : (appendUpdateToQueue(queue1, update), (queue2.lastUpdate = update));
 }
-function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
+function enqueueCapturedUpdate(workInProgress, update) {
   var workInProgressQueue = workInProgress.updateQueue;
   workInProgressQueue =
     null === workInProgressQueue
@@ -2103,11 +2152,6 @@ function enqueueCapturedUpdate(workInProgress, update, renderExpirationTime) {
     ? (workInProgressQueue.firstCapturedUpdate = workInProgressQueue.lastCapturedUpdate = update)
     : ((workInProgressQueue.lastCapturedUpdate.next = update),
       (workInProgressQueue.lastCapturedUpdate = update));
-  if (
-    0 === workInProgressQueue.expirationTime ||
-    workInProgressQueue.expirationTime > renderExpirationTime
-  )
-    workInProgressQueue.expirationTime = renderExpirationTime;
 }
 function ensureWorkInProgressQueueIsAClone(workInProgress, queue) {
   var current = workInProgress.alternate;
@@ -2155,95 +2199,83 @@ function processUpdateQueue(
   renderExpirationTime
 ) {
   hasForceUpdate = !1;
-  if (
-    !(0 === queue.expirationTime || queue.expirationTime > renderExpirationTime)
-  ) {
-    queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
-    for (
-      var newBaseState = queue.baseState,
-        newFirstUpdate = null,
-        newExpirationTime = 0,
-        update = queue.firstUpdate,
-        resultState = newBaseState;
-      null !== update;
+  queue = ensureWorkInProgressQueueIsAClone(workInProgress, queue);
+  for (
+    var newBaseState = queue.baseState,
+      newFirstUpdate = null,
+      newExpirationTime = 0,
+      update = queue.firstUpdate,
+      resultState = newBaseState;
+    null !== update;
 
-    ) {
-      var updateExpirationTime = update.expirationTime;
-      if (updateExpirationTime > renderExpirationTime) {
-        if (
-          (null === newFirstUpdate &&
-            ((newFirstUpdate = update), (newBaseState = resultState)),
-          0 === newExpirationTime || newExpirationTime > updateExpirationTime)
-        )
-          newExpirationTime = updateExpirationTime;
-      } else
-        (resultState = getStateFromUpdate(
-          workInProgress,
-          queue,
-          update,
-          resultState,
-          props,
-          instance
-        )),
-          null !== update.callback &&
-            ((workInProgress.effectTag |= 32),
-            (update.nextEffect = null),
-            null === queue.lastEffect
-              ? (queue.firstEffect = queue.lastEffect = update)
-              : ((queue.lastEffect.nextEffect = update),
-                (queue.lastEffect = update)));
-      update = update.next;
-    }
-    updateExpirationTime = null;
-    for (update = queue.firstCapturedUpdate; null !== update; ) {
-      var _updateExpirationTime = update.expirationTime;
-      if (_updateExpirationTime > renderExpirationTime) {
-        if (
-          (null === updateExpirationTime &&
-            ((updateExpirationTime = update),
-            null === newFirstUpdate && (newBaseState = resultState)),
-          0 === newExpirationTime || newExpirationTime > _updateExpirationTime)
-        )
-          newExpirationTime = _updateExpirationTime;
-      } else
-        (resultState = getStateFromUpdate(
-          workInProgress,
-          queue,
-          update,
-          resultState,
-          props,
-          instance
-        )),
-          null !== update.callback &&
-            ((workInProgress.effectTag |= 32),
-            (update.nextEffect = null),
-            null === queue.lastCapturedEffect
-              ? (queue.firstCapturedEffect = queue.lastCapturedEffect = update)
-              : ((queue.lastCapturedEffect.nextEffect = update),
-                (queue.lastCapturedEffect = update)));
-      update = update.next;
-    }
-    null === newFirstUpdate && (queue.lastUpdate = null);
-    null === updateExpirationTime
-      ? (queue.lastCapturedUpdate = null)
-      : (workInProgress.effectTag |= 32);
-    null === newFirstUpdate &&
-      null === updateExpirationTime &&
-      (newBaseState = resultState);
-    queue.baseState = newBaseState;
-    queue.firstUpdate = newFirstUpdate;
-    queue.firstCapturedUpdate = updateExpirationTime;
-    queue.expirationTime = newExpirationTime;
-    workInProgress.memoizedState = resultState;
+  ) {
+    var updateExpirationTime = update.expirationTime;
+    if (updateExpirationTime > renderExpirationTime) {
+      if (
+        (null === newFirstUpdate &&
+          ((newFirstUpdate = update), (newBaseState = resultState)),
+        0 === newExpirationTime || newExpirationTime > updateExpirationTime)
+      )
+        newExpirationTime = updateExpirationTime;
+    } else
+      (resultState = getStateFromUpdate(
+        workInProgress,
+        queue,
+        update,
+        resultState,
+        props,
+        instance
+      )),
+        null !== update.callback &&
+          ((workInProgress.effectTag |= 32),
+          (update.nextEffect = null),
+          null === queue.lastEffect
+            ? (queue.firstEffect = queue.lastEffect = update)
+            : ((queue.lastEffect.nextEffect = update),
+              (queue.lastEffect = update)));
+    update = update.next;
   }
-}
-function callCallback(callback, context) {
-  invariant(
-    "function" === typeof callback,
-    "Invalid argument passed as callback. Expected a function. Instead received: %s",
-    callback
-  );
-  callback.call(context);
+  updateExpirationTime = null;
+  for (update = queue.firstCapturedUpdate; null !== update; ) {
+    var _updateExpirationTime = update.expirationTime;
+    if (_updateExpirationTime > renderExpirationTime) {
+      if (
+        (null === updateExpirationTime &&
+          ((updateExpirationTime = update),
+          null === newFirstUpdate && (newBaseState = resultState)),
+        0 === newExpirationTime || newExpirationTime > _updateExpirationTime)
+      )
+        newExpirationTime = _updateExpirationTime;
+    } else
+      (resultState = getStateFromUpdate(
+        workInProgress,
+        queue,
+        update,
+        resultState,
+        props,
+        instance
+      )),
+        null !== update.callback &&
+          ((workInProgress.effectTag |= 32),
+          (update.nextEffect = null),
+          null === queue.lastCapturedEffect
+            ? (queue.firstCapturedEffect = queue.lastCapturedEffect = update)
+            : ((queue.lastCapturedEffect.nextEffect = update),
+              (queue.lastCapturedEffect = update)));
+    update = update.next;
+  }
+  null === newFirstUpdate && (queue.lastUpdate = null);
+  null === updateExpirationTime
+    ? (queue.lastCapturedUpdate = null)
+    : (workInProgress.effectTag |= 32);
+  null === newFirstUpdate &&
+    null === updateExpirationTime &&
+    (newBaseState = resultState);
+  queue.baseState = newBaseState;
+  queue.firstUpdate = newFirstUpdate;
+  queue.firstCapturedUpdate = updateExpirationTime;
+  workInProgress.expirationTime = newExpirationTime;
+  workInProgress.memoizedState = resultState;
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
   null !== finishedQueue.firstCapturedUpdate &&
@@ -2251,60 +2283,76 @@ function commitUpdateQueue(finishedWork, finishedQueue, instance) {
       ((finishedQueue.lastUpdate.next = finishedQueue.firstCapturedUpdate),
       (finishedQueue.lastUpdate = finishedQueue.lastCapturedUpdate)),
     (finishedQueue.firstCapturedUpdate = finishedQueue.lastCapturedUpdate = null));
-  finishedWork = finishedQueue.firstEffect;
-  for (
-    finishedQueue.firstEffect = finishedQueue.lastEffect = null;
-    null !== finishedWork;
-
-  ) {
-    var _callback3 = finishedWork.callback;
-    null !== _callback3 &&
-      ((finishedWork.callback = null), callCallback(_callback3, instance));
-    finishedWork = finishedWork.nextEffect;
+  commitUpdateEffects(finishedQueue.firstEffect, instance);
+  finishedQueue.firstEffect = finishedQueue.lastEffect = null;
+  commitUpdateEffects(finishedQueue.firstCapturedEffect, instance);
+  finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
+}
+function commitUpdateEffects(effect, instance) {
+  for (; null !== effect; ) {
+    var _callback3 = effect.callback;
+    if (null !== _callback3) {
+      effect.callback = null;
+      var context = instance;
+      invariant(
+        "function" === typeof _callback3,
+        "Invalid argument passed as callback. Expected a function. Instead received: %s",
+        _callback3
+      );
+      _callback3.call(context);
+    }
+    effect = effect.nextEffect;
   }
-  finishedWork = finishedQueue.firstCapturedEffect;
-  for (
-    finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null;
-    null !== finishedWork;
-
-  )
-    (finishedQueue = finishedWork.callback),
-      null !== finishedQueue &&
-        ((finishedWork.callback = null), callCallback(finishedQueue, instance)),
-      (finishedWork = finishedWork.nextEffect);
 }
 function createCapturedValue(value, source) {
   return {
     value: value,
     source: source,
-    stack: getStackAddendumByWorkInProgressFiber(source)
+    stack: getStackByFiberInDevAndProd(source)
   };
 }
-var providerCursor = createCursor(null),
-  valueCursor = createCursor(null),
-  changedBitsCursor = createCursor(0);
-function pushProvider(providerFiber) {
+var valueCursor = { current: null },
+  currentlyRenderingFiber = null,
+  lastContextDependency = null,
+  lastContextWithAllBitsObserved = null;
+function pushProvider(providerFiber, nextValue) {
   var context = providerFiber.type._context;
-  push(changedBitsCursor, context._changedBits, providerFiber);
   push(valueCursor, context._currentValue, providerFiber);
-  push(providerCursor, providerFiber, providerFiber);
-  context._currentValue = providerFiber.pendingProps.value;
-  context._changedBits = providerFiber.stateNode;
+  context._currentValue = nextValue;
 }
 function popProvider(providerFiber) {
-  var changedBits = changedBitsCursor.current,
-    currentValue = valueCursor.current;
-  pop(providerCursor, providerFiber);
+  var currentValue = valueCursor.current;
   pop(valueCursor, providerFiber);
-  pop(changedBitsCursor, providerFiber);
-  providerFiber = providerFiber.type._context;
-  providerFiber._currentValue = currentValue;
-  providerFiber._changedBits = changedBits;
+  providerFiber.type._context._currentValue = currentValue;
+}
+function prepareToReadContext(workInProgress) {
+  currentlyRenderingFiber = workInProgress;
+  lastContextWithAllBitsObserved = lastContextDependency = null;
+  workInProgress.firstContextDependency = null;
+}
+function readContext(context, observedBits) {
+  if (
+    lastContextWithAllBitsObserved !== context &&
+    !1 !== observedBits &&
+    0 !== observedBits
+  ) {
+    if ("number" !== typeof observedBits || 1073741823 === observedBits)
+      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
+    observedBits = { context: context, observedBits: observedBits, next: null };
+    null === lastContextDependency
+      ? (invariant(
+          null !== currentlyRenderingFiber,
+          "Context.unstable_read(): Context can only be read while React is rendering, e.g. inside the render method or getDerivedStateFromProps."
+        ),
+        (currentlyRenderingFiber.firstContextDependency = lastContextDependency = observedBits))
+      : (lastContextDependency = lastContextDependency.next = observedBits);
+  }
+  return context._currentValue;
 }
 var NO_CONTEXT = {},
-  contextStackCursor$1 = createCursor(NO_CONTEXT),
-  contextFiberStackCursor = createCursor(NO_CONTEXT),
-  rootInstanceStackCursor = createCursor(NO_CONTEXT);
+  contextStackCursor$1 = { current: NO_CONTEXT },
+  contextFiberStackCursor = { current: NO_CONTEXT },
+  rootInstanceStackCursor = { current: NO_CONTEXT };
 function requiredContext(c) {
   invariant(
     c !== NO_CONTEXT,
@@ -2324,22 +2372,39 @@ function popHostContainer(fiber) {
   pop(contextFiberStackCursor, fiber);
   pop(rootInstanceStackCursor, fiber);
 }
+function pushHostContext(fiber) {
+  requiredContext(rootInstanceStackCursor.current);
+  var context = requiredContext(contextStackCursor$1.current);
+  var nextContext = fiber.type;
+  nextContext =
+    "AndroidTextInput" === nextContext ||
+    "RCTMultilineTextInputView" === nextContext ||
+    "RCTSinglelineTextInputView" === nextContext ||
+    "RCTText" === nextContext ||
+    "RCTVirtualText" === nextContext;
+  nextContext =
+    context.isInAParentText !== nextContext
+      ? { isInAParentText: nextContext }
+      : context;
+  context !== nextContext &&
+    (push(contextFiberStackCursor, fiber, fiber),
+    push(contextStackCursor$1, nextContext, fiber));
+}
 function popHostContext(fiber) {
   contextFiberStackCursor.current === fiber &&
     (pop(contextStackCursor$1, fiber), pop(contextFiberStackCursor, fiber));
 }
 var commitTime = 0,
-  timerPausedAt = 0,
-  totalElapsedPauseTime = 0;
-function recordElapsedActualRenderTime(fiber) {
-  fiber.actualDuration = now$1() - totalElapsedPauseTime - fiber.actualDuration;
-}
-function resumeActualRenderTimerIfPaused() {
-  0 < timerPausedAt &&
-    ((totalElapsedPauseTime += now$1() - timerPausedAt), (timerPausedAt = 0));
+  profilerStartTime = -1;
+function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
+  if (0 <= profilerStartTime) {
+    var elapsedTime = now$1() - profilerStartTime;
+    fiber.actualDuration += elapsedTime;
+    overrideBaseTime && (fiber.selfBaseDuration = elapsedTime);
+    profilerStartTime = -1;
+  }
 }
-var baseStartTime = -1,
-  hasOwnProperty = Object.prototype.hasOwnProperty;
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 function is(x, y) {
   return x === y ? 0 !== x || 0 !== y || 1 / x === 1 / y : x !== x && y !== y;
 }
@@ -2363,22 +2428,24 @@ function shallowEqual(objA, objB) {
       return !1;
   return !0;
 }
+var emptyRefsObject = new React.Component().refs;
 function applyDerivedStateFromProps(
   workInProgress,
+  ctor,
   getDerivedStateFromProps,
   nextProps
 ) {
-  var prevState = workInProgress.memoizedState;
-  getDerivedStateFromProps = getDerivedStateFromProps(nextProps, prevState);
-  prevState =
+  ctor = workInProgress.memoizedState;
+  getDerivedStateFromProps = getDerivedStateFromProps(nextProps, ctor);
+  getDerivedStateFromProps =
     null === getDerivedStateFromProps || void 0 === getDerivedStateFromProps
-      ? prevState
-      : Object.assign({}, prevState, getDerivedStateFromProps);
-  workInProgress.memoizedState = prevState;
-  workInProgress = workInProgress.updateQueue;
-  null !== workInProgress &&
+      ? ctor
+      : Object.assign({}, ctor, getDerivedStateFromProps);
+  workInProgress.memoizedState = getDerivedStateFromProps;
+  nextProps = workInProgress.updateQueue;
+  null !== nextProps &&
     0 === workInProgress.expirationTime &&
-    (workInProgress.baseState = prevState);
+    (nextProps.baseState = getDerivedStateFromProps);
 }
 var classComponentUpdater = {
   isMounted: function(component) {
@@ -2388,49 +2455,49 @@ var classComponentUpdater = {
   },
   enqueueSetState: function(inst, payload, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.tag = 1;
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternalFiber;
-    var currentTime = recalculateCurrentTime();
+    var currentTime = requestCurrentTime();
     currentTime = computeExpirationForFiber(currentTime, inst);
     var update = createUpdate(currentTime);
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update, currentTime);
+    enqueueUpdate(inst, update);
     scheduleWork(inst, currentTime);
   }
 };
 function checkShouldComponentUpdate(
   workInProgress,
+  ctor,
   oldProps,
   newProps,
   oldState,
   newState,
-  newContext
+  nextContext
 ) {
-  var instance = workInProgress.stateNode;
-  workInProgress = workInProgress.type;
-  return "function" === typeof instance.shouldComponentUpdate
-    ? instance.shouldComponentUpdate(newProps, newState, newContext)
-    : workInProgress.prototype && workInProgress.prototype.isPureReactComponent
+  workInProgress = workInProgress.stateNode;
+  return "function" === typeof workInProgress.shouldComponentUpdate
+    ? workInProgress.shouldComponentUpdate(newProps, newState, nextContext)
+    : ctor.prototype && ctor.prototype.isPureReactComponent
       ? !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
       : !0;
 }
@@ -2438,38 +2505,46 @@ function callComponentWillReceiveProps(
   workInProgress,
   instance,
   newProps,
-  newContext
+  nextContext
 ) {
   workInProgress = instance.state;
   "function" === typeof instance.componentWillReceiveProps &&
-    instance.componentWillReceiveProps(newProps, newContext);
+    instance.componentWillReceiveProps(newProps, nextContext);
   "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
-    instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    instance.UNSAFE_componentWillReceiveProps(newProps, nextContext);
   instance.state !== workInProgress &&
     classComponentUpdater.enqueueReplaceState(instance, instance.state, null);
 }
-function mountClassInstance(workInProgress, renderExpirationTime) {
-  var ctor = workInProgress.type,
-    instance = workInProgress.stateNode,
-    props = workInProgress.pendingProps,
-    unmaskedContext = getUnmaskedContext(workInProgress);
-  instance.props = props;
+function mountClassInstance(
+  workInProgress,
+  ctor,
+  newProps,
+  renderExpirationTime
+) {
+  var instance = workInProgress.stateNode;
+  instance.props = newProps;
   instance.state = workInProgress.memoizedState;
-  instance.refs = emptyObject;
-  instance.context = getMaskedContext(workInProgress, unmaskedContext);
-  unmaskedContext = workInProgress.updateQueue;
-  null !== unmaskedContext &&
+  instance.refs = emptyRefsObject;
+  var contextType = ctor.contextType;
+  "object" === typeof contextType && null !== contextType
+    ? (instance.context = contextType.unstable_read())
+    : ((contextType = isContextProvider(ctor)
+        ? previousContext
+        : contextStackCursor.current),
+      (instance.context = getMaskedContext(workInProgress, contextType)));
+  contextType = workInProgress.updateQueue;
+  null !== contextType &&
     (processUpdateQueue(
       workInProgress,
-      unmaskedContext,
-      props,
+      contextType,
+      newProps,
       instance,
       renderExpirationTime
     ),
     (instance.state = workInProgress.memoizedState));
-  unmaskedContext = workInProgress.type.getDerivedStateFromProps;
-  "function" === typeof unmaskedContext &&
-    (applyDerivedStateFromProps(workInProgress, unmaskedContext, props),
+  contextType = ctor.getDerivedStateFromProps;
+  "function" === typeof contextType &&
+    (applyDerivedStateFromProps(workInProgress, ctor, contextType, newProps),
     (instance.state = workInProgress.memoizedState));
   "function" === typeof ctor.getDerivedStateFromProps ||
     "function" === typeof instance.getSnapshotBeforeUpdate ||
@@ -2482,12 +2557,12 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
       instance.UNSAFE_componentWillMount(),
     ctor !== instance.state &&
       classComponentUpdater.enqueueReplaceState(instance, instance.state, null),
-    (unmaskedContext = workInProgress.updateQueue),
-    null !== unmaskedContext &&
+    (contextType = workInProgress.updateQueue),
+    null !== contextType &&
       (processUpdateQueue(
         workInProgress,
-        unmaskedContext,
-        props,
+        contextType,
+        newProps,
         instance,
         renderExpirationTime
       ),
@@ -2495,8 +2570,8 @@ function mountClassInstance(workInProgress, renderExpirationTime) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.effectTag |= 4);
 }
-var isArray$1 = Array.isArray;
-function coerceRef(returnFiber, current, element) {
+var isArray = Array.isArray;
+function coerceRef(returnFiber, current$$1, element) {
   returnFiber = element.ref;
   if (
     null !== returnFiber &&
@@ -2508,8 +2583,8 @@ function coerceRef(returnFiber, current, element) {
       var inst = void 0;
       element &&
         (invariant(
-          2 === element.tag,
-          "Stateless function components cannot have refs."
+          2 === element.tag || 3 === element.tag,
+          "Function components cannot have refs."
         ),
         (inst = element.stateNode));
       invariant(
@@ -2519,26 +2594,27 @@ function coerceRef(returnFiber, current, element) {
       );
       var stringRef = "" + returnFiber;
       if (
-        null !== current &&
-        null !== current.ref &&
-        "function" === typeof current.ref &&
-        current.ref._stringRef === stringRef
+        null !== current$$1 &&
+        null !== current$$1.ref &&
+        "function" === typeof current$$1.ref &&
+        current$$1.ref._stringRef === stringRef
       )
-        return current.ref;
-      current = function(value) {
-        var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
+        return current$$1.ref;
+      current$$1 = function(value) {
+        var refs = inst.refs;
+        refs === emptyRefsObject && (refs = inst.refs = {});
         null === value ? delete refs[stringRef] : (refs[stringRef] = value);
       };
-      current._stringRef = stringRef;
-      return current;
+      current$$1._stringRef = stringRef;
+      return current$$1;
     }
     invariant(
       "string" === typeof returnFiber,
-      "Expected ref to be a function or a string."
+      "Expected ref to be a function, a string, an object returned by React.createRef(), or null."
     );
     invariant(
       element._owner,
-      "Element ref was specified as a string (%s) but no owner was set. This could happen for one of the following reasons:\n1. You may be adding a ref to a functional component\n2. You may be adding a ref to a component that was not created inside a component's render method\n3. You have multiple copies of React loaded\nSee https://fb.me/react-refs-must-have-owner for more information.",
+      "Element ref was specified as a string (%s) but no owner was set. This could happen for one of the following reasons:\n1. You may be adding a ref to a function component\n2. You may be adding a ref to a component that was not created inside a component's render method\n3. You have multiple copies of React loaded\nSee https://fb.me/react-refs-must-have-owner for more information.",
       returnFiber
     );
   }
@@ -2608,26 +2684,31 @@ function ChildReconciler(shouldTrackSideEffects) {
       (newFiber.effectTag = 2);
     return newFiber;
   }
-  function updateTextNode(returnFiber, current, textContent, expirationTime) {
-    if (null === current || 6 !== current.tag)
+  function updateTextNode(
+    returnFiber,
+    current$$1,
+    textContent,
+    expirationTime
+  ) {
+    if (null === current$$1 || 8 !== current$$1.tag)
       return (
-        (current = createFiberFromText(
+        (current$$1 = createFiberFromText(
           textContent,
           returnFiber.mode,
           expirationTime
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, textContent, expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, textContent, expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
-  function updateElement(returnFiber, current, element, expirationTime) {
-    if (null !== current && current.type === element.type)
+  function updateElement(returnFiber, current$$1, element, expirationTime) {
+    if (null !== current$$1 && current$$1.type === element.type)
       return (
-        (expirationTime = useFiber(current, element.props, expirationTime)),
-        (expirationTime.ref = coerceRef(returnFiber, current, element)),
+        (expirationTime = useFiber(current$$1, element.props, expirationTime)),
+        (expirationTime.ref = coerceRef(returnFiber, current$$1, element)),
         (expirationTime.return = returnFiber),
         expirationTime
       );
@@ -2636,45 +2717,51 @@ function ChildReconciler(shouldTrackSideEffects) {
       returnFiber.mode,
       expirationTime
     );
-    expirationTime.ref = coerceRef(returnFiber, current, element);
+    expirationTime.ref = coerceRef(returnFiber, current$$1, element);
     expirationTime.return = returnFiber;
     return expirationTime;
   }
-  function updatePortal(returnFiber, current, portal, expirationTime) {
+  function updatePortal(returnFiber, current$$1, portal, expirationTime) {
     if (
-      null === current ||
-      4 !== current.tag ||
-      current.stateNode.containerInfo !== portal.containerInfo ||
-      current.stateNode.implementation !== portal.implementation
+      null === current$$1 ||
+      6 !== current$$1.tag ||
+      current$$1.stateNode.containerInfo !== portal.containerInfo ||
+      current$$1.stateNode.implementation !== portal.implementation
     )
       return (
-        (current = createFiberFromPortal(
+        (current$$1 = createFiberFromPortal(
           portal,
           returnFiber.mode,
           expirationTime
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, portal.children || [], expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, portal.children || [], expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
-  function updateFragment(returnFiber, current, fragment, expirationTime, key) {
-    if (null === current || 10 !== current.tag)
+  function updateFragment(
+    returnFiber,
+    current$$1,
+    fragment,
+    expirationTime,
+    key
+  ) {
+    if (null === current$$1 || 9 !== current$$1.tag)
       return (
-        (current = createFiberFromFragment(
+        (current$$1 = createFiberFromFragment(
           fragment,
           returnFiber.mode,
           expirationTime,
           key
         )),
-        (current.return = returnFiber),
-        current
+        (current$$1.return = returnFiber),
+        current$$1
       );
-    current = useFiber(current, fragment, expirationTime);
-    current.return = returnFiber;
-    return current;
+    current$$1 = useFiber(current$$1, fragment, expirationTime);
+    current$$1.return = returnFiber;
+    return current$$1;
   }
   function createChild(returnFiber, newChild, expirationTime) {
     if ("string" === typeof newChild || "number" === typeof newChild)
@@ -2711,7 +2798,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2751,7 +2838,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ? updatePortal(returnFiber, oldFiber, newChild, expirationTime)
             : null;
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(
@@ -2819,7 +2906,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             )
           );
       }
-      if (isArray$1(newChild) || getIteratorFn(newChild))
+      if (isArray(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(
@@ -3036,7 +3123,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ) {
               if (isUnkeyedTopLevelFragment.key === isObject)
                 if (
-                  10 === isUnkeyedTopLevelFragment.tag
+                  9 === isUnkeyedTopLevelFragment.tag
                     ? newChild.type === REACT_FRAGMENT_TYPE
                     : isUnkeyedTopLevelFragment.type === newChild.type
                 ) {
@@ -3101,7 +3188,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             ) {
               if (currentFirstChild.key === isUnkeyedTopLevelFragment)
                 if (
-                  4 === currentFirstChild.tag &&
+                  6 === currentFirstChild.tag &&
                   currentFirstChild.stateNode.containerInfo ===
                     newChild.containerInfo &&
                   currentFirstChild.stateNode.implementation ===
@@ -3139,7 +3226,7 @@ function ChildReconciler(shouldTrackSideEffects) {
     if ("string" === typeof newChild || "number" === typeof newChild)
       return (
         (newChild = "" + newChild),
-        null !== currentFirstChild && 6 === currentFirstChild.tag
+        null !== currentFirstChild && 8 === currentFirstChild.tag
           ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
             (currentFirstChild = useFiber(
               currentFirstChild,
@@ -3158,7 +3245,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             (returnFiber = currentFirstChild)),
         placeSingleChild(returnFiber)
       );
-    if (isArray$1(newChild))
+    if (isArray(newChild))
       return reconcileChildrenArray(
         returnFiber,
         currentFirstChild,
@@ -3176,7 +3263,8 @@ function ChildReconciler(shouldTrackSideEffects) {
     if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
       switch (returnFiber.tag) {
         case 2:
-        case 1:
+        case 3:
+        case 0:
           (expirationTime = returnFiber.type),
             invariant(
               !1,
@@ -3194,12 +3282,12 @@ var reconcileChildFibers = ChildReconciler(!0),
   isHydrating = !1;
 function tryHydrate(fiber, nextInstance) {
   switch (fiber.tag) {
-    case 5:
+    case 7:
       return (
         (nextInstance = shim$1(nextInstance, fiber.type, fiber.pendingProps)),
         null !== nextInstance ? ((fiber.stateNode = nextInstance), !0) : !1
       );
-    case 6:
+    case 8:
       return (
         (nextInstance = shim$1(nextInstance, fiber.pendingProps)),
         null !== nextInstance ? ((fiber.stateNode = nextInstance), !0) : !1
@@ -3222,7 +3310,7 @@ function tryToClaimNextHydratableInstance(fiber$jscomp$0) {
           return;
         }
         var returnFiber = hydrationParentFiber,
-          fiber = new FiberNode(5, null, null, 0);
+          fiber = new FiberNode(7, null, null, 0);
         fiber.type = "DELETED";
         fiber.stateNode = firstAttemptedInstance;
         fiber.return = returnFiber;
@@ -3240,22 +3328,47 @@ function tryToClaimNextHydratableInstance(fiber$jscomp$0) {
         (hydrationParentFiber = fiber$jscomp$0);
   }
 }
-function reconcileChildren(current, workInProgress, nextChildren) {
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    workInProgress.expirationTime
-  );
+function readLazyComponentType(thenable) {
+  switch (thenable._reactStatus) {
+    case 1:
+      return thenable._reactResult;
+    case 2:
+      throw thenable._reactResult;
+    case 0:
+      throw thenable;
+    default:
+      throw ((thenable._reactStatus = 0),
+      thenable.then(
+        function(resolvedValue) {
+          if (0 === thenable._reactStatus) {
+            thenable._reactStatus = 1;
+            if ("object" === typeof resolvedValue && null !== resolvedValue) {
+              var defaultExport = resolvedValue.default;
+              resolvedValue =
+                void 0 !== defaultExport && null !== defaultExport
+                  ? defaultExport
+                  : resolvedValue;
+            }
+            thenable._reactResult = resolvedValue;
+          }
+        },
+        function(error) {
+          0 === thenable._reactStatus &&
+            ((thenable._reactStatus = 2), (thenable._reactResult = error));
+        }
+      ),
+      thenable);
+  }
 }
-function reconcileChildrenAtExpirationTime(
-  current,
+var ReactCurrentOwner$3 = ReactSharedInternals.ReactCurrentOwner;
+function reconcileChildren(
+  current$$1,
   workInProgress,
   nextChildren,
   renderExpirationTime
 ) {
   workInProgress.child =
-    null === current
+    null === current$$1
       ? mountChildFibers(
           workInProgress,
           null,
@@ -3264,57 +3377,397 @@ function reconcileChildrenAtExpirationTime(
         )
       : reconcileChildFibers(
           workInProgress,
-          current.child,
+          current$$1.child,
           nextChildren,
           renderExpirationTime
         );
 }
-function markRef(current, workInProgress) {
+function updateForwardRef(
+  current$$1,
+  workInProgress,
+  type,
+  nextProps,
+  renderExpirationTime
+) {
+  type = type.render;
+  var ref = workInProgress.ref;
+  if (
+    !didPerformWorkStackCursor.current &&
+    workInProgress.memoizedProps === nextProps &&
+    ref === (null !== current$$1 ? current$$1.ref : null)
+  )
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
+  type = type(nextProps, ref);
+  reconcileChildren(current$$1, workInProgress, type, renderExpirationTime);
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
+}
+function updatePureComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  updateExpirationTime,
+  renderExpirationTime
+) {
+  var render = Component.render,
+    ref = workInProgress.ref;
+  if (
+    null !== current$$1 &&
+    (0 === updateExpirationTime ||
+      updateExpirationTime > renderExpirationTime) &&
+    ((updateExpirationTime = current$$1.memoizedProps),
+    (Component = Component.compare),
+    (Component = null !== Component ? Component : shallowEqual),
+    workInProgress.ref === current$$1.ref &&
+      Component(updateExpirationTime, nextProps))
+  )
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  render = render(nextProps, ref);
+  workInProgress.effectTag |= 1;
+  reconcileChildren(current$$1, workInProgress, render, renderExpirationTime);
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
+}
+function markRef(current$$1, workInProgress) {
   var ref = workInProgress.ref;
   if (
-    (null === current && null !== ref) ||
-    (null !== current && current.ref !== ref)
+    (null === current$$1 && null !== ref) ||
+    (null !== current$$1 && current$$1.ref !== ref)
   )
     workInProgress.effectTag |= 128;
 }
+function updateFunctionComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
+  var unmaskedContext = isContextProvider(Component)
+    ? previousContext
+    : contextStackCursor.current;
+  unmaskedContext = getMaskedContext(workInProgress, unmaskedContext);
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  Component = Component(nextProps, unmaskedContext);
+  workInProgress.effectTag |= 1;
+  reconcileChildren(
+    current$$1,
+    workInProgress,
+    Component,
+    renderExpirationTime
+  );
+  workInProgress.memoizedProps = nextProps;
+  return workInProgress.child;
+}
+function updateClassComponent(
+  current$$1,
+  workInProgress,
+  Component,
+  nextProps,
+  renderExpirationTime
+) {
+  if (isContextProvider(Component)) {
+    var hasContext = !0;
+    pushContextProvider(workInProgress);
+  } else hasContext = !1;
+  prepareToReadContext(workInProgress, renderExpirationTime);
+  if (null === current$$1)
+    if (null === workInProgress.stateNode) {
+      var isLegacyContextConsumer = !1,
+        unmaskedContext = emptyContextObject;
+      var context = Component.contextType;
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((unmaskedContext = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (isLegacyContextConsumer = Component.contextTypes),
+          (context = (isLegacyContextConsumer =
+            null !== isLegacyContextConsumer &&
+            void 0 !== isLegacyContextConsumer)
+            ? getMaskedContext(workInProgress, unmaskedContext)
+            : emptyContextObject));
+      var instance = new Component(nextProps, context);
+      workInProgress.memoizedState =
+        null !== instance.state && void 0 !== instance.state
+          ? instance.state
+          : null;
+      instance.updater = classComponentUpdater;
+      workInProgress.stateNode = instance;
+      instance._reactInternalFiber = workInProgress;
+      isLegacyContextConsumer &&
+        ((isLegacyContextConsumer = workInProgress.stateNode),
+        (isLegacyContextConsumer.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
+        (isLegacyContextConsumer.__reactInternalMemoizedMaskedChildContext = context));
+      mountClassInstance(
+        workInProgress,
+        Component,
+        nextProps,
+        renderExpirationTime
+      );
+      nextProps = !0;
+    } else {
+      unmaskedContext = workInProgress.stateNode;
+      isLegacyContextConsumer = workInProgress.memoizedProps;
+      unmaskedContext.props = isLegacyContextConsumer;
+      var oldContext = unmaskedContext.context;
+      context = Component.contextType;
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((context = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (context = getMaskedContext(workInProgress, context)));
+      var getDerivedStateFromProps = Component.getDerivedStateFromProps;
+      (instance =
+        "function" === typeof getDerivedStateFromProps ||
+        "function" === typeof unmaskedContext.getSnapshotBeforeUpdate) ||
+        ("function" !==
+          typeof unmaskedContext.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof unmaskedContext.componentWillReceiveProps) ||
+        ((isLegacyContextConsumer !== nextProps || oldContext !== context) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            unmaskedContext,
+            nextProps,
+            context
+          ));
+      hasForceUpdate = !1;
+      var oldState = workInProgress.memoizedState;
+      oldContext = unmaskedContext.state = oldState;
+      var updateQueue = workInProgress.updateQueue;
+      null !== updateQueue &&
+        (processUpdateQueue(
+          workInProgress,
+          updateQueue,
+          nextProps,
+          unmaskedContext,
+          renderExpirationTime
+        ),
+        (oldContext = workInProgress.memoizedState));
+      isLegacyContextConsumer !== nextProps ||
+      oldState !== oldContext ||
+      didPerformWorkStackCursor.current ||
+      hasForceUpdate
+        ? ("function" === typeof getDerivedStateFromProps &&
+            (applyDerivedStateFromProps(
+              workInProgress,
+              Component,
+              getDerivedStateFromProps,
+              nextProps
+            ),
+            (oldContext = workInProgress.memoizedState)),
+          (isLegacyContextConsumer =
+            hasForceUpdate ||
+            checkShouldComponentUpdate(
+              workInProgress,
+              Component,
+              isLegacyContextConsumer,
+              nextProps,
+              oldState,
+              oldContext,
+              context
+            ))
+            ? (instance ||
+                ("function" !==
+                  typeof unmaskedContext.UNSAFE_componentWillMount &&
+                  "function" !== typeof unmaskedContext.componentWillMount) ||
+                ("function" === typeof unmaskedContext.componentWillMount &&
+                  unmaskedContext.componentWillMount(),
+                "function" ===
+                  typeof unmaskedContext.UNSAFE_componentWillMount &&
+                  unmaskedContext.UNSAFE_componentWillMount()),
+              "function" === typeof unmaskedContext.componentDidMount &&
+                (workInProgress.effectTag |= 4))
+            : ("function" === typeof unmaskedContext.componentDidMount &&
+                (workInProgress.effectTag |= 4),
+              (workInProgress.memoizedProps = nextProps),
+              (workInProgress.memoizedState = oldContext)),
+          (unmaskedContext.props = nextProps),
+          (unmaskedContext.state = oldContext),
+          (unmaskedContext.context = context),
+          (nextProps = isLegacyContextConsumer))
+        : ("function" === typeof unmaskedContext.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          (nextProps = !1));
+    }
+  else
+    (unmaskedContext = workInProgress.stateNode),
+      (isLegacyContextConsumer = workInProgress.memoizedProps),
+      (unmaskedContext.props = isLegacyContextConsumer),
+      (oldContext = unmaskedContext.context),
+      (context = Component.contextType),
+      "object" === typeof context && null !== context
+        ? (context = context.unstable_read())
+        : ((context = isContextProvider(Component)
+            ? previousContext
+            : contextStackCursor.current),
+          (context = getMaskedContext(workInProgress, context))),
+      (getDerivedStateFromProps = Component.getDerivedStateFromProps),
+      (instance =
+        "function" === typeof getDerivedStateFromProps ||
+        "function" === typeof unmaskedContext.getSnapshotBeforeUpdate) ||
+        ("function" !==
+          typeof unmaskedContext.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof unmaskedContext.componentWillReceiveProps) ||
+        ((isLegacyContextConsumer !== nextProps || oldContext !== context) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            unmaskedContext,
+            nextProps,
+            context
+          )),
+      (hasForceUpdate = !1),
+      (oldContext = workInProgress.memoizedState),
+      (oldState = unmaskedContext.state = oldContext),
+      (updateQueue = workInProgress.updateQueue),
+      null !== updateQueue &&
+        (processUpdateQueue(
+          workInProgress,
+          updateQueue,
+          nextProps,
+          unmaskedContext,
+          renderExpirationTime
+        ),
+        (oldState = workInProgress.memoizedState)),
+      isLegacyContextConsumer !== nextProps ||
+      oldContext !== oldState ||
+      didPerformWorkStackCursor.current ||
+      hasForceUpdate
+        ? ("function" === typeof getDerivedStateFromProps &&
+            (applyDerivedStateFromProps(
+              workInProgress,
+              Component,
+              getDerivedStateFromProps,
+              nextProps
+            ),
+            (oldState = workInProgress.memoizedState)),
+          (getDerivedStateFromProps =
+            hasForceUpdate ||
+            checkShouldComponentUpdate(
+              workInProgress,
+              Component,
+              isLegacyContextConsumer,
+              nextProps,
+              oldContext,
+              oldState,
+              context
+            ))
+            ? (instance ||
+                ("function" !==
+                  typeof unmaskedContext.UNSAFE_componentWillUpdate &&
+                  "function" !== typeof unmaskedContext.componentWillUpdate) ||
+                ("function" === typeof unmaskedContext.componentWillUpdate &&
+                  unmaskedContext.componentWillUpdate(
+                    nextProps,
+                    oldState,
+                    context
+                  ),
+                "function" ===
+                  typeof unmaskedContext.UNSAFE_componentWillUpdate &&
+                  unmaskedContext.UNSAFE_componentWillUpdate(
+                    nextProps,
+                    oldState,
+                    context
+                  )),
+              "function" === typeof unmaskedContext.componentDidUpdate &&
+                (workInProgress.effectTag |= 4),
+              "function" === typeof unmaskedContext.getSnapshotBeforeUpdate &&
+                (workInProgress.effectTag |= 256))
+            : ("function" !== typeof unmaskedContext.componentDidUpdate ||
+                (isLegacyContextConsumer === current$$1.memoizedProps &&
+                  oldContext === current$$1.memoizedState) ||
+                (workInProgress.effectTag |= 4),
+              "function" !== typeof unmaskedContext.getSnapshotBeforeUpdate ||
+                (isLegacyContextConsumer === current$$1.memoizedProps &&
+                  oldContext === current$$1.memoizedState) ||
+                (workInProgress.effectTag |= 256),
+              (workInProgress.memoizedProps = nextProps),
+              (workInProgress.memoizedState = oldState)),
+          (unmaskedContext.props = nextProps),
+          (unmaskedContext.state = oldState),
+          (unmaskedContext.context = context),
+          (nextProps = getDerivedStateFromProps))
+        : ("function" !== typeof unmaskedContext.componentDidUpdate ||
+            (isLegacyContextConsumer === current$$1.memoizedProps &&
+              oldContext === current$$1.memoizedState) ||
+            (workInProgress.effectTag |= 4),
+          "function" !== typeof unmaskedContext.getSnapshotBeforeUpdate ||
+            (isLegacyContextConsumer === current$$1.memoizedProps &&
+              oldContext === current$$1.memoizedState) ||
+            (workInProgress.effectTag |= 256),
+          (nextProps = !1));
+  return finishClassComponent(
+    current$$1,
+    workInProgress,
+    Component,
+    nextProps,
+    hasContext,
+    renderExpirationTime
+  );
+}
 function finishClassComponent(
-  current,
+  current$$1,
   workInProgress,
+  Component,
   shouldUpdate,
   hasContext,
   renderExpirationTime
 ) {
-  markRef(current, workInProgress);
+  markRef(current$$1, workInProgress);
   var didCaptureError = 0 !== (workInProgress.effectTag & 64);
   if (!shouldUpdate && !didCaptureError)
     return (
-      hasContext && invalidateContextProvider(workInProgress, !1),
-      bailoutOnAlreadyFinishedWork(current, workInProgress)
+      hasContext && invalidateContextProvider(workInProgress, Component, !1),
+      bailoutOnAlreadyFinishedWork(
+        current$$1,
+        workInProgress,
+        renderExpirationTime
+      )
     );
   shouldUpdate = workInProgress.stateNode;
-  ReactCurrentOwner.current = workInProgress;
-  if (didCaptureError) {
+  ReactCurrentOwner$3.current = workInProgress;
+  if (
+    didCaptureError &&
+    "function" !== typeof Component.getDerivedStateFromError
+  ) {
     var nextChildren = null;
-    baseStartTime = -1;
+    profilerStartTime = -1;
   } else nextChildren = shouldUpdate.render();
   workInProgress.effectTag |= 1;
-  didCaptureError &&
-    (reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      null,
-      renderExpirationTime
-    ),
-    (workInProgress.child = null));
-  reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    renderExpirationTime
-  );
+  null !== current$$1 && didCaptureError
+    ? ((didCaptureError = nextChildren),
+      (workInProgress.child = reconcileChildFibers(
+        workInProgress,
+        current$$1.child,
+        null,
+        renderExpirationTime
+      )),
+      (workInProgress.child = reconcileChildFibers(
+        workInProgress,
+        null,
+        didCaptureError,
+        renderExpirationTime
+      )))
+    : reconcileChildren(
+        current$$1,
+        workInProgress,
+        nextChildren,
+        renderExpirationTime
+      );
   workInProgress.memoizedState = shouldUpdate.state;
   workInProgress.memoizedProps = shouldUpdate.props;
-  hasContext && invalidateContextProvider(workInProgress, !0);
+  hasContext && invalidateContextProvider(workInProgress, Component, !0);
   return workInProgress.child;
 }
 function pushHostRootContext(workInProgress) {
@@ -3329,632 +3782,611 @@ function pushHostRootContext(workInProgress) {
       pushTopLevelContextObject(workInProgress, root.context, !1);
   pushHostContainer(workInProgress, root.containerInfo);
 }
-function propagateContextChange(
+function resolveDefaultProps(Component, baseProps) {
+  if (Component && Component.defaultProps) {
+    baseProps = Object.assign({}, baseProps);
+    Component = Component.defaultProps;
+    for (var propName in Component)
+      void 0 === baseProps[propName] &&
+        (baseProps[propName] = Component[propName]);
+  }
+  return baseProps;
+}
+function bailoutOnAlreadyFinishedWork(
+  current$$1,
   workInProgress,
-  context,
-  changedBits,
   renderExpirationTime
 ) {
-  var fiber = workInProgress.child;
-  null !== fiber && (fiber.return = workInProgress);
-  for (; null !== fiber; ) {
-    switch (fiber.tag) {
-      case 12:
-        var nextFiber = fiber.stateNode | 0;
-        if (fiber.type === context && 0 !== (nextFiber & changedBits)) {
-          for (nextFiber = fiber; null !== nextFiber; ) {
-            var alternate = nextFiber.alternate;
-            if (
-              0 === nextFiber.expirationTime ||
-              nextFiber.expirationTime > renderExpirationTime
-            )
-              (nextFiber.expirationTime = renderExpirationTime),
-                null !== alternate &&
-                  (0 === alternate.expirationTime ||
-                    alternate.expirationTime > renderExpirationTime) &&
-                  (alternate.expirationTime = renderExpirationTime);
-            else if (
-              null !== alternate &&
-              (0 === alternate.expirationTime ||
-                alternate.expirationTime > renderExpirationTime)
-            )
-              alternate.expirationTime = renderExpirationTime;
-            else break;
-            nextFiber = nextFiber.return;
-          }
-          nextFiber = null;
-        } else nextFiber = fiber.child;
-        break;
-      case 13:
-        nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
-        break;
-      default:
-        nextFiber = fiber.child;
-    }
-    if (null !== nextFiber) nextFiber.return = fiber;
-    else
-      for (nextFiber = fiber; null !== nextFiber; ) {
-        if (nextFiber === workInProgress) {
-          nextFiber = null;
-          break;
-        }
-        fiber = nextFiber.sibling;
-        if (null !== fiber) {
-          fiber.return = nextFiber.return;
-          nextFiber = fiber;
-          break;
-        }
-        nextFiber = nextFiber.return;
-      }
-    fiber = nextFiber;
-  }
-}
-function updateContextProvider(current, workInProgress, renderExpirationTime) {
-  var context = workInProgress.type._context,
-    newProps = workInProgress.pendingProps,
-    oldProps = workInProgress.memoizedProps,
-    canBailOnProps = !0;
-  if (didPerformWorkStackCursor.current) canBailOnProps = !1;
-  else if (oldProps === newProps)
-    return (
-      (workInProgress.stateNode = 0),
-      pushProvider(workInProgress),
-      bailoutOnAlreadyFinishedWork(current, workInProgress)
-    );
-  var newValue = newProps.value;
-  workInProgress.memoizedProps = newProps;
-  if (null === oldProps) newValue = 1073741823;
-  else if (oldProps.value === newProps.value) {
-    if (oldProps.children === newProps.children && canBailOnProps)
-      return (
-        (workInProgress.stateNode = 0),
-        pushProvider(workInProgress),
-        bailoutOnAlreadyFinishedWork(current, workInProgress)
-      );
-    newValue = 0;
-  } else {
-    var oldValue = oldProps.value;
-    if (
-      (oldValue === newValue &&
-        (0 !== oldValue || 1 / oldValue === 1 / newValue)) ||
-      (oldValue !== oldValue && newValue !== newValue)
-    ) {
-      if (oldProps.children === newProps.children && canBailOnProps)
-        return (
-          (workInProgress.stateNode = 0),
-          pushProvider(workInProgress),
-          bailoutOnAlreadyFinishedWork(current, workInProgress)
-        );
-      newValue = 0;
-    } else if (
-      ((newValue =
-        "function" === typeof context._calculateChangedBits
-          ? context._calculateChangedBits(oldValue, newValue)
-          : 1073741823),
-      (newValue |= 0),
-      0 === newValue)
-    ) {
-      if (oldProps.children === newProps.children && canBailOnProps)
-        return (
-          (workInProgress.stateNode = 0),
-          pushProvider(workInProgress),
-          bailoutOnAlreadyFinishedWork(current, workInProgress)
-        );
-    } else
-      propagateContextChange(
-        workInProgress,
-        context,
-        newValue,
-        renderExpirationTime
-      );
-  }
-  workInProgress.stateNode = newValue;
-  pushProvider(workInProgress);
-  reconcileChildren(current, workInProgress, newProps.children);
-  return workInProgress.child;
-}
-function bailoutOnAlreadyFinishedWork(current, workInProgress) {
-  baseStartTime = -1;
+  null !== current$$1 &&
+    (workInProgress.firstContextDependency = current$$1.firstContextDependency);
+  profilerStartTime = -1;
+  var childExpirationTime = workInProgress.childExpirationTime;
+  if (0 === childExpirationTime || childExpirationTime > renderExpirationTime)
+    return null;
   invariant(
-    null === current || workInProgress.child === current.child,
+    null === current$$1 || workInProgress.child === current$$1.child,
     "Resuming work not yet implemented."
   );
   if (null !== workInProgress.child) {
-    current = workInProgress.child;
-    var newChild = createWorkInProgress(
-      current,
-      current.pendingProps,
-      current.expirationTime
+    current$$1 = workInProgress.child;
+    renderExpirationTime = createWorkInProgress(
+      current$$1,
+      current$$1.pendingProps,
+      current$$1.expirationTime
     );
-    workInProgress.child = newChild;
-    for (newChild.return = workInProgress; null !== current.sibling; )
-      (current = current.sibling),
-        (newChild = newChild.sibling = createWorkInProgress(
-          current,
-          current.pendingProps,
-          current.expirationTime
+    workInProgress.child = renderExpirationTime;
+    for (
+      renderExpirationTime.return = workInProgress;
+      null !== current$$1.sibling;
+
+    )
+      (current$$1 = current$$1.sibling),
+        (renderExpirationTime = renderExpirationTime.sibling = createWorkInProgress(
+          current$$1,
+          current$$1.pendingProps,
+          current$$1.expirationTime
         )),
-        (newChild.return = workInProgress);
-    newChild.sibling = null;
+        (renderExpirationTime.return = workInProgress);
+    renderExpirationTime.sibling = null;
   }
   return workInProgress.child;
 }
-function beginWork(current, workInProgress, renderExpirationTime) {
-  workInProgress.mode & 4 &&
-    ((workInProgress.actualDuration =
-      now$1() - workInProgress.actualDuration - totalElapsedPauseTime),
-    (workInProgress.actualStartTime = now$1()));
+function beginWork(current$$1, workInProgress, renderExpirationTime) {
+  var updateExpirationTime = workInProgress.expirationTime;
   if (
-    0 === workInProgress.expirationTime ||
-    workInProgress.expirationTime > renderExpirationTime
+    null !== current$$1 &&
+    current$$1.memoizedProps === workInProgress.pendingProps &&
+    !didPerformWorkStackCursor.current &&
+    (0 === updateExpirationTime || updateExpirationTime > renderExpirationTime)
   ) {
-    baseStartTime = -1;
     switch (workInProgress.tag) {
-      case 3:
+      case 5:
         pushHostRootContext(workInProgress);
         break;
+      case 7:
+        pushHostContext(workInProgress);
+        break;
       case 2:
-        pushContextProvider(workInProgress);
+        isContextProvider(workInProgress.type) &&
+          pushContextProvider(workInProgress);
         break;
-      case 4:
+      case 3:
+        isContextProvider(workInProgress.type._reactResult) &&
+          pushContextProvider(workInProgress);
+        break;
+      case 6:
         pushHostContainer(
           workInProgress,
           workInProgress.stateNode.containerInfo
         );
         break;
-      case 13:
-        pushProvider(workInProgress);
+      case 12:
+        pushProvider(workInProgress, workInProgress.memoizedProps.value);
+        break;
+      case 15:
+        workInProgress.effectTag |= 4;
     }
-    return null;
+    return bailoutOnAlreadyFinishedWork(
+      current$$1,
+      workInProgress,
+      renderExpirationTime
+    );
   }
+  workInProgress.expirationTime = 0;
   switch (workInProgress.tag) {
-    case 0:
+    case 4:
+      var Component = workInProgress.type;
       invariant(
-        null === current,
+        null === current$$1,
         "An indeterminate component should never have mounted. This error is likely caused by a bug in React. Please file an issue."
       );
-      var fn = workInProgress.type,
-        props = workInProgress.pendingProps,
-        unmaskedContext = getUnmaskedContext(workInProgress);
-      unmaskedContext = getMaskedContext(workInProgress, unmaskedContext);
-      fn = fn(props, unmaskedContext);
-      workInProgress.effectTag |= 1;
-      "object" === typeof fn &&
-      null !== fn &&
-      "function" === typeof fn.render &&
-      void 0 === fn.$$typeof
-        ? ((unmaskedContext = workInProgress.type),
-          (workInProgress.tag = 2),
-          (workInProgress.memoizedState =
-            null !== fn.state && void 0 !== fn.state ? fn.state : null),
-          (unmaskedContext = unmaskedContext.getDerivedStateFromProps),
-          "function" === typeof unmaskedContext &&
-            applyDerivedStateFromProps(workInProgress, unmaskedContext, props),
-          (props = pushContextProvider(workInProgress)),
-          (fn.updater = classComponentUpdater),
-          (workInProgress.stateNode = fn),
-          (fn._reactInternalFiber = workInProgress),
-          mountClassInstance(workInProgress, renderExpirationTime),
-          (current = finishClassComponent(
-            current,
+      var props = workInProgress.pendingProps;
+      if (
+        "object" === typeof Component &&
+        null !== Component &&
+        "function" === typeof Component.then
+      ) {
+        Component = readLazyComponentType(Component);
+        var resolvedTag = (workInProgress.tag = resolveLazyComponentTag(
             workInProgress,
-            !0,
-            props,
-            renderExpirationTime
-          )))
-        : ((workInProgress.tag = 1),
-          reconcileChildren(current, workInProgress, fn),
-          (workInProgress.memoizedProps = props),
-          (current = workInProgress.child));
-      return current;
-    case 1:
-      return (
-        (props = workInProgress.type),
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime
-          ? ((fn = getUnmaskedContext(workInProgress)),
-            (fn = getMaskedContext(workInProgress, fn)),
-            (props = props(renderExpirationTime, fn)),
-            (workInProgress.effectTag |= 1),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
-      );
-    case 2:
-      props = pushContextProvider(workInProgress);
-      if (null === current)
-        if (null === workInProgress.stateNode) {
-          var props$jscomp$0 = workInProgress.pendingProps,
-            ctor = workInProgress.type;
-          fn = getUnmaskedContext(workInProgress);
-          var needsContext =
-            2 === workInProgress.tag &&
-            null != workInProgress.type.contextTypes;
-          unmaskedContext = needsContext
-            ? getMaskedContext(workInProgress, fn)
-            : emptyObject;
-          props$jscomp$0 = new ctor(props$jscomp$0, unmaskedContext);
-          workInProgress.memoizedState =
-            null !== props$jscomp$0.state && void 0 !== props$jscomp$0.state
-              ? props$jscomp$0.state
-              : null;
-          props$jscomp$0.updater = classComponentUpdater;
-          workInProgress.stateNode = props$jscomp$0;
-          props$jscomp$0._reactInternalFiber = workInProgress;
-          needsContext &&
-            ((needsContext = workInProgress.stateNode),
-            (needsContext.__reactInternalMemoizedUnmaskedChildContext = fn),
-            (needsContext.__reactInternalMemoizedMaskedChildContext = unmaskedContext));
-          mountClassInstance(workInProgress, renderExpirationTime);
-          fn = !0;
-        } else {
-          ctor = workInProgress.type;
-          fn = workInProgress.stateNode;
-          needsContext = workInProgress.memoizedProps;
-          unmaskedContext = workInProgress.pendingProps;
-          fn.props = needsContext;
-          var oldContext = fn.context;
-          props$jscomp$0 = getUnmaskedContext(workInProgress);
-          props$jscomp$0 = getMaskedContext(workInProgress, props$jscomp$0);
-          var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
-          (ctor =
-            "function" === typeof getDerivedStateFromProps ||
-            "function" === typeof fn.getSnapshotBeforeUpdate) ||
-            ("function" !== typeof fn.UNSAFE_componentWillReceiveProps &&
-              "function" !== typeof fn.componentWillReceiveProps) ||
-            ((needsContext !== unmaskedContext ||
-              oldContext !== props$jscomp$0) &&
-              callComponentWillReceiveProps(
-                workInProgress,
-                fn,
-                unmaskedContext,
-                props$jscomp$0
-              ));
-          hasForceUpdate = !1;
-          var oldState = workInProgress.memoizedState;
-          oldContext = fn.state = oldState;
-          var updateQueue = workInProgress.updateQueue;
-          null !== updateQueue &&
-            (processUpdateQueue(
+            Component
+          )),
+          resolvedProps = resolveDefaultProps(Component, props),
+          child = void 0;
+        switch (resolvedTag) {
+          case 1:
+            child = updateFunctionComponent(
+              current$$1,
               workInProgress,
-              updateQueue,
-              unmaskedContext,
-              fn,
+              Component,
+              resolvedProps,
               renderExpirationTime
-            ),
-            (oldContext = workInProgress.memoizedState));
-          needsContext !== unmaskedContext ||
-          oldState !== oldContext ||
-          didPerformWorkStackCursor.current ||
-          hasForceUpdate
-            ? ("function" === typeof getDerivedStateFromProps &&
-                (applyDerivedStateFromProps(
-                  workInProgress,
-                  getDerivedStateFromProps,
-                  unmaskedContext
-                ),
-                (oldContext = workInProgress.memoizedState)),
-              (needsContext =
-                hasForceUpdate ||
-                checkShouldComponentUpdate(
-                  workInProgress,
-                  needsContext,
-                  unmaskedContext,
-                  oldState,
-                  oldContext,
-                  props$jscomp$0
-                ))
-                ? (ctor ||
-                    ("function" !== typeof fn.UNSAFE_componentWillMount &&
-                      "function" !== typeof fn.componentWillMount) ||
-                    ("function" === typeof fn.componentWillMount &&
-                      fn.componentWillMount(),
-                    "function" === typeof fn.UNSAFE_componentWillMount &&
-                      fn.UNSAFE_componentWillMount()),
-                  "function" === typeof fn.componentDidMount &&
-                    (workInProgress.effectTag |= 4))
-                : ("function" === typeof fn.componentDidMount &&
-                    (workInProgress.effectTag |= 4),
-                  (workInProgress.memoizedProps = unmaskedContext),
-                  (workInProgress.memoizedState = oldContext)),
-              (fn.props = unmaskedContext),
-              (fn.state = oldContext),
-              (fn.context = props$jscomp$0),
-              (fn = needsContext))
-            : ("function" === typeof fn.componentDidMount &&
-                (workInProgress.effectTag |= 4),
-              (fn = !1));
-        }
-      else
-        (ctor = workInProgress.type),
-          (fn = workInProgress.stateNode),
-          (unmaskedContext = workInProgress.memoizedProps),
-          (needsContext = workInProgress.pendingProps),
-          (fn.props = unmaskedContext),
-          (oldContext = fn.context),
-          (props$jscomp$0 = getUnmaskedContext(workInProgress)),
-          (props$jscomp$0 = getMaskedContext(workInProgress, props$jscomp$0)),
-          (getDerivedStateFromProps = ctor.getDerivedStateFromProps),
-          (ctor =
-            "function" === typeof getDerivedStateFromProps ||
-            "function" === typeof fn.getSnapshotBeforeUpdate) ||
-            ("function" !== typeof fn.UNSAFE_componentWillReceiveProps &&
-              "function" !== typeof fn.componentWillReceiveProps) ||
-            ((unmaskedContext !== needsContext ||
-              oldContext !== props$jscomp$0) &&
-              callComponentWillReceiveProps(
-                workInProgress,
-                fn,
-                needsContext,
-                props$jscomp$0
-              )),
-          (hasForceUpdate = !1),
-          (oldContext = workInProgress.memoizedState),
-          (oldState = fn.state = oldContext),
-          (updateQueue = workInProgress.updateQueue),
-          null !== updateQueue &&
-            (processUpdateQueue(
+            );
+            break;
+          case 3:
+            child = updateClassComponent(
+              current$$1,
               workInProgress,
-              updateQueue,
-              needsContext,
-              fn,
+              Component,
+              resolvedProps,
               renderExpirationTime
-            ),
-            (oldState = workInProgress.memoizedState)),
-          unmaskedContext !== needsContext ||
-          oldContext !== oldState ||
-          didPerformWorkStackCursor.current ||
-          hasForceUpdate
-            ? ("function" === typeof getDerivedStateFromProps &&
-                (applyDerivedStateFromProps(
+            );
+            break;
+          case 14:
+            child = updateForwardRef(
+              current$$1,
+              workInProgress,
+              Component,
+              resolvedProps,
+              renderExpirationTime
+            );
+            break;
+          case 18:
+            child = updatePureComponent(
+              current$$1,
+              workInProgress,
+              Component,
+              resolvedProps,
+              updateExpirationTime,
+              renderExpirationTime
+            );
+            break;
+          default:
+            invariant(
+              !1,
+              "Element type is invalid. Received a promise that resolves to: %s. Promise elements must resolve to a class or function.",
+              Component
+            );
+        }
+        workInProgress.memoizedProps = props;
+        workInProgress = child;
+      } else
+        (updateExpirationTime = getMaskedContext(
+          workInProgress,
+          contextStackCursor.current
+        )),
+          prepareToReadContext(workInProgress, renderExpirationTime),
+          (updateExpirationTime = Component(props, updateExpirationTime)),
+          (workInProgress.effectTag |= 1),
+          "object" === typeof updateExpirationTime &&
+          null !== updateExpirationTime &&
+          "function" === typeof updateExpirationTime.render &&
+          void 0 === updateExpirationTime.$$typeof
+            ? ((workInProgress.tag = 2),
+              isContextProvider(Component)
+                ? ((resolvedTag = !0), pushContextProvider(workInProgress))
+                : (resolvedTag = !1),
+              (workInProgress.memoizedState =
+                null !== updateExpirationTime.state &&
+                void 0 !== updateExpirationTime.state
+                  ? updateExpirationTime.state
+                  : null),
+              (resolvedProps = Component.getDerivedStateFromProps),
+              "function" === typeof resolvedProps &&
+                applyDerivedStateFromProps(
                   workInProgress,
-                  getDerivedStateFromProps,
-                  needsContext
+                  Component,
+                  resolvedProps,
+                  props
                 ),
-                (oldState = workInProgress.memoizedState)),
-              (getDerivedStateFromProps =
-                hasForceUpdate ||
-                checkShouldComponentUpdate(
-                  workInProgress,
-                  unmaskedContext,
-                  needsContext,
-                  oldContext,
-                  oldState,
-                  props$jscomp$0
-                ))
-                ? (ctor ||
-                    ("function" !== typeof fn.UNSAFE_componentWillUpdate &&
-                      "function" !== typeof fn.componentWillUpdate) ||
-                    ("function" === typeof fn.componentWillUpdate &&
-                      fn.componentWillUpdate(
-                        needsContext,
-                        oldState,
-                        props$jscomp$0
-                      ),
-                    "function" === typeof fn.UNSAFE_componentWillUpdate &&
-                      fn.UNSAFE_componentWillUpdate(
-                        needsContext,
-                        oldState,
-                        props$jscomp$0
-                      )),
-                  "function" === typeof fn.componentDidUpdate &&
-                    (workInProgress.effectTag |= 4),
-                  "function" === typeof fn.getSnapshotBeforeUpdate &&
-                    (workInProgress.effectTag |= 256))
-                : ("function" !== typeof fn.componentDidUpdate ||
-                    (unmaskedContext === current.memoizedProps &&
-                      oldContext === current.memoizedState) ||
-                    (workInProgress.effectTag |= 4),
-                  "function" !== typeof fn.getSnapshotBeforeUpdate ||
-                    (unmaskedContext === current.memoizedProps &&
-                      oldContext === current.memoizedState) ||
-                    (workInProgress.effectTag |= 256),
-                  (workInProgress.memoizedProps = needsContext),
-                  (workInProgress.memoizedState = oldState)),
-              (fn.props = needsContext),
-              (fn.state = oldState),
-              (fn.context = props$jscomp$0),
-              (fn = getDerivedStateFromProps))
-            : ("function" !== typeof fn.componentDidUpdate ||
-                (unmaskedContext === current.memoizedProps &&
-                  oldContext === current.memoizedState) ||
-                (workInProgress.effectTag |= 4),
-              "function" !== typeof fn.getSnapshotBeforeUpdate ||
-                (unmaskedContext === current.memoizedProps &&
-                  oldContext === current.memoizedState) ||
-                (workInProgress.effectTag |= 256),
-              (fn = !1));
-      return finishClassComponent(
-        current,
+              (updateExpirationTime.updater = classComponentUpdater),
+              (workInProgress.stateNode = updateExpirationTime),
+              (updateExpirationTime._reactInternalFiber = workInProgress),
+              mountClassInstance(
+                workInProgress,
+                Component,
+                props,
+                renderExpirationTime
+              ),
+              (workInProgress = finishClassComponent(
+                current$$1,
+                workInProgress,
+                Component,
+                !0,
+                resolvedTag,
+                renderExpirationTime
+              )))
+            : ((workInProgress.tag = 0),
+              reconcileChildren(
+                current$$1,
+                workInProgress,
+                updateExpirationTime,
+                renderExpirationTime
+              ),
+              (workInProgress.memoizedProps = props),
+              (workInProgress = workInProgress.child));
+      return workInProgress;
+    case 0:
+      return updateFunctionComponent(
+        current$$1,
         workInProgress,
-        fn,
-        props,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        renderExpirationTime
+      );
+    case 1:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateFunctionComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
+    case 2:
+      return updateClassComponent(
+        current$$1,
+        workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
         renderExpirationTime
       );
     case 3:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateClassComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
+    case 5:
       return (
         pushHostRootContext(workInProgress),
-        (props = workInProgress.updateQueue),
-        null !== props
-          ? ((fn = workInProgress.memoizedState),
-            (fn = null !== fn ? fn.element : null),
-            processUpdateQueue(
+        (Component = workInProgress.updateQueue),
+        invariant(
+          null !== Component,
+          "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
+        ),
+        (props = workInProgress.memoizedState),
+        (props = null !== props ? props.element : null),
+        processUpdateQueue(
+          workInProgress,
+          Component,
+          workInProgress.pendingProps,
+          null,
+          renderExpirationTime
+        ),
+        (Component = workInProgress.memoizedState.element),
+        Component === props
+          ? (workInProgress = bailoutOnAlreadyFinishedWork(
+              current$$1,
               workInProgress,
-              props,
-              workInProgress.pendingProps,
-              null,
+              renderExpirationTime
+            ))
+          : (reconcileChildren(
+              current$$1,
+              workInProgress,
+              Component,
               renderExpirationTime
             ),
-            (renderExpirationTime = workInProgress.memoizedState.element),
-            renderExpirationTime === fn
-              ? (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))
-              : (reconcileChildren(
-                  current,
-                  workInProgress,
-                  renderExpirationTime
-                ),
-                (current = workInProgress.child)))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+            (workInProgress = workInProgress.child)),
+        workInProgress
       );
-    case 5:
+    case 7:
       return (
-        requiredContext(rootInstanceStackCursor.current),
-        (renderExpirationTime = requiredContext(contextStackCursor$1.current)),
-        (props = workInProgress.type),
-        (props =
-          "AndroidTextInput" === props ||
-          "RCTMultilineTextInputView" === props ||
-          "RCTSinglelineTextInputView" === props ||
-          "RCTText" === props ||
-          "RCTVirtualText" === props),
-        (props =
-          renderExpirationTime.isInAParentText !== props
-            ? { isInAParentText: props }
-            : renderExpirationTime),
-        renderExpirationTime !== props &&
-          (push(contextFiberStackCursor, workInProgress, workInProgress),
-          push(contextStackCursor$1, props, workInProgress)),
-        null === current && tryToClaimNextHydratableInstance(workInProgress),
-        (props = workInProgress.memoizedProps),
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current || props !== renderExpirationTime
-          ? ((props = renderExpirationTime.children),
-            markRef(current, workInProgress),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        pushHostContext(workInProgress),
+        null === current$$1 && tryToClaimNextHydratableInstance(workInProgress),
+        (Component = workInProgress.pendingProps),
+        (props = Component.children),
+        markRef(current$$1, workInProgress),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        (workInProgress = workInProgress.child),
+        workInProgress
       );
-    case 6:
+    case 8:
       return (
-        null === current && tryToClaimNextHydratableInstance(workInProgress),
+        null === current$$1 && tryToClaimNextHydratableInstance(workInProgress),
         (workInProgress.memoizedProps = workInProgress.pendingProps),
         null
       );
     case 16:
-      return null;
-    case 4:
+      return (
+        (Component = workInProgress.pendingProps),
+        (props = 0 === (workInProgress.effectTag & 64)),
+        null !== current$$1 && null !== workInProgress.updateQueue
+          ? ((workInProgress.updateQueue = null), (props = !0))
+          : (props = !props),
+        0 !== (workInProgress.mode & 2) &&
+          (props
+            ? (workInProgress.effectTag |= 4)
+            : (workInProgress.stateNode = null)),
+        (updateExpirationTime = Component.children),
+        (updateExpirationTime =
+          "function" === typeof updateExpirationTime
+            ? updateExpirationTime(props)
+            : props
+              ? Component.fallback
+              : updateExpirationTime),
+        null !== current$$1 && props !== workInProgress.memoizedState
+          ? ((workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              current$$1.child,
+              null,
+              renderExpirationTime
+            )),
+            (workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              null,
+              updateExpirationTime,
+              renderExpirationTime
+            )))
+          : reconcileChildren(
+              current$$1,
+              workInProgress,
+              updateExpirationTime,
+              renderExpirationTime
+            ),
+        (workInProgress.memoizedProps = Component),
+        (workInProgress.memoizedState = props),
+        workInProgress.child
+      );
+    case 6:
       return (
         pushHostContainer(
           workInProgress,
           workInProgress.stateNode.containerInfo
         ),
-        (props = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== props
-          ? (null === current
-              ? (workInProgress.child = reconcileChildFibers(
-                  workInProgress,
-                  null,
-                  props,
-                  renderExpirationTime
-                ))
-              : reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = props),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps),
+        null === current$$1
+          ? (workInProgress.child = reconcileChildFibers(
+              workInProgress,
+              null,
+              Component,
+              renderExpirationTime
+            ))
+          : reconcileChildren(
+              current$$1,
+              workInProgress,
+              Component,
+              renderExpirationTime
+            ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
+      );
+    case 13:
+      return updateForwardRef(
+        current$$1,
+        workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        renderExpirationTime
       );
     case 14:
       return (
-        (props = workInProgress.type.render),
-        (renderExpirationTime = workInProgress.pendingProps),
-        (fn = workInProgress.ref),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime ||
-        fn !== (null !== current ? current.ref : null)
-          ? ((props = props(renderExpirationTime, fn)),
-            reconcileChildren(current, workInProgress, props),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updateForwardRef(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
       );
-    case 10:
+    case 9:
       return (
-        (renderExpirationTime = workInProgress.pendingProps),
-        didPerformWorkStackCursor.current ||
-        workInProgress.memoizedProps !== renderExpirationTime
-          ? (reconcileChildren(current, workInProgress, renderExpirationTime),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
-    case 11:
+    case 10:
       return (
-        (renderExpirationTime = workInProgress.pendingProps.children),
-        didPerformWorkStackCursor.current ||
-        (null !== renderExpirationTime &&
-          workInProgress.memoizedProps !== renderExpirationTime)
-          ? (reconcileChildren(current, workInProgress, renderExpirationTime),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child))
-          : (current = bailoutOnAlreadyFinishedWork(current, workInProgress)),
-        current
+        (Component = workInProgress.pendingProps.children),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
     case 15:
       return (
-        (renderExpirationTime = workInProgress.pendingProps),
         (workInProgress.effectTag |= 4),
-        workInProgress.memoizedProps === renderExpirationTime
-          ? (current = bailoutOnAlreadyFinishedWork(current, workInProgress))
-          : (reconcileChildren(
-              current,
-              workInProgress,
-              renderExpirationTime.children
-            ),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            (current = workInProgress.child)),
-        current
+        (Component = workInProgress.pendingProps),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          Component.children,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
       );
-    case 13:
-      return updateContextProvider(
-        current,
+    case 12:
+      a: {
+        Component = workInProgress.type._context;
+        props = workInProgress.pendingProps;
+        resolvedTag = workInProgress.memoizedProps;
+        updateExpirationTime = props.value;
+        workInProgress.memoizedProps = props;
+        pushProvider(workInProgress, updateExpirationTime);
+        if (null !== resolvedTag)
+          if (
+            ((resolvedProps = resolvedTag.value),
+            (updateExpirationTime =
+              (resolvedProps === updateExpirationTime &&
+                (0 !== resolvedProps ||
+                  1 / resolvedProps === 1 / updateExpirationTime)) ||
+              (resolvedProps !== resolvedProps &&
+                updateExpirationTime !== updateExpirationTime)
+                ? 0
+                : ("function" === typeof Component._calculateChangedBits
+                    ? Component._calculateChangedBits(
+                        resolvedProps,
+                        updateExpirationTime
+                      )
+                    : 1073741823) | 0),
+            0 === updateExpirationTime)
+          ) {
+            if (
+              resolvedTag.children === props.children &&
+              !didPerformWorkStackCursor.current
+            ) {
+              workInProgress = bailoutOnAlreadyFinishedWork(
+                current$$1,
+                workInProgress,
+                renderExpirationTime
+              );
+              break a;
+            }
+          } else
+            for (
+              resolvedTag = workInProgress.child,
+                null !== resolvedTag && (resolvedTag.return = workInProgress);
+              null !== resolvedTag;
+
+            ) {
+              resolvedProps = resolvedTag.firstContextDependency;
+              if (null !== resolvedProps) {
+                do {
+                  if (
+                    resolvedProps.context === Component &&
+                    0 !== (resolvedProps.observedBits & updateExpirationTime)
+                  ) {
+                    if (2 === resolvedTag.tag || 3 === resolvedTag.tag)
+                      (child = createUpdate(renderExpirationTime)),
+                        (child.tag = 2),
+                        enqueueUpdate(resolvedTag, child);
+                    if (
+                      0 === resolvedTag.expirationTime ||
+                      resolvedTag.expirationTime > renderExpirationTime
+                    )
+                      resolvedTag.expirationTime = renderExpirationTime;
+                    child = resolvedTag.alternate;
+                    null !== child &&
+                      (0 === child.expirationTime ||
+                        child.expirationTime > renderExpirationTime) &&
+                      (child.expirationTime = renderExpirationTime);
+                    for (var node = resolvedTag.return; null !== node; ) {
+                      child = node.alternate;
+                      if (
+                        0 === node.childExpirationTime ||
+                        node.childExpirationTime > renderExpirationTime
+                      )
+                        (node.childExpirationTime = renderExpirationTime),
+                          null !== child &&
+                            (0 === child.childExpirationTime ||
+                              child.childExpirationTime >
+                                renderExpirationTime) &&
+                            (child.childExpirationTime = renderExpirationTime);
+                      else if (
+                        null !== child &&
+                        (0 === child.childExpirationTime ||
+                          child.childExpirationTime > renderExpirationTime)
+                      )
+                        child.childExpirationTime = renderExpirationTime;
+                      else break;
+                      node = node.return;
+                    }
+                  }
+                  child = resolvedTag.child;
+                  resolvedProps = resolvedProps.next;
+                } while (null !== resolvedProps);
+              } else
+                child =
+                  12 === resolvedTag.tag
+                    ? resolvedTag.type === workInProgress.type
+                      ? null
+                      : resolvedTag.child
+                    : resolvedTag.child;
+              if (null !== child) child.return = resolvedTag;
+              else
+                for (child = resolvedTag; null !== child; ) {
+                  if (child === workInProgress) {
+                    child = null;
+                    break;
+                  }
+                  resolvedTag = child.sibling;
+                  if (null !== resolvedTag) {
+                    resolvedTag.return = child.return;
+                    child = resolvedTag;
+                    break;
+                  }
+                  child = child.return;
+                }
+              resolvedTag = child;
+            }
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props.children,
+          renderExpirationTime
+        );
+        workInProgress = workInProgress.child;
+      }
+      return workInProgress;
+    case 11:
+      return (
+        (updateExpirationTime = workInProgress.type),
+        (Component = workInProgress.pendingProps),
+        (props = Component.children),
+        prepareToReadContext(workInProgress, renderExpirationTime),
+        (updateExpirationTime = readContext(
+          updateExpirationTime,
+          Component.unstable_observedBits
+        )),
+        (props = props(updateExpirationTime)),
+        (workInProgress.effectTag |= 1),
+        reconcileChildren(
+          current$$1,
+          workInProgress,
+          props,
+          renderExpirationTime
+        ),
+        (workInProgress.memoizedProps = Component),
+        workInProgress.child
+      );
+    case 17:
+      return updatePureComponent(
+        current$$1,
         workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        updateExpirationTime,
         renderExpirationTime
       );
-    case 12:
-      a: if (
-        ((fn = workInProgress.type),
-        (unmaskedContext = workInProgress.pendingProps),
-        (needsContext = workInProgress.memoizedProps),
-        (props = fn._currentValue),
-        (props$jscomp$0 = fn._changedBits),
-        didPerformWorkStackCursor.current ||
-          0 !== props$jscomp$0 ||
-          needsContext !== unmaskedContext)
-      ) {
-        workInProgress.memoizedProps = unmaskedContext;
-        ctor = unmaskedContext.unstable_observedBits;
-        if (void 0 === ctor || null === ctor) ctor = 1073741823;
-        workInProgress.stateNode = ctor;
-        if (0 !== (props$jscomp$0 & ctor))
-          propagateContextChange(
-            workInProgress,
-            fn,
-            props$jscomp$0,
-            renderExpirationTime
-          );
-        else if (needsContext === unmaskedContext) {
-          current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-          break a;
-        }
-        renderExpirationTime = unmaskedContext.children;
-        renderExpirationTime = renderExpirationTime(props);
-        workInProgress.effectTag |= 1;
-        reconcileChildren(current, workInProgress, renderExpirationTime);
-        current = workInProgress.child;
-      } else current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-      return current;
+    case 18:
+      return (
+        (props = workInProgress.type._reactResult),
+        (Component = workInProgress.pendingProps),
+        (current$$1 = updatePureComponent(
+          current$$1,
+          workInProgress,
+          props,
+          resolveDefaultProps(props, Component),
+          updateExpirationTime,
+          renderExpirationTime
+        )),
+        (workInProgress.memoizedProps = Component),
+        current$$1
+      );
     default:
       invariant(
         !1,
@@ -3966,245 +4398,101 @@ var updateHostContainer = void 0,
   updateHostComponent$1 = void 0,
   updateHostText$1 = void 0;
 updateHostContainer = function() {};
-updateHostComponent$1 = function(current, workInProgress, updatePayload) {
-  if ((workInProgress.updateQueue = updatePayload))
-    workInProgress.effectTag |= 4;
+updateHostComponent$1 = function(current, workInProgress, type, newProps) {
+  current.memoizedProps !== newProps &&
+    (requiredContext(contextStackCursor$1.current),
+    (workInProgress.updateQueue = UPDATE_SIGNAL)) &&
+    (workInProgress.effectTag |= 4);
 };
 updateHostText$1 = function(current, workInProgress, oldText, newText) {
   oldText !== newText && (workInProgress.effectTag |= 4);
 };
-function completeWork(current, workInProgress) {
-  var newProps = workInProgress.pendingProps;
-  workInProgress.mode & 4 && recordElapsedActualRenderTime(workInProgress);
-  switch (workInProgress.tag) {
-    case 1:
-      return null;
-    case 2:
-      return popContextProvider(workInProgress), null;
-    case 3:
-      popHostContainer(workInProgress);
-      popTopLevelContextObject(workInProgress);
-      newProps = workInProgress.stateNode;
-      newProps.pendingContext &&
-        ((newProps.context = newProps.pendingContext),
-        (newProps.pendingContext = null));
-      if (null === current || null === current.child)
-        workInProgress.effectTag &= -3;
-      updateHostContainer(workInProgress);
-      return null;
-    case 5:
-      popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-          rootInstanceStackCursor.current
-        ),
-        type = workInProgress.type;
-      if (null !== current && null != workInProgress.stateNode) {
-        var oldProps = current.memoizedProps,
-          currentHostContext = requiredContext(contextStackCursor$1.current);
-        updateHostComponent$1(
-          current,
-          workInProgress,
-          emptyObject,
-          type,
-          oldProps,
-          newProps,
-          rootContainerInstance,
-          currentHostContext
-        );
-        current.ref !== workInProgress.ref && (workInProgress.effectTag |= 128);
-      } else {
-        if (!newProps)
-          return (
-            invariant(
-              null !== workInProgress.stateNode,
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            null
-          );
-        current = requiredContext(contextStackCursor$1.current);
-        oldProps = allocateTag();
-        currentHostContext = ReactNativeViewConfigRegistry.get(type);
-        invariant(
-          "RCTView" !== type || !current.isInAParentText,
-          "Nesting of <View> within <Text> is not currently supported."
-        );
-        var updatePayload = diffProperties(
-          null,
-          emptyObject$1,
-          newProps,
-          currentHostContext.validAttributes
-        );
-        UIManager.createView(
-          oldProps,
-          currentHostContext.uiViewClassName,
-          rootContainerInstance,
-          updatePayload
-        );
-        currentHostContext = new ReactNativeFiberHostComponent(
-          oldProps,
-          currentHostContext
-        );
-        instanceCache[oldProps] = workInProgress;
-        instanceProps[oldProps] = newProps;
-        a: for (oldProps = workInProgress.child; null !== oldProps; ) {
-          if (5 === oldProps.tag || 6 === oldProps.tag)
-            currentHostContext._children.push(oldProps.stateNode);
-          else if (4 !== oldProps.tag && null !== oldProps.child) {
-            oldProps.child.return = oldProps;
-            oldProps = oldProps.child;
-            continue;
-          }
-          if (oldProps === workInProgress) break;
-          for (; null === oldProps.sibling; ) {
-            if (null === oldProps.return || oldProps.return === workInProgress)
-              break a;
-            oldProps = oldProps.return;
-          }
-          oldProps.sibling.return = oldProps.return;
-          oldProps = oldProps.sibling;
-        }
-        finalizeInitialChildren(
-          currentHostContext,
-          type,
-          newProps,
-          rootContainerInstance,
-          current
-        ) && (workInProgress.effectTag |= 4);
-        workInProgress.stateNode = currentHostContext;
-        null !== workInProgress.ref && (workInProgress.effectTag |= 128);
-      }
-      return null;
-    case 6:
-      if (current && null != workInProgress.stateNode)
-        updateHostText$1(
-          current,
-          workInProgress,
-          current.memoizedProps,
-          newProps
-        );
-      else {
-        if ("string" !== typeof newProps)
-          return (
-            invariant(
-              null !== workInProgress.stateNode,
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            null
-          );
-        rootContainerInstance = requiredContext(
-          rootInstanceStackCursor.current
-        );
-        type = requiredContext(contextStackCursor$1.current);
-        invariant(
-          type.isInAParentText,
-          "Text strings must be rendered within a <Text> component."
-        );
-        type = allocateTag();
-        UIManager.createView(type, "RCTRawText", rootContainerInstance, {
-          text: newProps
-        });
-        instanceCache[type] = workInProgress;
-        workInProgress.stateNode = type;
-      }
-      return null;
-    case 14:
-      return null;
-    case 16:
-      return null;
-    case 10:
-      return null;
-    case 11:
-      return null;
-    case 15:
-      return null;
-    case 4:
-      return (
-        popHostContainer(workInProgress),
-        updateHostContainer(workInProgress),
-        null
-      );
-    case 13:
-      return popProvider(workInProgress), null;
-    case 12:
-      return null;
-    case 0:
-      invariant(
-        !1,
-        "An indeterminate component should have become determinate before completing. This error is likely caused by a bug in React. Please file an issue."
-      );
-    default:
-      invariant(
-        !1,
-        "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
-      );
-  }
+function logCapturedError(capturedError) {
+  var componentStack = capturedError.componentStack,
+    error = capturedError.error;
+  if (error instanceof Error) {
+    capturedError = error.message;
+    var name = error.name;
+    try {
+      error.message =
+        (capturedError ? name + ": " + capturedError : name) +
+        "\n\nThis error is located at:" +
+        componentStack;
+    } catch (e) {}
+  } else
+    error =
+      "string" === typeof error
+        ? Error(error + "\n\nThis error is located at:" + componentStack)
+        : Error("Unspecified error at:" + componentStack);
+  ExceptionsManager.handleException(error, !1);
 }
+var emptyObject$1 = {};
 function logError(boundary, errorInfo) {
   var source = errorInfo.source,
     stack = errorInfo.stack;
   null === stack &&
     null !== source &&
-    (stack = getStackAddendumByWorkInProgressFiber(source));
-  null !== source && getComponentName(source);
-  source = null !== stack ? stack : "";
-  errorInfo = errorInfo.value;
-  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
+    (stack = getStackByFiberInDevAndProd(source));
+  errorInfo = {
+    componentName: null !== source ? getComponentName(source.type) : null,
+    componentStack: null !== stack ? stack : "",
+    error: errorInfo.value,
+    errorBoundary: null,
+    errorBoundaryName: null,
+    errorBoundaryFound: !1,
+    willRetry: !1
+  };
+  null !== boundary &&
+    2 === boundary.tag &&
+    ((errorInfo.errorBoundary = boundary.stateNode),
+    (errorInfo.errorBoundaryName = getComponentName(boundary.type)),
+    (errorInfo.errorBoundaryFound = !0),
+    (errorInfo.willRetry = !0));
   try {
-    if (errorInfo instanceof Error) {
-      var message = errorInfo.message,
-        name = errorInfo.name;
-      var errorToHandle = errorInfo;
-      try {
-        errorToHandle.message =
-          (message ? name + ": " + message : name) +
-          "\n\nThis error is located at:" +
-          source;
-      } catch (e) {}
-    } else
-      errorToHandle =
-        "string" === typeof errorInfo
-          ? Error(errorInfo + "\n\nThis error is located at:" + source)
-          : Error("Unspecified error at:" + source);
-    ExceptionsManager.handleException(errorToHandle, !1);
+    logCapturedError(errorInfo);
   } catch (e) {
-    (e && e.suppressReactErrorLogging) || console.error(e);
+    setTimeout(function() {
+      throw e;
+    });
   }
 }
-function safelyDetachRef(current) {
-  var ref = current.ref;
+function safelyDetachRef(current$$1) {
+  var ref = current$$1.ref;
   if (null !== ref)
     if ("function" === typeof ref)
       try {
         ref(null);
       } catch (refError) {
-        captureCommitPhaseError(current, refError);
+        captureCommitPhaseError(current$$1, refError);
       }
     else ref.current = null;
 }
-function commitUnmount(current) {
-  "function" === typeof onCommitUnmount && onCommitUnmount(current);
-  switch (current.tag) {
+function commitUnmount(current$$1) {
+  "function" === typeof onCommitFiberUnmount &&
+    onCommitFiberUnmount(current$$1);
+  switch (current$$1.tag) {
     case 2:
-      safelyDetachRef(current);
-      var instance = current.stateNode;
+    case 3:
+      safelyDetachRef(current$$1);
+      var instance = current$$1.stateNode;
       if ("function" === typeof instance.componentWillUnmount)
         try {
-          (instance.props = current.memoizedProps),
-            (instance.state = current.memoizedState),
+          (instance.props = current$$1.memoizedProps),
+            (instance.state = current$$1.memoizedState),
             instance.componentWillUnmount();
         } catch (unmountError) {
-          captureCommitPhaseError(current, unmountError);
+          captureCommitPhaseError(current$$1, unmountError);
         }
       break;
-    case 5:
-      safelyDetachRef(current);
+    case 7:
+      safelyDetachRef(current$$1);
       break;
-    case 4:
-      unmountHostComponents(current);
+    case 6:
+      unmountHostComponents(current$$1);
   }
 }
 function isHostParent(fiber) {
-  return 5 === fiber.tag || 3 === fiber.tag || 4 === fiber.tag;
+  return 7 === fiber.tag || 5 === fiber.tag || 6 === fiber.tag;
 }
 function commitPlacement(finishedWork) {
   a: {
@@ -4223,15 +4511,15 @@ function commitPlacement(finishedWork) {
   }
   var isContainer = (parent = void 0);
   switch (parentFiber.tag) {
-    case 5:
+    case 7:
       parent = parentFiber.stateNode;
       isContainer = !1;
       break;
-    case 3:
+    case 5:
       parent = parentFiber.stateNode.containerInfo;
       isContainer = !0;
       break;
-    case 4:
+    case 6:
       parent = parentFiber.stateNode.containerInfo;
       isContainer = !0;
       break;
@@ -4253,11 +4541,11 @@ function commitPlacement(finishedWork) {
     parentFiber.sibling.return = parentFiber.return;
     for (
       parentFiber = parentFiber.sibling;
-      5 !== parentFiber.tag && 6 !== parentFiber.tag;
+      7 !== parentFiber.tag && 8 !== parentFiber.tag;
 
     ) {
       if (parentFiber.effectTag & 2) continue b;
-      if (null === parentFiber.child || 4 === parentFiber.tag) continue b;
+      if (null === parentFiber.child || 6 === parentFiber.tag) continue b;
       else
         (parentFiber.child.return = parentFiber),
           (parentFiber = parentFiber.child);
@@ -4268,7 +4556,7 @@ function commitPlacement(finishedWork) {
     }
   }
   for (var node = finishedWork; ; ) {
-    if (5 === node.tag || 6 === node.tag)
+    if (7 === node.tag || 8 === node.tag)
       if (parentFiber)
         if (isContainer)
           invariant(
@@ -4337,7 +4625,7 @@ function commitPlacement(finishedWork) {
                   [index.length - 1],
                   []
                 )));
-    else if (4 !== node.tag && null !== node.child) {
+    else if (6 !== node.tag && null !== node.child) {
       node.child.return = node;
       node = node.child;
       continue;
@@ -4351,9 +4639,9 @@ function commitPlacement(finishedWork) {
     node = node.sibling;
   }
 }
-function unmountHostComponents(current) {
+function unmountHostComponents(current$$1) {
   for (
-    var node = current,
+    var node = current$$1,
       currentParentIsValid = !1,
       currentParent = void 0,
       currentParentIsContainer = void 0;
@@ -4368,15 +4656,15 @@ function unmountHostComponents(current) {
           "Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue."
         );
         switch (currentParentIsValid.tag) {
-          case 5:
+          case 7:
             currentParent = currentParentIsValid.stateNode;
             currentParentIsContainer = !1;
             break a;
-          case 3:
+          case 5:
             currentParent = currentParentIsValid.stateNode.containerInfo;
             currentParentIsContainer = !0;
             break a;
-          case 4:
+          case 6:
             currentParent = currentParentIsValid.stateNode.containerInfo;
             currentParentIsContainer = !0;
             break a;
@@ -4385,11 +4673,11 @@ function unmountHostComponents(current) {
       }
       currentParentIsValid = !0;
     }
-    if (5 === node.tag || 6 === node.tag) {
+    if (7 === node.tag || 8 === node.tag) {
       a: for (var root = node, node$jscomp$0 = root; ; )
         if (
           (commitUnmount(node$jscomp$0),
-          null !== node$jscomp$0.child && 4 !== node$jscomp$0.tag)
+          null !== node$jscomp$0.child && 6 !== node$jscomp$0.tag)
         )
           (node$jscomp$0.child.return = node$jscomp$0),
             (node$jscomp$0 = node$jscomp$0.child);
@@ -4417,8 +4705,9 @@ function unmountHostComponents(current) {
         UIManager.manageChildren(root._nativeTag, [], [], [], [], [child]);
       }
     } else if (
-      (4 === node.tag
-        ? (currentParent = node.stateNode.containerInfo)
+      (6 === node.tag
+        ? ((currentParent = node.stateNode.containerInfo),
+          (currentParentIsContainer = !0))
         : commitUnmount(node),
       null !== node.child)
     ) {
@@ -4426,25 +4715,26 @@ function unmountHostComponents(current) {
       node = node.child;
       continue;
     }
-    if (node === current) break;
+    if (node === current$$1) break;
     for (; null === node.sibling; ) {
-      if (null === node.return || node.return === current) return;
+      if (null === node.return || node.return === current$$1) return;
       node = node.return;
-      4 === node.tag && (currentParentIsValid = !1);
+      6 === node.tag && (currentParentIsValid = !1);
     }
     node.sibling.return = node.return;
     node = node.sibling;
   }
 }
-function commitWork(current, finishedWork) {
+function commitWork(current$$1, finishedWork) {
   switch (finishedWork.tag) {
     case 2:
+    case 3:
       break;
-    case 5:
+    case 7:
       var instance = finishedWork.stateNode;
       if (null != instance) {
         var newProps = finishedWork.memoizedProps;
-        current = null !== current ? current.memoizedProps : newProps;
+        current$$1 = null !== current$$1 ? current$$1.memoizedProps : newProps;
         var updatePayload = finishedWork.updateQueue;
         finishedWork.updateQueue = null;
         null !== updatePayload &&
@@ -4452,7 +4742,7 @@ function commitWork(current, finishedWork) {
           (instanceProps[instance._nativeTag] = newProps),
           (newProps = diffProperties(
             null,
-            current,
+            current$$1,
             newProps,
             finishedWork.validAttributes
           )),
@@ -4464,7 +4754,7 @@ function commitWork(current, finishedWork) {
             ));
       }
       break;
-    case 6:
+    case 8:
       invariant(
         null !== finishedWork.stateNode,
         "This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue."
@@ -4473,18 +4763,9 @@ function commitWork(current, finishedWork) {
         text: finishedWork.memoizedProps
       });
       break;
-    case 3:
+    case 5:
       break;
     case 15:
-      instance = finishedWork.memoizedProps.onRender;
-      instance(
-        finishedWork.memoizedProps.id,
-        null === current ? "mount" : "update",
-        finishedWork.actualDuration,
-        finishedWork.treeBaseTime,
-        finishedWork.actualStartTime,
-        commitTime
-      );
       break;
     case 16:
       break;
@@ -4495,6 +4776,9 @@ function commitWork(current, finishedWork) {
       );
   }
 }
+function NoopComponent() {
+  return null;
+}
 function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime = createUpdate(expirationTime);
   expirationTime.tag = 3;
@@ -4509,13 +4793,21 @@ function createRootErrorUpdate(fiber, errorInfo, expirationTime) {
 function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime = createUpdate(expirationTime);
   expirationTime.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error$jscomp$0 = errorInfo.value;
+    expirationTime.payload = function() {
+      return getDerivedStateFromError(error$jscomp$0);
+    };
+  }
   var inst = fiber.stateNode;
   null !== inst &&
     "function" === typeof inst.componentDidCatch &&
     (expirationTime.callback = function() {
-      null === legacyErrorBoundariesThatAlreadyFailed
-        ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-        : legacyErrorBoundariesThatAlreadyFailed.add(this);
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this));
       var error = errorInfo.value,
         stack = errorInfo.stack;
       logError(fiber, errorInfo);
@@ -4525,11 +4817,142 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
     });
   return expirationTime;
 }
+function throwException(
+  root,
+  returnFiber,
+  sourceFiber,
+  value,
+  renderExpirationTime
+) {
+  sourceFiber.effectTag |= 512;
+  sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+  if (
+    null !== value &&
+    "object" === typeof value &&
+    "function" === typeof value.then
+  ) {
+    var thenable = value;
+    value = returnFiber;
+    var earliestTimeoutMs = -1,
+      startTimeMs = -1;
+    do {
+      if (16 === value.tag) {
+        var current = value.alternate;
+        if (
+          null !== current &&
+          !0 === current.memoizedState &&
+          null !== current.stateNode
+        ) {
+          startTimeMs = 10 * (current.stateNode.timedOutAt - 2);
+          break;
+        }
+        current = value.pendingProps.maxDuration;
+        if ("number" === typeof current)
+          if (0 >= current) earliestTimeoutMs = 0;
+          else if (-1 === earliestTimeoutMs || current < earliestTimeoutMs)
+            earliestTimeoutMs = current;
+      }
+      value = value.return;
+    } while (null !== value);
+    value = returnFiber;
+    do {
+      if (16 === value.tag && !value.memoizedState) {
+        returnFiber = retrySuspendedRoot.bind(
+          null,
+          root,
+          value,
+          0 === (value.mode & 1) ? 1 : renderExpirationTime
+        );
+        returnFiber = tracing.unstable_wrap(returnFiber);
+        thenable.then(returnFiber, returnFiber);
+        if (0 === (value.mode & 2)) {
+          value.effectTag |= 4;
+          reconcileChildren(
+            sourceFiber.alternate,
+            sourceFiber,
+            null,
+            renderExpirationTime
+          );
+          sourceFiber.effectTag &= -513;
+          4 === sourceFiber.tag && (sourceFiber.tag = 0);
+          if (2 === sourceFiber.tag || 3 === sourceFiber.tag)
+            (sourceFiber.effectTag &= -421),
+              null === sourceFiber.alternate &&
+                ((sourceFiber.tag = 0), (sourceFiber.type = NoopComponent));
+          return;
+        }
+        -1 === earliestTimeoutMs
+          ? (root = 1073741823)
+          : (-1 === startTimeMs &&
+              (startTimeMs =
+                10 *
+                  (findEarliestOutstandingPriorityLevel(
+                    root,
+                    renderExpirationTime
+                  ) -
+                    2) -
+                5e3),
+            (root = startTimeMs + earliestTimeoutMs));
+        0 <= root &&
+          nextLatestAbsoluteTimeoutMs < root &&
+          (nextLatestAbsoluteTimeoutMs = root);
+        value.effectTag |= 1024;
+        value.expirationTime = renderExpirationTime;
+        return;
+      }
+      value = value.return;
+    } while (null !== value);
+    value = Error(
+      "An update was suspended, but no placeholder UI was provided."
+    );
+  }
+  nextRenderDidError = !0;
+  value = createCapturedValue(value, sourceFiber);
+  root = returnFiber;
+  do {
+    switch (root.tag) {
+      case 5:
+        sourceFiber = value;
+        root.effectTag |= 1024;
+        root.expirationTime = renderExpirationTime;
+        renderExpirationTime = createRootErrorUpdate(
+          root,
+          sourceFiber,
+          renderExpirationTime
+        );
+        enqueueCapturedUpdate(root, renderExpirationTime);
+        return;
+      case 2:
+      case 3:
+        if (
+          ((sourceFiber = value),
+          (returnFiber = root.type),
+          (thenable = root.stateNode),
+          0 === (root.effectTag & 64) &&
+            ("function" === typeof returnFiber.getDerivedStateFromError ||
+              (null !== thenable &&
+                "function" === typeof thenable.componentDidCatch &&
+                (null === legacyErrorBoundariesThatAlreadyFailed ||
+                  !legacyErrorBoundariesThatAlreadyFailed.has(thenable)))))
+        ) {
+          root.effectTag |= 1024;
+          root.expirationTime = renderExpirationTime;
+          renderExpirationTime = createClassErrorUpdate(
+            root,
+            sourceFiber,
+            renderExpirationTime
+          );
+          enqueueCapturedUpdate(root, renderExpirationTime);
+          return;
+        }
+    }
+    root = root.return;
+  } while (null !== root);
+}
 function unwindWork(workInProgress) {
-  workInProgress.mode & 4 && recordElapsedActualRenderTime(workInProgress);
   switch (workInProgress.tag) {
     case 2:
-      popContextProvider(workInProgress);
+      isContextProvider(workInProgress.type) && popContext(workInProgress);
       var effectTag = workInProgress.effectTag;
       return effectTag & 1024
         ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4537,8 +4960,8 @@ function unwindWork(workInProgress) {
         : null;
     case 3:
       return (
-        popHostContainer(workInProgress),
-        popTopLevelContextObject(workInProgress),
+        isContextProvider(workInProgress.type._reactResult) &&
+          popContext(workInProgress),
         (effectTag = workInProgress.effectTag),
         effectTag & 1024
           ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4546,6 +4969,18 @@ function unwindWork(workInProgress) {
           : null
       );
     case 5:
+      return (
+        popHostContainer(workInProgress),
+        popTopLevelContextObject(workInProgress),
+        (effectTag = workInProgress.effectTag),
+        invariant(
+          0 === (effectTag & 64),
+          "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
+        ),
+        (workInProgress.effectTag = (effectTag & -1025) | 64),
+        workInProgress
+      );
+    case 7:
       return popHostContext(workInProgress), null;
     case 16:
       return (
@@ -4555,24 +4990,26 @@ function unwindWork(workInProgress) {
             workInProgress)
           : null
       );
-    case 4:
+    case 6:
       return popHostContainer(workInProgress), null;
-    case 13:
+    case 12:
       return popProvider(workInProgress), null;
     default:
       return null;
   }
 }
-var originalStartTimeMs = now$1(),
-  mostRecentCurrentTime = 2,
-  mostRecentCurrentTimeMs = originalStartTimeMs,
-  lastUniqueAsyncExpiration = 0,
-  expirationContext = 0,
-  isWorking = !1,
+var Dispatcher = { readContext: readContext },
+  ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner;
+invariant(
+  null != tracing.__interactionsRef &&
+    null != tracing.__interactionsRef.current,
+  "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `schedule/tracing` module with `schedule/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at http://fb.me/react-profiling"
+);
+var isWorking = !1,
   nextUnitOfWork = null,
   nextRoot = null,
   nextRenderExpirationTime = 0,
-  nextLatestTimeoutMs = -1,
+  nextLatestAbsoluteTimeoutMs = -1,
   nextRenderDidError = !1,
   nextEffect = null,
   isCommitting$1 = !1,
@@ -4585,268 +5022,763 @@ function resetStack() {
 
     ) {
       var interruptedWork$jscomp$0 = interruptedWork;
-      interruptedWork$jscomp$0.mode & 4 &&
-        (resumeActualRenderTimerIfPaused(),
-        recordElapsedActualRenderTime(interruptedWork$jscomp$0));
       switch (interruptedWork$jscomp$0.tag) {
         case 2:
-          popContextProvider(interruptedWork$jscomp$0);
+          var childContextTypes =
+            interruptedWork$jscomp$0.type.childContextTypes;
+          null !== childContextTypes &&
+            void 0 !== childContextTypes &&
+            popContext(interruptedWork$jscomp$0);
           break;
         case 3:
+          childContextTypes =
+            interruptedWork$jscomp$0.type._reactResult.childContextTypes;
+          null !== childContextTypes &&
+            void 0 !== childContextTypes &&
+            popContext(interruptedWork$jscomp$0);
+          break;
+        case 5:
           popHostContainer(interruptedWork$jscomp$0);
           popTopLevelContextObject(interruptedWork$jscomp$0);
           break;
-        case 5:
+        case 7:
           popHostContext(interruptedWork$jscomp$0);
           break;
-        case 4:
+        case 6:
           popHostContainer(interruptedWork$jscomp$0);
           break;
-        case 13:
+        case 12:
           popProvider(interruptedWork$jscomp$0);
       }
       interruptedWork = interruptedWork.return;
     }
   nextRoot = null;
   nextRenderExpirationTime = 0;
-  nextLatestTimeoutMs = -1;
+  nextLatestAbsoluteTimeoutMs = -1;
   nextRenderDidError = !1;
   nextUnitOfWork = null;
 }
-function completeUnitOfWork(workInProgress$jscomp$0) {
-  for (;;) {
-    var current = workInProgress$jscomp$0.alternate,
-      returnFiber = workInProgress$jscomp$0.return,
-      siblingFiber = workInProgress$jscomp$0.sibling;
-    if (0 === (workInProgress$jscomp$0.effectTag & 512)) {
-      current = completeWork(
-        current,
-        workInProgress$jscomp$0,
-        nextRenderExpirationTime
+function commitAllHostEffects() {
+  for (; null !== nextEffect; ) {
+    var effectTag = nextEffect.effectTag;
+    if (effectTag & 128) {
+      var current$$1 = nextEffect.alternate;
+      null !== current$$1 &&
+        ((current$$1 = current$$1.ref),
+        null !== current$$1 &&
+          ("function" === typeof current$$1
+            ? current$$1(null)
+            : (current$$1.current = null)));
+    }
+    switch (effectTag & 14) {
+      case 2:
+        commitPlacement(nextEffect);
+        nextEffect.effectTag &= -3;
+        break;
+      case 6:
+        commitPlacement(nextEffect);
+        nextEffect.effectTag &= -3;
+        commitWork(nextEffect.alternate, nextEffect);
+        break;
+      case 4:
+        commitWork(nextEffect.alternate, nextEffect);
+        break;
+      case 8:
+        (effectTag = nextEffect),
+          unmountHostComponents(effectTag),
+          (effectTag.return = null),
+          (effectTag.child = null),
+          effectTag.alternate &&
+            ((effectTag.alternate.child = null),
+            (effectTag.alternate.return = null));
+    }
+    nextEffect = nextEffect.nextEffect;
+  }
+}
+function commitBeforeMutationLifecycles() {
+  for (; null !== nextEffect; ) {
+    if (nextEffect.effectTag & 256) {
+      var current$$1 = nextEffect.alternate;
+      a: {
+        var finishedWork = nextEffect;
+        switch (finishedWork.tag) {
+          case 2:
+          case 3:
+            if (finishedWork.effectTag & 256 && null !== current$$1) {
+              var prevProps = current$$1.memoizedProps,
+                prevState = current$$1.memoizedState;
+              current$$1 = finishedWork.stateNode;
+              current$$1.props = finishedWork.memoizedProps;
+              current$$1.state = finishedWork.memoizedState;
+              finishedWork = current$$1.getSnapshotBeforeUpdate(
+                prevProps,
+                prevState
+              );
+              current$$1.__reactInternalSnapshotBeforeUpdate = finishedWork;
+            }
+            break a;
+          case 5:
+          case 7:
+          case 8:
+          case 6:
+            break a;
+          default:
+            invariant(
+              !1,
+              "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+            );
+        }
+      }
+    }
+    nextEffect = nextEffect.nextEffect;
+  }
+}
+function commitAllLifeCycles(
+  finishedRoot$jscomp$0,
+  committedExpirationTime$jscomp$0
+) {
+  for (; null !== nextEffect; ) {
+    var effectTag = nextEffect.effectTag;
+    if (effectTag & 36) {
+      var finishedRoot = finishedRoot$jscomp$0,
+        current$$1 = nextEffect.alternate,
+        finishedWork = nextEffect,
+        committedExpirationTime = committedExpirationTime$jscomp$0;
+      switch (finishedWork.tag) {
+        case 2:
+        case 3:
+          finishedRoot = finishedWork.stateNode;
+          if (finishedWork.effectTag & 4)
+            if (null === current$$1)
+              (finishedRoot.props = finishedWork.memoizedProps),
+                (finishedRoot.state = finishedWork.memoizedState),
+                finishedRoot.componentDidMount();
+            else {
+              var prevProps = current$$1.memoizedProps;
+              current$$1 = current$$1.memoizedState;
+              finishedRoot.props = finishedWork.memoizedProps;
+              finishedRoot.state = finishedWork.memoizedState;
+              finishedRoot.componentDidUpdate(
+                prevProps,
+                current$$1,
+                finishedRoot.__reactInternalSnapshotBeforeUpdate
+              );
+            }
+          current$$1 = finishedWork.updateQueue;
+          null !== current$$1 &&
+            ((finishedRoot.props = finishedWork.memoizedProps),
+            (finishedRoot.state = finishedWork.memoizedState),
+            commitUpdateQueue(
+              finishedWork,
+              current$$1,
+              finishedRoot,
+              committedExpirationTime
+            ));
+          break;
+        case 5:
+          current$$1 = finishedWork.updateQueue;
+          if (null !== current$$1) {
+            finishedRoot = null;
+            if (null !== finishedWork.child)
+              switch (finishedWork.child.tag) {
+                case 7:
+                  finishedRoot = finishedWork.child.stateNode;
+                  break;
+                case 2:
+                case 3:
+                  finishedRoot = finishedWork.child.stateNode;
+              }
+            commitUpdateQueue(
+              finishedWork,
+              current$$1,
+              finishedRoot,
+              committedExpirationTime
+            );
+          }
+          break;
+        case 7:
+          break;
+        case 8:
+          break;
+        case 6:
+          break;
+        case 15:
+          committedExpirationTime = finishedWork.memoizedProps.onRender;
+          committedExpirationTime(
+            finishedWork.memoizedProps.id,
+            null === current$$1 ? "mount" : "update",
+            finishedWork.actualDuration,
+            finishedWork.treeBaseDuration,
+            finishedWork.actualStartTime,
+            commitTime,
+            finishedRoot.memoizedInteractions
+          );
+          break;
+        case 16:
+          0 === (finishedWork.mode & 2)
+            ? ((finishedWork.updateQueue = emptyObject$1),
+              scheduleWork(finishedWork, 1))
+            : ((committedExpirationTime = requestCurrentTime()),
+              (finishedWork.stateNode = {
+                timedOutAt: committedExpirationTime
+              }));
+          break;
+        default:
+          invariant(
+            !1,
+            "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+          );
+      }
+    }
+    effectTag & 128 &&
+      ((effectTag = nextEffect.ref),
+      null !== effectTag &&
+        ((finishedWork = nextEffect.stateNode),
+        "function" === typeof effectTag
+          ? effectTag(finishedWork)
+          : (effectTag.current = finishedWork)));
+    effectTag = nextEffect.nextEffect;
+    nextEffect.nextEffect = null;
+    nextEffect = effectTag;
+  }
+}
+function commitRoot(root, finishedWork) {
+  isCommitting$1 = isWorking = !0;
+  invariant(
+    root.current !== finishedWork,
+    "Cannot commit the same tree as before. This is probably a bug related to the return field. This error is likely caused by a bug in React. Please file an issue."
+  );
+  var committedExpirationTime = root.pendingCommitExpirationTime;
+  invariant(
+    0 !== committedExpirationTime,
+    "Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue."
+  );
+  root.pendingCommitExpirationTime = 0;
+  var updateExpirationTimeBeforeCommit = finishedWork.expirationTime,
+    childExpirationTimeBeforeCommit = finishedWork.childExpirationTime;
+  markCommittedPriorityLevels(
+    root,
+    0 === updateExpirationTimeBeforeCommit ||
+    (0 !== childExpirationTimeBeforeCommit &&
+      childExpirationTimeBeforeCommit < updateExpirationTimeBeforeCommit)
+      ? childExpirationTimeBeforeCommit
+      : updateExpirationTimeBeforeCommit
+  );
+  updateExpirationTimeBeforeCommit = null;
+  updateExpirationTimeBeforeCommit = tracing.__interactionsRef.current;
+  tracing.__interactionsRef.current = root.memoizedInteractions;
+  ReactCurrentOwner$2.current = null;
+  childExpirationTimeBeforeCommit = void 0;
+  1 < finishedWork.effectTag
+    ? null !== finishedWork.lastEffect
+      ? ((finishedWork.lastEffect.nextEffect = finishedWork),
+        (childExpirationTimeBeforeCommit = finishedWork.firstEffect))
+      : (childExpirationTimeBeforeCommit = finishedWork)
+    : (childExpirationTimeBeforeCommit = finishedWork.firstEffect);
+  for (nextEffect = childExpirationTimeBeforeCommit; null !== nextEffect; ) {
+    var didError = !1,
+      error$jscomp$0 = void 0;
+    try {
+      commitBeforeMutationLifecycles();
+    } catch (e) {
+      (didError = !0), (error$jscomp$0 = e);
+    }
+    didError &&
+      (invariant(
+        null !== nextEffect,
+        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+      ),
+      captureCommitPhaseError(nextEffect, error$jscomp$0),
+      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+  }
+  commitTime = now$1();
+  for (nextEffect = childExpirationTimeBeforeCommit; null !== nextEffect; ) {
+    didError = !1;
+    error$jscomp$0 = void 0;
+    try {
+      commitAllHostEffects();
+    } catch (e) {
+      (didError = !0), (error$jscomp$0 = e);
+    }
+    didError &&
+      (invariant(
+        null !== nextEffect,
+        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+      ),
+      captureCommitPhaseError(nextEffect, error$jscomp$0),
+      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+  }
+  root.current = finishedWork;
+  for (nextEffect = childExpirationTimeBeforeCommit; null !== nextEffect; ) {
+    childExpirationTimeBeforeCommit = !1;
+    didError = void 0;
+    try {
+      commitAllLifeCycles(root, committedExpirationTime);
+    } catch (e) {
+      (childExpirationTimeBeforeCommit = !0), (didError = e);
+    }
+    childExpirationTimeBeforeCommit &&
+      (invariant(
+        null !== nextEffect,
+        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+      ),
+      captureCommitPhaseError(nextEffect, didError),
+      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+  }
+  isWorking = isCommitting$1 = !1;
+  "function" === typeof onCommitFiberRoot &&
+    onCommitFiberRoot(finishedWork.stateNode);
+  childExpirationTimeBeforeCommit = finishedWork.expirationTime;
+  finishedWork = finishedWork.childExpirationTime;
+  var earliestRemainingTimeAfterCommit =
+    0 === childExpirationTimeBeforeCommit ||
+    (0 !== finishedWork && finishedWork < childExpirationTimeBeforeCommit)
+      ? finishedWork
+      : childExpirationTimeBeforeCommit;
+  0 === earliestRemainingTimeAfterCommit &&
+    (legacyErrorBoundariesThatAlreadyFailed = null);
+  onCommit(root, earliestRemainingTimeAfterCommit);
+  tracing.__interactionsRef.current = updateExpirationTimeBeforeCommit;
+  var subscriber = void 0;
+  try {
+    if (
+      ((subscriber = tracing.__subscriberRef.current),
+      null !== subscriber && 0 < root.memoizedInteractions.size)
+    )
+      subscriber.onWorkStopped(
+        root.memoizedInteractions,
+        1e3 * committedExpirationTime + root.interactionThreadID
       );
-      var workInProgress = workInProgress$jscomp$0;
+  } catch (error) {
+    hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
+  } finally {
+    var pendingInteractionMap = root.pendingInteractionMap;
+    pendingInteractionMap.forEach(function(
+      scheduledInteractions,
+      scheduledExpirationTime
+    ) {
+      if (
+        0 === earliestRemainingTimeAfterCommit ||
+        scheduledExpirationTime < earliestRemainingTimeAfterCommit
+      )
+        pendingInteractionMap.delete(scheduledExpirationTime),
+          scheduledInteractions.forEach(function(interaction) {
+            interaction.__count--;
+            if (null !== subscriber && 0 === interaction.__count)
+              try {
+                subscriber.onInteractionScheduledWorkCompleted(interaction);
+              } catch (error) {
+                hasUnhandledError ||
+                  ((hasUnhandledError = !0), (unhandledError = error));
+              }
+          });
+    });
+  }
+}
+function completeUnitOfWork(workInProgress) {
+  for (;;) {
+    var current$$1 = workInProgress.alternate,
+      returnFiber = workInProgress.return,
+      siblingFiber = workInProgress.sibling;
+    if (0 === (workInProgress.effectTag & 512)) {
+      if (workInProgress.mode & 4) {
+        var fiber = workInProgress;
+        profilerStartTime = now$1();
+        0 > fiber.actualStartTime && (fiber.actualStartTime = now$1());
+      }
+      var current = current$$1;
+      current$$1 = workInProgress;
+      fiber = current$$1.pendingProps;
+      switch (current$$1.tag) {
+        case 0:
+        case 1:
+          break;
+        case 2:
+          isContextProvider(current$$1.type) && popContext(current$$1);
+          break;
+        case 3:
+          isContextProvider(current$$1.type._reactResult) &&
+            popContext(current$$1);
+          break;
+        case 5:
+          popHostContainer(current$$1);
+          popTopLevelContextObject(current$$1);
+          fiber = current$$1.stateNode;
+          fiber.pendingContext &&
+            ((fiber.context = fiber.pendingContext),
+            (fiber.pendingContext = null));
+          if (null === current || null === current.child)
+            current$$1.effectTag &= -3;
+          updateHostContainer(current$$1);
+          break;
+        case 7:
+          popHostContext(current$$1);
+          var rootContainerInstance = requiredContext(
+              rootInstanceStackCursor.current
+            ),
+            type = current$$1.type;
+          if (null !== current && null != current$$1.stateNode)
+            updateHostComponent$1(
+              current,
+              current$$1,
+              type,
+              fiber,
+              rootContainerInstance
+            ),
+              current.ref !== current$$1.ref && (current$$1.effectTag |= 128);
+          else if (fiber) {
+            current = requiredContext(contextStackCursor$1.current);
+            var internalInstanceHandle = current$$1,
+              tag = allocateTag(),
+              viewConfig = ReactNativeViewConfigRegistry.get(type);
+            invariant(
+              "RCTView" !== type || !current.isInAParentText,
+              "Nesting of <View> within <Text> is not currently supported."
+            );
+            var updatePayload = diffProperties(
+              null,
+              emptyObject,
+              fiber,
+              viewConfig.validAttributes
+            );
+            UIManager.createView(
+              tag,
+              viewConfig.uiViewClassName,
+              rootContainerInstance,
+              updatePayload
+            );
+            viewConfig = new ReactNativeFiberHostComponent(tag, viewConfig);
+            instanceCache[tag] = internalInstanceHandle;
+            instanceProps[tag] = fiber;
+            a: for (
+              internalInstanceHandle = viewConfig,
+                tag = current$$1,
+                updatePayload = tag.child;
+              null !== updatePayload;
+
+            ) {
+              if (7 === updatePayload.tag || 8 === updatePayload.tag)
+                internalInstanceHandle._children.push(updatePayload.stateNode);
+              else if (
+                6 !== updatePayload.tag &&
+                null !== updatePayload.child
+              ) {
+                updatePayload.child.return = updatePayload;
+                updatePayload = updatePayload.child;
+                continue;
+              }
+              if (updatePayload === tag) break;
+              for (; null === updatePayload.sibling; ) {
+                if (
+                  null === updatePayload.return ||
+                  updatePayload.return === tag
+                )
+                  break a;
+                updatePayload = updatePayload.return;
+              }
+              updatePayload.sibling.return = updatePayload.return;
+              updatePayload = updatePayload.sibling;
+            }
+            finalizeInitialChildren(
+              viewConfig,
+              type,
+              fiber,
+              rootContainerInstance,
+              current
+            ) && (current$$1.effectTag |= 4);
+            current$$1.stateNode = viewConfig;
+            null !== current$$1.ref && (current$$1.effectTag |= 128);
+          } else
+            invariant(
+              null !== current$$1.stateNode,
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          break;
+        case 8:
+          current && null != current$$1.stateNode
+            ? updateHostText$1(
+                current,
+                current$$1,
+                current.memoizedProps,
+                fiber
+              )
+            : ("string" !== typeof fiber &&
+                invariant(
+                  null !== current$$1.stateNode,
+                  "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+                ),
+              (current = requiredContext(rootInstanceStackCursor.current)),
+              (type = requiredContext(contextStackCursor$1.current)),
+              (rootContainerInstance = current$$1),
+              invariant(
+                type.isInAParentText,
+                "Text strings must be rendered within a <Text> component."
+              ),
+              (type = allocateTag()),
+              UIManager.createView(type, "RCTRawText", current, {
+                text: fiber
+              }),
+              (instanceCache[type] = current$$1),
+              (rootContainerInstance.stateNode = type));
+          break;
+        case 13:
+        case 14:
+          break;
+        case 16:
+          break;
+        case 9:
+          break;
+        case 10:
+          break;
+        case 15:
+          break;
+        case 6:
+          popHostContainer(current$$1);
+          updateHostContainer(current$$1);
+          break;
+        case 12:
+          popProvider(current$$1);
+          break;
+        case 11:
+          break;
+        case 17:
+        case 18:
+          break;
+        case 4:
+          invariant(
+            !1,
+            "An indeterminate component should have become determinate before completing. This error is likely caused by a bug in React. Please file an issue."
+          );
+        default:
+          invariant(
+            !1,
+            "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
+          );
+      }
+      nextUnitOfWork = null;
+      workInProgress.mode & 4 &&
+        stopProfilerTimerIfRunningAndRecordDelta(workInProgress, !1);
+      current$$1 = workInProgress;
       if (
         1073741823 === nextRenderExpirationTime ||
-        1073741823 !== workInProgress.expirationTime
+        1073741823 !== current$$1.childExpirationTime
       ) {
-        var newExpirationTime = 0;
-        switch (workInProgress.tag) {
-          case 3:
-          case 2:
-            var updateQueue = workInProgress.updateQueue;
-            null !== updateQueue &&
-              (newExpirationTime = updateQueue.expirationTime);
-        }
-        if (workInProgress.mode & 4) {
-          updateQueue = workInProgress.selfBaseTime;
-          for (var child = workInProgress.child; null !== child; )
-            (updateQueue += child.treeBaseTime),
-              0 !== child.expirationTime &&
-                (0 === newExpirationTime ||
-                  newExpirationTime > child.expirationTime) &&
-                (newExpirationTime = child.expirationTime),
-              (child = child.sibling);
-          workInProgress.treeBaseTime = updateQueue;
+        fiber = 0;
+        if (current$$1.mode & 4) {
+          rootContainerInstance = current$$1.actualDuration;
+          type = current$$1.selfBaseDuration;
+          current =
+            null === current$$1.alternate ||
+            current$$1.child !== current$$1.alternate.child;
+          for (viewConfig = current$$1.child; null !== viewConfig; ) {
+            internalInstanceHandle = viewConfig.expirationTime;
+            tag = viewConfig.childExpirationTime;
+            if (
+              0 === fiber ||
+              (0 !== internalInstanceHandle && internalInstanceHandle < fiber)
+            )
+              fiber = internalInstanceHandle;
+            if (0 === fiber || (0 !== tag && tag < fiber)) fiber = tag;
+            current && (rootContainerInstance += viewConfig.actualDuration);
+            type += viewConfig.treeBaseDuration;
+            viewConfig = viewConfig.sibling;
+          }
+          current$$1.actualDuration = rootContainerInstance;
+          current$$1.treeBaseDuration = type;
         } else
-          for (updateQueue = workInProgress.child; null !== updateQueue; )
-            0 !== updateQueue.expirationTime &&
-              (0 === newExpirationTime ||
-                newExpirationTime > updateQueue.expirationTime) &&
-              (newExpirationTime = updateQueue.expirationTime),
-              (updateQueue = updateQueue.sibling);
-        workInProgress.expirationTime = newExpirationTime;
+          for (
+            rootContainerInstance = current$$1.child;
+            null !== rootContainerInstance;
+
+          ) {
+            type = rootContainerInstance.expirationTime;
+            current = rootContainerInstance.childExpirationTime;
+            if (0 === fiber || (0 !== type && type < fiber)) fiber = type;
+            if (0 === fiber || (0 !== current && current < fiber))
+              fiber = current;
+            rootContainerInstance = rootContainerInstance.sibling;
+          }
+        current$$1.childExpirationTime = fiber;
       }
-      if (null !== current) return current;
       null !== returnFiber &&
         0 === (returnFiber.effectTag & 512) &&
         (null === returnFiber.firstEffect &&
-          (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
-        null !== workInProgress$jscomp$0.lastEffect &&
+          (returnFiber.firstEffect = workInProgress.firstEffect),
+        null !== workInProgress.lastEffect &&
           (null !== returnFiber.lastEffect &&
-            (returnFiber.lastEffect.nextEffect =
-              workInProgress$jscomp$0.firstEffect),
-          (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
-        1 < workInProgress$jscomp$0.effectTag &&
+            (returnFiber.lastEffect.nextEffect = workInProgress.firstEffect),
+          (returnFiber.lastEffect = workInProgress.lastEffect)),
+        1 < workInProgress.effectTag &&
           (null !== returnFiber.lastEffect
-            ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
-            : (returnFiber.firstEffect = workInProgress$jscomp$0),
-          (returnFiber.lastEffect = workInProgress$jscomp$0)));
+            ? (returnFiber.lastEffect.nextEffect = workInProgress)
+            : (returnFiber.firstEffect = workInProgress),
+          (returnFiber.lastEffect = workInProgress)));
     } else {
-      workInProgress$jscomp$0 = unwindWork(
-        workInProgress$jscomp$0,
-        nextRenderExpirationTime
-      );
-      if (null !== workInProgress$jscomp$0)
-        return (
-          (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
-        );
+      workInProgress.mode & 4 &&
+        stopProfilerTimerIfRunningAndRecordDelta(workInProgress, !1);
+      workInProgress = unwindWork(workInProgress, nextRenderExpirationTime);
+      if (null !== workInProgress) {
+        if (workInProgress.mode & 4) {
+          returnFiber = workInProgress.actualDuration;
+          for (siblingFiber = workInProgress.child; null !== siblingFiber; )
+            (returnFiber += siblingFiber.actualDuration),
+              (siblingFiber = siblingFiber.sibling);
+          workInProgress.actualDuration = returnFiber;
+        }
+        workInProgress.effectTag &= 511;
+        return workInProgress;
+      }
       null !== returnFiber &&
         ((returnFiber.firstEffect = returnFiber.lastEffect = null),
         (returnFiber.effectTag |= 512));
     }
     if (null !== siblingFiber) return siblingFiber;
-    if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+    if (null !== returnFiber) workInProgress = returnFiber;
     else break;
   }
   return null;
 }
 function performUnitOfWork(workInProgress) {
-  var current = workInProgress.alternate;
-  workInProgress.mode & 4 && (baseStartTime = now$1());
-  current = beginWork(current, workInProgress, nextRenderExpirationTime);
+  var current$$1 = workInProgress.alternate;
   workInProgress.mode & 4 &&
-    (-1 !== baseStartTime &&
-      (workInProgress.selfBaseTime = now$1() - baseStartTime),
-    (baseStartTime = -1));
-  null === current && (current = completeUnitOfWork(workInProgress));
-  ReactCurrentOwner.current = null;
-  return current;
-}
-function renderRoot(root$jscomp$0, isYieldy) {
+    ((profilerStartTime = now$1()),
+    0 > workInProgress.actualStartTime &&
+      (workInProgress.actualStartTime = now$1()));
+  current$$1 = beginWork(current$$1, workInProgress, nextRenderExpirationTime);
+  workInProgress.mode & 4 &&
+    stopProfilerTimerIfRunningAndRecordDelta(workInProgress, !0);
+  null === current$$1 && (current$$1 = completeUnitOfWork(workInProgress));
+  ReactCurrentOwner$2.current = null;
+  return current$$1;
+}
+function renderRoot(root, isYieldy, isExpired) {
   invariant(
     !isWorking,
     "renderRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
   );
   isWorking = !0;
-  var expirationTime = root$jscomp$0.nextExpirationTimeToWorkOn;
+  ReactCurrentOwner$2.currentDispatcher = Dispatcher;
+  var expirationTime = root.nextExpirationTimeToWorkOn;
   if (
     expirationTime !== nextRenderExpirationTime ||
-    root$jscomp$0 !== nextRoot ||
+    root !== nextRoot ||
     null === nextUnitOfWork
-  )
-    resetStack(),
-      (nextRoot = root$jscomp$0),
-      (nextRenderExpirationTime = expirationTime),
-      (nextLatestTimeoutMs = -1),
-      (nextRenderDidError = !1),
-      (nextUnitOfWork = createWorkInProgress(
-        nextRoot.current,
-        null,
-        nextRenderExpirationTime
-      )),
-      (root$jscomp$0.pendingCommitExpirationTime = 0);
-  var didFatal = !1;
+  ) {
+    resetStack();
+    nextRoot = root;
+    nextRenderExpirationTime = expirationTime;
+    nextUnitOfWork = createWorkInProgress(
+      nextRoot.current,
+      null,
+      nextRenderExpirationTime
+    );
+    root.pendingCommitExpirationTime = 0;
+    var interactions = new Set();
+    root.pendingInteractionMap.forEach(function(
+      scheduledInteractions,
+      scheduledExpirationTime
+    ) {
+      scheduledExpirationTime <= expirationTime &&
+        scheduledInteractions.forEach(function(interaction) {
+          return interactions.add(interaction);
+        });
+    });
+    root.memoizedInteractions = interactions;
+    if (0 < interactions.size) {
+      var subscriber = tracing.__subscriberRef.current;
+      if (null !== subscriber) {
+        var threadID = 1e3 * expirationTime + root.interactionThreadID;
+        try {
+          subscriber.onWorkStarted(interactions, threadID);
+        } catch (error) {
+          hasUnhandledError ||
+            ((hasUnhandledError = !0), (unhandledError = error));
+        }
+      }
+    }
+  }
+  subscriber = null;
+  subscriber = tracing.__interactionsRef.current;
+  tracing.__interactionsRef.current = root.memoizedInteractions;
+  threadID = !1;
   do {
     try {
-      if (isYieldy) {
+      if (isYieldy)
         for (; null !== nextUnitOfWork && !shouldYield(); )
           nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-        0 === timerPausedAt && (timerPausedAt = now$1());
-      } else
+      else
         for (; null !== nextUnitOfWork; )
           nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
     } catch (thrownValue) {
-      if (((baseStartTime = -1), null === nextUnitOfWork))
-        (didFatal = !0), onUncaughtError(thrownValue);
+      if (null === nextUnitOfWork)
+        (threadID = !0), onUncaughtError(thrownValue);
       else {
         invariant(
           null !== nextUnitOfWork,
           "Failed to replay rendering after an error. This is likely caused by a bug in React. Please file an issue with a reproducing case to help us find it."
         );
-        isYieldy = nextUnitOfWork;
-        var returnFiber = isYieldy.return;
-        if (null === returnFiber) {
-          didFatal = !0;
-          onUncaughtError(thrownValue);
-          break;
-        }
-        a: {
-          var root = root$jscomp$0,
-            returnFiber$jscomp$0 = returnFiber,
-            sourceFiber = isYieldy,
-            value = thrownValue;
-          returnFiber = nextRenderExpirationTime;
-          sourceFiber.effectTag |= 512;
-          sourceFiber.firstEffect = sourceFiber.lastEffect = null;
-          nextRenderDidError = !0;
-          if (
-            (root.didError || 1 === returnFiber) &&
-            (returnFiber === root.latestPendingTime ||
-              returnFiber === root.latestSuspendedTime)
-          ) {
-            value = createCapturedValue(value, sourceFiber);
-            root = returnFiber$jscomp$0;
-            do {
-              switch (root.tag) {
-                case 3:
-                  root.effectTag |= 1024;
-                  value = createRootErrorUpdate(root, value, returnFiber);
-                  enqueueCapturedUpdate(root, value, returnFiber);
-                  break a;
-                case 2:
-                  if (
-                    ((returnFiber$jscomp$0 = value),
-                    (sourceFiber = root.stateNode),
-                    0 === (root.effectTag & 64) &&
-                      null !== sourceFiber &&
-                      "function" === typeof sourceFiber.componentDidCatch &&
-                      (null === legacyErrorBoundariesThatAlreadyFailed ||
-                        !legacyErrorBoundariesThatAlreadyFailed.has(
-                          sourceFiber
-                        )))
-                  ) {
-                    root.effectTag |= 1024;
-                    value = createClassErrorUpdate(
-                      root,
-                      returnFiber$jscomp$0,
-                      returnFiber
-                    );
-                    enqueueCapturedUpdate(root, value, returnFiber);
-                    break a;
-                  }
-              }
-              root = root.return;
-            } while (null !== root);
-          }
+        var sourceFiber = nextUnitOfWork,
+          returnFiber = sourceFiber.return;
+        if (null === returnFiber) (threadID = !0), onUncaughtError(thrownValue);
+        else {
+          throwException(
+            root,
+            returnFiber,
+            sourceFiber,
+            thrownValue,
+            nextRenderExpirationTime
+          );
+          nextUnitOfWork = completeUnitOfWork(sourceFiber);
+          continue;
         }
-        nextUnitOfWork = completeUnitOfWork(isYieldy);
       }
     }
     break;
   } while (1);
+  tracing.__interactionsRef.current = subscriber;
   isWorking = !1;
-  didFatal
-    ? (root$jscomp$0.finishedWork = null)
-    : null === nextUnitOfWork
-      ? ((didFatal = root$jscomp$0.current.alternate),
-        invariant(
-          null !== didFatal,
-          "Finished root should have a work-in-progress. This error is likely caused by a bug in React. Please file an issue."
-        ),
-        0 === (didFatal.effectTag & 512)
-          ? ((root$jscomp$0.pendingCommitExpirationTime = expirationTime),
-            (root$jscomp$0.finishedWork = didFatal))
-          : (!nextRenderDidError ||
-            (expirationTime !== root$jscomp$0.latestPendingTime &&
-              expirationTime !== root$jscomp$0.latestSuspendedTime)
-              ? ((didFatal = root$jscomp$0.earliestPendingTime),
-                (isYieldy = root$jscomp$0.latestPendingTime),
-                didFatal === expirationTime
-                  ? (root$jscomp$0.earliestPendingTime =
-                      isYieldy === expirationTime
-                        ? (root$jscomp$0.latestPendingTime = 0)
-                        : isYieldy)
-                  : isYieldy === expirationTime &&
-                    (root$jscomp$0.latestPendingTime = didFatal),
-                (didFatal = root$jscomp$0.latestSuspendedTime),
-                didFatal === expirationTime &&
-                  (root$jscomp$0.latestPingedTime = 0),
-                (isYieldy = root$jscomp$0.earliestSuspendedTime),
-                0 === isYieldy
-                  ? (root$jscomp$0.earliestSuspendedTime = root$jscomp$0.latestSuspendedTime = expirationTime)
-                  : isYieldy > expirationTime
-                    ? (root$jscomp$0.earliestSuspendedTime = expirationTime)
-                    : didFatal < expirationTime &&
-                      (root$jscomp$0.latestSuspendedTime = expirationTime))
-              : (root$jscomp$0.didError = !0),
-            findNextPendingPriorityLevel(root$jscomp$0),
-            onSuspend(
-              root$jscomp$0,
-              expirationTime,
-              root$jscomp$0.expirationTime,
-              nextLatestTimeoutMs
-            )))
-      : (root$jscomp$0.finishedWork = null);
+  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = ReactCurrentOwner$2.currentDispatcher = null;
+  if (threadID) (nextRoot = null), (root.finishedWork = null);
+  else if (null !== nextUnitOfWork) root.finishedWork = null;
+  else {
+    isYieldy = root.current.alternate;
+    invariant(
+      null !== isYieldy,
+      "Finished root should have a work-in-progress. This error is likely caused by a bug in React. Please file an issue."
+    );
+    nextRoot = null;
+    if (nextRenderDidError) {
+      if (hasLowerPriorityWork(root, expirationTime)) {
+        markSuspendedPriorityLevel(root, expirationTime);
+        onSuspend(root, isYieldy, expirationTime, root.expirationTime, -1);
+        return;
+      }
+      if (!root.didError && !isExpired) {
+        root.didError = !0;
+        isExpired = root.nextExpirationTimeToWorkOn = expirationTime;
+        subscriber = root.expirationTime = 1;
+        onSuspend(root, isYieldy, isExpired, subscriber, -1);
+        return;
+      }
+    }
+    isExpired || -1 === nextLatestAbsoluteTimeoutMs
+      ? onComplete(root, isYieldy, expirationTime)
+      : (markSuspendedPriorityLevel(root, expirationTime),
+        (isExpired =
+          10 *
+          (findEarliestOutstandingPriorityLevel(root, expirationTime) - 2)),
+        isExpired < nextLatestAbsoluteTimeoutMs &&
+          (nextLatestAbsoluteTimeoutMs = isExpired),
+        (isExpired = 10 * (requestCurrentTime() - 2)),
+        (isExpired = nextLatestAbsoluteTimeoutMs - isExpired),
+        onSuspend(
+          root,
+          isYieldy,
+          expirationTime,
+          root.expirationTime,
+          0 > isExpired ? 0 : isExpired
+        ));
+  }
 }
 function captureCommitPhaseError(fiber, error) {
   var JSCompiler_inline_result;
@@ -4862,101 +5794,156 @@ function captureCommitPhaseError(fiber, error) {
     ) {
       switch (JSCompiler_inline_result.tag) {
         case 2:
+        case 3:
           var instance = JSCompiler_inline_result.stateNode;
           if (
             "function" ===
-              typeof JSCompiler_inline_result.type.getDerivedStateFromCatch ||
+              typeof JSCompiler_inline_result.type.getDerivedStateFromError ||
             ("function" === typeof instance.componentDidCatch &&
               (null === legacyErrorBoundariesThatAlreadyFailed ||
                 !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
           ) {
             fiber = createCapturedValue(error, fiber);
             fiber = createClassErrorUpdate(JSCompiler_inline_result, fiber, 1);
-            enqueueUpdate(JSCompiler_inline_result, fiber, 1);
+            enqueueUpdate(JSCompiler_inline_result, fiber);
             scheduleWork(JSCompiler_inline_result, 1);
             JSCompiler_inline_result = void 0;
             break a;
           }
           break;
-        case 3:
+        case 5:
           fiber = createCapturedValue(error, fiber);
           fiber = createRootErrorUpdate(JSCompiler_inline_result, fiber, 1);
-          enqueueUpdate(JSCompiler_inline_result, fiber, 1);
+          enqueueUpdate(JSCompiler_inline_result, fiber);
           scheduleWork(JSCompiler_inline_result, 1);
           JSCompiler_inline_result = void 0;
           break a;
       }
       JSCompiler_inline_result = JSCompiler_inline_result.return;
     }
-    3 === fiber.tag &&
+    5 === fiber.tag &&
       ((JSCompiler_inline_result = createCapturedValue(error, fiber)),
       (JSCompiler_inline_result = createRootErrorUpdate(
         fiber,
         JSCompiler_inline_result,
         1
       )),
-      enqueueUpdate(fiber, JSCompiler_inline_result, 1),
+      enqueueUpdate(fiber, JSCompiler_inline_result),
       scheduleWork(fiber, 1));
     JSCompiler_inline_result = void 0;
   }
   return JSCompiler_inline_result;
 }
 function computeExpirationForFiber(currentTime, fiber) {
-  currentTime =
-    0 !== expirationContext
-      ? expirationContext
-      : isWorking
-        ? isCommitting$1 ? 1 : nextRenderExpirationTime
-        : fiber.mode & 1
-          ? isBatchingInteractiveUpdates
-            ? 2 + 10 * ((((currentTime - 2 + 15) / 10) | 0) + 1)
-            : 2 + 25 * ((((currentTime - 2 + 500) / 25) | 0) + 1)
-          : 1;
+  isWorking
+    ? (currentTime = isCommitting$1 ? 1 : nextRenderExpirationTime)
+    : fiber.mode & 1
+      ? ((currentTime = isBatchingInteractiveUpdates
+          ? 2 + 10 * ((((currentTime - 2 + 15) / 10) | 0) + 1)
+          : 2 + 25 * ((((currentTime - 2 + 500) / 25) | 0) + 1)),
+        null !== nextRoot &&
+          currentTime === nextRenderExpirationTime &&
+          (currentTime += 1))
+      : (currentTime = 1);
   isBatchingInteractiveUpdates &&
-    (0 === lowestPendingInteractiveExpirationTime ||
-      currentTime > lowestPendingInteractiveExpirationTime) &&
-    (lowestPendingInteractiveExpirationTime = currentTime);
+    currentTime > lowestPriorityPendingInteractiveExpirationTime &&
+    (lowestPriorityPendingInteractiveExpirationTime = currentTime);
   return currentTime;
 }
-function scheduleWork(fiber, expirationTime) {
-  for (; null !== fiber; ) {
-    if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
-      fiber.expirationTime = expirationTime;
-    null !== fiber.alternate &&
-      (0 === fiber.alternate.expirationTime ||
-        fiber.alternate.expirationTime > expirationTime) &&
-      (fiber.alternate.expirationTime = expirationTime);
-    if (null === fiber.return)
-      if (3 === fiber.tag) {
-        var root = fiber.stateNode;
-        !isWorking &&
-          0 !== nextRenderExpirationTime &&
-          expirationTime < nextRenderExpirationTime &&
-          resetStack();
-        markPendingPriorityLevel(root, expirationTime);
-        (isWorking && !isCommitting$1 && nextRoot === root) ||
-          requestWork(root, root.expirationTime);
-        nestedUpdateCount > NESTED_UPDATE_LIMIT &&
-          invariant(
-            !1,
-            "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."
-          );
-      } else break;
-    fiber = fiber.return;
+function retrySuspendedRoot(root, fiber, suspendedTime) {
+  var retryTime = root.earliestSuspendedTime;
+  var latestSuspendedTime = root.latestSuspendedTime;
+  if (
+    0 !== retryTime &&
+    suspendedTime >= retryTime &&
+    suspendedTime <= latestSuspendedTime
+  ) {
+    latestSuspendedTime = retryTime = suspendedTime;
+    root.didError = !1;
+    var latestPingedTime = root.latestPingedTime;
+    if (0 === latestPingedTime || latestPingedTime < latestSuspendedTime)
+      root.latestPingedTime = latestSuspendedTime;
+    findNextExpirationTimeToWorkOn(latestSuspendedTime, root);
+  } else
+    (retryTime = requestCurrentTime()),
+      (retryTime = computeExpirationForFiber(retryTime, fiber)),
+      markPendingPriorityLevel(root, retryTime);
+  0 !== (fiber.mode & 1) &&
+    root === nextRoot &&
+    nextRenderExpirationTime === suspendedTime &&
+    (nextRoot = null);
+  scheduleWorkToRoot(fiber, retryTime);
+  fiber = root.expirationTime;
+  0 !== fiber && requestWork(root, fiber);
+}
+function scheduleWorkToRoot(fiber, expirationTime) {
+  if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
+    fiber.expirationTime = expirationTime;
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    (0 === alternate.expirationTime ||
+      alternate.expirationTime > expirationTime) &&
+    (alternate.expirationTime = expirationTime);
+  var node = fiber.return,
+    root = null;
+  if (null === node && 5 === fiber.tag) root = fiber.stateNode;
+  else
+    for (; null !== node; ) {
+      alternate = node.alternate;
+      if (
+        0 === node.childExpirationTime ||
+        node.childExpirationTime > expirationTime
+      )
+        node.childExpirationTime = expirationTime;
+      null !== alternate &&
+        (0 === alternate.childExpirationTime ||
+          alternate.childExpirationTime > expirationTime) &&
+        (alternate.childExpirationTime = expirationTime);
+      if (null === node.return && 5 === node.tag) {
+        root = node.stateNode;
+        break;
+      }
+      node = node.return;
+    }
+  if (null === root) return null;
+  fiber = tracing.__interactionsRef.current;
+  if (0 < fiber.size) {
+    alternate = root.pendingInteractionMap;
+    var pendingInteractions = alternate.get(expirationTime);
+    null != pendingInteractions
+      ? fiber.forEach(function(interaction) {
+          pendingInteractions.has(interaction) || interaction.__count++;
+          pendingInteractions.add(interaction);
+        })
+      : (alternate.set(expirationTime, new Set(fiber)),
+        fiber.forEach(function(interaction) {
+          interaction.__count++;
+        }));
+    alternate = tracing.__subscriberRef.current;
+    if (null !== alternate)
+      alternate.onWorkScheduled(
+        fiber,
+        1e3 * expirationTime + root.interactionThreadID
+      );
   }
+  return root;
 }
-function recalculateCurrentTime() {
-  mostRecentCurrentTimeMs = now$1() - originalStartTimeMs;
-  return (mostRecentCurrentTime = ((mostRecentCurrentTimeMs / 10) | 0) + 2);
-}
-function syncUpdates(fn, a, b, c, d) {
-  var previousExpirationContext = expirationContext;
-  expirationContext = 1;
-  try {
-    return fn(a, b, c, d);
-  } finally {
-    expirationContext = previousExpirationContext;
-  }
+function scheduleWork(fiber, expirationTime) {
+  fiber = scheduleWorkToRoot(fiber, expirationTime);
+  null !== fiber &&
+    (!isWorking &&
+      0 !== nextRenderExpirationTime &&
+      expirationTime < nextRenderExpirationTime &&
+      resetStack(),
+    markPendingPriorityLevel(fiber, expirationTime),
+    (isWorking && !isCommitting$1 && nextRoot === fiber) ||
+      requestWork(fiber, fiber.expirationTime),
+    nestedUpdateCount > NESTED_UPDATE_LIMIT &&
+      ((nestedUpdateCount = 0),
+      invariant(
+        !1,
+        "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 firstScheduledRoot = null,
   lastScheduledRoot = null,
@@ -4965,7 +5952,7 @@ var firstScheduledRoot = null,
   isRendering = !1,
   nextFlushedRoot = null,
   nextFlushedExpirationTime = 0,
-  lowestPendingInteractiveExpirationTime = 0,
+  lowestPriorityPendingInteractiveExpirationTime = 0,
   deadlineDidExpire = !1,
   hasUnhandledError = !1,
   unhandledError = null,
@@ -4974,38 +5961,76 @@ var firstScheduledRoot = null,
   isUnbatchingUpdates = !1,
   isBatchingInteractiveUpdates = !1,
   completedBatches = null,
-  NESTED_UPDATE_LIMIT = 1e3,
+  originalStartTimeMs = now$1(),
+  currentRendererTime = ((originalStartTimeMs / 10) | 0) + 2,
+  currentSchedulerTime = currentRendererTime,
+  NESTED_UPDATE_LIMIT = 50,
   nestedUpdateCount = 0,
+  lastCommittedRootDuringThisBatch = null,
   timeHeuristicForUnitOfWork = 1;
-function scheduleCallbackWithExpirationTime(expirationTime) {
+function recomputeCurrentRendererTime() {
+  currentRendererTime = (((now$1() - originalStartTimeMs) / 10) | 0) + 2;
+}
+function scheduleCallbackWithExpirationTime(root, expirationTime) {
   if (0 !== callbackExpirationTime) {
     if (expirationTime > callbackExpirationTime) return;
-    if (null !== callbackID) {
-      var callbackID$jscomp$0 = callbackID;
-      scheduledCallback = null;
-      clearTimeout(callbackID$jscomp$0);
-    }
+    null !== callbackID &&
+      ((root = callbackID), (scheduledCallback = null), clearTimeout(root));
   }
   callbackExpirationTime = expirationTime;
   now$1();
   scheduledCallback = performAsyncWork;
   callbackID = setTimeout(setTimeoutCallback, 1);
 }
-function onSuspend(root, suspendedExpirationTime, expirationTime, timeoutMs) {
-  0 <= timeoutMs &&
-    setTimeout(function() {
-      var latestSuspendedTime = root.latestSuspendedTime;
-      0 !== latestSuspendedTime &&
-        latestSuspendedTime <= suspendedExpirationTime &&
-        ((latestSuspendedTime = root.latestPingedTime),
-        0 === latestSuspendedTime ||
-          latestSuspendedTime < suspendedExpirationTime) &&
-        (root.latestPingedTime = suspendedExpirationTime);
-      findNextPendingPriorityLevel(root);
-      latestSuspendedTime = root.expirationTime;
-      0 !== latestSuspendedTime && requestWork(root, latestSuspendedTime);
-    }, timeoutMs);
+function onComplete(root, finishedWork, expirationTime) {
+  root.pendingCommitExpirationTime = expirationTime;
+  root.finishedWork = finishedWork;
+}
+function onSuspend(
+  root,
+  finishedWork,
+  suspendedExpirationTime,
+  rootExpirationTime,
+  msUntilTimeout
+) {
+  root.expirationTime = rootExpirationTime;
+  0 !== msUntilTimeout || shouldYield()
+    ? 0 < msUntilTimeout &&
+      (root.timeoutHandle = scheduleTimeout(
+        onTimeout.bind(null, root, finishedWork, suspendedExpirationTime),
+        msUntilTimeout
+      ))
+    : ((root.pendingCommitExpirationTime = suspendedExpirationTime),
+      (root.finishedWork = finishedWork));
+}
+function onTimeout(root, finishedWork, suspendedExpirationTime) {
+  root.pendingCommitExpirationTime = suspendedExpirationTime;
+  root.finishedWork = finishedWork;
+  recomputeCurrentRendererTime();
+  currentSchedulerTime = currentRendererTime;
+  invariant(
+    !isRendering,
+    "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
+  );
+  nextFlushedRoot = root;
+  nextFlushedExpirationTime = suspendedExpirationTime;
+  performWorkOnRoot(root, suspendedExpirationTime, !0);
+  performWork(1, null);
+}
+function onCommit(root, expirationTime) {
   root.expirationTime = expirationTime;
+  root.finishedWork = null;
+}
+function requestCurrentTime() {
+  if (isRendering) return currentSchedulerTime;
+  findHighestPriorityRoot();
+  if (
+    0 === nextFlushedExpirationTime ||
+    1073741823 === nextFlushedExpirationTime
+  )
+    recomputeCurrentRendererTime(),
+      (currentSchedulerTime = currentRendererTime);
+  return currentSchedulerTime;
 }
 function requestWork(root, expirationTime) {
   if (null === root.nextScheduledRoot)
@@ -5028,10 +6053,10 @@ function requestWork(root, expirationTime) {
       ? isUnbatchingUpdates &&
         ((nextFlushedRoot = root),
         (nextFlushedExpirationTime = 1),
-        performWorkOnRoot(root, 1, !1))
+        performWorkOnRoot(root, 1, !0))
       : 1 === expirationTime
         ? performWork(1, null)
-        : scheduleCallbackWithExpirationTime(expirationTime));
+        : scheduleCallbackWithExpirationTime(root, expirationTime));
 }
 function findHighestPriorityRoot() {
   var highestPriorityWork = 0,
@@ -5073,40 +6098,50 @@ function findHighestPriorityRoot() {
           (highestPriorityWork = remainingExpirationTime),
             (highestPriorityRoot = root);
         if (root === lastScheduledRoot) break;
+        if (1 === highestPriorityWork) break;
         previousScheduledRoot = root;
         root = root.nextScheduledRoot;
       }
     }
-  previousScheduledRoot = nextFlushedRoot;
-  null !== previousScheduledRoot &&
-  previousScheduledRoot === highestPriorityRoot &&
-  1 === highestPriorityWork
-    ? nestedUpdateCount++
-    : (nestedUpdateCount = 0);
   nextFlushedRoot = highestPriorityRoot;
   nextFlushedExpirationTime = highestPriorityWork;
 }
 function performAsyncWork(dl) {
+  if (dl.didTimeout && null !== firstScheduledRoot) {
+    recomputeCurrentRendererTime();
+    var root = firstScheduledRoot;
+    do {
+      var expirationTime = root.expirationTime;
+      0 !== expirationTime &&
+        currentRendererTime >= expirationTime &&
+        (root.nextExpirationTimeToWorkOn = currentRendererTime);
+      root = root.nextScheduledRoot;
+    } while (root !== firstScheduledRoot);
+  }
   performWork(0, dl);
 }
 function performWork(minExpirationTime, dl) {
   deadline = dl;
   findHighestPriorityRoot();
-  resumeActualRenderTimerIfPaused();
   if (null !== deadline)
     for (
-      ;
+      recomputeCurrentRendererTime(),
+        currentSchedulerTime = currentRendererTime;
       null !== nextFlushedRoot &&
       0 !== nextFlushedExpirationTime &&
       (0 === minExpirationTime ||
         minExpirationTime >= nextFlushedExpirationTime) &&
-      (!deadlineDidExpire ||
-        recalculateCurrentTime() >= nextFlushedExpirationTime);
+      (!deadlineDidExpire || currentRendererTime >= nextFlushedExpirationTime);
 
     )
-      recalculateCurrentTime(),
-        performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !0),
-        findHighestPriorityRoot();
+      performWorkOnRoot(
+        nextFlushedRoot,
+        nextFlushedExpirationTime,
+        currentRendererTime >= nextFlushedExpirationTime
+      ),
+        findHighestPriorityRoot(),
+        recomputeCurrentRendererTime(),
+        (currentSchedulerTime = currentRendererTime);
   else
     for (
       ;
@@ -5116,22 +6151,25 @@ function performWork(minExpirationTime, dl) {
         minExpirationTime >= nextFlushedExpirationTime);
 
     )
-      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !1),
+      performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, !0),
         findHighestPriorityRoot();
   null !== deadline && ((callbackExpirationTime = 0), (callbackID = null));
   0 !== nextFlushedExpirationTime &&
-    scheduleCallbackWithExpirationTime(nextFlushedExpirationTime);
+    scheduleCallbackWithExpirationTime(
+      nextFlushedRoot,
+      nextFlushedExpirationTime
+    );
   deadline = null;
   deadlineDidExpire = !1;
-  finishRendering();
-}
-function finishRendering() {
   nestedUpdateCount = 0;
-  if (null !== completedBatches) {
-    var batches = completedBatches;
-    completedBatches = null;
-    for (var i = 0; i < batches.length; i++) {
-      var batch = batches[i];
+  lastCommittedRootDuringThisBatch = null;
+  if (null !== completedBatches)
+    for (
+      minExpirationTime = completedBatches, completedBatches = null, dl = 0;
+      dl < minExpirationTime.length;
+      dl++
+    ) {
+      var batch = minExpirationTime[dl];
       try {
         batch._onComplete();
       } catch (error) {
@@ -5139,41 +6177,47 @@ function finishRendering() {
           ((hasUnhandledError = !0), (unhandledError = error));
       }
     }
-  }
   if (hasUnhandledError)
-    throw ((batches = unhandledError),
+    throw ((minExpirationTime = unhandledError),
     (unhandledError = null),
     (hasUnhandledError = !1),
-    batches);
+    minExpirationTime);
 }
-function performWorkOnRoot(root, expirationTime, isYieldy) {
+function performWorkOnRoot(root, expirationTime, isExpired) {
   invariant(
     !isRendering,
     "performWorkOnRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
   );
   isRendering = !0;
-  isYieldy
-    ? ((isYieldy = root.finishedWork),
-      null !== isYieldy
-        ? completeRoot(root, isYieldy, expirationTime)
+  if (null === deadline || isExpired) {
+    var finishedWork = root.finishedWork;
+    null !== finishedWork
+      ? completeRoot(root, finishedWork, expirationTime)
+      : ((root.finishedWork = null),
+        (finishedWork = root.timeoutHandle),
+        -1 !== finishedWork &&
+          ((root.timeoutHandle = -1), cancelTimeout(finishedWork)),
+        renderRoot(root, !1, isExpired),
+        (finishedWork = root.finishedWork),
+        null !== finishedWork &&
+          completeRoot(root, finishedWork, expirationTime));
+  } else
+    (finishedWork = root.finishedWork),
+      null !== finishedWork
+        ? completeRoot(root, finishedWork, expirationTime)
         : ((root.finishedWork = null),
-          renderRoot(root, !0),
-          (isYieldy = root.finishedWork),
-          null !== isYieldy &&
+          (finishedWork = root.timeoutHandle),
+          -1 !== finishedWork &&
+            ((root.timeoutHandle = -1), cancelTimeout(finishedWork)),
+          renderRoot(root, !0, isExpired),
+          (finishedWork = root.finishedWork),
+          null !== finishedWork &&
             (shouldYield()
-              ? ((root.finishedWork = isYieldy),
-                0 === timerPausedAt && (timerPausedAt = now$1()))
-              : completeRoot(root, isYieldy, expirationTime))))
-    : ((isYieldy = root.finishedWork),
-      null !== isYieldy
-        ? completeRoot(root, isYieldy, expirationTime)
-        : ((root.finishedWork = null),
-          renderRoot(root, !1),
-          (isYieldy = root.finishedWork),
-          null !== isYieldy && completeRoot(root, isYieldy, expirationTime)));
+              ? (root.finishedWork = finishedWork)
+              : completeRoot(root, finishedWork, expirationTime)));
   isRendering = !1;
 }
-function completeRoot(root, finishedWork$jscomp$0, expirationTime) {
+function completeRoot(root, finishedWork, expirationTime) {
   var firstBatch = root.firstBatch;
   if (
     null !== firstBatch &&
@@ -5183,276 +6227,22 @@ function completeRoot(root, finishedWork$jscomp$0, expirationTime) {
       : completedBatches.push(firstBatch),
     firstBatch._defer)
   ) {
-    root.finishedWork = finishedWork$jscomp$0;
+    root.finishedWork = finishedWork;
     root.expirationTime = 0;
     return;
   }
   root.finishedWork = null;
-  isCommitting$1 = isWorking = !0;
-  invariant(
-    root.current !== finishedWork$jscomp$0,
-    "Cannot commit the same tree as before. This is probably a bug related to the return field. This error is likely caused by a bug in React. Please file an issue."
-  );
-  expirationTime = root.pendingCommitExpirationTime;
-  invariant(
-    0 !== expirationTime,
-    "Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue."
-  );
-  root.pendingCommitExpirationTime = 0;
-  firstBatch = finishedWork$jscomp$0.expirationTime;
-  recalculateCurrentTime();
-  root.didError = !1;
-  if (0 === firstBatch)
-    (root.earliestPendingTime = 0),
-      (root.latestPendingTime = 0),
-      (root.earliestSuspendedTime = 0),
-      (root.latestSuspendedTime = 0),
-      (root.latestPingedTime = 0);
-  else {
-    var latestPendingTime = root.latestPendingTime;
-    0 !== latestPendingTime &&
-      (latestPendingTime < firstBatch
-        ? (root.earliestPendingTime = root.latestPendingTime = 0)
-        : root.earliestPendingTime < firstBatch &&
-          (root.earliestPendingTime = root.latestPendingTime));
-    latestPendingTime = root.earliestSuspendedTime;
-    0 === latestPendingTime
-      ? markPendingPriorityLevel(root, firstBatch)
-      : firstBatch > root.latestSuspendedTime
-        ? ((root.earliestSuspendedTime = 0),
-          (root.latestSuspendedTime = 0),
-          (root.latestPingedTime = 0),
-          markPendingPriorityLevel(root, firstBatch))
-        : firstBatch < latestPendingTime &&
-          markPendingPriorityLevel(root, firstBatch);
-  }
-  findNextPendingPriorityLevel(root);
-  ReactCurrentOwner.current = null;
-  1 < finishedWork$jscomp$0.effectTag
-    ? null !== finishedWork$jscomp$0.lastEffect
-      ? ((finishedWork$jscomp$0.lastEffect.nextEffect = finishedWork$jscomp$0),
-        (firstBatch = finishedWork$jscomp$0.firstEffect))
-      : (firstBatch = finishedWork$jscomp$0)
-    : (firstBatch = finishedWork$jscomp$0.firstEffect);
-  for (nextEffect = firstBatch; null !== nextEffect; ) {
-    latestPendingTime = !1;
-    var error = void 0;
-    try {
-      for (; null !== nextEffect; ) {
-        if (nextEffect.effectTag & 256) {
-          var current = nextEffect.alternate,
-            finishedWork = nextEffect;
-          switch (finishedWork.tag) {
-            case 2:
-              if (finishedWork.effectTag & 256 && null !== current) {
-                var prevProps = current.memoizedProps,
-                  prevState = current.memoizedState,
-                  instance = finishedWork.stateNode;
-                instance.props = finishedWork.memoizedProps;
-                instance.state = finishedWork.memoizedState;
-                var snapshot = instance.getSnapshotBeforeUpdate(
-                  prevProps,
-                  prevState
-                );
-                instance.__reactInternalSnapshotBeforeUpdate = snapshot;
-              }
-              break;
-            case 3:
-            case 5:
-            case 6:
-            case 4:
-              break;
-            default:
-              invariant(
-                !1,
-                "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-              );
-          }
-        }
-        nextEffect = nextEffect.nextEffect;
-      }
-    } catch (e) {
-      (latestPendingTime = !0), (error = e);
-    }
-    latestPendingTime &&
-      (invariant(
-        null !== nextEffect,
-        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
-      ),
-      captureCommitPhaseError(nextEffect, error),
-      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
-  }
-  commitTime = now$1();
-  for (nextEffect = firstBatch; null !== nextEffect; ) {
-    current = !1;
-    prevProps = void 0;
-    try {
-      for (; null !== nextEffect; ) {
-        var effectTag = nextEffect.effectTag;
-        if (effectTag & 128) {
-          var current$jscomp$0 = nextEffect.alternate;
-          if (null !== current$jscomp$0) {
-            var currentRef = current$jscomp$0.ref;
-            null !== currentRef &&
-              ("function" === typeof currentRef
-                ? currentRef(null)
-                : (currentRef.current = null));
-          }
-        }
-        switch (effectTag & 14) {
-          case 2:
-            commitPlacement(nextEffect);
-            nextEffect.effectTag &= -3;
-            break;
-          case 6:
-            commitPlacement(nextEffect);
-            nextEffect.effectTag &= -3;
-            commitWork(nextEffect.alternate, nextEffect);
-            break;
-          case 4:
-            commitWork(nextEffect.alternate, nextEffect);
-            break;
-          case 8:
-            (prevState = nextEffect),
-              unmountHostComponents(prevState),
-              (prevState.return = null),
-              (prevState.child = null),
-              prevState.alternate &&
-                ((prevState.alternate.child = null),
-                (prevState.alternate.return = null));
-        }
-        nextEffect = nextEffect.nextEffect;
-      }
-    } catch (e) {
-      (current = !0), (prevProps = e);
-    }
-    current &&
-      (invariant(
-        null !== nextEffect,
-        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
-      ),
-      captureCommitPhaseError(nextEffect, prevProps),
-      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
-  }
-  root.current = finishedWork$jscomp$0;
-  for (nextEffect = firstBatch; null !== nextEffect; ) {
-    effectTag = !1;
-    current$jscomp$0 = void 0;
-    try {
-      for (currentRef = expirationTime; null !== nextEffect; ) {
-        var effectTag$jscomp$0 = nextEffect.effectTag;
-        if (effectTag$jscomp$0 & 36) {
-          var current$jscomp$1 = nextEffect.alternate;
-          current = nextEffect;
-          prevProps = currentRef;
-          switch (current.tag) {
-            case 2:
-              var instance$jscomp$0 = current.stateNode;
-              if (current.effectTag & 4)
-                if (null === current$jscomp$1)
-                  (instance$jscomp$0.props = current.memoizedProps),
-                    (instance$jscomp$0.state = current.memoizedState),
-                    instance$jscomp$0.componentDidMount();
-                else {
-                  var prevProps$jscomp$0 = current$jscomp$1.memoizedProps,
-                    prevState$jscomp$0 = current$jscomp$1.memoizedState;
-                  instance$jscomp$0.props = current.memoizedProps;
-                  instance$jscomp$0.state = current.memoizedState;
-                  instance$jscomp$0.componentDidUpdate(
-                    prevProps$jscomp$0,
-                    prevState$jscomp$0,
-                    instance$jscomp$0.__reactInternalSnapshotBeforeUpdate
-                  );
-                }
-              var updateQueue = current.updateQueue;
-              null !== updateQueue &&
-                ((instance$jscomp$0.props = current.memoizedProps),
-                (instance$jscomp$0.state = current.memoizedState),
-                commitUpdateQueue(
-                  current,
-                  updateQueue,
-                  instance$jscomp$0,
-                  prevProps
-                ));
-              break;
-            case 3:
-              var _updateQueue = current.updateQueue;
-              if (null !== _updateQueue) {
-                prevState = null;
-                if (null !== current.child)
-                  switch (current.child.tag) {
-                    case 5:
-                      prevState = current.child.stateNode;
-                      break;
-                    case 2:
-                      prevState = current.child.stateNode;
-                  }
-                commitUpdateQueue(current, _updateQueue, prevState, prevProps);
-              }
-              break;
-            case 5:
-              break;
-            case 6:
-              break;
-            case 4:
-              break;
-            case 15:
-              break;
-            case 16:
-              break;
-            default:
-              invariant(
-                !1,
-                "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-              );
-          }
-        }
-        if (effectTag$jscomp$0 & 128) {
-          current = void 0;
-          var ref = nextEffect.ref;
-          if (null !== ref) {
-            var instance$jscomp$1 = nextEffect.stateNode;
-            switch (nextEffect.tag) {
-              case 5:
-                current = instance$jscomp$1;
-                break;
-              default:
-                current = instance$jscomp$1;
-            }
-            "function" === typeof ref ? ref(current) : (ref.current = current);
-          }
-        }
-        var next = nextEffect.nextEffect;
-        nextEffect.nextEffect = null;
-        nextEffect = next;
-      }
-    } catch (e) {
-      (effectTag = !0), (current$jscomp$0 = e);
-    }
-    effectTag &&
-      (invariant(
-        null !== nextEffect,
-        "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
-      ),
-      captureCommitPhaseError(nextEffect, current$jscomp$0),
-      null !== nextEffect && (nextEffect = nextEffect.nextEffect));
-  }
-  totalElapsedPauseTime = 0;
-  isWorking = isCommitting$1 = !1;
-  "function" === typeof onCommitRoot &&
-    onCommitRoot(finishedWork$jscomp$0.stateNode);
-  finishedWork$jscomp$0 = root.expirationTime;
-  0 === finishedWork$jscomp$0 &&
-    (legacyErrorBoundariesThatAlreadyFailed = null);
-  root.expirationTime = finishedWork$jscomp$0;
-  root.finishedWork = null;
+  root === lastCommittedRootDuringThisBatch
+    ? nestedUpdateCount++
+    : ((lastCommittedRootDuringThisBatch = root), (nestedUpdateCount = 0));
+  commitRoot(root, finishedWork);
 }
 function shouldYield() {
-  return null === deadline ||
-    deadlineDidExpire ||
-    deadline.timeRemaining() > timeHeuristicForUnitOfWork
-    ? !1
-    : (deadlineDidExpire = !0);
+  return deadlineDidExpire
+    ? !0
+    : null === deadline || deadline.timeRemaining() > timeHeuristicForUnitOfWork
+      ? !1
+      : (deadlineDidExpire = !0);
 }
 function onUncaughtError(error) {
   invariant(
@@ -5462,51 +6252,54 @@ function onUncaughtError(error) {
   nextFlushedRoot.expirationTime = 0;
   hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
 }
-function updateContainerAtExpirationTime(
-  element,
-  container,
-  parentComponent,
-  expirationTime,
-  callback
-) {
-  var current = container.current;
-  if (parentComponent) {
-    parentComponent = parentComponent._reactInternalFiber;
-    var parentContext;
-    b: {
-      invariant(
-        2 === isFiberMountedImpl(parentComponent) && 2 === parentComponent.tag,
-        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-      );
-      for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
-        if (isContextProvider(parentContext)) {
-          parentContext =
-            parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
-          break b;
-        }
-        parentContext = parentContext.return;
-        invariant(
-          parentContext,
-          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-        );
+function getContextForSubtree(parentComponent) {
+  if (!parentComponent) return emptyContextObject;
+  parentComponent = parentComponent._reactInternalFiber;
+  a: {
+    invariant(
+      2 === isFiberMountedImpl(parentComponent) &&
+        (2 === parentComponent.tag || 3 === parentComponent.tag),
+      "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+    );
+    var parentContext = parentComponent;
+    do {
+      switch (parentContext.tag) {
+        case 5:
+          parentContext = parentContext.stateNode.context;
+          break a;
+        case 2:
+          if (isContextProvider(parentContext.type)) {
+            parentContext =
+              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
+            break a;
+          }
+          break;
+        case 3:
+          if (isContextProvider(parentContext.type._reactResult)) {
+            parentContext =
+              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
+            break a;
+          }
       }
-      parentContext = parentContext.stateNode.context;
-    }
-    parentComponent = isContextProvider(parentComponent)
-      ? processChildContext(parentComponent, parentContext)
-      : parentContext;
-  } else parentComponent = emptyObject;
-  null === container.context
-    ? (container.context = parentComponent)
-    : (container.pendingContext = parentComponent);
-  container = callback;
-  callback = createUpdate(expirationTime);
-  callback.payload = { element: element };
-  container = void 0 === container ? null : container;
-  null !== container && (callback.callback = container);
-  enqueueUpdate(current, callback, expirationTime);
-  scheduleWork(current, expirationTime);
-  return expirationTime;
+      parentContext = parentContext.return;
+    } while (null !== parentContext);
+    invariant(
+      !1,
+      "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+    );
+    parentContext = void 0;
+  }
+  if (2 === parentComponent.tag) {
+    var Component = parentComponent.type;
+    if (isContextProvider(Component))
+      return processChildContext(parentComponent, Component, parentContext);
+  } else if (
+    3 === parentComponent.tag &&
+    ((Component = parentComponent.type._reactResult),
+    isContextProvider(Component))
+  )
+    return processChildContext(parentComponent, Component, parentContext);
+  return parentContext;
 }
 function findHostInstance$1(component) {
   var fiber = component._reactInternalFiber;
@@ -5522,158 +6315,23 @@ function findHostInstance$1(component) {
   return null === component ? null : component.stateNode;
 }
 function updateContainer(element, container, parentComponent, callback) {
-  var current = container.current,
-    currentTime = recalculateCurrentTime();
-  current = computeExpirationForFiber(currentTime, current);
-  return updateContainerAtExpirationTime(
-    element,
-    container,
-    parentComponent,
-    current,
-    callback
-  );
-}
-function getPublicRootInstance(container) {
-  container = container.current;
-  if (!container.child) return null;
-  switch (container.child.tag) {
-    case 5:
-      return container.child.stateNode;
-    default:
-      return container.child.stateNode;
-  }
-}
-function injectIntoDevTools(devToolsConfig) {
-  var findFiberByHostInstance = devToolsConfig.findFiberByHostInstance;
-  return injectInternals(
-    Object.assign({}, devToolsConfig, {
-      findHostInstanceByFiber: function(fiber) {
-        fiber = findCurrentHostFiber(fiber);
-        return null === fiber ? null : fiber.stateNode;
-      },
-      findFiberByHostInstance: function(instance) {
-        return findFiberByHostInstance
-          ? findFiberByHostInstance(instance)
-          : null;
-      }
-    })
-  );
+  var current$$1 = container.current,
+    currentTime = requestCurrentTime();
+  current$$1 = computeExpirationForFiber(currentTime, current$$1);
+  currentTime = container.current;
+  parentComponent = getContextForSubtree(parentComponent);
+  null === container.context
+    ? (container.context = parentComponent)
+    : (container.pendingContext = parentComponent);
+  container = callback;
+  callback = createUpdate(current$$1);
+  callback.payload = { element: element };
+  container = void 0 === container ? null : container;
+  null !== container && (callback.callback = container);
+  enqueueUpdate(currentTime, callback);
+  scheduleWork(currentTime, current$$1);
+  return current$$1;
 }
-var ReactNativeFiberRenderer = {
-  updateContainerAtExpirationTime: updateContainerAtExpirationTime,
-  createContainer: function(containerInfo, isAsync, hydrate) {
-    return createFiberRoot(containerInfo, isAsync, hydrate);
-  },
-  updateContainer: updateContainer,
-  flushRoot: function(root, expirationTime) {
-    invariant(
-      !isRendering,
-      "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
-    );
-    nextFlushedRoot = root;
-    nextFlushedExpirationTime = expirationTime;
-    performWorkOnRoot(root, expirationTime, !1);
-    performWork(1, null);
-    finishRendering();
-  },
-  requestWork: requestWork,
-  computeUniqueAsyncExpiration: function() {
-    var result =
-      2 + 25 * ((((recalculateCurrentTime() - 2 + 500) / 25) | 0) + 1);
-    result <= lastUniqueAsyncExpiration &&
-      (result = lastUniqueAsyncExpiration + 1);
-    return (lastUniqueAsyncExpiration = result);
-  },
-  batchedUpdates: function(fn, a) {
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      return fn(a);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates) ||
-        isRendering ||
-        performWork(1, null);
-    }
-  },
-  unbatchedUpdates: function(fn, a) {
-    if (isBatchingUpdates && !isUnbatchingUpdates) {
-      isUnbatchingUpdates = !0;
-      try {
-        return fn(a);
-      } finally {
-        isUnbatchingUpdates = !1;
-      }
-    }
-    return fn(a);
-  },
-  deferredUpdates: function(fn) {
-    var previousExpirationContext = expirationContext;
-    expirationContext =
-      2 + 25 * ((((recalculateCurrentTime() - 2 + 500) / 25) | 0) + 1);
-    try {
-      return fn();
-    } finally {
-      expirationContext = previousExpirationContext;
-    }
-  },
-  syncUpdates: syncUpdates,
-  interactiveUpdates: function(fn, a, b) {
-    if (isBatchingInteractiveUpdates) return fn(a, b);
-    isBatchingUpdates ||
-      isRendering ||
-      0 === lowestPendingInteractiveExpirationTime ||
-      (performWork(lowestPendingInteractiveExpirationTime, null),
-      (lowestPendingInteractiveExpirationTime = 0));
-    var previousIsBatchingInteractiveUpdates = isBatchingInteractiveUpdates,
-      previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = isBatchingInteractiveUpdates = !0;
-    try {
-      return fn(a, b);
-    } finally {
-      (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
-        (isBatchingUpdates = previousIsBatchingUpdates) ||
-          isRendering ||
-          performWork(1, null);
-    }
-  },
-  flushInteractiveUpdates: function() {
-    isRendering ||
-      0 === lowestPendingInteractiveExpirationTime ||
-      (performWork(lowestPendingInteractiveExpirationTime, null),
-      (lowestPendingInteractiveExpirationTime = 0));
-  },
-  flushControlled: function(fn) {
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      syncUpdates(fn);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates) ||
-        isRendering ||
-        performWork(1, null);
-    }
-  },
-  flushSync: function(fn, a) {
-    invariant(
-      !isRendering,
-      "flushSync was called from inside a lifecycle method. It cannot be called when React is already rendering."
-    );
-    var previousIsBatchingUpdates = isBatchingUpdates;
-    isBatchingUpdates = !0;
-    try {
-      return syncUpdates(fn, a);
-    } finally {
-      (isBatchingUpdates = previousIsBatchingUpdates), performWork(1, null);
-    }
-  },
-  getPublicRootInstance: getPublicRootInstance,
-  findHostInstance: findHostInstance$1,
-  findHostInstanceWithNoPortals: function(fiber) {
-    fiber = findCurrentHostFiberWithNoPortals(fiber);
-    return null === fiber ? null : fiber.stateNode;
-  },
-  injectIntoDevTools: injectIntoDevTools
-};
 function createPortal(children, containerInfo, implementation) {
   var key =
     3 < arguments.length && void 0 !== arguments[3] ? arguments[3] : null;
@@ -5721,8 +6379,23 @@ function findNodeHandle(componentOrHandle) {
       ? componentOrHandle.canonical._nativeTag
       : componentOrHandle._nativeTag;
 }
-_batchedUpdates = ReactNativeFiberRenderer.batchedUpdates;
-_flushInteractiveUpdates = ReactNativeFiberRenderer.flushInteractiveUpdates;
+_batchedUpdatesImpl = function(fn, a) {
+  var previousIsBatchingUpdates = isBatchingUpdates;
+  isBatchingUpdates = !0;
+  try {
+    return fn(a);
+  } finally {
+    (isBatchingUpdates = previousIsBatchingUpdates) ||
+      isRendering ||
+      performWork(1, null);
+  }
+};
+_flushInteractiveUpdatesImpl = function() {
+  isRendering ||
+    0 === lowestPriorityPendingInteractiveExpirationTime ||
+    (performWork(lowestPriorityPendingInteractiveExpirationTime, null),
+    (lowestPriorityPendingInteractiveExpirationTime = 0));
+};
 var roots = new Map(),
   ReactNativeRenderer = {
     NativeComponent: (function(findNodeHandle, findHostInstance) {
@@ -5750,13 +6423,13 @@ var roots = new Map(),
         ReactNativeComponent.prototype.measure = function(callback) {
           UIManager.measure(
             findNodeHandle(this),
-            mountSafeCallback(this, callback)
+            mountSafeCallback_NOT_REALLY_SAFE(this, callback)
           );
         };
         ReactNativeComponent.prototype.measureInWindow = function(callback) {
           UIManager.measureInWindow(
             findNodeHandle(this),
-            mountSafeCallback(this, callback)
+            mountSafeCallback_NOT_REALLY_SAFE(this, callback)
           );
         };
         ReactNativeComponent.prototype.measureLayout = function(
@@ -5767,8 +6440,8 @@ var roots = new Map(),
           UIManager.measureLayout(
             findNodeHandle(this),
             relativeToNativeNode,
-            mountSafeCallback(this, onFail),
-            mountSafeCallback(this, onSuccess)
+            mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+            mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
           );
         };
         ReactNativeComponent.prototype.setNativeProps = function(nativeProps) {
@@ -5781,7 +6454,7 @@ var roots = new Map(),
               maybeInstance.viewConfig || maybeInstance.canonical.viewConfig;
             nativeProps = diffProperties(
               null,
-              emptyObject$1,
+              emptyObject,
               nativeProps,
               viewConfig.validAttributes
             );
@@ -5799,11 +6472,48 @@ var roots = new Map(),
     findNodeHandle: findNodeHandle,
     render: function(element, containerTag, callback) {
       var root = roots.get(containerTag);
-      root ||
-        ((root = createFiberRoot(containerTag, !1, !1)),
-        roots.set(containerTag, root));
+      if (!root) {
+        root = 0;
+        isDevToolsPresent && (root |= 4);
+        root = new FiberNode(5, null, null, root);
+        var root$jscomp$0 = {
+          current: root,
+          containerInfo: containerTag,
+          pendingChildren: null,
+          earliestPendingTime: 0,
+          latestPendingTime: 0,
+          earliestSuspendedTime: 0,
+          latestSuspendedTime: 0,
+          latestPingedTime: 0,
+          didError: !1,
+          pendingCommitExpirationTime: 0,
+          finishedWork: null,
+          timeoutHandle: -1,
+          context: null,
+          pendingContext: null,
+          hydrate: !1,
+          nextExpirationTimeToWorkOn: 0,
+          expirationTime: 0,
+          firstBatch: null,
+          nextScheduledRoot: null,
+          interactionThreadID: tracing.unstable_getThreadID(),
+          memoizedInteractions: new Set(),
+          pendingInteractionMap: new Map()
+        };
+        root = root.stateNode = root$jscomp$0;
+        roots.set(containerTag, root);
+      }
       updateContainer(element, root, null, callback);
-      return getPublicRootInstance(root);
+      a: if (((element = root.current), element.child))
+        switch (element.child.tag) {
+          case 7:
+            element = element.child.stateNode;
+            break a;
+          default:
+            element = element.child.stateNode;
+        }
+      else element = null;
+      return element;
     },
     unmountComponentAtNode: function(containerTag) {
       var root = roots.get(containerTag);
@@ -5831,21 +6541,21 @@ var roots = new Map(),
           measure: function(callback) {
             UIManager.measure(
               findNodeHandle(this),
-              mountSafeCallback(this, callback)
+              mountSafeCallback_NOT_REALLY_SAFE(this, callback)
             );
           },
           measureInWindow: function(callback) {
             UIManager.measureInWindow(
               findNodeHandle(this),
-              mountSafeCallback(this, callback)
+              mountSafeCallback_NOT_REALLY_SAFE(this, callback)
             );
           },
           measureLayout: function(relativeToNativeNode, onSuccess, onFail) {
             UIManager.measureLayout(
               findNodeHandle(this),
               relativeToNativeNode,
-              mountSafeCallback(this, onFail),
-              mountSafeCallback(this, onSuccess)
+              mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+              mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
             );
           },
           setNativeProps: function(nativeProps) {
@@ -5857,7 +6567,7 @@ var roots = new Map(),
               var viewConfig = maybeInstance.viewConfig;
               nativeProps = diffProperties(
                 null,
-                emptyObject$1,
+                emptyObject,
                 nativeProps,
                 viewConfig.validAttributes
               );
@@ -5879,21 +6589,34 @@ var roots = new Map(),
       })(findNodeHandle, findHostInstance$1),
       computeComponentStackForErrorReporting: function(reactTag) {
         return (reactTag = getInstanceFromTag(reactTag))
-          ? getStackAddendumByWorkInProgressFiber(reactTag)
+          ? getStackByFiberInDevAndProd(reactTag)
           : "";
       }
     }
   };
-injectIntoDevTools({
+(function(devToolsConfig) {
+  var findFiberByHostInstance = devToolsConfig.findFiberByHostInstance;
+  return injectInternals(
+    Object.assign({}, devToolsConfig, {
+      findHostInstanceByFiber: function(fiber) {
+        fiber = findCurrentHostFiber(fiber);
+        return null === fiber ? null : fiber.stateNode;
+      },
+      findFiberByHostInstance: function(instance) {
+        return findFiberByHostInstance
+          ? findFiberByHostInstance(instance)
+          : null;
+      }
+    })
+  );
+})({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.4.1",
+  version: "16.6.0-alpha.8af6728",
   rendererPackageName: "react-native-renderer"
 });
 var ReactNativeRenderer$2 = { default: ReactNativeRenderer },
   ReactNativeRenderer$3 =
     (ReactNativeRenderer$2 && ReactNativeRenderer) || ReactNativeRenderer$2;
-module.exports = ReactNativeRenderer$3.default
-  ? ReactNativeRenderer$3.default
-  : ReactNativeRenderer$3;
+module.exports = ReactNativeRenderer$3.default || ReactNativeRenderer$3;
diff --git a/Libraries/Renderer/shims/NativeMethodsMixin.js b/Libraries/Renderer/shims/NativeMethodsMixin.js
index 70e1d9dda54038..857e2981077072 100644
--- a/Libraries/Renderer/shims/NativeMethodsMixin.js
+++ b/Libraries/Renderer/shims/NativeMethodsMixin.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Renderer/shims/ReactFabric.js b/Libraries/Renderer/shims/ReactFabric.js
index a5e317ba4a2743..03691e23d1d8dd 100644
--- a/Libraries/Renderer/shims/ReactFabric.js
+++ b/Libraries/Renderer/shims/ReactFabric.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Renderer/shims/ReactNative.js b/Libraries/Renderer/shims/ReactNative.js
index fd7d3e3dbe25cf..13a5985f9f19d5 100644
--- a/Libraries/Renderer/shims/ReactNative.js
+++ b/Libraries/Renderer/shims/ReactNative.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Renderer/shims/ReactNativeTypes.js b/Libraries/Renderer/shims/ReactNativeTypes.js
index 991aa338e77016..f9058abc1e939a 100644
--- a/Libraries/Renderer/shims/ReactNativeTypes.js
+++ b/Libraries/Renderer/shims/ReactNativeTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -33,26 +33,52 @@ export type MeasureLayoutOnSuccessCallback = (
   height: number,
 ) => void;
 
-type BubblingEventType = {
-  phasedRegistrationNames: {
-    captured: string,
-    bubbled: string,
-  },
-};
-
-type DirectEventType = {
-  registrationName: string,
-};
-
-export type ReactNativeBaseComponentViewConfig = {
-  validAttributes: Object,
+type AttributeType =
+  | true
+  | $ReadOnly<{|
+      diff?: <T>(arg1: T, arg2: T) => boolean,
+      process?: (arg1: any) => any,
+    |}>;
+
+export type AttributeConfiguration<
+  TProps = string,
+  TStyleProps = string,
+> = $ReadOnly<{
+  [propName: TProps]: AttributeType,
+  style: $ReadOnly<{
+    [propName: TStyleProps]: AttributeType,
+  }>,
+}>;
+
+export type ReactNativeBaseComponentViewConfig<
+  TProps = string,
+  TStyleProps = string,
+> = $ReadOnly<{|
+  baseModuleName?: string,
+  bubblingEventTypes?: $ReadOnly<{
+    [eventName: string]: $ReadOnly<{|
+      phasedRegistrationNames: $ReadOnly<{|
+        captured: string,
+        bubbled: string,
+      |}>,
+    |}>,
+  }>,
+  Commands?: $ReadOnly<{
+    [commandName: string]: number,
+  }>,
+  directEventTypes?: $ReadOnly<{
+    [eventName: string]: $ReadOnly<{|
+      registrationName: string,
+    |}>,
+  }>,
+  NativeProps?: $ReadOnly<{
+    [propName: string]: string,
+  }>,
   uiViewClassName: string,
-  bubblingEventTypes?: {[topLevelType: string]: BubblingEventType},
-  directEventTypes?: {[topLevelType: string]: DirectEventType},
-  propTypes?: Object,
-};
+  validAttributes: AttributeConfiguration<TProps, TStyleProps>,
+|}>;
 
-export type ViewConfigGetter = () => ReactNativeBaseComponentViewConfig;
+export type ViewConfigGetter = () => ReactNativeBaseComponentViewConfig<>;
 
 /**
  * Class only exists for its Flow type.
diff --git a/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js b/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
index 44a7f1827da6d4..0430c8e9ffd75b 100644
--- a/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
+++ b/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
@@ -30,7 +30,7 @@ const viewConfigCallbacks = new Map();
 const viewConfigs = new Map();
 
 function processEventTypes(
-  viewConfig: ReactNativeBaseComponentViewConfig,
+  viewConfig: ReactNativeBaseComponentViewConfig<>,
 ): void {
   const {bubblingEventTypes, directEventTypes} = viewConfig;
 
@@ -86,15 +86,20 @@ exports.register = function(name: string, callback: ViewConfigGetter): string {
  * If this is the first time the view has been used,
  * This configuration will be lazy-loaded from UIManager.
  */
-exports.get = function(name: string): ReactNativeBaseComponentViewConfig {
+exports.get = function(name: string): ReactNativeBaseComponentViewConfig<> {
   let viewConfig;
   if (!viewConfigs.has(name)) {
     const callback = viewConfigCallbacks.get(name);
-    invariant(
-      typeof callback === 'function',
-      'View config not found for name %s',
-      name,
-    );
+    if (typeof callback !== 'function') {
+      invariant(
+        false,
+        'View config not found for name %s.%s',
+        name,
+        typeof name[0] === 'string' && /[a-z]/.test(name[0])
+          ? ' Make sure to start component names with a capital letter.'
+          : '',
+      );
+    }
     viewConfigCallbacks.set(name, null);
     viewConfig = callback();
     processEventTypes(viewConfig);
diff --git a/Libraries/Renderer/shims/ReactTypes.js b/Libraries/Renderer/shims/ReactTypes.js
index ac4eed362d0ada..20f76eef30f8c2 100644
--- a/Libraries/Renderer/shims/ReactTypes.js
+++ b/Libraries/Renderer/shims/ReactTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,45 +9,20 @@
 
 export type ReactNode =
   | React$Element<any>
-  | ReactCall<any>
-  | ReactReturn<any>
   | ReactPortal
   | ReactText
   | ReactFragment
   | ReactProvider<any>
   | ReactConsumer<any>;
 
+export type ReactEmpty = null | void | boolean;
+
 export type ReactFragment = ReactEmpty | Iterable<React$Node>;
 
 export type ReactNodeList = ReactEmpty | React$Node;
 
 export type ReactText = string | number;
 
-export type ReactEmpty = null | void | boolean;
-
-export type ReactCall<V> = {
-  $$typeof: Symbol | number,
-  type: Symbol | number,
-  key: null | string,
-  ref: null,
-  props: {
-    props: any,
-    // This should be a more specific CallHandler
-    handler: (props: any, returns: Array<V>) => ReactNodeList,
-    children?: ReactNodeList,
-  },
-};
-
-export type ReactReturn<V> = {
-  $$typeof: Symbol | number,
-  type: Symbol | number,
-  key: null,
-  ref: null,
-  props: {
-    value: V,
-  },
-};
-
 export type ReactProvider<T> = {
   $$typeof: Symbol | number,
   type: ReactProviderType<T>,
@@ -79,14 +54,12 @@ export type ReactContext<T> = {
   $$typeof: Symbol | number,
   Consumer: ReactContext<T>,
   Provider: ReactProviderType<T>,
+  unstable_read: () => T,
 
   _calculateChangedBits: ((a: T, b: T) => number) | null,
-  _defaultValue: T,
 
   _currentValue: T,
   _currentValue2: T,
-  _changedBits: number,
-  _changedBits2: number,
 
   // DEV only
   _currentRenderer?: Object | null,
diff --git a/Libraries/Renderer/shims/createReactNativeComponentClass.js b/Libraries/Renderer/shims/createReactNativeComponentClass.js
index 4ea7d2818378fe..e9f5fc0f978af2 100644
--- a/Libraries/Renderer/shims/createReactNativeComponentClass.js
+++ b/Libraries/Renderer/shims/createReactNativeComponentClass.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Sample/Sample.android.js b/Libraries/Sample/Sample.android.js
index 2755a884bb3195..2b30b41d7defa4 100644
--- a/Libraries/Sample/Sample.android.js
+++ b/Libraries/Sample/Sample.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Sample/Sample.ios.js b/Libraries/Sample/Sample.ios.js
index 6c7443201667f8..63e6c2840b3e07 100644
--- a/Libraries/Sample/Sample.ios.js
+++ b/Libraries/Sample/Sample.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,7 +7,7 @@
  * Stub of Sample for Android.
  *
  * @format
- * @flow
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Sample/Sample.xcodeproj/project.pbxproj b/Libraries/Sample/Sample.xcodeproj/project.pbxproj
index b0fa1f7b34ac54..7200a72610119f 100644
--- a/Libraries/Sample/Sample.xcodeproj/project.pbxproj
+++ b/Libraries/Sample/Sample.xcodeproj/project.pbxproj
@@ -85,7 +85,7 @@
 		58B511D31A9E6C8500147676 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					58B511DA1A9E6C8500147676 = {
@@ -130,19 +130,31 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -170,19 +182,30 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
diff --git a/Libraries/Settings/RCTSettingsManager.h b/Libraries/Settings/RCTSettingsManager.h
index a331074c64a4f4..d9723b2d14450f 100644
--- a/Libraries/Settings/RCTSettingsManager.h
+++ b/Libraries/Settings/RCTSettingsManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Settings/RCTSettingsManager.m b/Libraries/Settings/RCTSettingsManager.m
index 79c18707016c53..e36ed99c3bbfaf 100644
--- a/Libraries/Settings/RCTSettingsManager.m
+++ b/Libraries/Settings/RCTSettingsManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Settings/Settings.android.js b/Libraries/Settings/Settings.android.js
index 1e6708a182a5d9..d754a7504bbbbe 100644
--- a/Libraries/Settings/Settings.android.js
+++ b/Libraries/Settings/Settings.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Settings/Settings.ios.js b/Libraries/Settings/Settings.ios.js
index 439f8850dd0889..d3987c3ec62d92 100644
--- a/Libraries/Settings/Settings.ios.js
+++ b/Libraries/Settings/Settings.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Share/Share.js b/Libraries/Share/Share.js
index 5018170e6ac2f3..a4cf5de087d399 100644
--- a/Libraries/Share/Share.js
+++ b/Libraries/Share/Share.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Storage/AsyncStorage.js b/Libraries/Storage/AsyncStorage.js
index 0877e9b099f378..877e707628ece2 100644
--- a/Libraries/Storage/AsyncStorage.js
+++ b/Libraries/Storage/AsyncStorage.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/StyleSheet/EdgeInsetsPropType.js b/Libraries/StyleSheet/EdgeInsetsPropType.js
index 7d9ea680d8fc10..779bca391da9d3 100644
--- a/Libraries/StyleSheet/EdgeInsetsPropType.js
+++ b/Libraries/StyleSheet/EdgeInsetsPropType.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,20 +10,9 @@
 
 'use strict';
 
-const PropTypes = require('prop-types');
-
-const EdgeInsetsPropType = PropTypes.shape({
-  top: PropTypes.number,
-  left: PropTypes.number,
-  bottom: PropTypes.number,
-  right: PropTypes.number,
-});
-
 export type EdgeInsetsProp = $ReadOnly<{|
   top?: ?number,
   left?: ?number,
   bottom?: ?number,
   right?: ?number,
 |}>;
-
-module.exports = EdgeInsetsPropType;
diff --git a/Libraries/StyleSheet/LayoutPropTypes.js b/Libraries/StyleSheet/LayoutPropTypes.js
deleted file mode 100644
index ce99d659a3fd33..00000000000000
--- a/Libraries/StyleSheet/LayoutPropTypes.js
+++ /dev/null
@@ -1,561 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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';
-
-const ReactPropTypes = require('prop-types');
-
-/**
- * React Native's layout system is based on Flexbox and is powered both
- * on iOS and Android by an open source project called `Yoga`:
- * https://github.com/facebook/yoga
- *
- * The implementation in Yoga is slightly different from what the
- * Flexbox spec defines - for example, we chose more sensible default
- * values. Since our layout docs are generated from the comments in this
- * file, please keep a brief comment describing each prop type.
- *
- * These properties are a subset of our styles that are consumed by the layout
- * algorithm and affect the positioning and sizing of views.
- */
-const LayoutPropTypes = {
-  /** `display` sets the display type of this component.
-   *
-   *  It works similarly to `display` in CSS, but only support 'flex' and 'none'.
-   *  'flex' is the default.
-   */
-  display: ReactPropTypes.oneOf(['none', 'flex']),
-
-  /** `width` sets the width of this component.
-   *
-   *  It works similarly to `width` in CSS, but in React Native you
-   *  must use points or percentages. Ems and other units are not supported.
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/width for more details.
-   */
-  width: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `height` sets the height of this component.
-   *
-   *  It works similarly to `height` in CSS, but in React Native you
-   *  must use points or percentages. Ems and other units are not supported.
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/height for more details.
-   */
-  height: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /**
-   * When the direction is `ltr`, `start` is equivalent to `left`.
-   * When the direction is `rtl`, `start` is equivalent to `right`.
-   *
-   * This style takes precedence over the `left`, `right`, and `end` styles.
-   */
-  start: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /**
-   * When the direction is `ltr`, `end` is equivalent to `right`.
-   * When the direction is `rtl`, `end` is equivalent to `left`.
-   *
-   * This style takes precedence over the `left` and `right` styles.
-   */
-  end: ReactPropTypes.oneOfType([ReactPropTypes.number, ReactPropTypes.string]),
-
-  /** `top` is the number of logical pixels to offset the top edge of
-   *  this component.
-   *
-   *  It works similarly to `top` in CSS, but in React Native you
-   *  must use points or percentages. Ems and other units are not supported.
-   *
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/top
-   *  for more details of how `top` affects layout.
-   */
-  top: ReactPropTypes.oneOfType([ReactPropTypes.number, ReactPropTypes.string]),
-
-  /** `left` is the number of logical pixels to offset the left edge of
-   *  this component.
-   *
-   *  It works similarly to `left` in CSS, but in React Native you
-   *  must use points or percentages. Ems and other units are not supported.
-   *
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/left
-   *  for more details of how `left` affects layout.
-   */
-  left: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `right` is the number of logical pixels to offset the right edge of
-   *  this component.
-   *
-   *  It works similarly to `right` in CSS, but in React Native you
-   *  must use points or percentages. Ems and other units are not supported.
-   *
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/right
-   *  for more details of how `right` affects layout.
-   */
-  right: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `bottom` is the number of logical pixels to offset the bottom edge of
-   *  this component.
-   *
-   *  It works similarly to `bottom` in CSS, but in React Native you
-   *  must use points or percentages. Ems and other units are not supported.
-   *
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/bottom
-   *  for more details of how `bottom` affects layout.
-   */
-  bottom: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `minWidth` is the minimum width for this component, in logical pixels.
-   *
-   *  It works similarly to `min-width` in CSS, but in React Native you
-   *  must use points or percentages. Ems and other units are not supported.
-   *
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/min-width
-   *  for more details.
-   */
-  minWidth: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `maxWidth` is the maximum width for this component, in logical pixels.
-   *
-   *  It works similarly to `max-width` in CSS, but in React Native you
-   *  must use points or percentages. Ems and other units are not supported.
-   *
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/max-width
-   *  for more details.
-   */
-  maxWidth: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `minHeight` is the minimum height for this component, in logical pixels.
-   *
-   *  It works similarly to `min-height` in CSS, but in React Native you
-   *  must use points or percentages. Ems and other units are not supported.
-   *
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/min-height
-   *  for more details.
-   */
-  minHeight: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `maxHeight` is the maximum height for this component, in logical pixels.
-   *
-   *  It works similarly to `max-height` in CSS, but in React Native you
-   *  must use points or percentages. Ems and other units are not supported.
-   *
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/max-height
-   *  for more details.
-   */
-  maxHeight: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** Setting `margin` has the same effect as setting each of
-   *  `marginTop`, `marginLeft`, `marginBottom`, and `marginRight`.
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/margin
-   *  for more details.
-   */
-  margin: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** Setting `marginVertical` has the same effect as setting both
-   *  `marginTop` and `marginBottom`.
-   */
-  marginVertical: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** Setting `marginHorizontal` has the same effect as setting
-   *  both `marginLeft` and `marginRight`.
-   */
-  marginHorizontal: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `marginTop` works like `margin-top` in CSS.
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/margin-top
-   *  for more details.
-   */
-  marginTop: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `marginBottom` works like `margin-bottom` in CSS.
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/margin-bottom
-   *  for more details.
-   */
-  marginBottom: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `marginLeft` works like `margin-left` in CSS.
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/margin-left
-   *  for more details.
-   */
-  marginLeft: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `marginRight` works like `margin-right` in CSS.
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/margin-right
-   *  for more details.
-   */
-  marginRight: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /**
-   * When direction is `ltr`, `marginStart` is equivalent to `marginLeft`.
-   * When direction is `rtl`, `marginStart` is equivalent to `marginRight`.
-   */
-  marginStart: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /**
-   * When direction is `ltr`, `marginEnd` is equivalent to `marginRight`.
-   * When direction is `rtl`, `marginEnd` is equivalent to `marginLeft`.
-   */
-  marginEnd: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** Setting `padding` has the same effect as setting each of
-   *  `paddingTop`, `paddingBottom`, `paddingLeft`, and `paddingRight`.
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/padding
-   *  for more details.
-   */
-  padding: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** Setting `paddingVertical` is like setting both of
-   *  `paddingTop` and `paddingBottom`.
-   */
-  paddingVertical: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** Setting `paddingHorizontal` is like setting both of
-   *  `paddingLeft` and `paddingRight`.
-   */
-  paddingHorizontal: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `paddingTop` works like `padding-top` in CSS.
-   * See https://developer.mozilla.org/en-US/docs/Web/CSS/padding-top
-   * for more details.
-   */
-  paddingTop: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `paddingBottom` works like `padding-bottom` in CSS.
-   * See https://developer.mozilla.org/en-US/docs/Web/CSS/padding-bottom
-   * for more details.
-   */
-  paddingBottom: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `paddingLeft` works like `padding-left` in CSS.
-   * See https://developer.mozilla.org/en-US/docs/Web/CSS/padding-left
-   * for more details.
-   */
-  paddingLeft: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `paddingRight` works like `padding-right` in CSS.
-   * See https://developer.mozilla.org/en-US/docs/Web/CSS/padding-right
-   * for more details.
-   */
-  paddingRight: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /**
-   * When direction is `ltr`, `paddingStart` is equivalent to `paddingLeft`.
-   * When direction is `rtl`, `paddingStart` is equivalent to `paddingRight`.
-   */
-  paddingStart: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /**
-   * When direction is `ltr`, `paddingEnd` is equivalent to `paddingRight`.
-   * When direction is `rtl`, `paddingEnd` is equivalent to `paddingLeft`.
-   */
-  paddingEnd: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.string,
-  ]),
-
-  /** `borderWidth` works like `border-width` in CSS.
-   * See https://developer.mozilla.org/en-US/docs/Web/CSS/border-width
-   * for more details.
-   */
-  borderWidth: ReactPropTypes.number,
-
-  /** `borderTopWidth` works like `border-top-width` in CSS.
-   * See https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-width
-   * for more details.
-   */
-  borderTopWidth: ReactPropTypes.number,
-
-  /**
-   * When direction is `ltr`, `borderStartWidth` is equivalent to `borderLeftWidth`.
-   * When direction is `rtl`, `borderStartWidth` is equivalent to `borderRightWidth`.
-   */
-  borderStartWidth: ReactPropTypes.number,
-
-  /**
-   * When direction is `ltr`, `borderEndWidth` is equivalent to `borderRightWidth`.
-   * When direction is `rtl`, `borderEndWidth` is equivalent to `borderLeftWidth`.
-   */
-  borderEndWidth: ReactPropTypes.number,
-
-  /** `borderRightWidth` works like `border-right-width` in CSS.
-   * See https://developer.mozilla.org/en-US/docs/Web/CSS/border-right-width
-   * for more details.
-   */
-  borderRightWidth: ReactPropTypes.number,
-
-  /** `borderBottomWidth` works like `border-bottom-width` in CSS.
-   * See https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-width
-   * for more details.
-   */
-  borderBottomWidth: ReactPropTypes.number,
-
-  /** `borderLeftWidth` works like `border-left-width` in CSS.
-   * See https://developer.mozilla.org/en-US/docs/Web/CSS/border-left-width
-   * for more details.
-   */
-  borderLeftWidth: ReactPropTypes.number,
-
-  /** `position` in React Native is similar to regular CSS, but
-   *  everything is set to `relative` by default, so `absolute`
-   *  positioning is always just relative to the parent.
-   *
-   *  If you want to position a child using specific numbers of logical
-   *  pixels relative to its parent, set the child to have `absolute`
-   *  position.
-   *
-   *  If you want to position a child relative to something
-   *  that is not its parent, just don't use styles for that. Use the
-   *  component tree.
-   *
-   *  See https://github.com/facebook/yoga
-   *  for more details on how `position` differs between React Native
-   *  and CSS.
-   */
-  position: ReactPropTypes.oneOf(['absolute', 'relative']),
-
-  /** `flexDirection` controls which directions children of a container go.
-   *  `row` goes left to right, `column` goes top to bottom, and you may
-   *  be able to guess what the other two do. It works like `flex-direction`
-   *  in CSS, except the default is `column`.
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/flex-direction
-   *  for more details.
-   */
-  flexDirection: ReactPropTypes.oneOf([
-    'row',
-    'row-reverse',
-    'column',
-    'column-reverse',
-  ]),
-
-  /** `flexWrap` controls whether children can wrap around after they
-   *  hit the end of a flex container.
-   *  It works like `flex-wrap` in CSS (default: nowrap).
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/flex-wrap
-   *  for more details.
-   */
-  flexWrap: ReactPropTypes.oneOf(['wrap', 'nowrap', 'wrap-reverse']),
-
-  /** `justifyContent` aligns children in the main direction.
-   *  For example, if children are flowing vertically, `justifyContent`
-   *  controls how they align vertically.
-   *  It works like `justify-content` in CSS (default: flex-start).
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content
-   *  for more details.
-   */
-  justifyContent: ReactPropTypes.oneOf([
-    'flex-start',
-    'flex-end',
-    'center',
-    'space-between',
-    'space-around',
-    'space-evenly',
-  ]),
-
-  /** `alignItems` aligns children in the cross direction.
-   *  For example, if children are flowing vertically, `alignItems`
-   *  controls how they align horizontally.
-   *  It works like `align-items` in CSS (default: stretch).
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/align-items
-   *  for more details.
-   */
-  alignItems: ReactPropTypes.oneOf([
-    'flex-start',
-    'flex-end',
-    'center',
-    'stretch',
-    'baseline',
-  ]),
-
-  /** `alignSelf` controls how a child aligns in the cross direction,
-   *  overriding the `alignItems` of the parent. It works like `align-self`
-   *  in CSS (default: auto).
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/align-self
-   *  for more details.
-   */
-  alignSelf: ReactPropTypes.oneOf([
-    'auto',
-    'flex-start',
-    'flex-end',
-    'center',
-    'stretch',
-    'baseline',
-  ]),
-
-  /** `alignContent` controls how rows align in the cross direction,
-   *  overriding the `alignContent` of the parent.
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/align-content
-   *  for more details.
-   */
-  alignContent: ReactPropTypes.oneOf([
-    'flex-start',
-    'flex-end',
-    'center',
-    'stretch',
-    'space-between',
-    'space-around',
-  ]),
-
-  /** `overflow` controls how children are measured and displayed.
-   *  `overflow: hidden` causes views to be clipped while `overflow: scroll`
-   *  causes views to be measured independently of their parents main axis.
-   *  It works like `overflow` in CSS (default: visible).
-   *  See https://developer.mozilla.org/en/docs/Web/CSS/overflow
-   *  for more details.
-   *  `overflow: visible` only works on iOS. On Android, all views will clip
-   *  their children.
-   */
-  overflow: ReactPropTypes.oneOf(['visible', 'hidden', 'scroll']),
-
-  /** In React Native `flex` does not work the same way that it does in CSS.
-   *  `flex` is a number rather than a string, and it works
-   *  according to the `Yoga` library
-   *  at https://github.com/facebook/yoga
-   *
-   *  When `flex` is a positive number, it makes the component flexible
-   *  and it will be sized proportional to its flex value. So a
-   *  component with `flex` set to 2 will take twice the space as a
-   *  component with `flex` set to 1.
-   *
-   *  When `flex` is 0, the component is sized according to `width`
-   *  and `height` and it is inflexible.
-   *
-   *  When `flex` is -1, the component is normally sized according
-   *  `width` and `height`. However, if there's not enough space,
-   *  the component will shrink to its `minWidth` and `minHeight`.
-   *
-   * flexGrow, flexShrink, and flexBasis work the same as in CSS.
-   */
-  flex: ReactPropTypes.number,
-  flexGrow: ReactPropTypes.number,
-  flexShrink: ReactPropTypes.number,
-  flexBasis: ReactPropTypes.oneOfType([
-    ReactPropTypes.number,
-    ReactPropTypes.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.
-   *
-   * - 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
-   *   if unset
-   * - On a node with a measure function aspect ratio works as though the measure function measures
-   *   the flex basis
-   * - 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
-   */
-  aspectRatio: ReactPropTypes.number,
-
-  /** `zIndex` controls which components display on top of others.
-   *  Normally, you don't use `zIndex`. Components render according to
-   *  their order in the document tree, so later components draw over
-   *  earlier ones. `zIndex` may be useful if you have animations or custom
-   *  modal interfaces where you don't want this behavior.
-   *
-   *  It works like the CSS `z-index` property - components with a larger
-   *  `zIndex` will render on top. Think of the z-direction like it's
-   *  pointing from the phone into your eyeball.
-   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/z-index for
-   *  more details.
-   */
-  zIndex: ReactPropTypes.number,
-
-  /** `direction` specifies the directional flow of the user interface.
-   *  The default is `inherit`, except for root node which will have
-   *  value based on the current locale.
-   *  See https://facebook.github.io/yoga/docs/rtl/
-   *  for more details.
-   *  @platform ios
-   */
-  direction: ReactPropTypes.oneOf(['inherit', 'ltr', 'rtl']),
-};
-
-module.exports = LayoutPropTypes;
diff --git a/Libraries/StyleSheet/PointPropType.js b/Libraries/StyleSheet/PointPropType.js
index 86d40b5afee201..302892edae391a 100644
--- a/Libraries/StyleSheet/PointPropType.js
+++ b/Libraries/StyleSheet/PointPropType.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,16 +10,7 @@
 
 'use strict';
 
-const PropTypes = require('prop-types');
-
-const PointPropType = PropTypes.shape({
-  x: PropTypes.number,
-  y: PropTypes.number,
-});
-
 export type PointProp = $ReadOnly<{
   x: number,
   y: number,
 }>;
-
-module.exports = PointPropType;
diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index 4384ce9dbfc05d..554b786414b5e8 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -272,12 +272,12 @@ module.exports = {
    * array, saving allocations and maintaining reference equality for
    * PureComponent checks.
    */
-  compose(
-    style1: ?DangerouslyImpreciseStyleProp,
-    style2: ?DangerouslyImpreciseStyleProp,
-  ): ?DangerouslyImpreciseStyleProp {
+  compose<T: DangerouslyImpreciseStyleProp>(
+    style1: ?T,
+    style2: ?T,
+  ): ?T | $ReadOnlyArray<T> {
     if (style1 != null && style2 != null) {
-      return [style1, style2];
+      return ([style1, style2]: $ReadOnlyArray<T>);
     } else {
       return style1 != null ? style1 : style2;
     }
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index 41cab5de3b42a2..5fd2c1a4d958a4 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 
@@ -15,48 +15,333 @@ const AnimatedNode = require('AnimatedNode');
 export type ColorValue = null | string;
 export type DimensionValue = null | number | string | AnimatedNode;
 
+/**
+ * React Native's layout system is based on Flexbox and is powered both
+ * on iOS and Android by an open source project called `Yoga`:
+ * https://github.com/facebook/yoga
+ *
+ * The implementation in Yoga is slightly different from what the
+ * Flexbox spec defines - for example, we chose more sensible default
+ * values. Since our layout docs are generated from the comments in this
+ * file, please keep a brief comment describing each prop type.
+ *
+ * These properties are a subset of our styles that are consumed by the layout
+ * algorithm and affect the positioning and sizing of views.
+ */
 export type ____LayoutStyle_Internal = $ReadOnly<{|
+  /** `display` sets the display type of this component.
+   *
+   *  It works similarly to `display` in CSS, but only support 'flex' and 'none'.
+   *  'flex' is the default.
+   */
   display?: 'none' | 'flex',
+
+  /** `width` sets the width of this component.
+   *
+   *  It works similarly to `width` in CSS, but in React Native you
+   *  must use points or percentages. Ems and other units are not supported.
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/width for more details.
+   */
   width?: DimensionValue,
+
+  /** `height` sets the height of this component.
+   *
+   *  It works similarly to `height` in CSS, but in React Native you
+   *  must use points or percentages. Ems and other units are not supported.
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/height for more details.
+   */
   height?: DimensionValue,
+
+  /** `bottom` is the number of logical pixels to offset the bottom edge of
+   *  this component.
+   *
+   *  It works similarly to `bottom` in CSS, but in React Native you
+   *  must use points or percentages. Ems and other units are not supported.
+   *
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/bottom
+   *  for more details of how `bottom` affects layout.
+   */
   bottom?: DimensionValue,
+
+  /**
+   * When the direction is `ltr`, `end` is equivalent to `right`.
+   * When the direction is `rtl`, `end` is equivalent to `left`.
+   *
+   * This style takes precedence over the `left` and `right` styles.
+   */
   end?: DimensionValue,
+
+  /** `left` is the number of logical pixels to offset the left edge of
+   *  this component.
+   *
+   *  It works similarly to `left` in CSS, but in React Native you
+   *  must use points or percentages. Ems and other units are not supported.
+   *
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/left
+   *  for more details of how `left` affects layout.
+   */
   left?: DimensionValue,
+
+  /** `right` is the number of logical pixels to offset the right edge of
+   *  this component.
+   *
+   *  It works similarly to `right` in CSS, but in React Native you
+   *  must use points or percentages. Ems and other units are not supported.
+   *
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/right
+   *  for more details of how `right` affects layout.
+   */
   right?: DimensionValue,
+
+  /**
+   * When the direction is `ltr`, `start` is equivalent to `left`.
+   * When the direction is `rtl`, `start` is equivalent to `right`.
+   *
+   * This style takes precedence over the `left`, `right`, and `end` styles.
+   */
   start?: DimensionValue,
+
+  /** `top` is the number of logical pixels to offset the top edge of
+   *  this component.
+   *
+   *  It works similarly to `top` in CSS, but in React Native you
+   *  must use points or percentages. Ems and other units are not supported.
+   *
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/top
+   *  for more details of how `top` affects layout.
+   */
   top?: DimensionValue,
+
+  /** `minWidth` is the minimum width for this component, in logical pixels.
+   *
+   *  It works similarly to `min-width` in CSS, but in React Native you
+   *  must use points or percentages. Ems and other units are not supported.
+   *
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/min-width
+   *  for more details.
+   */
   minWidth?: DimensionValue,
+
+  /** `maxWidth` is the maximum width for this component, in logical pixels.
+   *
+   *  It works similarly to `max-width` in CSS, but in React Native you
+   *  must use points or percentages. Ems and other units are not supported.
+   *
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/max-width
+   *  for more details.
+   */
   maxWidth?: DimensionValue,
+
+  /** `minHeight` is the minimum height for this component, in logical pixels.
+   *
+   *  It works similarly to `min-height` in CSS, but in React Native you
+   *  must use points or percentages. Ems and other units are not supported.
+   *
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/min-height
+   *  for more details.
+   */
   minHeight?: DimensionValue,
+
+  /** `maxHeight` is the maximum height for this component, in logical pixels.
+   *
+   *  It works similarly to `max-height` in CSS, but in React Native you
+   *  must use points or percentages. Ems and other units are not supported.
+   *
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/max-height
+   *  for more details.
+   */
   maxHeight?: DimensionValue,
+
+  /** Setting `margin` has the same effect as setting each of
+   *  `marginTop`, `marginLeft`, `marginBottom`, and `marginRight`.
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/margin
+   *  for more details.
+   */
   margin?: DimensionValue,
+
+  /** `marginBottom` works like `margin-bottom` in CSS.
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/margin-bottom
+   *  for more details.
+   */
   marginBottom?: DimensionValue,
+
+  /**
+   * When direction is `ltr`, `marginEnd` is equivalent to `marginRight`.
+   * When direction is `rtl`, `marginEnd` is equivalent to `marginLeft`.
+   */
   marginEnd?: DimensionValue,
+
+  /** Setting `marginHorizontal` has the same effect as setting
+   *  both `marginLeft` and `marginRight`.
+   */
   marginHorizontal?: DimensionValue,
+
+  /** `marginLeft` works like `margin-left` in CSS.
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/margin-left
+   *  for more details.
+   */
   marginLeft?: DimensionValue,
+
+  /** `marginRight` works like `margin-right` in CSS.
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/margin-right
+   *  for more details.
+   */
   marginRight?: DimensionValue,
+
+  /**
+   * When direction is `ltr`, `marginStart` is equivalent to `marginLeft`.
+   * When direction is `rtl`, `marginStart` is equivalent to `marginRight`.
+   */
   marginStart?: DimensionValue,
+
+  /** `marginTop` works like `margin-top` in CSS.
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/margin-top
+   *  for more details.
+   */
   marginTop?: DimensionValue,
+
+  /** Setting `marginVertical` has the same effect as setting both
+   *  `marginTop` and `marginBottom`.
+   */
   marginVertical?: DimensionValue,
+
+  /** Setting `padding` has the same effect as setting each of
+   *  `paddingTop`, `paddingBottom`, `paddingLeft`, and `paddingRight`.
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/padding
+   *  for more details.
+   */
   padding?: DimensionValue,
+
+  /** `paddingBottom` works like `padding-bottom` in CSS.
+   * See https://developer.mozilla.org/en-US/docs/Web/CSS/padding-bottom
+   * for more details.
+   */
   paddingBottom?: DimensionValue,
+
+  /**
+   * When direction is `ltr`, `paddingEnd` is equivalent to `paddingRight`.
+   * When direction is `rtl`, `paddingEnd` is equivalent to `paddingLeft`.
+   */
   paddingEnd?: DimensionValue,
+
+  /** Setting `paddingHorizontal` is like setting both of
+   *  `paddingLeft` and `paddingRight`.
+   */
   paddingHorizontal?: DimensionValue,
+
+  /** `paddingLeft` works like `padding-left` in CSS.
+   * See https://developer.mozilla.org/en-US/docs/Web/CSS/padding-left
+   * for more details.
+   */
   paddingLeft?: DimensionValue,
+
+  /** `paddingRight` works like `padding-right` in CSS.
+   * See https://developer.mozilla.org/en-US/docs/Web/CSS/padding-right
+   * for more details.
+   */
   paddingRight?: DimensionValue,
+
+  /**
+   * When direction is `ltr`, `paddingStart` is equivalent to `paddingLeft`.
+   * When direction is `rtl`, `paddingStart` is equivalent to `paddingRight`.
+   */
   paddingStart?: DimensionValue,
+
+  /** `paddingTop` works like `padding-top` in CSS.
+   * See https://developer.mozilla.org/en-US/docs/Web/CSS/padding-top
+   * for more details.
+   */
   paddingTop?: DimensionValue,
+
+  /** Setting `paddingVertical` is like setting both of
+   *  `paddingTop` and `paddingBottom`.
+   */
   paddingVertical?: DimensionValue,
+
+  /** `borderWidth` works like `border-width` in CSS.
+   * See https://developer.mozilla.org/en-US/docs/Web/CSS/border-width
+   * for more details.
+   */
   borderWidth?: number,
+
+  /** `borderBottomWidth` works like `border-bottom-width` in CSS.
+   * See https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-width
+   * for more details.
+   */
   borderBottomWidth?: number,
+
+  /**
+   * When direction is `ltr`, `borderEndWidth` is equivalent to `borderRightWidth`.
+   * When direction is `rtl`, `borderEndWidth` is equivalent to `borderLeftWidth`.
+   */
   borderEndWidth?: number,
+
+  /** `borderLeftWidth` works like `border-left-width` in CSS.
+   * See https://developer.mozilla.org/en-US/docs/Web/CSS/border-left-width
+   * for more details.
+   */
   borderLeftWidth?: number,
+
+  /** `borderRightWidth` works like `border-right-width` in CSS.
+   * See https://developer.mozilla.org/en-US/docs/Web/CSS/border-right-width
+   * for more details.
+   */
   borderRightWidth?: number,
+
+  /**
+   * When direction is `ltr`, `borderStartWidth` is equivalent to `borderLeftWidth`.
+   * When direction is `rtl`, `borderStartWidth` is equivalent to `borderRightWidth`.
+   */
   borderStartWidth?: number,
+
+  /** `borderTopWidth` works like `border-top-width` in CSS.
+   * See https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-width
+   * for more details.
+   */
   borderTopWidth?: number,
+
+  /** `position` in React Native is similar to regular CSS, but
+   *  everything is set to `relative` by default, so `absolute`
+   *  positioning is always just relative to the parent.
+   *
+   *  If you want to position a child using specific numbers of logical
+   *  pixels relative to its parent, set the child to have `absolute`
+   *  position.
+   *
+   *  If you want to position a child relative to something
+   *  that is not its parent, just don't use styles for that. Use the
+   *  component tree.
+   *
+   *  See https://github.com/facebook/yoga
+   *  for more details on how `position` differs between React Native
+   *  and CSS.
+   */
   position?: 'absolute' | 'relative',
+
+  /** `flexDirection` controls which directions children of a container go.
+   *  `row` goes left to right, `column` goes top to bottom, and you may
+   *  be able to guess what the other two do. It works like `flex-direction`
+   *  in CSS, except the default is `column`.
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/flex-direction
+   *  for more details.
+   */
   flexDirection?: 'row' | 'row-reverse' | 'column' | 'column-reverse',
+
+  /** `flexWrap` controls whether children can wrap around after they
+   *  hit the end of a flex container.
+   *  It works like `flex-wrap` in CSS (default: nowrap).
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/flex-wrap
+   *  for more details.
+   */
   flexWrap?: 'wrap' | 'nowrap' | 'wrap-reverse',
+
+  /** `justifyContent` aligns children in the main direction.
+   *  For example, if children are flowing vertically, `justifyContent`
+   *  controls how they align vertically.
+   *  It works like `justify-content` in CSS (default: flex-start).
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content
+   *  for more details.
+   */
   justifyContent?:
     | 'flex-start'
     | 'flex-end'
@@ -64,7 +349,22 @@ export type ____LayoutStyle_Internal = $ReadOnly<{|
     | 'space-between'
     | 'space-around'
     | 'space-evenly',
+
+  /** `alignItems` aligns children in the cross direction.
+   *  For example, if children are flowing vertically, `alignItems`
+   *  controls how they align horizontally.
+   *  It works like `align-items` in CSS (default: stretch).
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/align-items
+   *  for more details.
+   */
   alignItems?: 'flex-start' | 'flex-end' | 'center' | 'stretch' | 'baseline',
+
+  /** `alignSelf` controls how a child aligns in the cross direction,
+   *  overriding the `alignItems` of the parent. It works like `align-self`
+   *  in CSS (default: auto).
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/align-self
+   *  for more details.
+   */
   alignSelf?:
     | 'auto'
     | 'flex-start'
@@ -72,6 +372,12 @@ export type ____LayoutStyle_Internal = $ReadOnly<{|
     | 'center'
     | 'stretch'
     | 'baseline',
+
+  /** `alignContent` controls how rows align in the cross direction,
+   *  overriding the `alignContent` of the parent.
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/align-content
+   *  for more details.
+   */
   alignContent?:
     | 'flex-start'
     | 'flex-end'
@@ -79,17 +385,98 @@ export type ____LayoutStyle_Internal = $ReadOnly<{|
     | 'stretch'
     | 'space-between'
     | 'space-around',
+
+  /** `overflow` controls how children are measured and displayed.
+   *  `overflow: hidden` causes views to be clipped while `overflow: scroll`
+   *  causes views to be measured independently of their parents main axis.
+   *  It works like `overflow` in CSS (default: visible).
+   *  See https://developer.mozilla.org/en/docs/Web/CSS/overflow
+   *  for more details.
+   *  `overflow: visible` only works on iOS. On Android, all views will clip
+   *  their children.
+   */
   overflow?: 'visible' | 'hidden' | 'scroll',
+
+  /** In React Native `flex` does not work the same way that it does in CSS.
+   *  `flex` is a number rather than a string, and it works
+   *  according to the `Yoga` library
+   *  at https://github.com/facebook/yoga
+   *
+   *  When `flex` is a positive number, it makes the component flexible
+   *  and it will be sized proportional to its flex value. So a
+   *  component with `flex` set to 2 will take twice the space as a
+   *  component with `flex` set to 1.
+   *
+   *  When `flex` is 0, the component is sized according to `width`
+   *  and `height` and it is inflexible.
+   *
+   *  When `flex` is -1, the component is normally sized according
+   *  `width` and `height`. However, if there's not enough space,
+   *  the component will shrink to its `minWidth` and `minHeight`.
+   *
+   * flexGrow, flexShrink, and flexBasis work the same as in CSS.
+   */
   flex?: number,
   flexGrow?: number,
   flexShrink?: number,
   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.
+   *
+   * - 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
+   *   if unset
+   * - On a node with a measure function aspect ratio works as though the measure function measures
+   *   the flex basis
+   * - 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
+   */
   aspectRatio?: number,
+
+  /** `zIndex` controls which components display on top of others.
+   *  Normally, you don't use `zIndex`. Components render according to
+   *  their order in the document tree, so later components draw over
+   *  earlier ones. `zIndex` may be useful if you have animations or custom
+   *  modal interfaces where you don't want this behavior.
+   *
+   *  It works like the CSS `z-index` property - components with a larger
+   *  `zIndex` will render on top. Think of the z-direction like it's
+   *  pointing from the phone into your eyeball.
+   *  See https://developer.mozilla.org/en-US/docs/Web/CSS/z-index for
+   *  more details.
+   */
   zIndex?: number,
+
+  /** `direction` specifies the directional flow of the user interface.
+   *  The default is `inherit`, except for root node which will have
+   *  value based on the current locale.
+   *  See https://facebook.github.io/yoga/docs/rtl/
+   *  for more details.
+   *  @platform ios
+   */
   direction?: 'inherit' | 'ltr' | 'rtl',
 |}>;
 
 export type ____TransformStyle_Internal = $ReadOnly<{|
+  /**
+   * `transform` accepts an array of transformation objects. Each object specifies
+   * the property that will be transformed as the key, and the value to use in the
+   * transformation. Objects should not be combined. Use a single key/value pair
+   * per object.
+   *
+   * The rotate transformations require a string so that the transform may be
+   * expressed in degrees (deg) or radians (rad). For example:
+   *
+   * `transform([{ rotateX: '45deg' }, { rotateZ: '0.785398rad' }])`
+   *
+   * The skew transformations require a string so that the transform may be
+   * expressed in degrees (deg). For example:
+   *
+   * `transform([{ skewX: '45deg' }])`
+   */
   transform?: $ReadOnlyArray<
     | {|+perspective: number | AnimatedNode|}
     | {|+rotate: string | AnimatedNode|}
@@ -115,13 +502,38 @@ export type ____TransformStyle_Internal = $ReadOnly<{|
   >,
 |}>;
 
+/**
+ * These props can be used to dynamically generate shadows on views, images, text, etc.
+ *
+ * Because they are dynamically generated, they may cause performance regressions. Static
+ * shadow image asset may be a better way to go for optimal performance.
+ *
+ * These properties are iOS only - for similar functionality on Android, use the [`elevation`
+ * property](docs/viewstyleproptypes.html#elevation).
+ */
 export type ____ShadowStyle_Internal = $ReadOnly<{|
+  /**
+   * Sets the drop shadow color
+   * @platform ios
+   */
   shadowColor?: ColorValue,
+  /**
+   * Sets the drop shadow offset
+   * @platform ios
+   */
   shadowOffset?: $ReadOnly<{|
     width?: number,
     height?: number,
   |}>,
+  /**
+   * Sets the drop shadow opacity (multiplied by the color's alpha component)
+   * @platform ios
+   */
   shadowOpacity?: number | AnimatedNode,
+  /**
+   * Sets the drop shadow blur radius
+   * @platform ios
+   */
   shadowRadius?: number,
 |}>;
 
diff --git a/Libraries/StyleSheet/StyleSheetValidation.js b/Libraries/StyleSheet/StyleSheetValidation.js
index a645c1e36b3b05..5ff8a5c8408ee8 100644
--- a/Libraries/StyleSheet/StyleSheetValidation.js
+++ b/Libraries/StyleSheet/StyleSheetValidation.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,9 +10,9 @@
 
 'use strict';
 
-const ImageStylePropTypes = require('ImageStylePropTypes');
+const DeprecatedImageStylePropTypes = require('DeprecatedImageStylePropTypes');
 const TextStylePropTypes = require('TextStylePropTypes');
-const ViewStylePropTypes = require('ViewStylePropTypes');
+const DeprecatedViewStylePropTypes = require('DeprecatedViewStylePropTypes');
 
 const invariant = require('fbjs/lib/invariant');
 
@@ -24,7 +24,7 @@ const ReactPropTypesSecret = 'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED';
 
 class StyleSheetValidation {
   static validateStyleProp(prop: string, style: Object, caller: string) {
-    if (!__DEV__) {
+    if (!__DEV__ || global.__RCTProfileIsProfiling) {
       return;
     }
     if (allStylePropTypes[prop] === undefined) {
@@ -48,7 +48,7 @@ class StyleSheetValidation {
   }
 
   static validateStyle(name: string, styles: Object) {
-    if (!__DEV__) {
+    if (!__DEV__ || global.__RCTProfileIsProfiling) {
       return;
     }
     for (const prop in styles[name]) {
@@ -61,6 +61,9 @@ class StyleSheetValidation {
   }
 
   static addValidStylePropTypes(stylePropTypes) {
+    if (!__DEV__ || global.__RCTProfileIsProfiling) {
+      return;
+    }
     for (const key in stylePropTypes) {
       allStylePropTypes[key] = stylePropTypes[key];
     }
@@ -81,8 +84,10 @@ const styleError = function(message1, style, caller?, message2?) {
 
 const allStylePropTypes = {};
 
-StyleSheetValidation.addValidStylePropTypes(ImageStylePropTypes);
-StyleSheetValidation.addValidStylePropTypes(TextStylePropTypes);
-StyleSheetValidation.addValidStylePropTypes(ViewStylePropTypes);
+if (__DEV__ && !global.__RCTProfileIsProfiling) {
+  StyleSheetValidation.addValidStylePropTypes(DeprecatedImageStylePropTypes);
+  StyleSheetValidation.addValidStylePropTypes(TextStylePropTypes);
+  StyleSheetValidation.addValidStylePropTypes(DeprecatedViewStylePropTypes);
+}
 
 module.exports = StyleSheetValidation;
diff --git a/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js b/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js
new file mode 100644
index 00000000000000..de7d6a6521c797
--- /dev/null
+++ b/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js
@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 StyleSheet = require('StyleSheet');
+
+import type {ImageStyleProp, TextStyleProp} from 'StyleSheet';
+
+const imageStyle = {tintColor: 'rgb(0, 0, 0)'};
+const textStyle = {color: 'rgb(0, 0, 0)'};
+
+module.exports = {
+  testGoodCompose() {
+    (StyleSheet.compose(
+      imageStyle,
+      imageStyle,
+    ): ImageStyleProp);
+
+    (StyleSheet.compose(
+      textStyle,
+      textStyle,
+    ): TextStyleProp);
+
+    (StyleSheet.compose(
+      null,
+      null,
+    ): TextStyleProp);
+
+    (StyleSheet.compose(
+      textStyle,
+      null,
+    ): TextStyleProp);
+
+    (StyleSheet.compose(
+      textStyle,
+      Math.random() < 0.5 ? textStyle : null,
+    ): TextStyleProp);
+
+    (StyleSheet.compose(
+      [textStyle],
+      null,
+    ): TextStyleProp);
+
+    (StyleSheet.compose(
+      [textStyle],
+      null,
+    ): TextStyleProp);
+
+    (StyleSheet.compose(
+      [textStyle],
+      [textStyle],
+    ): TextStyleProp);
+  },
+
+  testBadCompose() {
+    // $FlowExpectedError - Incompatible type.
+    (StyleSheet.compose(
+      textStyle,
+      textStyle,
+    ): ImageStyleProp);
+
+    (StyleSheet.compose(
+      // $FlowExpectedError - Incompatible type.
+      [textStyle],
+      null,
+    ): ImageStyleProp);
+
+    // $FlowExpectedError - Incompatible type.
+    (StyleSheet.compose(
+      Math.random() < 0.5 ? textStyle : null,
+      null,
+    ): ImageStyleProp);
+  },
+};
diff --git a/Libraries/StyleSheet/__tests__/flattenStyle-test.js b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
index fed9be2b5aada5..f441c76203a049 100644
--- a/Libraries/StyleSheet/__tests__/flattenStyle-test.js
+++ b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/StyleSheet/__tests__/normalizeColor-test.js b/Libraries/StyleSheet/__tests__/normalizeColor-test.js
index 65b398ee222d83..86f39d764b32a8 100644
--- a/Libraries/StyleSheet/__tests__/normalizeColor-test.js
+++ b/Libraries/StyleSheet/__tests__/normalizeColor-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/StyleSheet/__tests__/processColor-test.js b/Libraries/StyleSheet/__tests__/processColor-test.js
index 1d717bf4726841..5342bfa7d6a857 100644
--- a/Libraries/StyleSheet/__tests__/processColor-test.js
+++ b/Libraries/StyleSheet/__tests__/processColor-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/StyleSheet/__tests__/processTransform-test.js b/Libraries/StyleSheet/__tests__/processTransform-test.js
index 08809e94fccc73..820db774956e53 100644
--- a/Libraries/StyleSheet/__tests__/processTransform-test.js
+++ b/Libraries/StyleSheet/__tests__/processTransform-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
index f2d09ecb4e1821..2afffd0d0189c2 100644
--- a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
+++ b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/StyleSheet/flattenStyle.js b/Libraries/StyleSheet/flattenStyle.js
index cb5f6ebc96e71f..6aa9647437406a 100644
--- a/Libraries/StyleSheet/flattenStyle.js
+++ b/Libraries/StyleSheet/flattenStyle.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 'use strict';
diff --git a/Libraries/StyleSheet/processColor.js b/Libraries/StyleSheet/processColor.js
index 77ba69ded17eb3..9d87b462a8c600 100644
--- a/Libraries/StyleSheet/processColor.js
+++ b/Libraries/StyleSheet/processColor.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/StyleSheet/processTransform.js b/Libraries/StyleSheet/processTransform.js
index e9076493c2890e..fc634d43c92df1 100644
--- a/Libraries/StyleSheet/processTransform.js
+++ b/Libraries/StyleSheet/processTransform.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/StyleSheet/setNormalizedColorAlpha.js b/Libraries/StyleSheet/setNormalizedColorAlpha.js
index 52fe783fd60200..ea576926088045 100644
--- a/Libraries/StyleSheet/setNormalizedColorAlpha.js
+++ b/Libraries/StyleSheet/setNormalizedColorAlpha.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h
index 99e89e56ad95c9..7dfd2ac96f08d4 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
index 6cbdbd8a99716c..404cc22bd5ccf3 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -32,7 +32,7 @@ + (instancetype)newWithBridge:(RCTBridge *)bridge
 
   RCTSurfaceBackedComponentState *state = scope.state();
 
-  if (state.surface == nil || state.surface.bridge != bridge || ![state.surface.moduleName isEqualToString:moduleName]) {
+  if (state.surface == nil || ![state.surface.moduleName isEqualToString:moduleName]) {
     RCTSurface *surface =
       [[RCTSurface alloc] initWithBridge:bridge
                               moduleName:moduleName
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
index c2bfbc81bf095a..75d03e2d36f106 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm
index 60a72cb0ad25be..5123963cb1aa1f 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h
index 269c73e79eccbe..b8a81d6d994164 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h
index 975a72bbc64e68..48ad9ce78b6359 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
index 963813ff80eedf..6782f9a4daefeb 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h
index 7937090ab225cd..17da5de8a5c799 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
index 73ba8e3767da55..d3a024ec2fa2fb 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
index 5c9946eb350af1..6ebadafe49e466 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
index 2759fdd9fcdbeb..13defa9de2bf18 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
index c2e44c9db345ff..60020bb01cc60b 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/BaseText/RCTBaseTextShadowView.h b/Libraries/Text/BaseText/RCTBaseTextShadowView.h
index 331d1ca2161e3f..a7cbf10b70d25a 100644
--- a/Libraries/Text/BaseText/RCTBaseTextShadowView.h
+++ b/Libraries/Text/BaseText/RCTBaseTextShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/BaseText/RCTBaseTextShadowView.m b/Libraries/Text/BaseText/RCTBaseTextShadowView.m
index 49ce7690dfc96e..ed5fd8ca9dd056 100644
--- a/Libraries/Text/BaseText/RCTBaseTextShadowView.m
+++ b/Libraries/Text/BaseText/RCTBaseTextShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/BaseText/RCTBaseTextViewManager.h b/Libraries/Text/BaseText/RCTBaseTextViewManager.h
index b6c105e3759f54..782a47610d78a6 100644
--- a/Libraries/Text/BaseText/RCTBaseTextViewManager.h
+++ b/Libraries/Text/BaseText/RCTBaseTextViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/BaseText/RCTBaseTextViewManager.m b/Libraries/Text/BaseText/RCTBaseTextViewManager.m
index 2cf43ebf38cf6c..247c636d9cda64 100644
--- a/Libraries/Text/BaseText/RCTBaseTextViewManager.m
+++ b/Libraries/Text/BaseText/RCTBaseTextViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -36,6 +36,7 @@ - (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(maxFontSizeMultiplier, textAttributes.maxFontSizeMultiplier, CGFloat)
 RCT_REMAP_SHADOW_PROPERTY(letterSpacing, textAttributes.letterSpacing, CGFloat)
 // Paragraph Styles
 RCT_REMAP_SHADOW_PROPERTY(lineHeight, textAttributes.lineHeight, CGFloat)
diff --git a/Libraries/Text/RCTConvert+Text.h b/Libraries/Text/RCTConvert+Text.h
index 7c43cfca8943ab..0a33ab38b0be47 100644
--- a/Libraries/Text/RCTConvert+Text.h
+++ b/Libraries/Text/RCTConvert+Text.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/RCTConvert+Text.m b/Libraries/Text/RCTConvert+Text.m
index aaf7c1383c1c79..cd91ba9623478a 100644
--- a/Libraries/Text/RCTConvert+Text.m
+++ b/Libraries/Text/RCTConvert+Text.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/RCTTextAttributes.h b/Libraries/Text/RCTTextAttributes.h
index 7575bb17269f80..01070aa4e2192c 100644
--- a/Libraries/Text/RCTTextAttributes.h
+++ b/Libraries/Text/RCTTextAttributes.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -31,6 +31,7 @@ extern NSString *const RCTTextAttributesTagAttributeName;
 @property (nonatomic, copy, nullable) NSString *fontFamily;
 @property (nonatomic, assign) CGFloat fontSize;
 @property (nonatomic, assign) CGFloat fontSizeMultiplier;
+@property (nonatomic, assign) CGFloat maxFontSizeMultiplier;
 @property (nonatomic, copy, nullable) NSString *fontWeight;
 @property (nonatomic, copy, nullable) NSString *fontStyle;
 @property (nonatomic, copy, nullable) NSArray<NSString *> *fontVariant;
@@ -71,7 +72,7 @@ extern NSString *const RCTTextAttributesTagAttributeName;
 - (UIFont *)effectiveFont;
 
 /**
- * Font size multiplier reflects `allowFontScaling` and `fontSizeMultiplier`.
+ * Font size multiplier reflects `allowFontScaling`, `fontSizeMultiplier`, and `maxFontSizeMultiplier`.
  */
 - (CGFloat)effectiveFontSizeMultiplier;
 
diff --git a/Libraries/Text/RCTTextAttributes.m b/Libraries/Text/RCTTextAttributes.m
index 4309138d00fe09..f1bf6beab67f1a 100644
--- a/Libraries/Text/RCTTextAttributes.m
+++ b/Libraries/Text/RCTTextAttributes.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -24,6 +24,7 @@ - (instancetype)init
     _lineHeight = NAN;
     _textDecorationStyle = NSUnderlineStyleSingle;
     _fontSizeMultiplier = NAN;
+    _maxFontSizeMultiplier = NAN;
     _alignment = NSTextAlignmentNatural;
     _baseWritingDirection = NSWritingDirectionNatural;
     _textShadowRadius = NAN;
@@ -49,6 +50,7 @@ - (void)applyTextAttributes:(RCTTextAttributes *)textAttributes
   _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;
   _fontWeight = textAttributes->_fontWeight ?: _fontWeight;
   _fontStyle = textAttributes->_fontStyle ?: _fontStyle;
   _fontVariant = textAttributes->_fontVariant ?: _fontVariant;
@@ -191,7 +193,15 @@ - (UIFont *)effectiveFont
 
 - (CGFloat)effectiveFontSizeMultiplier
 {
-  return !RCTHasFontHandlerSet() && _allowFontScaling && !isnan(_fontSizeMultiplier) ? _fontSizeMultiplier : 1.0;
+  bool fontScalingEnabled = !RCTHasFontHandlerSet() && _allowFontScaling;
+
+  if (fontScalingEnabled) {
+    CGFloat fontSizeMultiplier = !isnan(_fontSizeMultiplier) ? _fontSizeMultiplier : 1.0;
+    CGFloat maxFontSizeMultiplier = !isnan(_maxFontSizeMultiplier) ? _maxFontSizeMultiplier : 0.0;
+    return maxFontSizeMultiplier >= 1.0 ? fminf(maxFontSizeMultiplier, fontSizeMultiplier) : fontSizeMultiplier;
+  } else {
+    return 1.0;
+  }
 }
 
 - (UIColor *)effectiveForegroundColor
@@ -260,6 +270,7 @@ - (BOOL)isEqual:(RCTTextAttributes *)textAttributes
     RCTTextAttributesCompareObjects(_fontFamily) &&
     RCTTextAttributesCompareFloats(_fontSize) &&
     RCTTextAttributesCompareFloats(_fontSizeMultiplier) &&
+    RCTTextAttributesCompareFloats(_maxFontSizeMultiplier) &&
     RCTTextAttributesCompareStrings(_fontWeight) &&
     RCTTextAttributesCompareObjects(_fontStyle) &&
     RCTTextAttributesCompareObjects(_fontVariant) &&
diff --git a/Libraries/Text/RCTTextTransform.h b/Libraries/Text/RCTTextTransform.h
index eddebd0f0c207e..af50fe6316e8e1 100644
--- a/Libraries/Text/RCTTextTransform.h
+++ b/Libraries/Text/RCTTextTransform.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/RawText/RCTRawTextShadowView.h b/Libraries/Text/RawText/RCTRawTextShadowView.h
index 51760308ba090e..ca875b334bf065 100644
--- a/Libraries/Text/RawText/RCTRawTextShadowView.h
+++ b/Libraries/Text/RawText/RCTRawTextShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/RawText/RCTRawTextShadowView.m b/Libraries/Text/RawText/RCTRawTextShadowView.m
index 12c01d1b5f6af5..823058626ea186 100644
--- a/Libraries/Text/RawText/RCTRawTextShadowView.m
+++ b/Libraries/Text/RawText/RCTRawTextShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/RawText/RCTRawTextViewManager.h b/Libraries/Text/RawText/RCTRawTextViewManager.h
index 8ff302815527e7..d67d56aa8b92e7 100644
--- a/Libraries/Text/RawText/RCTRawTextViewManager.h
+++ b/Libraries/Text/RawText/RCTRawTextViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/RawText/RCTRawTextViewManager.m b/Libraries/Text/RawText/RCTRawTextViewManager.m
index f159f73d3b92bb..641f4e7d30cbf4 100644
--- a/Libraries/Text/RawText/RCTRawTextViewManager.m
+++ b/Libraries/Text/RawText/RCTRawTextViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index 2a0a939f876af7..02c4ce284843f5 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,15 +10,15 @@
 
 'use strict';
 
+const DeprecatedTextPropTypes = require('DeprecatedTextPropTypes');
 const React = require('React');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 const TextAncestor = require('TextAncestor');
-const TextPropTypes = require('TextPropTypes');
 const Touchable = require('Touchable');
 const UIManager = require('UIManager');
 
 const createReactNativeComponentClass = require('createReactNativeComponentClass');
-const nullthrows = require('fbjs/lib/nullthrows');
+const nullthrows = require('nullthrows');
 const processColor = require('processColor');
 
 import type {PressEvent} from 'CoreEventTypes';
@@ -58,12 +58,19 @@ const viewConfig = {
     numberOfLines: true,
     ellipsizeMode: true,
     allowFontScaling: true,
+    maxFontSizeMultiplier: true,
     disabled: true,
     selectable: true,
     selectionColor: true,
     adjustsFontSizeToFit: true,
     minimumFontScale: true,
     textBreakStrategy: true,
+    onTextLayout: true,
+  },
+  directEventTypes: {
+    topTextLayout: {
+      registrationName: 'onTextLayout',
+    },
   },
   uiViewClassName: 'RCTText',
 };
@@ -251,12 +258,13 @@ const RCTText = createReactNativeComponentClass(
 );
 
 const RCTVirtualText =
-  UIManager.RCTVirtualText == null
+  UIManager.getViewManagerConfig('RCTVirtualText') == null
     ? RCTText
     : createReactNativeComponentClass('RCTVirtualText', () => ({
         validAttributes: {
           ...ReactNativeViewAttributes.UIView,
           isHighlighted: true,
+          maxFontSizeMultiplier: true,
         },
         uiViewClassName: 'RCTVirtualText',
       }));
@@ -271,6 +279,6 @@ const Text = (
 const TextToExport = React.forwardRef(Text);
 
 // TODO: Deprecate this.
-TextToExport.propTypes = TextPropTypes;
+TextToExport.propTypes = DeprecatedTextPropTypes;
 
 module.exports = (TextToExport: Class<NativeComponent<TextProps>>);
diff --git a/Libraries/Text/Text/NSTextStorage+FontScaling.h b/Libraries/Text/Text/NSTextStorage+FontScaling.h
index 8372a0d2be9183..1ec019ef673b15 100644
--- a/Libraries/Text/Text/NSTextStorage+FontScaling.h
+++ b/Libraries/Text/Text/NSTextStorage+FontScaling.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/Text/NSTextStorage+FontScaling.m b/Libraries/Text/Text/NSTextStorage+FontScaling.m
index 5002dddd8a425c..01f6c8a1a76bcf 100644
--- a/Libraries/Text/Text/NSTextStorage+FontScaling.m
+++ b/Libraries/Text/Text/NSTextStorage+FontScaling.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/Text/RCTTextShadowView.h b/Libraries/Text/Text/RCTTextShadowView.h
index d62748df8169cf..aaaf8e3d8db51d 100644
--- a/Libraries/Text/Text/RCTTextShadowView.h
+++ b/Libraries/Text/Text/RCTTextShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) NSLineBreakMode lineBreakMode;
 @property (nonatomic, assign) BOOL adjustsFontSizeToFit;
 @property (nonatomic, assign) CGFloat minimumFontScale;
+@property (nonatomic, copy) RCTDirectEventBlock onTextLayout;
 
 - (void)uiManagerWillPerformMounting;
 
diff --git a/Libraries/Text/Text/RCTTextShadowView.m b/Libraries/Text/Text/RCTTextShadowView.m
index 1266f8afd74dd9..850879aa4f9ae7 100644
--- a/Libraries/Text/Text/RCTTextShadowView.m
+++ b/Libraries/Text/Text/RCTTextShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -133,7 +133,7 @@ - (void)postprocessAttributedText:(NSMutableAttributedString *)attributedText
     return;
   }
 
-  [attributedText beginEditing];
+  __block CGFloat maximumFontLineHeight = 0;
 
   [attributedText enumerateAttribute:NSFontAttributeName
                              inRange:NSMakeRange(0, attributedText.length)
@@ -144,19 +144,21 @@ - (void)postprocessAttributedText:(NSMutableAttributedString *)attributedText
         return;
       }
 
-      if (maximumLineHeight <= font.lineHeight) {
-        return;
+      if (maximumFontLineHeight <= font.lineHeight) {
+        maximumFontLineHeight = font.lineHeight;
       }
+    }
+  ];
 
-      CGFloat baseLineOffset = maximumLineHeight / 2.0 - font.lineHeight / 2.0;
+  if (maximumLineHeight < maximumFontLineHeight) {
+    return;
+  }
 
-      [attributedText addAttribute:NSBaselineOffsetAttributeName
-                             value:@(baseLineOffset)
-                             range:range];
-     }
-   ];
+  CGFloat baseLineOffset = maximumLineHeight / 2.0 - maximumFontLineHeight / 2.0;
 
-   [attributedText endEditing];
+  [attributedText addAttribute:NSBaselineOffsetAttributeName
+                         value:@(baseLineOffset)
+                         range:NSMakeRange(0, attributedText.length)];
 }
 
 - (NSAttributedString *)attributedTextWithMeasuredAttachmentsThatFitSize:(CGSize)size
@@ -304,6 +306,35 @@ - (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
       [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,
+      };
+    _onTextLayout(payload);
+  }
 }
 
 - (CGFloat)lastBaselineForSize:(CGSize)size
diff --git a/Libraries/Text/Text/RCTTextView.h b/Libraries/Text/Text/RCTTextView.h
index b8923b1ef5fa4e..a082013cbaf59d 100644
--- a/Libraries/Text/Text/RCTTextView.h
+++ b/Libraries/Text/Text/RCTTextView.h
@@ -1,10 +1,12 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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/RCTComponent.h>
+
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Libraries/Text/Text/RCTTextView.m b/Libraries/Text/Text/RCTTextView.m
index 45c09313909d51..917cf83904aecc 100644
--- a/Libraries/Text/Text/RCTTextView.m
+++ b/Libraries/Text/Text/RCTTextView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -238,7 +238,7 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
   if (_selectable && action == @selector(copy:)) {
     return YES;
   }
-  
+
   return [self.nextResponder canPerformAction:action withSender:sender];
 }
 
diff --git a/Libraries/Text/Text/RCTTextViewManager.h b/Libraries/Text/Text/RCTTextViewManager.h
index d11e4b5919d066..e9586b3d41b892 100644
--- a/Libraries/Text/Text/RCTTextViewManager.h
+++ b/Libraries/Text/Text/RCTTextViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/Text/RCTTextViewManager.m b/Libraries/Text/Text/RCTTextViewManager.m
index a729e644898286..9e0af363715d5d 100644
--- a/Libraries/Text/Text/RCTTextViewManager.m
+++ b/Libraries/Text/Text/RCTTextViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -24,7 +24,6 @@ @interface RCTTextViewManager () <RCTUIManagerObserver>
 @implementation RCTTextViewManager
 {
   NSHashTable<RCTTextShadowView *> *_shadowViews;
-  CGFloat _fontSizeMultiplier;
 }
 
 RCT_EXPORT_MODULE(RCTText)
@@ -34,6 +33,8 @@ @implementation RCTTextViewManager
 RCT_REMAP_SHADOW_PROPERTY(adjustsFontSizeToFit, adjustsFontSizeToFit, BOOL)
 RCT_REMAP_SHADOW_PROPERTY(minimumFontScale, minimumFontScale, CGFloat)
 
+RCT_EXPORT_SHADOW_PROPERTY(onTextLayout, RCTDirectEventBlock)
+
 RCT_EXPORT_VIEW_PROPERTY(selectable, BOOL)
 
 - (void)setBridge:(RCTBridge *)bridge
diff --git a/Libraries/Text/TextAncestor.js b/Libraries/Text/TextAncestor.js
index 53a109c9d88b56..85d0bc2de47aa5 100644
--- a/Libraries/Text/TextAncestor.js
+++ b/Libraries/Text/TextAncestor.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h
index 97466f4d455eba..fca709148359bb 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
index 334fc5a1254be7..dd6b489020926a 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h
index db6c62751ab828..18dc486c7eb971 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
index 0a2b6d5a4c9a63..b086dfaecbd933 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.h b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
index cb817cba754039..2c0bbb22c4e377 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.h
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
index ddfd1c27f50d7b..ca206e39424683 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
index c580a11ead1c1f..4beb21bc974c10 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
index 6968313acff585..5f5ea9ca6b377c 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
index a095c3d0f6f5a3..75421035523c78 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h b/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
index d19e221064c84f..9992986a46badb 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h
index ea8abd3fdcee78..8b4244626ffc3f 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
index f5a7ca1724754d..c79d65e136f88f 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -23,6 +23,7 @@ @implementation RCTBaseTextInputShadowView
   NSAttributedString *_Nullable _localAttributedText;
   CGSize _previousContentSize;
 
+  NSString *_text;
   NSTextStorage *_textStorage;
   NSTextContainer *_textContainer;
   NSLayoutManager *_layoutManager;
@@ -101,6 +102,20 @@ - (void)invalidateContentSize
   });
 }
 
+- (NSString *)text
+{
+  return _text;
+}
+
+- (void)setText:(NSString *)text
+{
+  _text = text;
+  // Clear `_previousAttributedText` to notify the view about the change
+  // when `text` native prop is set.
+  _previousAttributedText = nil;
+  [self dirtyLayout];
+}
+
 #pragma mark - RCTUIManagerObserver
 
 - (void)uiManagerWillPerformMounting
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.h b/Libraries/Text/TextInput/RCTBaseTextInputView.h
index 1ea3d8df46be97..67c1e54a9db3a6 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index 0d085c19cac616..21af44009184f1 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -99,11 +99,19 @@ - (NSAttributedString *)attributedText
 }
 
 - (BOOL)textOf:(NSAttributedString*)newText equals:(NSAttributedString*)oldText{
-  UITextInputMode *currentInputMode =  self.backedTextInputView.textInputMode;
-  if ([currentInputMode.primaryLanguage isEqualToString:@"dictation"]) {
-    // When the dictation is running we can't update the attibuted 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.
+  // When the dictation is running we can't update the attibuted 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.
+  // 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.
+  BOOL shouldFallbackToBareTextComparison =
+    [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
+    self.backedTextInputView.markedTextRange ||
+    self.backedTextInputView.isSecureTextEntry;
+  if (shouldFallbackToBareTextComparison) {
     return ([newText.string isEqualToString:oldText.string]);
   } else {
     return ([newText isEqualToAttributedString:oldText]);
@@ -320,15 +328,10 @@ - (BOOL)textInputShouldChangeTextInRange:(NSRange)range replacementText:(NSStrin
 
   NSString *previousText = [_predictedText substringWithRange:range] ?: @"";
 
-  // After clearing the text by replacing it with an empty string, `_predictedText`
-  // still preserves the deleted text.
-  // As the first character in the TextInput always comes with the range value (0, 0),
-  // we should check the range value in order to avoid appending a character to the deleted string
-  // (which caused the issue #18374)
-  if (!NSEqualRanges(range, NSMakeRange(0, 0)) && _predictedText) {
-    _predictedText = [_predictedText stringByReplacingCharactersInRange:range withString:text];
-  } else {
+  if (!_predictedText || backedTextInputView.attributedText.string.length == 0) {
     _predictedText = text;
+  } else {
+    _predictedText = [_predictedText stringByReplacingCharactersInRange:range withString:text];
   }
 
   if (_onTextInput) {
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h
index c370779b206610..4eb39b1d052cc6 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
index d5c49328042812..6d5f7ec5aa001e 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -48,6 +48,7 @@ @implementation RCTBaseTextInputViewManager
 RCT_REMAP_VIEW_PROPERTY(spellCheck, backedTextInputView.spellCheckingType, UITextSpellCheckingType)
 RCT_REMAP_VIEW_PROPERTY(caretHidden, backedTextInputView.caretHidden, BOOL)
 RCT_REMAP_VIEW_PROPERTY(clearButtonMode, backedTextInputView.clearButtonMode, UITextFieldViewMode)
+RCT_REMAP_VIEW_PROPERTY(scrollEnabled, backedTextInputView.scrollEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(blurOnSubmit, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(clearTextOnFocus, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(keyboardType, UIKeyboardType)
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryShadowView.h b/Libraries/Text/TextInput/RCTInputAccessoryShadowView.h
index c63fdf48158acf..0e73aaca84c669 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryShadowView.h
+++ b/Libraries/Text/TextInput/RCTInputAccessoryShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m b/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m
index 6798744148e392..68a6681df3682d 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m
+++ b/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryView.h b/Libraries/Text/TextInput/RCTInputAccessoryView.h
index 207203fc22321e..ec1e2917041683 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryView.h
+++ b/Libraries/Text/TextInput/RCTInputAccessoryView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryView.m b/Libraries/Text/TextInput/RCTInputAccessoryView.m
index 1f66e473966c06..1535f9719f9f16 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryView.m
+++ b/Libraries/Text/TextInput/RCTInputAccessoryView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -42,7 +42,7 @@ - (BOOL)canBecomeFirstResponder
 
 - (void)reactSetFrame:(CGRect)frame
 {
-  [_inputAccessoryView setFrame:frame];
+  [_inputAccessoryView reactSetFrame:frame];
 
   if (_shouldBecomeFirstResponder) {
     _shouldBecomeFirstResponder = NO;
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h
index 7dca711a648d83..09321c89db201e 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
index 5a9f142c6108a5..6cd4350e25c55c 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,6 +12,7 @@
 @implementation RCTInputAccessoryViewContent
 {
   UIView *_safeAreaContainer;
+  NSLayoutConstraint *_heightConstraint;
 }
 
 - (instancetype)init
@@ -19,31 +20,48 @@ - (instancetype)init
   if (self = [super init]) {
     _safeAreaContainer = [UIView new];
     [self addSubview:_safeAreaContainer];
-  }
-  return self;
-}
 
-- (void)didMoveToSuperview
-{
+    // Use autolayout to position the view properly and take into account
+    // safe area insets on iPhone X.
+    // TODO: Support rotation, anchor to left and right without breaking frame x coordinate (T27974328).
+    self.autoresizingMask = UIViewAutoresizingFlexibleHeight;
+    _safeAreaContainer.translatesAutoresizingMaskIntoConstraints = NO;
+
+    _heightConstraint = [_safeAreaContainer.heightAnchor constraintEqualToConstant:0];
+    _heightConstraint.active = YES;
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
-  // Avoid the home pill (in portrait mode)
-  // TODO: Support rotation, anchor to left and right without breaking frame x coordinate (T27974328).
-  if (@available(iOS 11.0, *)) {
-    if (self.window) {
-      [_safeAreaContainer.bottomAnchor
-       constraintLessThanOrEqualToSystemSpacingBelowAnchor:self.window.safeAreaLayoutGuide.bottomAnchor
-       multiplier:1.0f].active = YES;
+    if (@available(iOS 11.0, *)) {
+      [_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.bottomAnchor].active = YES;
+      [_safeAreaContainer.topAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.topAnchor].active = YES;
+      [_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.leadingAnchor].active = YES;
+      [_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.trailingAnchor].active = YES;
+    } else {
+      [_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.bottomAnchor].active = YES;
+      [_safeAreaContainer.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.leadingAnchor].active = YES;
+      [_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.trailingAnchor].active = YES;
     }
   }
-#endif
+  return self;
+}
 
+- (CGSize)intrinsicContentSize
+{
+  // This is needed so the view size is based on autolayout constraints.
+  return CGSizeZero;
 }
 
-- (void)setFrame:(CGRect)frame
+- (void)reactSetFrame:(CGRect)frame
 {
-  [super setFrame:frame];
+  // We still need to set the frame here, otherwise it won't be
+  // measured until moved to the window during the keyboard opening
+  // animation. If this happens, the height will be animated from 0 to
+  // its actual size and we don't want that.
+  [self setFrame:frame];
   [_safeAreaContainer setFrame:frame];
+
+  _heightConstraint.constant = frame.size.height;
+  [self layoutIfNeeded];
 }
 
 - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)index
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h
index 590723a5631716..cada7d44014fc0 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m
index 490aa841aa49a2..5fe42d86efb267 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTTextSelection.h b/Libraries/Text/TextInput/RCTTextSelection.h
index b77746a91647d6..0b4b9a029295df 100644
--- a/Libraries/Text/TextInput/RCTTextSelection.h
+++ b/Libraries/Text/TextInput/RCTTextSelection.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/RCTTextSelection.m b/Libraries/Text/TextInput/RCTTextSelection.m
index 436228c5545ab2..082b8fd3e48f82 100644
--- a/Libraries/Text/TextInput/RCTTextSelection.m
+++ b/Libraries/Text/TextInput/RCTTextSelection.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h
index 1c99fed6354501..c5ca8ee769996b 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
index 0a4b9944c0d705..4292a04fb69031 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h
index b19ff183925daa..5662c7928fae40 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
index 4399c3677ff6ac..5a2af1cbcb2f1a 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.h b/Libraries/Text/TextInput/Singleline/RCTUITextField.h
index a2e7a0e0c61bd6..5e3c5b340941c9 100644
--- a/Libraries/Text/TextInput/Singleline/RCTUITextField.h
+++ b/Libraries/Text/TextInput/Singleline/RCTUITextField.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
index 84e2528f83fff4..aac8ec51ac4fa6 100644
--- a/Libraries/Text/TextInput/Singleline/RCTUITextField.m
+++ b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/TextPropTypes.js b/Libraries/Text/TextPropTypes.js
index 5a3c99d7378531..dddb43ea00726b 100644
--- a/Libraries/Text/TextPropTypes.js
+++ b/Libraries/Text/TextPropTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,13 +10,13 @@
 
 'use strict';
 
-const ColorPropType = require('ColorPropType');
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const DeprecatedColorPropType = require('DeprecatedColorPropType');
+const DeprecatedEdgeInsetsPropType = require('DeprecatedEdgeInsetsPropType');
 const PropTypes = require('prop-types');
-const StyleSheetPropType = require('StyleSheetPropType');
+const DeprecatedStyleSheetPropType = require('DeprecatedStyleSheetPropType');
 const TextStylePropTypes = require('TextStylePropTypes');
 
-const stylePropType = StyleSheetPropType(TextStylePropTypes);
+const stylePropType = DeprecatedStyleSheetPropType(TextStylePropTypes);
 
 module.exports = {
   /**
@@ -62,7 +62,7 @@ module.exports = {
    *
    * See https://facebook.github.io/react-native/docs/text.html#pressretentionoffset
    */
-  pressRetentionOffset: EdgeInsetsPropType,
+  pressRetentionOffset: DeprecatedEdgeInsetsPropType,
   /**
    * Lets the user select text.
    *
@@ -74,7 +74,7 @@ module.exports = {
    *
    * See https://facebook.github.io/react-native/docs/text.html#selectioncolor
    */
-  selectionColor: ColorPropType,
+  selectionColor: DeprecatedColorPropType,
   /**
    * When `true`, no visual change is made when text is pressed down.
    *
@@ -100,6 +100,14 @@ module.exports = {
    * See https://facebook.github.io/react-native/docs/text.html#allowfontscaling
    */
   allowFontScaling: PropTypes.bool,
+  /**
+   * 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: PropTypes.number,
   /**
    * Indicates whether the view is an accessibility element.
    *
diff --git a/Libraries/Text/TextProps.js b/Libraries/Text/TextProps.js
index 474c8fef802bb5..773125d56be721 100644
--- a/Libraries/Text/TextProps.js
+++ b/Libraries/Text/TextProps.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,12 +10,14 @@
 
 'use strict';
 
-import type {AccessibilityTrait} from 'ViewAccessibility';
-
-import type {Node} from 'react';
-
-import type {LayoutEvent, PressEvent} from 'CoreEventTypes';
+import type {LayoutEvent, PressEvent, TextLayoutEvent} from 'CoreEventTypes';
+import type React from 'React';
 import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
+import type {
+  AccessibilityRole,
+  AccessibilityStates,
+  AccessibilityTrait,
+} from 'ViewAccessibility';
 
 export type PressRetentionOffset = $ReadOnly<{|
   top: number,
@@ -28,15 +30,81 @@ export type PressRetentionOffset = $ReadOnly<{|
  * @see https://facebook.github.io/react-native/docs/text.html#reference
  */
 export type TextProps = $ReadOnly<{
+  /**
+   * Indicates whether the view is an accessibility element.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#accessible
+   */
   accessible?: ?boolean,
-  accessibilityTraits?: AccessibilityTrait | Array<AccessibilityTrait>,
+  accessibilityRole?: ?AccessibilityRole,
+  accessibilityStates?: ?AccessibilityStates,
+  accessibilityTraits?: ?(AccessibilityTrait | Array<AccessibilityTrait>),
+
+  /**
+   * Whether font should be scaled down automatically.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#adjustsfontsizetofit
+   */
+  adjustsFontSizeToFit?: ?boolean,
+
+  /**
+   * Whether fonts should scale to respect Text Size accessibility settings.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#allowfontscaling
+   */
   allowFontScaling?: ?boolean,
-  children?: Node,
-  ellipsizeMode?: 'clip' | 'head' | 'middle' | 'tail',
-  nativeID?: string,
+  children?: ?React.Node,
+
+  /**
+   * When `numberOfLines` is set, this prop defines how text will be
+   * truncated.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#ellipsizemode
+   */
+  ellipsizeMode?: ?('clip' | 'head' | 'middle' | 'tail'),
+
+  /**
+   * 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,
+
+  /**
+   * Used to locate this view from native code.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#nativeid
+   */
+  nativeID?: ?string,
+
+  /**
+   * Used to truncate the text with an ellipsis.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#numberoflines
+   */
   numberOfLines?: ?number,
+
+  /**
+   * Invoked on mount and layout changes.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#onlayout
+   */
   onLayout?: ?(event: LayoutEvent) => mixed,
+
+  /**
+   * This function is called on long press.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#onlongpress
+   */
   onLongPress?: ?(event: PressEvent) => mixed,
+
+  /**
+   * This function is called on press.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#onpress
+   */
   onPress?: ?(event: PressEvent) => mixed,
   onResponderGrant?: ?Function,
   onResponderMove?: ?Function,
@@ -44,18 +112,72 @@ export type TextProps = $ReadOnly<{
   onResponderTerminate?: ?Function,
   onResponderTerminationRequest?: ?Function,
   onStartShouldSetResponder?: ?Function,
+  onTextLayout?: ?(event: TextLayoutEvent) => mixed,
+
+  /**
+   * Defines how far your touch may move off of the button, before
+   * deactivating the button.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#pressretentionoffset
+   */
   pressRetentionOffset?: ?PressRetentionOffset,
+
+  /**
+   * Lets the user select text.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#selectable
+   */
   selectable?: ?boolean,
   style?: ?DangerouslyImpreciseStyleProp,
-  testID?: string,
 
-  // Android Only
+  /**
+   * Used to locate this view in end-to-end tests.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#testid
+   */
+  testID?: ?string,
+
+  /**
+   * Android Only
+   */
+
+  /**
+   * Specifies the disabled state of the text view for testing purposes.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#disabled
+   */
   disabled?: ?boolean,
+
+  /**
+   * The highlight color of the text.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#selectioncolor
+   */
   selectionColor?: ?string,
-  textBreakStrategy?: 'balanced' | 'highQuality' | 'simple',
 
-  // iOS Only
+  /**
+   * Set text break strategy on Android.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#textbreakstrategy
+   */
+  textBreakStrategy?: ?('balanced' | 'highQuality' | 'simple'),
+
+  /**
+   * iOS Only
+   */
   adjustsFontSizeToFit?: ?boolean,
+
+  /**
+   * Smallest possible scale a font can reach.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#minimumfontscale
+   */
   minimumFontScale?: ?number,
+
+  /**
+   * When `true`, no visual change is made when text is pressed down.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#supperhighlighting
+   */
   suppressHighlighting?: ?boolean,
 }>;
diff --git a/Libraries/Text/TextStylePropTypes.js b/Libraries/Text/TextStylePropTypes.js
index 28f63c01d7d3e6..d4755ef762c1dc 100644
--- a/Libraries/Text/TextStylePropTypes.js
+++ b/Libraries/Text/TextStylePropTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,14 +10,14 @@
 
 'use strict';
 
-const ColorPropType = require('ColorPropType');
+const DeprecatedColorPropType = require('DeprecatedColorPropType');
 const ReactPropTypes = require('prop-types');
-const ViewStylePropTypes = require('ViewStylePropTypes');
+const DeprecatedViewStylePropTypes = require('DeprecatedViewStylePropTypes');
 
 const TextStylePropTypes = {
-  ...ViewStylePropTypes,
+  ...DeprecatedViewStylePropTypes,
 
-  color: ColorPropType,
+  color: DeprecatedColorPropType,
   fontFamily: ReactPropTypes.string,
   fontSize: ReactPropTypes.number,
   fontStyle: ReactPropTypes.oneOf(['normal', 'italic']),
@@ -56,7 +56,7 @@ const TextStylePropTypes = {
     height: ReactPropTypes.number,
   }),
   textShadowRadius: ReactPropTypes.number,
-  textShadowColor: ColorPropType,
+  textShadowColor: DeprecatedColorPropType,
   /**
    * @platform ios
    */
@@ -107,10 +107,7 @@ const TextStylePropTypes = {
   /**
    * @platform ios
    */
-  textDecorationColor: ColorPropType,
-  /**
-   * @platform ios
-   */
+  textDecorationColor: DeprecatedColorPropType,
   textTransform: ReactPropTypes.oneOf([
     'none' /*default*/,
     'capitalize',
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h
index 159a155f994a7b..c2bef89803eaad 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h
+++ b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
index 55fd8a6eef5746..af59ad7dfd565f 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
+++ b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h
index cf2072f5df5750..3382d762c3457f 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h
+++ b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m
index adc3c885405e36..48eec5ff25a199 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m
+++ b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Types/CoreEventTypes.js b/Libraries/Types/CoreEventTypes.js
index 0714dc2316c7f3..abe7cdbd929479 100644
--- a/Libraries/Types/CoreEventTypes.js
+++ b/Libraries/Types/CoreEventTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -19,7 +19,9 @@ export type SyntheticEvent<T> = $ReadOnly<{|
     registrationName: string,
   |}>,
   eventPhase: ?number,
+  preventDefault: () => void,
   isDefaultPrevented: () => boolean,
+  stopPropagation: () => void,
   isPropagationStopped: () => boolean,
   isTrusted: ?boolean,
   nativeEvent: T,
@@ -29,6 +31,29 @@ export type SyntheticEvent<T> = $ReadOnly<{|
   type: ?string,
 |}>;
 
+export type ResponderSyntheticEvent<T> = $ReadOnly<{|
+  ...SyntheticEvent<T>,
+  touchHistory: $ReadOnly<{|
+    indexOfSingleActiveTouch: number,
+    mostRecentTimeStamp: number,
+    numberActiveTouches: number,
+    touchBank: $ReadOnlyArray<
+      $ReadOnly<{|
+        touchActive: boolean,
+        startPageX: number,
+        startPageY: number,
+        startTimeStamp: number,
+        currentPageX: number,
+        currentPageY: number,
+        currentTimeStamp: number,
+        previousPageX: number,
+        previousPageY: number,
+        previousTimeStamp: number,
+      |}>,
+    >,
+  |}>,
+|}>;
+
 export type Layout = $ReadOnly<{|
   x: number,
   y: number,
@@ -36,13 +61,28 @@ export type Layout = $ReadOnly<{|
   height: number,
 |}>;
 
+export type TextLayout = $ReadOnly<{|
+  ...Layout,
+  ascender: number,
+  capHeight: number,
+  descender: number,
+  text: string,
+  xHeight: number,
+|}>;
+
 export type LayoutEvent = SyntheticEvent<
   $ReadOnly<{|
     layout: Layout,
   |}>,
 >;
 
-export type PressEvent = SyntheticEvent<
+export type TextLayoutEvent = SyntheticEvent<
+  $ReadOnly<{|
+    lines: Array<TextLayout>,
+  |}>,
+>;
+
+export type PressEvent = ResponderSyntheticEvent<
   $ReadOnly<{|
     changedTouches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,
     force: number,
@@ -77,6 +117,20 @@ export type ScrollEvent = SyntheticEvent<
       height: number,
       width: number,
     |}>,
+    targetContentOffset?: $ReadOnly<{|
+      y: number,
+      x: number,
+    |}>,
+    velocity?: $ReadOnly<{|
+      y: number,
+      x: number,
+    |}>,
     zoomScale: number,
   |}>,
 >;
+
+export type SwitchChangeEvent = SyntheticEvent<
+  $ReadOnly<{|
+    value: boolean,
+  |}>,
+>;
diff --git a/Libraries/UTFSequence.js b/Libraries/UTFSequence.js
index 5c450cd2bdcfef..bd10afc6ca2c72 100644
--- a/Libraries/UTFSequence.js
+++ b/Libraries/UTFSequence.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 
diff --git a/Libraries/Utilities/BackAndroid.js b/Libraries/Utilities/BackAndroid.js
index 9484ace2411957..cf4f0cd6381235 100644
--- a/Libraries/Utilities/BackAndroid.js
+++ b/Libraries/Utilities/BackAndroid.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/BackHandler.android.js b/Libraries/Utilities/BackHandler.android.js
index 35c60a155b126c..d6198a923c01f7 100644
--- a/Libraries/Utilities/BackHandler.android.js
+++ b/Libraries/Utilities/BackHandler.android.js
@@ -1,10 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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';
@@ -16,24 +17,19 @@ const DEVICE_BACK_EVENT = 'hardwareBackPress';
 
 type BackPressEventName = $Enum<{
   backPress: string,
+  hardwareBackPress: string,
 }>;
 
-const _backPressSubscriptions = new Set();
+const _backPressSubscriptions = [];
 
 RCTDeviceEventEmitter.addListener(DEVICE_BACK_EVENT, function() {
-  let invokeDefault = true;
-  const subscriptions = Array.from(_backPressSubscriptions.values()).reverse();
-
-  for (let i = 0; i < subscriptions.length; ++i) {
-    if (subscriptions[i]()) {
-      invokeDefault = false;
-      break;
+  for (let i = _backPressSubscriptions.length - 1; i >= 0; i--) {
+    if (_backPressSubscriptions[i]()) {
+      return;
     }
   }
 
-  if (invokeDefault) {
-    BackHandler.exitApp();
-  }
+  BackHandler.exitApp();
 });
 
 /**
@@ -67,7 +63,7 @@ RCTDeviceEventEmitter.addListener(DEVICE_BACK_EVENT, function() {
  * ```
  */
 const BackHandler = {
-  exitApp: function() {
+  exitApp: function(): void {
     DeviceEventManager.invokeDefaultBackPressHandler();
   },
 
@@ -81,9 +77,11 @@ const BackHandler = {
     eventName: BackPressEventName,
     handler: Function,
   ): {remove: () => void} {
-    _backPressSubscriptions.add(handler);
+    if (_backPressSubscriptions.indexOf(handler) === -1) {
+      _backPressSubscriptions.push(handler);
+    }
     return {
-      remove: () => BackHandler.removeEventListener(eventName, handler),
+      remove: (): void => BackHandler.removeEventListener(eventName, handler),
     };
   },
 
@@ -94,7 +92,12 @@ const BackHandler = {
     eventName: BackPressEventName,
     handler: Function,
   ): void {
-    _backPressSubscriptions.delete(handler);
+    if (_backPressSubscriptions.indexOf(handler) !== -1) {
+      _backPressSubscriptions.splice(
+        _backPressSubscriptions.indexOf(handler),
+        1,
+      );
+    }
   },
 };
 
diff --git a/Libraries/Utilities/BackHandler.ios.js b/Libraries/Utilities/BackHandler.ios.js
index 969a031ab62a96..6d986f9ce91d95 100644
--- a/Libraries/Utilities/BackHandler.ios.js
+++ b/Libraries/Utilities/BackHandler.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,6 +8,7 @@
  * On iOS, this just implements a stub.
  *
  * @format
+ * @flow
  */
 
 'use strict';
@@ -17,9 +18,10 @@ const TVEventHandler = require('TVEventHandler');
 
 type BackPressEventName = $Enum<{
   backPress: string,
+  hardwareBackPress: string,
 }>;
 
-function emptyFunction() {}
+function emptyFunction(): void {}
 
 /**
  * Detect hardware button presses for back navigation.
@@ -100,12 +102,12 @@ if (Platform.isTV) {
 } else {
   BackHandler = {
     exitApp: emptyFunction,
-    addEventListener() {
+    addEventListener(_eventName: BackPressEventName, _handler: Function) {
       return {
         remove: emptyFunction,
       };
     },
-    removeEventListener: emptyFunction,
+    removeEventListener(_eventName: BackPressEventName, _handler: Function) {},
   };
 }
 
diff --git a/Libraries/Utilities/DeviceInfo.js b/Libraries/Utilities/DeviceInfo.js
index 88b2a896167f8f..318e434a39709f 100644
--- a/Libraries/Utilities/DeviceInfo.js
+++ b/Libraries/Utilities/DeviceInfo.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Utilities/Dimensions.js b/Libraries/Utilities/Dimensions.js
index bd4e60f0ef5ba7..8e8bd1af94081a 100644
--- a/Libraries/Utilities/Dimensions.js
+++ b/Libraries/Utilities/Dimensions.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/HMRClient.js b/Libraries/Utilities/HMRClient.js
index 77169a2efcb57b..5f3122ef52c180 100644
--- a/Libraries/Utilities/HMRClient.js
+++ b/Libraries/Utilities/HMRClient.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/HMRLoadingView.android.js b/Libraries/Utilities/HMRLoadingView.android.js
index ae17636537a2d9..dc814bb9e2d6ed 100644
--- a/Libraries/Utilities/HMRLoadingView.android.js
+++ b/Libraries/Utilities/HMRLoadingView.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/HMRLoadingView.ios.js b/Libraries/Utilities/HMRLoadingView.ios.js
index 631df2c2f8193a..84d9edf32be4a3 100644
--- a/Libraries/Utilities/HMRLoadingView.ios.js
+++ b/Libraries/Utilities/HMRLoadingView.ios.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Utilities/HeapCapture.js b/Libraries/Utilities/HeapCapture.js
index 999cb869b30d4e..e64fac14504818 100644
--- a/Libraries/Utilities/HeapCapture.js
+++ b/Libraries/Utilities/HeapCapture.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Utilities/JSDevSupportModule.js b/Libraries/Utilities/JSDevSupportModule.js
index 074ebef6b19fbb..518c3400390ff8 100644
--- a/Libraries/Utilities/JSDevSupportModule.js
+++ b/Libraries/Utilities/JSDevSupportModule.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Utilities/MatrixMath.js b/Libraries/Utilities/MatrixMath.js
index bb91c1d329181b..453bcf73924f05 100755
--- a/Libraries/Utilities/MatrixMath.js
+++ b/Libraries/Utilities/MatrixMath.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/PerformanceLogger.js b/Libraries/Utilities/PerformanceLogger.js
index 8bd1cc638a2b21..0054b2464b77a9 100644
--- a/Libraries/Utilities/PerformanceLogger.js
+++ b/Libraries/Utilities/PerformanceLogger.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -26,6 +26,7 @@ type Timespan = {
 
 let timespans: {[key: string]: Timespan} = {};
 let extras: {[key: string]: any} = {};
+let points: {[key: string]: number} = {};
 const cookies: {[key: string]: number} = {};
 
 const PRINT_TO_CONSOLE: false = false; // Type as false to prevent accidentally committing `true`;
@@ -107,6 +108,7 @@ const PerformanceLogger = {
   clear() {
     timespans = {};
     extras = {};
+    points = {};
     if (PRINT_TO_CONSOLE) {
       infoLog('PerformanceLogger.js', 'clear');
     }
@@ -119,6 +121,7 @@ const PerformanceLogger = {
       }
     }
     extras = {};
+    points = {};
     if (PRINT_TO_CONSOLE) {
       infoLog('PerformanceLogger.js', 'clearCompleted');
     }
@@ -132,6 +135,7 @@ const PerformanceLogger = {
       return previous;
     }, {});
     extras = {};
+    points = {};
     if (PRINT_TO_CONSOLE) {
       infoLog('PerformanceLogger.js', 'clearExceptTimespans', keys);
     }
@@ -188,6 +192,29 @@ const PerformanceLogger = {
   logExtras() {
     infoLog(extras);
   },
+
+  markPoint(key: string, timestamp?: number) {
+    if (points[key]) {
+      if (__DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to mark a point that has been already logged ',
+          key,
+        );
+      }
+      return;
+    }
+    points[key] = timestamp ?? performanceNow();
+  },
+
+  getPoints() {
+    return points;
+  },
+
+  logPoints() {
+    for (const key in points) {
+      infoLog(key + ': ' + points[key] + 'ms');
+    }
+  },
 };
 
 module.exports = PerformanceLogger;
diff --git a/Libraries/Utilities/PixelRatio.js b/Libraries/Utilities/PixelRatio.js
index 0c6386e31a2c68..7c742e76f2d10b 100644
--- a/Libraries/Utilities/PixelRatio.js
+++ b/Libraries/Utilities/PixelRatio.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
@@ -68,9 +68,15 @@ class PixelRatio {
    *     - iPhone 4, 4S
    *     - iPhone 5, 5c, 5s
    *     - iPhone 6
+   *     - iPhone 7
+   *     - iPhone 8
+   *     - iPhone SE
    *     - xhdpi Android devices (320 dpi)
    *   - PixelRatio.get() === 3
-   *     - iPhone 6 plus
+   *     - iPhone 6 Plus
+   *     - iPhone 7 Plus
+   *     - iPhone 8 Plus
+   *     - iPhone X
    *     - xxhdpi Android devices (480 dpi)
    *   - PixelRatio.get() === 3.5
    *     - Nexus 6
diff --git a/Libraries/Utilities/Platform.android.js b/Libraries/Utilities/Platform.android.js
index 92edba18299b3a..714045b93c9d05 100644
--- a/Libraries/Utilities/Platform.android.js
+++ b/Libraries/Utilities/Platform.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/Platform.ios.js b/Libraries/Utilities/Platform.ios.js
index df3a15be20f2a4..a2f97769cc889b 100644
--- a/Libraries/Utilities/Platform.ios.js
+++ b/Libraries/Utilities/Platform.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/PlatformOS.android.js b/Libraries/Utilities/PlatformOS.android.js
index 5ddf8d81e6e753..00d771a5d57f44 100644
--- a/Libraries/Utilities/PlatformOS.android.js
+++ b/Libraries/Utilities/PlatformOS.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/PlatformOS.ios.js b/Libraries/Utilities/PlatformOS.ios.js
index a1f28837ac36a0..2d1b92b71be043 100644
--- a/Libraries/Utilities/PlatformOS.ios.js
+++ b/Libraries/Utilities/PlatformOS.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/PolyfillFunctions.js b/Libraries/Utilities/PolyfillFunctions.js
index 28cb44d5402bae..0adb00647d2fe8 100644
--- a/Libraries/Utilities/PolyfillFunctions.js
+++ b/Libraries/Utilities/PolyfillFunctions.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -33,10 +33,7 @@ function polyfillObjectProperty<T>(
   const descriptor = Object.getOwnPropertyDescriptor(object, name);
   if (__DEV__ && descriptor) {
     const backupName = `original${name[0].toUpperCase()}${name.substr(1)}`;
-    Object.defineProperty(object, backupName, {
-      ...descriptor,
-      value: object[name],
-    });
+    Object.defineProperty(object, backupName, descriptor);
   }
 
   const {enumerable, writable, configurable} = descriptor || {};
diff --git a/Libraries/Utilities/RCTLog.js b/Libraries/Utilities/RCTLog.js
index ab29cd5ce6ee6c..c6fdd6ca14fae7 100644
--- a/Libraries/Utilities/RCTLog.js
+++ b/Libraries/Utilities/RCTLog.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/SceneTracker.js b/Libraries/Utilities/SceneTracker.js
index 4928efaa4e6772..266494913dcb8d 100644
--- a/Libraries/Utilities/SceneTracker.js
+++ b/Libraries/Utilities/SceneTracker.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/__mocks__/BackHandler.js b/Libraries/Utilities/__mocks__/BackHandler.js
index ec1d60bec3b879..8422b05057c6e5 100644
--- a/Libraries/Utilities/__mocks__/BackHandler.js
+++ b/Libraries/Utilities/__mocks__/BackHandler.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/__mocks__/PixelRatio.js b/Libraries/Utilities/__mocks__/PixelRatio.js
index efe64953563e81..90c0de2041bdfa 100644
--- a/Libraries/Utilities/__mocks__/PixelRatio.js
+++ b/Libraries/Utilities/__mocks__/PixelRatio.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2004-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/__tests__/MatrixMath-test.js b/Libraries/Utilities/__tests__/MatrixMath-test.js
index e70fbed91477e0..30de5f87992cb0 100644
--- a/Libraries/Utilities/__tests__/MatrixMath-test.js
+++ b/Libraries/Utilities/__tests__/MatrixMath-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/__tests__/Platform-test.js b/Libraries/Utilities/__tests__/Platform-test.js
index 823ed7e56882a9..dd1a85caf5cd72 100644
--- a/Libraries/Utilities/__tests__/Platform-test.js
+++ b/Libraries/Utilities/__tests__/Platform-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/__tests__/SceneTracker-test.js b/Libraries/Utilities/__tests__/SceneTracker-test.js
index 2e95b87cb3adf5..01fe1e3d8c644a 100644
--- a/Libraries/Utilities/__tests__/SceneTracker-test.js
+++ b/Libraries/Utilities/__tests__/SceneTracker-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js b/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
index 321f541e91b47e..5b00ddd4b2cd38 100644
--- a/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
+++ b/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js b/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
index 4b5e11ea5f37a4..c8bafdc65441bc 100644
--- a/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
+++ b/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/__tests__/groupByEveryN-test.js b/Libraries/Utilities/__tests__/groupByEveryN-test.js
index a084cf225ec530..d31294308c9d3c 100644
--- a/Libraries/Utilities/__tests__/groupByEveryN-test.js
+++ b/Libraries/Utilities/__tests__/groupByEveryN-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/__tests__/mapWithSeparator-test.js b/Libraries/Utilities/__tests__/mapWithSeparator-test.js
index 96de9fa889aa74..0bbe0dc7defc0e 100644
--- a/Libraries/Utilities/__tests__/mapWithSeparator-test.js
+++ b/Libraries/Utilities/__tests__/mapWithSeparator-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/__tests__/setAndForwardRef-test.js b/Libraries/Utilities/__tests__/setAndForwardRef-test.js
new file mode 100644
index 00000000000000..e1899bb3c2fdf1
--- /dev/null
+++ b/Libraries/Utilities/__tests__/setAndForwardRef-test.js
@@ -0,0 +1,134 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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
+ * @emails oncall+react_native
+ */
+
+'use strict';
+
+const React = require('React');
+const ReactTestRenderer = require('react-test-renderer');
+
+const setAndForwardRef = require('setAndForwardRef');
+
+describe('setAndForwardRef', () => {
+  let innerFuncCalled = false;
+  let outerFuncCalled = false;
+
+  class ForwardedComponent extends React.Component<{||}> {
+    testFunc() {
+      innerFuncCalled = true;
+      return true;
+    }
+
+    render() {
+      return null;
+    }
+  }
+
+  type Props = $ReadOnly<{|
+    callFunc?: ?boolean,
+    forwardedRef: React.Ref<typeof ForwardedComponent>,
+  |}>;
+
+  class TestComponent extends React.Component<Props> {
+    _nativeRef: ?React.ElementRef<typeof ForwardedComponent> = null;
+    _setNativeRef = setAndForwardRef({
+      getForwardedRef: () => this.props.forwardedRef,
+      setLocalRef: ref => {
+        this._nativeRef = ref;
+      },
+    });
+
+    componentDidMount() {
+      if (this.props.callFunc) {
+        outerFuncCalled = this._nativeRef && this._nativeRef.testFunc();
+      }
+    }
+
+    render() {
+      return <ForwardedComponent ref={this._setNativeRef} />;
+    }
+  }
+
+  // $FlowFixMe - TODO T29156721 `React.forwardRef` is not defined in Flow, yet.
+  const TestComponentWithRef = React.forwardRef((props, ref) => (
+    <TestComponent {...props} forwardedRef={ref} />
+  ));
+
+  beforeEach(() => {
+    innerFuncCalled = false;
+    outerFuncCalled = false;
+  });
+
+  it('should forward refs (function-based)', () => {
+    let testRef: ?React.ElementRef<typeof ForwardedComponent> = null;
+
+    ReactTestRenderer.create(
+      <TestComponentWithRef
+        ref={ref => {
+          testRef = ref;
+        }}
+      />,
+    );
+
+    const val = testRef && testRef.testFunc();
+
+    expect(innerFuncCalled).toBe(true);
+    expect(val).toBe(true);
+  });
+
+  it('should forward refs (createRef-based)', () => {
+    const createdRef = React.createRef<typeof ForwardedComponent>();
+
+    ReactTestRenderer.create(<TestComponentWithRef ref={createdRef} />);
+
+    const val = createdRef.current && createdRef.current.testFunc();
+
+    expect(innerFuncCalled).toBe(true);
+    expect(val).toBe(true);
+  });
+
+  it('should forward refs (string-based)', () => {
+    class Test extends React.Component<{||}> {
+      refs: $ReadOnly<{|
+        stringRef?: ?React.ElementRef<typeof ForwardedComponent>,
+      |}>;
+
+      componentDidMount() {
+        /* eslint-disable react/no-string-refs */
+        this.refs.stringRef && this.refs.stringRef.testFunc();
+        /* eslint-enable react/no-string-refs */
+      }
+
+      render() {
+        /**
+         * Can't directly pass the test component to `ReactTestRenderer.create`,
+         * otherwise it will throw. See:
+         * https://reactjs.org/warnings/refs-must-have-owner.html#strings-refs-outside-the-render-method
+         */
+        /* eslint-disable react/no-string-refs */
+        return <TestComponentWithRef ref="stringRef" />;
+        /* eslint-enable react/no-string-refs */
+      }
+    }
+
+    ReactTestRenderer.create(<Test />);
+
+    expect(innerFuncCalled).toBe(true);
+  });
+
+  it('should be able to use the ref from inside of the forwarding class', () => {
+    expect(() =>
+      ReactTestRenderer.create(<TestComponentWithRef callFunc={true} />),
+    ).not.toThrow();
+
+    expect(innerFuncCalled).toBe(true);
+    expect(outerFuncCalled).toBe(true);
+  });
+});
diff --git a/Libraries/Utilities/__tests__/truncate-test.js b/Libraries/Utilities/__tests__/truncate-test.js
index b9eb0eef5faf26..1bfb319d9619ea 100644
--- a/Libraries/Utilities/__tests__/truncate-test.js
+++ b/Libraries/Utilities/__tests__/truncate-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/binaryToBase64.js b/Libraries/Utilities/binaryToBase64.js
index 78e6ae97bc605b..1c16a966cda20f 100644
--- a/Libraries/Utilities/binaryToBase64.js
+++ b/Libraries/Utilities/binaryToBase64.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/buildStyleInterpolator.js b/Libraries/Utilities/buildStyleInterpolator.js
index c316409876c2e4..c2eb7937afc945 100644
--- a/Libraries/Utilities/buildStyleInterpolator.js
+++ b/Libraries/Utilities/buildStyleInterpolator.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -54,6 +54,9 @@ const computeNextValLinear = function(anim, from, to, value) {
   if (hasRoundRatio) {
     nextVal = Math.round(roundRatio * nextVal) / roundRatio;
   }
+  if (!isFinite(nextVal)) {
+    nextVal = null;
+  }
   return nextVal;
 };
 
diff --git a/Libraries/Utilities/clamp.js b/Libraries/Utilities/clamp.js
index bbeb9701b69609..1531f828a1f886 100644
--- a/Libraries/Utilities/clamp.js
+++ b/Libraries/Utilities/clamp.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js b/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
index 2e2c4952ee0acf..d42b8ba7302bd7 100644
--- a/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
+++ b/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/defineLazyObjectProperty.js b/Libraries/Utilities/defineLazyObjectProperty.js
index 53091c4dff27b3..23aee34d999c79 100644
--- a/Libraries/Utilities/defineLazyObjectProperty.js
+++ b/Libraries/Utilities/defineLazyObjectProperty.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/deprecatedPropType.js b/Libraries/Utilities/deprecatedPropType.js
index 7421b44e950476..59619fb50bfc25 100644
--- a/Libraries/Utilities/deprecatedPropType.js
+++ b/Libraries/Utilities/deprecatedPropType.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
@@ -21,7 +21,10 @@ function deprecatedPropType(
 ): ReactPropsCheckType {
   return function validate(props, propName, componentName, ...rest) {
     // Don't warn for native components.
-    if (!UIManager[componentName] && props[propName] !== undefined) {
+    if (
+      !UIManager.getViewManagerConfig(componentName) &&
+      props[propName] !== undefined
+    ) {
       console.warn(
         `\`${propName}\` supplied to \`${componentName}\` has been deprecated. ${explanation}`,
       );
diff --git a/Libraries/Utilities/differ/__tests__/deepDiffer-test.js b/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
index fd27aa8b1b41e9..7ccb0770965538 100644
--- a/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
+++ b/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/differ/deepDiffer.js b/Libraries/Utilities/differ/deepDiffer.js
index 8c51cf2117c745..cae6cde1d06338 100644
--- a/Libraries/Utilities/differ/deepDiffer.js
+++ b/Libraries/Utilities/differ/deepDiffer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/differ/insetsDiffer.js b/Libraries/Utilities/differ/insetsDiffer.js
index c0031775fc2e0b..369ffce884f0f8 100644
--- a/Libraries/Utilities/differ/insetsDiffer.js
+++ b/Libraries/Utilities/differ/insetsDiffer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/differ/matricesDiffer.js b/Libraries/Utilities/differ/matricesDiffer.js
index 0b2d2005f84ab8..ade2a5fc3f9246 100644
--- a/Libraries/Utilities/differ/matricesDiffer.js
+++ b/Libraries/Utilities/differ/matricesDiffer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/differ/pointsDiffer.js b/Libraries/Utilities/differ/pointsDiffer.js
index ebaa014da2ed0d..96fb189d43e2ef 100644
--- a/Libraries/Utilities/differ/pointsDiffer.js
+++ b/Libraries/Utilities/differ/pointsDiffer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/differ/sizesDiffer.js b/Libraries/Utilities/differ/sizesDiffer.js
index 9bf477572b2316..63ab71d3243781 100644
--- a/Libraries/Utilities/differ/sizesDiffer.js
+++ b/Libraries/Utilities/differ/sizesDiffer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/dismissKeyboard.js b/Libraries/Utilities/dismissKeyboard.js
index ba212f2f9376c8..22092ec6427e1e 100644
--- a/Libraries/Utilities/dismissKeyboard.js
+++ b/Libraries/Utilities/dismissKeyboard.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,7 @@
  *
  * This function dismisses the currently-open keyboard, if any
  *
+ * @flow strict-local
  * @format
  */
 
diff --git a/Libraries/Utilities/groupByEveryN.js b/Libraries/Utilities/groupByEveryN.js
index eae0eb0a3d37fa..1e9c8bf1da8901 100644
--- a/Libraries/Utilities/groupByEveryN.js
+++ b/Libraries/Utilities/groupByEveryN.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/infoLog.js b/Libraries/Utilities/infoLog.js
index 34b032fe7df574..fd90c86b97038b 100644
--- a/Libraries/Utilities/infoLog.js
+++ b/Libraries/Utilities/infoLog.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/logError.js b/Libraries/Utilities/logError.js
index b09a7be5e1644d..45252c6d0f632f 100644
--- a/Libraries/Utilities/logError.js
+++ b/Libraries/Utilities/logError.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/mapWithSeparator.js b/Libraries/Utilities/mapWithSeparator.js
index 776049b2ccf608..ea9004b054835a 100644
--- a/Libraries/Utilities/mapWithSeparator.js
+++ b/Libraries/Utilities/mapWithSeparator.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/mergeIntoFast.js b/Libraries/Utilities/mergeIntoFast.js
index a1716a324f2b0d..663f897ae5d5a2 100644
--- a/Libraries/Utilities/mergeIntoFast.js
+++ b/Libraries/Utilities/mergeIntoFast.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/setAndForwardRef.js b/Libraries/Utilities/setAndForwardRef.js
new file mode 100644
index 00000000000000..c135e73788f3a3
--- /dev/null
+++ b/Libraries/Utilities/setAndForwardRef.js
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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('fbjs/lib/invariant');
+
+import type React from 'React';
+
+type Args = $ReadOnly<{|
+  getForwardedRef: () => ?React.Ref<any>,
+  setLocalRef: (ref: React.ElementRef<any>) => mixed,
+|}>;
+
+/**
+ * This is a helper function for when a component needs to be able to forward a ref
+ * to a child component, but still needs to have access to that component as part of
+ * its implementation.
+ *
+ * Its main use case is in wrappers for native components.
+ *
+ * Usage:
+ *
+ *   class MyView extends React.Component {
+ *     _nativeRef = null;
+ *
+ *     _setNativeRef = setAndForwardRef({
+ *       getForwardedRef: () => this.props.forwardedRef,
+ *       setLocalRef: ref => {
+ *         this._nativeRef = ref;
+ *       },
+ *     });
+ *
+ *     render() {
+ *       return <View ref={this._setNativeRef} />;
+ *     }
+ *   }
+ *
+ *   const MyViewWithRef = React.forwardRef((props, ref) => (
+ *     <MyView {...props} forwardedRef={ref} />
+ *   ));
+ *
+ *   module.exports = MyViewWithRef;
+ */
+
+function setAndForwardRef({getForwardedRef, setLocalRef}: Args) {
+  return function forwardRef(ref: React.ElementRef<any>) {
+    const forwardedRef = getForwardedRef();
+
+    setLocalRef(ref);
+
+    // Forward to user ref prop (if one has been specified)
+    if (typeof forwardedRef === 'function') {
+      // Handle function-based refs. String-based refs are handled as functions.
+      forwardedRef(ref);
+    } else if (typeof forwardedRef === 'object' && forwardedRef != null) {
+      // Handle createRef-based refs
+      forwardedRef.current = ref;
+    }
+  };
+}
+
+module.exports = setAndForwardRef;
diff --git a/Libraries/Utilities/stringifySafe.js b/Libraries/Utilities/stringifySafe.js
index bfc6dc343f41f1..73e81a345dbf17 100644
--- a/Libraries/Utilities/stringifySafe.js
+++ b/Libraries/Utilities/stringifySafe.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Utilities/truncate.js b/Libraries/Utilities/truncate.js
index 736ae6b452c7b5..b892f0d66d42c9 100644
--- a/Libraries/Utilities/truncate.js
+++ b/Libraries/Utilities/truncate.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Vibration/RCTVibration.h b/Libraries/Vibration/RCTVibration.h
index d1efc147c4aa49..b6172f238c745a 100644
--- a/Libraries/Vibration/RCTVibration.h
+++ b/Libraries/Vibration/RCTVibration.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Vibration/RCTVibration.m b/Libraries/Vibration/RCTVibration.m
index 3a9e065c585992..0c960cd449ce1a 100644
--- a/Libraries/Vibration/RCTVibration.m
+++ b/Libraries/Vibration/RCTVibration.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Vibration/Vibration.js b/Libraries/Vibration/Vibration.js
index 39625ac3aa83e0..7c8f695be85af9 100644
--- a/Libraries/Vibration/Vibration.js
+++ b/Libraries/Vibration/Vibration.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Vibration/VibrationIOS.android.js b/Libraries/Vibration/VibrationIOS.android.js
index 59cbab19c2737a..e9acfb49582446 100644
--- a/Libraries/Vibration/VibrationIOS.android.js
+++ b/Libraries/Vibration/VibrationIOS.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Vibration/VibrationIOS.ios.js b/Libraries/Vibration/VibrationIOS.ios.js
index 6f1c95c9a2944b..b3e59cb04a8ec8 100644
--- a/Libraries/Vibration/VibrationIOS.ios.js
+++ b/Libraries/Vibration/VibrationIOS.ios.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/WebSocket/RCTReconnectingWebSocket.h b/Libraries/WebSocket/RCTReconnectingWebSocket.h
index bcadb3b0ad3241..a371b785aa3a87 100644
--- a/Libraries/WebSocket/RCTReconnectingWebSocket.h
+++ b/Libraries/WebSocket/RCTReconnectingWebSocket.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/WebSocket/RCTReconnectingWebSocket.m b/Libraries/WebSocket/RCTReconnectingWebSocket.m
index 522eca0eabf44c..98480838399d44 100644
--- a/Libraries/WebSocket/RCTReconnectingWebSocket.m
+++ b/Libraries/WebSocket/RCTReconnectingWebSocket.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj b/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj
index 406890ccc9f9eb..2fa18295ebb46e 100644
--- a/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj
+++ b/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj
@@ -13,7 +13,6 @@
 		2D3B5F3D1D9B165B00451313 /* RCTSRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDD1B04ACC80064A9C9 /* RCTSRWebSocket.m */; };
 		2D3B5F3E1D9B165B00451313 /* RCTWebSocketExecutor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDF1B04ACC80064A9C9 /* RCTWebSocketExecutor.m */; };
 		2D3B5F401D9B165B00451313 /* RCTWebSocketModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C86DF7B1ADF695F0047B81A /* RCTWebSocketModule.m */; };
-		2DC5E5281F3A6CFD000EE84B /* libfishhook-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DC5E5271F3A6CFD000EE84B /* libfishhook-tvOS.a */; };
 		3C86DF7C1ADF695F0047B81A /* RCTWebSocketModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C86DF7B1ADF695F0047B81A /* RCTWebSocketModule.m */; };
 		3DBE0D141F3B185A0099AA32 /* fishhook.c in Sources */ = {isa = PBXBuildFile; fileRef = 3DBE0D121F3B185A0099AA32 /* fishhook.c */; };
 		3DBE0D151F3B185A0099AA32 /* fishhook.c in Sources */ = {isa = PBXBuildFile; fileRef = 3DBE0D121F3B185A0099AA32 /* fishhook.c */; };
@@ -21,6 +20,7 @@
 		3DBE0D821F3B1B0C0099AA32 /* fishhook.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DBE0D131F3B185A0099AA32 /* fishhook.h */; };
 		A12E9E2E1E5DEC4E0029001B /* RCTReconnectingWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = A12E9E2D1E5DEC4E0029001B /* RCTReconnectingWebSocket.m */; };
 		A12E9E2F1E5DEC550029001B /* RCTReconnectingWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = A12E9E2D1E5DEC4E0029001B /* RCTReconnectingWebSocket.m */; };
+		ED297176215062BA00B7C4FE /* libfishhook-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DBE0D0D1F3B181C0099AA32 /* libfishhook-tvOS.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -95,7 +95,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2DC5E5281F3A6CFD000EE84B /* libfishhook-tvOS.a in Frameworks */,
+				ED297176215062BA00B7C4FE /* libfishhook-tvOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Libraries/WebSocket/RCTWebSocketExecutor.h b/Libraries/WebSocket/RCTWebSocketExecutor.h
index 5aa7cdb44635ef..98d6f8fa5b1f6f 100644
--- a/Libraries/WebSocket/RCTWebSocketExecutor.h
+++ b/Libraries/WebSocket/RCTWebSocketExecutor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/WebSocket/RCTWebSocketExecutor.m b/Libraries/WebSocket/RCTWebSocketExecutor.m
index 2544772829a2aa..4d8daa32f47d5b 100644
--- a/Libraries/WebSocket/RCTWebSocketExecutor.m
+++ b/Libraries/WebSocket/RCTWebSocketExecutor.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/WebSocket/RCTWebSocketModule.h b/Libraries/WebSocket/RCTWebSocketModule.h
index 18632a9a6fbbad..88dbdcbf8d5d19 100644
--- a/Libraries/WebSocket/RCTWebSocketModule.h
+++ b/Libraries/WebSocket/RCTWebSocketModule.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/WebSocket/RCTWebSocketModule.m b/Libraries/WebSocket/RCTWebSocketModule.m
index bc79dcd16c3040..af8e77065c055e 100644
--- a/Libraries/WebSocket/RCTWebSocketModule.m
+++ b/Libraries/WebSocket/RCTWebSocketModule.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/WebSocket/WebSocket.js b/Libraries/WebSocket/WebSocket.js
index bef05b0d70e8cb..8f317deb583f31 100644
--- a/Libraries/WebSocket/WebSocket.js
+++ b/Libraries/WebSocket/WebSocket.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/WebSocket/WebSocketEvent.js b/Libraries/WebSocket/WebSocketEvent.js
index 0fa075b25a27ee..d174ac272b97e5 100644
--- a/Libraries/WebSocket/WebSocketEvent.js
+++ b/Libraries/WebSocket/WebSocketEvent.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/WebSocket/WebSocketInterceptor.js b/Libraries/WebSocket/WebSocketInterceptor.js
index 186dfc253f8c74..29b4a9c5e18164 100644
--- a/Libraries/WebSocket/WebSocketInterceptor.js
+++ b/Libraries/WebSocket/WebSocketInterceptor.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/WebSocket/__mocks__/event-target-shim.js b/Libraries/WebSocket/__mocks__/event-target-shim.js
index 5b099ea724bde2..10dc68082c441b 100644
--- a/Libraries/WebSocket/__mocks__/event-target-shim.js
+++ b/Libraries/WebSocket/__mocks__/event-target-shim.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/WebSocket/__tests__/WebSocket-test.js b/Libraries/WebSocket/__tests__/WebSocket-test.js
index d3db6493e29581..62e6f14c3b123e 100644
--- a/Libraries/WebSocket/__tests__/WebSocket-test.js
+++ b/Libraries/WebSocket/__tests__/WebSocket-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,7 @@
 
 'use strict';
 
-jest.enableAutomock().unmock('WebSocket');
+jest.mock('NativeEventEmitter');
 jest.setMock('NativeModules', {
   WebSocketModule: {
     connect: () => {},
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleView.h b/Libraries/Wrapper/Example/RCTWrapperExampleView.h
index b7d2aa4aaddf65..ece0fef7d7158d 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleView.h
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleView.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the license found in the
 // LICENSE-examples file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleView.m b/Libraries/Wrapper/Example/RCTWrapperExampleView.m
index 218eefbac98d0a..64fcdac02f177b 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleView.m
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleView.m
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the license found in the
 // LICENSE-examples file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h
index c0a838cf5a5d5a..79ade8778484be 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the license found in the
 // LICENSE-examples file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
index b49862028019b8..756dcfcbbee13d 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the license found in the
 // LICENSE-examples file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h
index 0d31356faac7be..f22cebabe1eccb 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the license found in the
 // LICENSE-examples file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
index c93b2a2076cd64..dda3592c27dee3 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the license found in the
 // LICENSE-examples file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h
index 357dea11dc6bd8..ba0cff256e3ba9 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the license found in the
 // LICENSE-examples file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
index 4fb88e9c1cbdbb..a7e90759a85e3e 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the license found in the
 // LICENSE-examples file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/RCTWrapper.h b/Libraries/Wrapper/RCTWrapper.h
index 2fff2638542f19..5b2694648f2e89 100644
--- a/Libraries/Wrapper/RCTWrapper.h
+++ b/Libraries/Wrapper/RCTWrapper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/RCTWrapperShadowView.h b/Libraries/Wrapper/RCTWrapperShadowView.h
index ab7d332eb322dd..f0186111d299ec 100644
--- a/Libraries/Wrapper/RCTWrapperShadowView.h
+++ b/Libraries/Wrapper/RCTWrapperShadowView.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/RCTWrapperShadowView.m b/Libraries/Wrapper/RCTWrapperShadowView.m
index 09b1f2eea2c5fd..a43a81fd8fca15 100644
--- a/Libraries/Wrapper/RCTWrapperShadowView.m
+++ b/Libraries/Wrapper/RCTWrapperShadowView.m
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/RCTWrapperView.h b/Libraries/Wrapper/RCTWrapperView.h
index f6c8599f2a8c62..ae967da6ce8a84 100644
--- a/Libraries/Wrapper/RCTWrapperView.h
+++ b/Libraries/Wrapper/RCTWrapperView.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/RCTWrapperView.m b/Libraries/Wrapper/RCTWrapperView.m
index 483f07f92cdb39..af24bb6e95f00c 100644
--- a/Libraries/Wrapper/RCTWrapperView.m
+++ b/Libraries/Wrapper/RCTWrapperView.m
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h
index d323944bb46b71..cab4fb95835742 100644
--- a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h
+++ b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
index da42a0c4fafde5..143f071b4e352a 100644
--- a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
+++ b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/RCTWrapperViewManager.h b/Libraries/Wrapper/RCTWrapperViewManager.h
index ae8dcee5963188..3fb6f51f78ce25 100644
--- a/Libraries/Wrapper/RCTWrapperViewManager.h
+++ b/Libraries/Wrapper/RCTWrapperViewManager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/Libraries/Wrapper/RCTWrapperViewManager.m b/Libraries/Wrapper/RCTWrapperViewManager.m
index 7058a4d06d6898..1a66085f521c86 100644
--- a/Libraries/Wrapper/RCTWrapperViewManager.m
+++ b/Libraries/Wrapper/RCTWrapperViewManager.m
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/Data/YellowBoxCategory.js b/Libraries/YellowBox/Data/YellowBoxCategory.js
index b0c5984ce950ff..bf0dd67ccbd131 100644
--- a/Libraries/YellowBox/Data/YellowBoxCategory.js
+++ b/Libraries/YellowBox/Data/YellowBoxCategory.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/Data/YellowBoxRegistry.js b/Libraries/YellowBox/Data/YellowBoxRegistry.js
index 9c8e11079db5f9..4e30addef837ac 100644
--- a/Libraries/YellowBox/Data/YellowBoxRegistry.js
+++ b/Libraries/YellowBox/Data/YellowBoxRegistry.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/Data/YellowBoxSymbolication.js b/Libraries/YellowBox/Data/YellowBoxSymbolication.js
index c97b52857ca861..816a1c40962932 100644
--- a/Libraries/YellowBox/Data/YellowBoxSymbolication.js
+++ b/Libraries/YellowBox/Data/YellowBoxSymbolication.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -21,6 +21,10 @@ export type Stack = Array<StackFrame>;
 const cache: Map<CacheKey, Promise<Stack>> = new Map();
 
 const YellowBoxSymbolication = {
+  delete(stack: Stack): void {
+    cache.delete(getCacheKey(stack));
+  },
+
   symbolicate(stack: Stack): Promise<Stack> {
     const key = getCacheKey(stack);
 
diff --git a/Libraries/YellowBox/Data/YellowBoxWarning.js b/Libraries/YellowBox/Data/YellowBoxWarning.js
index 6841bc9da32942..f9b6ede089f1b3 100644
--- a/Libraries/YellowBox/Data/YellowBoxWarning.js
+++ b/Libraries/YellowBox/Data/YellowBoxWarning.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -63,6 +63,11 @@ class YellowBoxWarning {
       : this.stack;
   }
 
+  retrySymbolicate(callback: () => void): SymbolicationRequest {
+    YellowBoxSymbolication.delete(this.stack);
+    return this.symbolicate(callback);
+  }
+
   symbolicate(callback: () => void): SymbolicationRequest {
     let aborted = false;
 
diff --git a/Libraries/YellowBox/Data/__tests__/YellowBoxCategory-test.js b/Libraries/YellowBox/Data/__tests__/YellowBoxCategory-test.js
index e835485ec1b566..8e32c42d019b3e 100644
--- a/Libraries/YellowBox/Data/__tests__/YellowBoxCategory-test.js
+++ b/Libraries/YellowBox/Data/__tests__/YellowBoxCategory-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/Data/__tests__/YellowBoxRegistry-test.js b/Libraries/YellowBox/Data/__tests__/YellowBoxRegistry-test.js
index af596ce4ee6aa5..f9ab55366b5749 100644
--- a/Libraries/YellowBox/Data/__tests__/YellowBoxRegistry-test.js
+++ b/Libraries/YellowBox/Data/__tests__/YellowBoxRegistry-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/Data/__tests__/YellowBoxSymbolication-test.js b/Libraries/YellowBox/Data/__tests__/YellowBoxSymbolication-test.js
index c4ca0ad53188ad..c6af1d2cb851f8 100644
--- a/Libraries/YellowBox/Data/__tests__/YellowBoxSymbolication-test.js
+++ b/Libraries/YellowBox/Data/__tests__/YellowBoxSymbolication-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/Data/__tests__/YellowBoxWarning-test.js b/Libraries/YellowBox/Data/__tests__/YellowBoxWarning-test.js
index 8918741b1190be..d3b3143ac66e03 100644
--- a/Libraries/YellowBox/Data/__tests__/YellowBoxWarning-test.js
+++ b/Libraries/YellowBox/Data/__tests__/YellowBoxWarning-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/UI/YellowBoxButton.js b/Libraries/YellowBox/UI/YellowBoxButton.js
index 6ea9f45258222c..e8a98057d9127e 100644
--- a/Libraries/YellowBox/UI/YellowBoxButton.js
+++ b/Libraries/YellowBox/UI/YellowBoxButton.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/UI/YellowBoxImageSource.js b/Libraries/YellowBox/UI/YellowBoxImageSource.js
index 1d3fc2e979c7fc..b4258d8c4f0a4d 100644
--- a/Libraries/YellowBox/UI/YellowBoxImageSource.js
+++ b/Libraries/YellowBox/UI/YellowBoxImageSource.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 
@@ -41,6 +41,18 @@ const YellowBoxImageSource = {
       : scale > 1
         ? 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAf0lEQVRYhe2UvQ2AIBQGL3EBR3AESkv3bxxFN8DmWUgwvkI+En1X0cBd+IMg+DuDyDMCs413kfMiX4EMbD3l8oCaPIU85B4mYLEF5XJscrYFPRGvb/sZ4IlocubJGdH0wj1FSG77XYT0qdUi5O+8jOjyyZQRUnkZ0UUeBMF3OQC/0VsyGlxligAAAABJRU5ErkJggg=='
         : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAASElEQVQ4jWNgGJHAgIGBIYESze8ZGBjWU6L5PAMDgwBNNCdAFZJt83qoQmRDSHK2AFQhzBCy/IxsCNkBJsDAwLAfiknWPBIBAETPFeuA4fr6AAAAAElFTkSuQmCC',
+  chevronLeft:
+    scale > 2
+      ? 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAgElEQVRoge3YMQ6DQBAEwRYvnf8nPAECbAnkyATsrt0lXUyPdAE6kCRJ/yXA+jopLbkhwHY6a2nNl8I1ftSA8Bm/MeQKBeNrBONrBONrBONrhMHxcPwOlMUvT32oszD8CoEj+giO6CE4oofgiB7Cj44Y86zyFoYPgOFPi5Ik6WwHji+QVIOyhqgAAAAASUVORK5CYII='
+      : scale > 1
+        ? 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAAaUlEQVRYhe3WsQ2AMAwAwRcs5LEYg3HpYANoQKKgcEEUI/6adM5LbgySfmZsNDeACdiApdEfaQGswH6+Xd1jugc9xYQxxhjz9RhaxwxvDuul3MrAqDyjsozKKnWgXUqdsJcAZgqsTFJ5B7gjUNw0n0HHAAAAAElFTkSuQmCC'
+        : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAARklEQVQ4jWNgGPKAmUh1AQwMDBIMDAwPyLEkgYGB4T/UELI1J9BdcwCxmpnIMZ1YkECsK+hmCNZoZCHCgAUMDAwfoHg4AgDJuQ/bcLyV+QAAAABJRU5ErkJggg==',
+  chevronRight:
+    scale > 2
+      ? 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAeElEQVRoge3YMQ6AIBQE0Ykn3fs3HEEbC6MdFp+v8xJaspNQAZIkqbcA4zwpXTJpAPvlpHTNhHtAu4jwDDCiQjBiDcGINQQj1hCMWEN4Boy3l25vL/iL0PgJBcfXCI6vERxfIzi+Rmg8Hj7wrdL+Yys0/1qUJEmzDvSAkFQ8EOdJAAAAAElFTkSuQmCC'
+      : scale > 1
+        ? 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAAZElEQVRYhe3WsQmAQAxA0Y8ulLEcw3HtdANtBNvzCJjD/5pUgQ9pApJ+Zu7YCWABDmDLzemzA+c94+MW4AkqExUY1caoVka1GibqlSm7qJJSJzPGGGMylYqBgi9sACtFYiQN7wKC6VDcJ7tlpQAAAABJRU5ErkJggg=='
+        : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAANUlEQVQ4jWNgGLbAgYGBIYASAwIYGBj+MzAwJFBiSMLQMISJEpMptp2mmimORgcGChPSEAIAHGENPH8gqdYAAAAASUVORK5CYII=',
   loader:
     scale > 2
       ? 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAABXElEQVRoge2a3W3DMAyEr+0CHkGjaISOcKN4k6zQETpCR+gGzgbpQ10kcamIpKQ6avQBBPxg3pHwL2UDg/8LASxrcNdKnCwATmssrUyeWgnju/DmXs8tRP+Sh2kgAJga1rFlWj2rcMD5YqQh77QJLbzIORjyRIJQCJW5ngYo5AVlrsgkCGqbsDbAhFfxqZsSZibP0oDXQ43HQPsg82i7sBoR+VcJq2YxKcPo0IoJLRZXmYGC6ezQmQUdVqhPBVH/CNBTSMkLVlzjA8Bbocb7GoPBoADi+umZilYzbrG/JrnljOvy734iu4To/BQaDB6Rl4LciPPF9Lmjhgvi+s7w6tCIGw3WKS0P8fvWNjt0ZkGHFeq7CQXTbkZKGg2JOxrqPUZ3s6ziNdju38IjS/dLi0EQpDLX2gDQYHEX6Hx5/YcA+6H0NgAYPnCMj3x7Mxq4wTGx3Q1E578aDDR8AX0mOGD6BEN/AAAAAElFTkSuQmCC'
diff --git a/Libraries/YellowBox/UI/YellowBoxInspector.js b/Libraries/YellowBox/UI/YellowBoxInspector.js
index aa0c742d77ff3c..a99bffc97269b7 100644
--- a/Libraries/YellowBox/UI/YellowBoxInspector.js
+++ b/Libraries/YellowBox/UI/YellowBoxInspector.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -77,6 +77,11 @@ class YellowBoxInspector extends React.Component<Props, State> {
             <View style={styles.bodyHeading}>
               <Text style={styles.bodyHeadingText}>Stack</Text>
               <YellowBoxInspectorSourceMapStatus
+                onPress={
+                  warning.symbolicated.status === 'FAILED'
+                    ? this._handleRetrySymbolication
+                    : null
+                }
                 status={warning.symbolicated.status}
               />
             </View>
@@ -121,6 +126,16 @@ class YellowBoxInspector extends React.Component<Props, State> {
     this._cancelSymbolication();
   }
 
+  _handleRetrySymbolication = () => {
+    this._cancelSymbolication();
+    this.forceUpdate(() => {
+      const warning = this.props.warnings[this.state.selectedIndex];
+      this._symbolication = warning.retrySymbolicate(() => {
+        this.forceUpdate();
+      });
+    });
+  };
+
   _handleSymbolication(): void {
     const warning = this.props.warnings[this.state.selectedIndex];
     if (warning.symbolicated.status !== 'COMPLETE') {
diff --git a/Libraries/YellowBox/UI/YellowBoxInspectorFooter.js b/Libraries/YellowBox/UI/YellowBoxInspectorFooter.js
index 71a45702a6a82d..56efa6fb9a94ac 100644
--- a/Libraries/YellowBox/UI/YellowBoxInspectorFooter.js
+++ b/Libraries/YellowBox/UI/YellowBoxInspectorFooter.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/UI/YellowBoxInspectorHeader.js b/Libraries/YellowBox/UI/YellowBoxInspectorHeader.js
index b84afd8ca4470e..dfcdb7d9f12afd 100644
--- a/Libraries/YellowBox/UI/YellowBoxInspectorHeader.js
+++ b/Libraries/YellowBox/UI/YellowBoxInspectorHeader.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,13 +10,14 @@
 
 'use strict';
 
+const Image = require('Image');
 const Platform = require('Platform');
 const React = require('React');
 const SafeAreaView = require('SafeAreaView');
 const StyleSheet = require('StyleSheet');
 const Text = require('Text');
-const UTFSequence = require('UTFSequence');
 const View = require('View');
+const YellowBoxImageSource = require('YellowBoxImageSource');
 const YellowBoxPressable = require('YellowBoxPressable');
 const YellowBoxStyle = require('YellowBoxStyle');
 
@@ -42,7 +43,7 @@ const YellowBoxInspectorHeader = (props: Props): React.Node => {
       <View style={styles.header}>
         <YellowBoxInspectorHeaderButton
           disabled={props.warnings[prevIndex] == null}
-          label={UTFSequence.TRIANGLE_LEFT}
+          image={YellowBoxImageSource.chevronLeft}
           onPress={() => props.onSelectIndex(prevIndex)}
         />
         <View style={styles.headerTitle}>
@@ -50,7 +51,7 @@ const YellowBoxInspectorHeader = (props: Props): React.Node => {
         </View>
         <YellowBoxInspectorHeaderButton
           disabled={props.warnings[nextIndex] == null}
-          label={UTFSequence.TRIANGLE_RIGHT}
+          image={YellowBoxImageSource.chevronRight}
           onPress={() => props.onSelectIndex(nextIndex)}
         />
       </View>
@@ -61,7 +62,7 @@ const YellowBoxInspectorHeader = (props: Props): React.Node => {
 const YellowBoxInspectorHeaderButton = (
   props: $ReadOnly<{|
     disabled: boolean,
-    label: React.Node,
+    image: string,
     onPress?: ?() => void,
   |}>,
 ): React.Node => (
@@ -73,7 +74,10 @@ const YellowBoxInspectorHeaderButton = (
     onPress={props.disabled ? null : props.onPress}
     style={styles.headerButton}>
     {props.disabled ? null : (
-      <Text style={styles.headerButtonText}>{props.label}</Text>
+      <Image
+        source={{height: 16, uri: props.image, width: 16}}
+        style={styles.headerButtonImage}
+      />
     )}
   </YellowBoxPressable>
 );
@@ -94,11 +98,8 @@ const styles = StyleSheet.create({
     aspectRatio: 1,
     justifyContent: 'center',
   },
-  headerButtonText: {
-    color: YellowBoxStyle.getTextColor(1),
-    fontSize: 16,
-    includeFontPadding: false,
-    lineHeight: 20,
+  headerButtonImage: {
+    tintColor: YellowBoxStyle.getTextColor(1),
   },
   headerTitle: {
     alignItems: 'center',
diff --git a/Libraries/YellowBox/UI/YellowBoxInspectorSourceMapStatus.js b/Libraries/YellowBox/UI/YellowBoxInspectorSourceMapStatus.js
index 831305d74ea5bc..6fea1672a47957 100644
--- a/Libraries/YellowBox/UI/YellowBoxInspectorSourceMapStatus.js
+++ b/Libraries/YellowBox/UI/YellowBoxInspectorSourceMapStatus.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 
@@ -15,14 +15,16 @@ const Easing = require('Easing');
 const React = require('React');
 const StyleSheet = require('StyleSheet');
 const Text = require('Text');
-const View = require('View');
 const YellowBoxImageSource = require('YellowBoxImageSource');
+const YellowBoxPressable = require('YellowBoxPressable');
 const YellowBoxStyle = require('YellowBoxStyle');
 
 import type {CompositeAnimation} from 'AnimatedImplementation';
 import type AnimatedInterpolation from 'AnimatedInterpolation';
+import type {PressEvent} from 'CoreEventTypes';
 
 type Props = $ReadOnly<{|
+  onPress?: ?(event: PressEvent) => void,
   status: 'COMPLETE' | 'FAILED' | 'NONE' | 'PENDING',
 |}>;
 
@@ -52,7 +54,13 @@ class YellowBoxInspectorSourceMapStatus extends React.Component<Props, State> {
     }
 
     return image == null ? null : (
-      <View
+      <YellowBoxPressable
+        backgroundColor={{
+          default: YellowBoxStyle.getTextColor(0.8),
+          pressed: YellowBoxStyle.getTextColor(0.6),
+        }}
+        hitSlop={{bottom: 8, left: 8, right: 8, top: 8}}
+        onPress={this.props.onPress}
         style={StyleSheet.compose(
           styles.root,
           this.props.status === 'PENDING' ? styles.pending : null,
@@ -67,7 +75,7 @@ class YellowBoxInspectorSourceMapStatus extends React.Component<Props, State> {
           )}
         />
         <Text style={styles.text}>Source Map</Text>
-      </View>
+      </YellowBoxPressable>
     );
   }
 
@@ -125,7 +133,6 @@ class YellowBoxInspectorSourceMapStatus extends React.Component<Props, State> {
 const styles = StyleSheet.create({
   root: {
     alignItems: 'center',
-    backgroundColor: YellowBoxStyle.getTextColor(0.8),
     borderRadius: 12,
     flexDirection: 'row',
     height: 24,
diff --git a/Libraries/YellowBox/UI/YellowBoxInspectorStackFrame.js b/Libraries/YellowBox/UI/YellowBoxInspectorStackFrame.js
index 8ee0d04b9cdf80..7840dc9dcf57a1 100644
--- a/Libraries/YellowBox/UI/YellowBoxInspectorStackFrame.js
+++ b/Libraries/YellowBox/UI/YellowBoxInspectorStackFrame.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/UI/YellowBoxList.js b/Libraries/YellowBox/UI/YellowBoxList.js
index 63b321cde9726e..41c85cdeffa17e 100644
--- a/Libraries/YellowBox/UI/YellowBoxList.js
+++ b/Libraries/YellowBox/UI/YellowBoxList.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/UI/YellowBoxListRow.js b/Libraries/YellowBox/UI/YellowBoxListRow.js
index e59d0e89e22707..3af72817f5f1d0 100644
--- a/Libraries/YellowBox/UI/YellowBoxListRow.js
+++ b/Libraries/YellowBox/UI/YellowBoxListRow.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/UI/YellowBoxPressable.js b/Libraries/YellowBox/UI/YellowBoxPressable.js
index 39149c251214c3..540c9eb4299677 100644
--- a/Libraries/YellowBox/UI/YellowBoxPressable.js
+++ b/Libraries/YellowBox/UI/YellowBoxPressable.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/UI/YellowBoxStyle.js b/Libraries/YellowBox/UI/YellowBoxStyle.js
index 32aa375e0c6739..d984514abd7000 100644
--- a/Libraries/YellowBox/UI/YellowBoxStyle.js
+++ b/Libraries/YellowBox/UI/YellowBoxStyle.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/YellowBox.js b/Libraries/YellowBox/YellowBox.js
index 16d1b453cf9c0a..0b6768110e85d7 100644
--- a/Libraries/YellowBox/YellowBox.js
+++ b/Libraries/YellowBox/YellowBox.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/YellowBox/__tests__/YellowBox-test.js b/Libraries/YellowBox/__tests__/YellowBox-test.js
index e22168b2417bd6..7fab54b447bbf2 100644
--- a/Libraries/YellowBox/__tests__/YellowBox-test.js
+++ b/Libraries/YellowBox/__tests__/YellowBox-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/polyfills/Array.es6.js b/Libraries/polyfills/Array.es6.js
index a4378d65df9810..64c012c7d6d15e 100644
--- a/Libraries/polyfills/Array.es6.js
+++ b/Libraries/polyfills/Array.es6.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/polyfills/Array.prototype.es6.js b/Libraries/polyfills/Array.prototype.es6.js
index d6b73752299971..1b2395d064db4b 100644
--- a/Libraries/polyfills/Array.prototype.es6.js
+++ b/Libraries/polyfills/Array.prototype.es6.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/polyfills/Number.es6.js b/Libraries/polyfills/Number.es6.js
index 27987677e939d2..8fd538f425d0a9 100644
--- a/Libraries/polyfills/Number.es6.js
+++ b/Libraries/polyfills/Number.es6.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/polyfills/Object.es6.js b/Libraries/polyfills/Object.es6.js
index 9c45b4c24f6ea4..b6c09479f6a307 100644
--- a/Libraries/polyfills/Object.es6.js
+++ b/Libraries/polyfills/Object.es6.js
@@ -1,65 +1,39 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @polyfill
- * @nolint
  */
 
-// WARNING: This is an optimized version that fails on hasOwnProperty checks
-// and non objects. It's not spec-compliant. It's a perf optimization.
-// This is only needed for iOS 8 and current Android JSC.
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign
 
-Object.assign = function(target, sources) {
-  if (__DEV__) {
-    if (target == null) {
-      throw new TypeError('Object.assign target cannot be null or undefined');
-    }
-    if (typeof target !== 'object' && typeof target !== 'function') {
-      throw new TypeError(
-        'In this environment the target of assign MUST be an object. ' +
-          'This error is a performance optimization and not spec compliant.',
-      );
-    }
-  }
-
-  for (var nextIndex = 1; nextIndex < arguments.length; nextIndex++) {
-    var nextSource = arguments[nextIndex];
-    if (nextSource == null) {
-      continue;
-    }
-
-    if (__DEV__) {
-      if (typeof nextSource !== 'object' && typeof nextSource !== 'function') {
-        throw new TypeError(
-          'In this environment the sources for assign MUST be an object. ' +
-            'This error is a performance optimization and not spec compliant.',
-        );
+if (typeof Object.assign !== 'function') {
+  Object.defineProperty(Object, 'assign', {
+    value: function assign(target, varArgs) {
+      'use strict';
+      if (target == null) {
+        throw new TypeError('Cannot convert undefined or null to object');
       }
-    }
 
-    // We don't currently support accessors nor proxies. Therefore this
-    // copy cannot throw. If we ever supported this then we must handle
-    // exceptions and side-effects.
+      let to = Object(target);
 
-    for (var key in nextSource) {
-      if (__DEV__) {
-        var hasOwnProperty = Object.prototype.hasOwnProperty;
-        if (!hasOwnProperty.call(nextSource, key)) {
-          throw new TypeError(
-            'One of the sources for assign has an enumerable key on the ' +
-              'prototype chain. Are you trying to assign a prototype property? ' +
-              "We don't allow it, as this is an edge case that we do not support. " +
-              'This error is a performance optimization and not spec compliant.',
-          );
+      for (let index = 1; index < arguments.length; index++) {
+        let nextSource = arguments[index];
+
+        if (nextSource != null) {
+          for (let nextKey in nextSource) {
+            if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+              to[nextKey] = nextSource[nextKey];
+            }
+          }
         }
       }
-      target[key] = nextSource[key];
-    }
-  }
-
-  return target;
-};
+      return to;
+    },
+    writable: true,
+    configurable: true,
+  });
+}
diff --git a/Libraries/polyfills/Object.es7.js b/Libraries/polyfills/Object.es7.js
index 16513b3cc7bbd1..19ff4bb7d149ef 100644
--- a/Libraries/polyfills/Object.es7.js
+++ b/Libraries/polyfills/Object.es7.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/polyfills/String.prototype.es6.js b/Libraries/polyfills/String.prototype.es6.js
index ac46fc873d2689..0c312c06d0de2c 100644
--- a/Libraries/polyfills/String.prototype.es6.js
+++ b/Libraries/polyfills/String.prototype.es6.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -124,3 +124,37 @@ if (!String.prototype.codePointAt) {
     return first;
   };
 }
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/padEnd
+if (!String.prototype.padEnd) {
+  String.prototype.padEnd = function padEnd(targetLength, padString) {
+    targetLength = targetLength >> 0; //floor if number or convert non-number to 0;
+    padString = String(typeof padString !== 'undefined' ? padString : ' ');
+    if (this.length > targetLength) {
+      return String(this);
+    } else {
+      targetLength = targetLength - this.length;
+      if (targetLength > padString.length) {
+        padString += padString.repeat(targetLength / padString.length); //append to original to ensure we are longer than needed
+      }
+      return String(this) + padString.slice(0, targetLength);
+    }
+  };
+}
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/padStart
+if (!String.prototype.padStart) {
+  String.prototype.padStart = function padStart(targetLength, padString) {
+    targetLength = targetLength >> 0; //truncate if number or convert non-number to 0;
+    padString = String(typeof padString !== 'undefined' ? padString : ' ');
+    if (this.length > targetLength) {
+      return String(this);
+    } else {
+      targetLength = targetLength - this.length;
+      if (targetLength > padString.length) {
+        padString += padString.repeat(targetLength / padString.length); //append to original to ensure we are longer than needed
+      }
+      return padString.slice(0, targetLength) + String(this);
+    }
+  };
+}
diff --git a/Libraries/polyfills/__tests__/Object.es7-test.js b/Libraries/polyfills/__tests__/Object.es7-test.js
index 9fcb9e0b170409..a4aa966e646ac4 100644
--- a/Libraries/polyfills/__tests__/Object.es7-test.js
+++ b/Libraries/polyfills/__tests__/Object.es7-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/polyfills/babelHelpers.js b/Libraries/polyfills/babelHelpers.js
index f831deaa842fac..47bc2440094200 100644
--- a/Libraries/polyfills/babelHelpers.js
+++ b/Libraries/polyfills/babelHelpers.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/polyfills/console.js b/Libraries/polyfills/console.js
index 738dc832444293..730a8c0ba57c2a 100644
--- a/Libraries/polyfills/console.js
+++ b/Libraries/polyfills/console.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/polyfills/error-guard.js b/Libraries/polyfills/error-guard.js
index 6a23071f2afc45..48ccc57933946e 100644
--- a/Libraries/polyfills/error-guard.js
+++ b/Libraries/polyfills/error-guard.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/promiseRejectionIsError.js b/Libraries/promiseRejectionIsError.js
index 1ee0320a214ed4..d77dc13f702e1b 100644
--- a/Libraries/promiseRejectionIsError.js
+++ b/Libraries/promiseRejectionIsError.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/react-native/React.js b/Libraries/react-native/React.js
index 37ee103b456ad2..ac9f5d1bcec4a7 100644
--- a/Libraries/react-native/React.js
+++ b/Libraries/react-native/React.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js
index 3ff7b9ed3b495e..0b76506bb7e941 100644
--- a/Libraries/react-native/react-native-implementation.js
+++ b/Libraries/react-native/react-native-implementation.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,8 +12,11 @@
 
 const invariant = require('fbjs/lib/invariant');
 
+let showedListViewDeprecation = false;
+let showedSwipeableListViewDeprecation = false;
+
 // Export React, plus some native additions.
-const ReactNative = {
+module.exports = {
   // Components
   get AccessibilityInfo() {
     return require('AccessibilityInfo');
@@ -58,6 +61,14 @@ const ReactNative = {
     return require('KeyboardAvoidingView');
   },
   get ListView() {
+    if (!showedListViewDeprecation) {
+      console.warn(
+        'ListView is deprecated and will be removed in a future release. ' +
+          'See https://fb.me/nolistview for more information',
+      );
+
+      showedListViewDeprecation = true;
+    }
     return require('ListView');
   },
   get MaskedViewIOS() {
@@ -66,9 +77,6 @@ const ReactNative = {
   get Modal() {
     return require('Modal');
   },
-  get NavigatorIOS() {
-    return require('NavigatorIOS');
-  },
   get Picker() {
     return require('Picker');
   },
@@ -112,6 +120,14 @@ const ReactNative = {
     return require('SwipeableFlatList');
   },
   get SwipeableListView() {
+    if (!showedSwipeableListViewDeprecation) {
+      console.warn(
+        'ListView and SwipeableListView are deprecated and will be removed in a future release. ' +
+          'See https://fb.me/nolistview for more information',
+      );
+
+      showedSwipeableListViewDeprecation = true;
+    }
     return require('SwipeableListView');
   },
   get TabBarIOS() {
@@ -304,16 +320,16 @@ const ReactNative = {
 
   // Prop Types
   get ColorPropType() {
-    return require('ColorPropType');
+    return require('DeprecatedColorPropType');
   },
   get EdgeInsetsPropType() {
-    return require('EdgeInsetsPropType');
+    return require('DeprecatedEdgeInsetsPropType');
   },
   get PointPropType() {
-    return require('PointPropType');
+    return require('DeprecatedPointPropType');
   },
   get ViewPropTypes() {
-    return require('ViewPropTypes');
+    return require('DeprecatedViewPropTypes');
   },
 
   // Deprecated
@@ -325,6 +341,11 @@ const ReactNative = {
         'Learn about alternative navigation solutions at http://facebook.github.io/react-native/docs/navigation.html',
     );
   },
+  get NavigatorIOS() {
+    invariant(
+      false,
+      'NavigatorIOS is deprecated and has been removed from this package. ' +
+        'Learn about alternative navigation solutions at http://facebook.github.io/react-native/docs/navigation.html',
+    );
+  },
 };
-
-module.exports = ReactNative;
diff --git a/Libraries/react-native/react-native-interface.js b/Libraries/react-native/react-native-interface.js
index 6e37e8b14d6fd3..5586dcaeeac6b2 100644
--- a/Libraries/react-native/react-native-interface.js
+++ b/Libraries/react-native/react-native-interface.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/core/ErrorUtils.js b/Libraries/vendor/core/ErrorUtils.js
index 4822d8684e0edc..a54b855244d282 100644
--- a/Libraries/vendor/core/ErrorUtils.js
+++ b/Libraries/vendor/core/ErrorUtils.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/core/Map.js b/Libraries/vendor/core/Map.js
index 1635083496881b..481b332202fa4f 100644
--- a/Libraries/vendor/core/Map.js
+++ b/Libraries/vendor/core/Map.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -553,7 +553,7 @@ module.exports = (function(global, undefined) {
 
   const getHash = (function() {
     const propIsEnumerable = Object.prototype.propertyIsEnumerable;
-    const hashProperty = guid();
+    const hashProperty = '__MAP_POLYFILL_INTERNAL_HASH__';
     let hashCounter = 0;
 
     /**
diff --git a/Libraries/vendor/core/Set.js b/Libraries/vendor/core/Set.js
index d811240a3ac696..7d713dc84d1d3a 100644
--- a/Libraries/vendor/core/Set.js
+++ b/Libraries/vendor/core/Set.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/core/_shouldPolyfillES6Collection.js b/Libraries/vendor/core/_shouldPolyfillES6Collection.js
index 8b027183b9cb2a..1ba893c5aebdbe 100644
--- a/Libraries/vendor/core/_shouldPolyfillES6Collection.js
+++ b/Libraries/vendor/core/_shouldPolyfillES6Collection.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/core/getObjectValues.js b/Libraries/vendor/core/getObjectValues.js
index 79f61f8aa04110..c8360297faaf20 100644
--- a/Libraries/vendor/core/getObjectValues.js
+++ b/Libraries/vendor/core/getObjectValues.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/core/guid.js b/Libraries/vendor/core/guid.js
index f2946e39735700..467a63236d072f 100644
--- a/Libraries/vendor/core/guid.js
+++ b/Libraries/vendor/core/guid.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/core/guid.js.flow b/Libraries/vendor/core/guid.js.flow
new file mode 100644
index 00000000000000..e41d259281ad86
--- /dev/null
+++ b/Libraries/vendor/core/guid.js.flow
@@ -0,0 +1,12 @@
+/**
+ * Copyright 2004-present Facebook. All Rights Reserved.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+declare function guid(): string;
+
+module.exports = guid;
diff --git a/Libraries/vendor/core/isEmpty.js b/Libraries/vendor/core/isEmpty.js
index f8b4eb2c96b0fd..78f8841d000d23 100644
--- a/Libraries/vendor/core/isEmpty.js
+++ b/Libraries/vendor/core/isEmpty.js
@@ -1,9 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
  */
 
@@ -12,7 +13,7 @@
 /**
  * Mimics empty from PHP.
  */
-function isEmpty(obj) {
+function isEmpty(obj: mixed): boolean {
   if (Array.isArray(obj)) {
     return obj.length === 0;
   } else if (typeof obj === 'object') {
diff --git a/Libraries/vendor/core/mergeHelpers.js b/Libraries/vendor/core/mergeHelpers.js
index 4382cd771aa966..8897156ca99daa 100644
--- a/Libraries/vendor/core/mergeHelpers.js
+++ b/Libraries/vendor/core/mergeHelpers.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/core/toIterator.js b/Libraries/vendor/core/toIterator.js
index eee68d4706e9fe..c580edd2e66608 100644
--- a/Libraries/vendor/core/toIterator.js
+++ b/Libraries/vendor/core/toIterator.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/core/whatwg-fetch.js b/Libraries/vendor/core/whatwg-fetch.js
index febc54dac8dd84..8655fb7f00051e 100644
--- a/Libraries/vendor/core/whatwg-fetch.js
+++ b/Libraries/vendor/core/whatwg-fetch.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/document/selection/DocumentSelectionState.js b/Libraries/vendor/document/selection/DocumentSelectionState.js
index 8ac05f6a1b178e..c57483dc8e31e8 100644
--- a/Libraries/vendor/document/selection/DocumentSelectionState.js
+++ b/Libraries/vendor/document/selection/DocumentSelectionState.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/emitter/EmitterSubscription.js b/Libraries/vendor/emitter/EmitterSubscription.js
index cb372a956bee27..c3793684164bf4 100644
--- a/Libraries/vendor/emitter/EmitterSubscription.js
+++ b/Libraries/vendor/emitter/EmitterSubscription.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/emitter/EventEmitter.js b/Libraries/vendor/emitter/EventEmitter.js
index 7cb35611f358c8..b268fd8047b308 100644
--- a/Libraries/vendor/emitter/EventEmitter.js
+++ b/Libraries/vendor/emitter/EventEmitter.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/emitter/EventEmitterWithHolding.js b/Libraries/vendor/emitter/EventEmitterWithHolding.js
index 582fe03c2be32d..34e6d3d90d8aa9 100644
--- a/Libraries/vendor/emitter/EventEmitterWithHolding.js
+++ b/Libraries/vendor/emitter/EventEmitterWithHolding.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/emitter/EventHolder.js b/Libraries/vendor/emitter/EventHolder.js
index a8c9a1a102acae..24c1bfc9349ad5 100644
--- a/Libraries/vendor/emitter/EventHolder.js
+++ b/Libraries/vendor/emitter/EventHolder.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/emitter/EventSubscription.js b/Libraries/vendor/emitter/EventSubscription.js
index 3b1052ab403b18..b226fec6b83de8 100644
--- a/Libraries/vendor/emitter/EventSubscription.js
+++ b/Libraries/vendor/emitter/EventSubscription.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/vendor/emitter/EventSubscriptionVendor.js b/Libraries/vendor/emitter/EventSubscriptionVendor.js
index a2602512cdc53b..f59b2674d3713a 100644
--- a/Libraries/vendor/emitter/EventSubscriptionVendor.js
+++ b/Libraries/vendor/emitter/EventSubscriptionVendor.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/emitter/EventValidator.js b/Libraries/vendor/emitter/EventValidator.js
index 400197f65268a2..f0dc3c58adf7bb 100644
--- a/Libraries/vendor/emitter/EventValidator.js
+++ b/Libraries/vendor/emitter/EventValidator.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/Libraries/vendor/emitter/mixInEventEmitter.js b/Libraries/vendor/emitter/mixInEventEmitter.js
index a53ce08d691cde..23f316378fcaab 100644
--- a/Libraries/vendor/emitter/mixInEventEmitter.js
+++ b/Libraries/vendor/emitter/mixInEventEmitter.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/README.md b/README.md
index a9c12562f1a698..d484350032056c 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,24 @@
-# [React Native](https://facebook.github.io/react-native/) &middot;  [![Circle CI Status](https://circleci.com/gh/facebook/react-native.svg?style=shield)](https://circleci.com/gh/facebook/react-native) [![npm version](https://badge.fury.io/js/react-native.svg)](https://badge.fury.io/js/react-native) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md#pull-requests)
+# [React Native](https://facebook.github.io/react-native/) &middot;  [![Circle CI Status](https://circleci.com/gh/facebook/react-native.svg?style=shield)](https://circleci.com/gh/facebook/react-native) [![Build status](https://ci.appveyor.com/api/projects/status/g8d58ipi3auqdtrk/branch/master?svg=true)](https://ci.appveyor.com/project/facebook/react-native/branch/master) [![npm version](https://badge.fury.io/js/react-native.svg)](https://badge.fury.io/js/react-native) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md#pull-requests)
 
 Learn once, write anywhere: Build mobile apps with React.
 
-- **Build native mobile apps using JavaScript and React:** React Native lets you build mobile apps using only JavaScript. It uses the same design as [React](https://facebook.github.io/react), letting you compose a rich mobile UI from declarative components.
-- **A React Native app is a real mobile app:** With React Native, you don't build a "mobile web app", an "HTML5 app", or a "hybrid app". You build a real mobile app that's indistinguishable from an app built using Objective-C, Java, or Swift. React Native uses the same fundamental UI building blocks as regular iOS and Android apps. You just put those building blocks together using JavaScript and React.
-- **Don't waste time recompiling:** React Native lets you build your app faster. Instead of recompiling, you can reload your app instantly. With hot reloading, you can even run new code while retaining your application state. Give it a try - it's a magical experience.
-- **Use native code when you need to:** React Native combines smoothly with components written in Objective-C, Java, or Swift. It's simple to drop down to native code if you need to optimize a few aspects of your application. It's also easy to build part of your app in React Native, and part of your app using native code directly - that's how the Facebook app works.
-
-The focus of React Native is on developer efficiency across all the platforms you care about - learn once, write anywhere. Facebook uses React Native in multiple production apps and will continue investing in React Native.
-
 See the official [React Native website](https://facebook.github.io/react-native/) for an introduction to React Native.
 
-Supported operating systems are >= Android 4.1 (API 16) and >= iOS 8.0.
-
-- [Getting Started](#getting-started)
-- [Documentation](#documentation)
-- [Upgrading](#upgrading)
-- [Contributing](#contributing)
+- [Requirements](#requirements)
+- [Getting Started](#building-your-first-react-native-app)
+- [Documentation](#full-documentation)
+- [Upgrading](https://facebook.github.io/react-native/docs/upgrading)
+- [Contributing](#join-the-react-native-community)
+- [Code of Conduct](./CODE_OF_CONDUCT.md)
 - [License](#license)
 
 ---
 
-## Getting Started
+## Requirements
+
+Supported target operating systems are >= Android 4.1 (API 16) and >= iOS 9.0. You may use Windows, macOS, or Linux as your development operating system, though building and running iOS apps is limited to macOS by default (tools like [Expo](https://expo.io) can be used to get around this).
+
+## Building your first React Native app
 
 Follow the [Getting Started guide](https://facebook.github.io/react-native/docs/getting-started.html). The recommended way to install React Native depends on your project. Here you can find short guides for the most common scenarios:
 
@@ -29,52 +26,34 @@ Follow the [Getting Started guide](https://facebook.github.io/react-native/docs/
 - [Creating a New Application](https://facebook.github.io/react-native/docs/getting-started.html)
 - [Adding React Native to an Existing Application](https://facebook.github.io/react-native/docs/integration-with-existing-apps.html)
 
----
-
-## Documentation
-
-[The website’s documentation](https://facebook.github.io/react-native/docs/getting-started.html) is divided into multiple sections.
-- There are **Guides** that discuss topics like [debugging](https://facebook.github.io/react-native/docs/debugging.html), [integrating with existing apps](https://facebook.github.io/react-native/docs/integration-with-existing-apps.html), and [the gesture responder system](https://facebook.github.io/react-native/docs/gesture-responder-system.html).
-- The **Components** section covers React components such as [`View`](https://facebook.github.io/react-native/docs/view.html) and [`Button`](https://facebook.github.io/react-native/docs/button.html).
-- The **APIs** section covers other libraries like [Animated](https://facebook.github.io/react-native/docs/animated.html) and [StyleSheet](https://facebook.github.io/react-native/docs/stylesheet.html) that aren’t React components themselves.
-- Finally, React Native provides a small number of **Polyfills** that offer web-like APIs.
-
-Another great way to learn more about the components and APIs included with React Native is to read their source. Look under the `Libraries/Components` directory for components like `ScrollView` and `TextInput`, for example. The RNTester example is also here to demonstrate some of the ways to use these components. From the source you can get an accurate understanding of each component’s behavior and API.
 
-The React Native documentation only discusses the components, APIs and topics specific to React Native (React on iOS and Android). For further documentation on the React API that is shared between React Native and React DOM, refer to the [React documentation](https://facebook.github.io/react/).
+## How React Native works
 
----
-
-## Upgrading
-
-React Native is under active development. See the guide on [upgrading React Native](https://facebook.github.io/react-native/docs/upgrading.html) to keep your project up-to-date.
-
----
+React Native lets you build mobile apps using JavaScript. It uses the same design as [React](https://facebook.github.io/react), letting you compose a rich mobile UI from declarative components.
 
-## Contributing
+With React Native, you don't build a "mobile web app", an "HTML5 app", or a "hybrid app". You build a real mobile app that's indistinguishable from an app built using Objective-C, Java, Kotlin, or Swift. React Native uses the same fundamental UI building blocks as regular iOS and Android apps. You just put those building blocks together using JavaScript and React.
 
-Read below to learn how you can take part in improving React Native.
+React Native lets you build your app faster. Instead of recompiling, you can reload your app instantly. With hot reloading, you can even run new code while retaining your application state.
 
-### [Code of Conduct](https://code.facebook.com/codeofconduct)
+React Native combines smoothly with components written in Objective-C, Java, Kotlin, or Swift. It's simple to drop down to native code if you need to optimize a few aspects of your application. It's also easy to build part of your app in React Native, and part of your app using native code directly - that's how the Facebook app works.
 
-Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.facebook.com/codeofconduct) so that you can understand what actions will and will not be tolerated.
+The focus of React Native is on developer efficiency across all the platforms you care about - learn once, write anywhere. Facebook uses React Native in multiple production apps and will continue investing in React Native.
 
-### Contributing Guide
+## Full documentation
 
-Read our [contributing guide](https://facebook.github.io/react-native/docs/contributing.html) to learn about our development process, how to propose bug fixes and improvements, and how to build and test your changes to React Native.
+The full documentation for React Native can be found on our [website](https://facebook.github.io/react-native/docs/getting-started.html). The source for the React Native documentation and website is hosted on a separate repo, <https://github.com/facebook/react-native-website>.
 
-### Beginner Friendly Bugs
+The React Native documentation only discusses the components, APIs, and topics specific to React Native (React on iOS and Android). For further documentation on the React API that is shared between React Native and React DOM, refer to the [React documentation](https://facebook.github.io/react/).
 
-We have a list of [beginner friendly issues](https://github.com/facebook/react-native/labels/Good%20first%20issue) to help you get your feet wet in the React Native codebase and familiar with our contribution process. This is a great place to get started.
+## Join the React Native community
+* Website: https://facebook.github.io/react-native
+* Twitter: https://twitter.com/reactnative
+* Discussion: https://discuss.reactjs.org/
 
----
+See the [CONTRIBUTING](./CONTRIBUTING.md) file for how to help out.
 
 ## License
 
-React Native is [MIT licensed](./LICENSE).
-
-React Native documentation is [Creative Commons licensed](./LICENSE-docs).
-
----
+React Native is MIT licensed, as found in the LICENSE file.
 
-<img src="https://avatars2.githubusercontent.com/u/69631?s=200&v=4" width="50"></img>
+React Native documentation is Creative Commons licensed, as found in the LICENSE-docs file.
diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock
index e4ba550e92c676..308fbb723a57a9 100644
--- a/RNTester/Podfile.lock
+++ b/RNTester/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
   - boost-for-react-native (1.63.0)
-  - DoubleConversion (1.1.5)
+  - DoubleConversion (1.1.6)
   - Folly (2016.10.31.00):
     - boost-for-react-native
     - DoubleConversion
     - glog
-  - glog (0.3.4)
+  - glog (0.3.5)
   - React/ART (1000.0.0):
     - React/Core
   - React/Core (1000.0.0):
@@ -14,20 +14,22 @@ PODS:
     - Folly (= 2016.10.31.00)
     - React/Core
     - React/cxxreact
+    - React/jsiexecutor
   - React/cxxreact (1000.0.0):
     - boost-for-react-native (= 1.63.0)
     - Folly (= 2016.10.31.00)
-    - React/jschelpers
     - React/jsinspector
   - React/DevSupport (1000.0.0):
     - React/Core
     - React/RCTWebSocket
   - React/fishhook (1000.0.0)
-  - React/jschelpers (1000.0.0):
+  - React/jsi (1000.0.0):
     - Folly (= 2016.10.31.00)
-    - React/PrivateDatabase
+  - React/jsiexecutor (1000.0.0):
+    - Folly (= 2016.10.31.00)
+    - React/cxxreact
+    - React/jsi
   - React/jsinspector (1000.0.0)
-  - React/PrivateDatabase (1000.0.0)
   - React/RCTActionSheet (1000.0.0):
     - React/Core
   - React/RCTAnimation (1000.0.0):
@@ -101,12 +103,12 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
-  DoubleConversion: a9706f16e388b53ff12cca34473428ee29746a26
+  DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
   Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
-  glog: 3931855c9cc99c3fab1355fc162fe369162d8183
-  React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
+  glog: 848747cb7af3aac910395f03626d7f63636e8ce6
+  React: 8cb457c5485e7640094a7df86fcdb6d1e56e182c
   yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
 
 PODFILE CHECKSUM: 7af77fbc34af9646e8c6389e7e2c0b4663bb16d9
 
-COCOAPODS: 1.5.2
+COCOAPODS: 1.5.3
diff --git a/RNTester/RNTester.xcodeproj/project.pbxproj b/RNTester/RNTester.xcodeproj/project.pbxproj
index 51cef6ad024e3c..59f27525d126ce 100644
--- a/RNTester/RNTester.xcodeproj/project.pbxproj
+++ b/RNTester/RNTester.xcodeproj/project.pbxproj
@@ -131,6 +131,8 @@
 		C654F0B31EB34A73000B7A9A /* RNTesterTestModule.m in Sources */ = {isa = PBXBuildFile; fileRef = C654F0B21EB34A73000B7A9A /* RNTesterTestModule.m */; };
 		C654F17E1EB34D24000B7A9A /* RNTesterTestModule.m in Sources */ = {isa = PBXBuildFile; fileRef = C654F0B21EB34A73000B7A9A /* RNTesterTestModule.m */; };
 		D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; };
+		ED2970992150247000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2970982150247000B7C4FE /* JavaScriptCore.framework */; };
+		EDEBC856214C774100DD5AC8 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDEBC7DA214C681C00DD5AC8 /* JavaScriptCore.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -218,20 +220,6 @@
 			remoteGlobalIDString = 2DD3238F1DA2DD8A000FE1B8;
 			remoteInfo = "RNTester-tvOS";
 		};
-		2D609F0C1F84BD7E00D65B08 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
-			remoteInfo = privatedata;
-		};
-		2D609F0E1F84BD7E00D65B08 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
-			remoteInfo = "privatedata-tvOS";
-		};
 		2D66FF641ECA405900F0A767 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 2D66FF5F1ECA405900F0A767 /* ART.xcodeproj */;
@@ -351,20 +339,6 @@
 			remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
 			remoteInfo = "cxxreact-tvOS";
 		};
-		3D05748F1DE6008900184BB4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
-			remoteInfo = jschelpers;
-		};
-		3D0574911DE6008900184BB4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
-			remoteInfo = "jschelpers-tvOS";
-		};
 		3D13F84B1D6F6B5F00E69E0E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
@@ -463,8 +437,49 @@
 			remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
 			remoteInfo = RCTVibration;
 		};
+		ED2970942150246200B7C4FE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = ED296FB6214C9A0900B7C4FE;
+			remoteInfo = "jsi-tvOS";
+		};
+		ED2970962150246200B7C4FE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = ED296FEE214C9CF800B7C4FE;
+			remoteInfo = "jsiexecutor-tvOS";
+		};
+		EDEBC6FB214B402000DD5AC8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EDEBC6D6214B3E7000DD5AC8;
+			remoteInfo = jsi;
+		};
+		EDEBC7C9214C503A00DD5AC8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EDEBC73B214B45A300DD5AC8;
+			remoteInfo = jsiexecutor;
+		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		EDEBC7DE214C68E400DD5AC8 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 12;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		001BFCE31D838343008E587E /* RCTMultipartStreamReaderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMultipartStreamReaderTests.m; sourceTree = "<group>"; };
 		004D289E1AAF61C70097A701 /* RNTesterUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNTesterUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -549,6 +564,8 @@
 		BC9C033F1DC9F1D600B1C635 /* RCTDevMenuTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDevMenuTests.m; sourceTree = "<group>"; };
 		C654F0B21EB34A73000B7A9A /* RNTesterTestModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterTestModule.m; sourceTree = "<group>"; };
 		D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
+		ED2970982150247000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
+		EDEBC7DA214C681C00DD5AC8 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -577,6 +594,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				EDEBC856214C774100DD5AC8 /* JavaScriptCore.framework in Frameworks */,
 				3D0E379D1F1CC77200DCAC9F /* libReact.a in Frameworks */,
 				52C11BBB1EEACA7100C1A058 /* libRCTBlob.a in Frameworks */,
 				2D66FF8F1ECA406D00F0A767 /* libART.a in Frameworks */,
@@ -615,6 +633,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ED2970992150247000B7C4FE /* JavaScriptCore.framework in Frameworks */,
 				52C11BE11EEACA7800C1A058 /* libRCTBlob-tvOS.a in Frameworks */,
 				2D66FF901ECA407E00F0A767 /* libART-tvOS.a in Frameworks */,
 				2DD323EA1DA2DE3F000FE1B8 /* libReact.a in Frameworks */,
@@ -843,16 +862,16 @@
 				3D3C08831DE3424E00C268FA /* libyoga.a */,
 				3D05748C1DE6008900184BB4 /* libcxxreact.a */,
 				3D05748E1DE6008900184BB4 /* libcxxreact.a */,
-				3D0574901DE6008900184BB4 /* libjschelpers.a */,
-				3D0574921DE6008900184BB4 /* libjschelpers.a */,
 				3DCE53221FEAB1C500613583 /* libjsinspector.a */,
 				3DCE53241FEAB1C500613583 /* libjsinspector-tvOS.a */,
 				3D507F421EBC88B700B56834 /* libthird-party.a */,
 				2D66FF8C1ECA405900F0A767 /* libthird-party.a */,
 				3D507F441EBC88B700B56834 /* libdouble-conversion.a */,
 				2D66FF8E1ECA405900F0A767 /* libdouble-conversion.a */,
-				2D609F0D1F84BD7E00D65B08 /* libprivatedata.a */,
-				2D609F0F1F84BD7E00D65B08 /* libprivatedata-tvOS.a */,
+				EDEBC6FC214B402000DD5AC8 /* libjsi.a */,
+				EDEBC7CA214C503A00DD5AC8 /* libjsiexecutor.a */,
+				ED2970952150246200B7C4FE /* libjsi-tvOS.a */,
+				ED2970972150246200B7C4FE /* libjsiexecutor-tvOS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -920,6 +939,8 @@
 		2DE7E7D81FB2A4F3009E225D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				ED2970982150247000B7C4FE /* JavaScriptCore.framework */,
+				EDEBC7DA214C681C00DD5AC8 /* JavaScriptCore.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -1039,6 +1060,7 @@
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				68CD48B71D2BCB2C007E06A9 /* Run Script */,
+				EDEBC7DE214C68E400DD5AC8 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
@@ -1151,7 +1173,7 @@
 						CreatedOnToolsVersion = 6.1.1;
 					};
 					13B07F861A680F5B00A75B9A = {
-						DevelopmentTeam = V9WTTPBFK9;
+						DevelopmentTeam = VYK7DLU38Z;
 					};
 					143BC5941B21E3E100462512 = {
 						CreatedOnToolsVersion = 6.3.2;
@@ -1332,20 +1354,6 @@
 			remoteRef = 14DC67F01AB71876001358AB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		2D609F0D1F84BD7E00D65B08 /* libprivatedata.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libprivatedata.a;
-			remoteRef = 2D609F0C1F84BD7E00D65B08 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		2D609F0F1F84BD7E00D65B08 /* libprivatedata-tvOS.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libprivatedata-tvOS.a";
-			remoteRef = 2D609F0E1F84BD7E00D65B08 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		2D66FF651ECA405900F0A767 /* libART.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1465,20 +1473,6 @@
 			remoteRef = 3D05748D1DE6008900184BB4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3D0574901DE6008900184BB4 /* libjschelpers.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libjschelpers.a;
-			remoteRef = 3D05748F1DE6008900184BB4 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		3D0574921DE6008900184BB4 /* libjschelpers.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libjschelpers.a;
-			remoteRef = 3D0574911DE6008900184BB4 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		3D3C08811DE3424E00C268FA /* libyoga.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1570,6 +1564,34 @@
 			remoteRef = D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		ED2970952150246200B7C4FE /* libjsi-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libjsi-tvOS.a";
+			remoteRef = ED2970942150246200B7C4FE /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		ED2970972150246200B7C4FE /* libjsiexecutor-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libjsiexecutor-tvOS.a";
+			remoteRef = ED2970962150246200B7C4FE /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		EDEBC6FC214B402000DD5AC8 /* libjsi.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjsi.a;
+			remoteRef = EDEBC6FB214B402000DD5AC8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		EDEBC7CA214C503A00DD5AC8 /* libjsiexecutor.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjsiexecutor.a;
+			remoteRef = EDEBC7C9214C503A00DD5AC8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -1850,9 +1872,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = V9WTTPBFK9;
+				DEVELOPMENT_TEAM = VYK7DLU38Z;
 				INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.react.uiapp;
 				PRODUCT_NAME = RNTester;
@@ -1864,9 +1887,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = V9WTTPBFK9;
+				DEVELOPMENT_TEAM = VYK7DLU38Z;
 				INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.react.uiapp;
 				PRODUCT_NAME = RNTester;
diff --git a/RNTester/RNTester/AppDelegate.h b/RNTester/RNTester/AppDelegate.h
index f74364db7052d7..b00402a68f3c5e 100644
--- a/RNTester/RNTester/AppDelegate.h
+++ b/RNTester/RNTester/AppDelegate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTester/AppDelegate.m b/RNTester/RNTester/AppDelegate.m
index d1e3548a75cc7a..ff34483af67861 100644
--- a/RNTester/RNTester/AppDelegate.m
+++ b/RNTester/RNTester/AppDelegate.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTester/Base.lproj/LaunchScreen.xib b/RNTester/RNTester/Base.lproj/LaunchScreen.xib
index 9a4c50e157cc14..f7722dde9ba78c 100644
--- a/RNTester/RNTester/Base.lproj/LaunchScreen.xib
+++ b/RNTester/RNTester/Base.lproj/LaunchScreen.xib
@@ -16,7 +16,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Facebook. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) Facebook, Inc. and its affiliates." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                     <rect key="frame" x="20" y="439" width="441" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
diff --git a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h
index bca55cd86b72c0..ad621fd29f0929 100644
--- a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h
+++ b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m
index dacb4f9ec25435..fbfca624b7f0ae 100644
--- a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m
+++ b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h
index 9ca7e89c23a6ab..90a38cec9b28c3 100644
--- a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h
+++ b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m
index 083f0e538ad3f8..36e4525e50a749 100644
--- a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m
+++ b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTester/RNTesterBundle/Info.plist b/RNTester/RNTester/RNTesterBundle/Info.plist
index 57894749706356..a99587849932cb 100644
--- a/RNTester/RNTester/RNTesterBundle/Info.plist
+++ b/RNTester/RNTester/RNTesterBundle/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Facebook. All rights reserved.</string>
+	<string>Copyright © Facebook, Inc. and its affiliates.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/RNTester/RNTester/main.m b/RNTester/RNTester/main.m
index 4094e2a9143067..cdb4b28bf98bc5 100644
--- a/RNTester/RNTester/main.m
+++ b/RNTester/RNTester/main.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m b/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m
index b93b96337f9b47..ea631d344d77d4 100644
--- a/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m
+++ b/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m b/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
index 18007b0cf0efbd..ec72c2b2fd37d7 100644
--- a/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
+++ b/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m b/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m
index d91c489211bdc4..6a886c40343223 100644
--- a/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m
+++ b/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m b/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
index 1549898e4377e4..a14c296b1a1791 100644
--- a/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
+++ b/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m b/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
index 12c7599744b253..81cb0a86472284 100644
--- a/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
+++ b/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m b/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m
index a6aaaca8c0c753..d5a4346c4155d1 100644
--- a/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m
+++ b/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS10@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS10@2x.png
index 1904eb149b1c88..ec70fd4d430f5f 100644
Binary files a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS10@2x.png and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS10@2x.png differ
diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS11@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS11@2x.png
index 20a2e6193296e4..0144c961161cd7 100644
Binary files a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS11@2x.png and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS11@2x.png differ
diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1@2x.png
index fcaf5fb309afeb..0d4521449a20d3 100644
Binary files a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1@2x.png and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1@2x.png differ
diff --git a/RNTester/RNTesterPods.xcworkspace/contents.xcworkspacedata b/RNTester/RNTesterPods.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 00000000000000..96d9c7f00fbc33
--- /dev/null
+++ b/RNTester/RNTesterPods.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:RNTesterPods.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/RNTester/RNTesterUnitTests/RCTAllocationTests.m b/RNTester/RNTesterUnitTests/RCTAllocationTests.m
index bb100f71c5aeee..5afb3b60b5e018 100644
--- a/RNTester/RNTesterUnitTests/RCTAllocationTests.m
+++ b/RNTester/RNTesterUnitTests/RCTAllocationTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -15,12 +15,6 @@
 #import <React/RCTModuleMethod.h>
 #import <React/RCTRootView.h>
 
-@interface RCTJavaScriptContext : NSObject
-
-@property (nonatomic, assign, readonly) JSGlobalContextRef ctx;
-
-@end
-
 @interface AllocationTestModule : NSObject<RCTBridgeModule, RCTInvalidating>
 
 @property (nonatomic, assign, getter=isValid) BOOL valid;
diff --git a/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m b/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m
index acd729c0b59f15..dc40bd1f1d8202 100644
--- a/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m
+++ b/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m b/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m
index cffde57aa4d796..2b0f5eb754b39a 100644
--- a/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m
+++ b/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m b/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m
index bc48eebfc37884..b1f7c204c7be53 100644
--- a/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m
+++ b/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m b/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m
index fd9fdf7e8bb8fb..fc994c77072501 100644
--- a/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m
+++ b/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m b/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m
index 830bebb27f564a..cdf4bfec8bf92f 100644
--- a/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m
+++ b/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m b/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m
index a12f525f288e22..de9ed826dd8bb0 100644
--- a/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m
+++ b/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTDevMenuTests.m b/RNTester/RNTesterUnitTests/RCTDevMenuTests.m
index 9dc5112a5b080e..487aaedab08ca5 100644
--- a/RNTester/RNTesterUnitTests/RCTDevMenuTests.m
+++ b/RNTester/RNTesterUnitTests/RCTDevMenuTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m b/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m
index d057aae878a4b7..bffde88f8977ce 100644
--- a/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m
+++ b/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTFontTests.m b/RNTester/RNTesterUnitTests/RCTFontTests.m
index 1d9573b489e1b2..e45b48cc6b17ec 100644
--- a/RNTester/RNTesterUnitTests/RCTFontTests.m
+++ b/RNTester/RNTesterUnitTests/RCTFontTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTGzipTests.m b/RNTester/RNTesterUnitTests/RCTGzipTests.m
index ea91bac8ffb4f3..1a077ab67565b0 100644
--- a/RNTester/RNTesterUnitTests/RCTGzipTests.m
+++ b/RNTester/RNTesterUnitTests/RCTGzipTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h
index 116aafcc7d8d96..46f2e38b4cbb7f 100644
--- a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h
+++ b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m
index 25178917b5130a..eec473cc8413ce 100644
--- a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m
+++ b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m b/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m
index b17ed4bcd3c9e9..e85c408a1407c1 100644
--- a/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m
+++ b/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTImageUtilTests.m b/RNTester/RNTesterUnitTests/RCTImageUtilTests.m
index b160fca59913f0..47de4554c8c03d 100644
--- a/RNTester/RNTesterUnitTests/RCTImageUtilTests.m
+++ b/RNTester/RNTesterUnitTests/RCTImageUtilTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTJSONTests.m b/RNTester/RNTesterUnitTests/RCTJSONTests.m
index dce9b1013f8843..3dcf15e2fd30dd 100644
--- a/RNTester/RNTesterUnitTests/RCTJSONTests.m
+++ b/RNTester/RNTesterUnitTests/RCTJSONTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m b/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m
index 268b7366de5d42..6b8b1b82043cfc 100644
--- a/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m
+++ b/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m b/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
index ca5b1c7ef6207e..137408b6f16ac6 100644
--- a/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
+++ b/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTModuleInitTests.m b/RNTester/RNTesterUnitTests/RCTModuleInitTests.m
index 1942d824aa1b99..52327fdd856eb9 100644
--- a/RNTester/RNTesterUnitTests/RCTModuleInitTests.m
+++ b/RNTester/RNTesterUnitTests/RCTModuleInitTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm b/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm
index 4fa8012d9d4b47..3efc6905343d9d 100644
--- a/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm
+++ b/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m b/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m
index 8d8de7cf0076ba..5d5ed2d9682078 100644
--- a/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m
+++ b/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m b/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
index efe0b952789622..eee726bf6bf32c 100644
--- a/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
+++ b/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTShadowViewTests.m b/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
index a8b41780224cf5..eecd901f582463 100644
--- a/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
+++ b/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTUIManagerTests.m b/RNTester/RNTesterUnitTests/RCTUIManagerTests.m
index bfa0be867b6451..54d6efde4f9dab 100644
--- a/RNTester/RNTesterUnitTests/RCTUIManagerTests.m
+++ b/RNTester/RNTesterUnitTests/RCTUIManagerTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m b/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m
index aeff07fefa0378..56e87c57b434f9 100644
--- a/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m
+++ b/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m b/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m
index 02f217e0fe3584..8f730931923302 100644
--- a/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m
+++ b/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js b/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js
index 9e387e5ee84288..d55f9b975f9afa 100644
--- a/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js
+++ b/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/android/app/BUCK b/RNTester/android/app/BUCK
index e987dc9304db41..bc7d7c40a3ba2c 100644
--- a/RNTester/android/app/BUCK
+++ b/RNTester/android/app/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "KEYSTORE_TARGET", "react_native_dep", "react_native_target", "rn_android_binary", "rn_android_library", "rn_android_resource")
+load("//tools/build_defs/oss:rn_defs.bzl", "KEYSTORE_TARGET", "react_native_dep", "react_native_target", "rn_android_binary", "rn_android_library", "rn_android_resource")
 
 rn_android_binary(
     name = "app",
@@ -18,6 +18,7 @@ rn_android_library(
         react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react:react"),
+        react_native_target("java/com/facebook/react/common:build_config"),
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("jni/prebuilt:android-jsc"),
diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle
index 4722633e7c4bdf..6656f6a40fedc4 100644
--- a/RNTester/android/app/build.gradle
+++ b/RNTester/android/app/build.gradle
@@ -62,7 +62,7 @@ project.ext.react = [
     bundleAssetName: "RNTesterApp.android.bundle",
     entryFile: file("../../js/RNTesterApp.android.js"),
     root: "$rootDir",
-    inputExcludes: ["android/**", "./**"]
+    inputExcludes: ["android/**", "./**", ".gradle/**"]
 ]
 
 apply from: "../../../react.gradle"
@@ -76,7 +76,7 @@ apply from: "../../../react.gradle"
  * Upload all the APKs to the Play Store and people will download
  * the correct one based on the CPU architecture of their device.
  */
-def enableSeparateBuildPerCPUArchitecture = false
+def enableSeparateBuildPerCPUArchitecture = true
 
 /**
  * Run Proguard to shrink the Java bytecode in release builds.
@@ -84,18 +84,15 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = true
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.3"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         applicationId "com.facebook.react.uiapp"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
     }
     signingConfigs {
         release {
@@ -110,7 +107,7 @@ android {
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false
             reset()
-            include "armeabi-v7a", "x86"
+            include "armeabi-v7a", "x86", "x86_64", "arm64-v8a"
         }
     }
     buildTypes {
@@ -123,26 +120,12 @@ android {
             signingConfig signingConfigs.release
         }
     }
-
-    // applicationVariants are e.g. debug, release
-    applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            // For each separate APK per architecture, set a unique version code as described here:
-            // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a":1, "x86":2]
-            def abi = output.getFilter(OutputFile.ABI)
-            if (abi != null) {  // null for the universal-debug, universal-release variants
-                output.versionCodeOverride =
-                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
-            }
-        }
-    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:26.1.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:27.1.1'
 
     // Build React Native from source
-    compile project(':ReactAndroid')
+    implementation project(':ReactAndroid')
 }
diff --git a/RNTester/android/app/gradle.properties b/RNTester/android/app/gradle.properties
index 926d2479c3f36b..4dc41ef3f9cadf 100644
--- a/RNTester/android/app/gradle.properties
+++ b/RNTester/android/app/gradle.properties
@@ -1,4 +1,3 @@
-android.useDeprecatedNdk=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 MYAPP_RELEASE_STORE_FILE=my-release-key.keystore
diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
index 5b55c3b26e5e12..ccb6aec0b7aca9 100644
--- a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
+++ b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
index b5eb40277e89e7..3e58370518ab69 100644
--- a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
+++ b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 
 import android.app.Application;
 
+import com.facebook.react.BuildConfig;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
diff --git a/RNTester/e2e/config.json b/RNTester/e2e/config.json
new file mode 100644
index 00000000000000..4dac170d3611e1
--- /dev/null
+++ b/RNTester/e2e/config.json
@@ -0,0 +1,6 @@
+{
+  "setupTestFrameworkScriptFile" : "./init.js",
+  "testEnvironment": "node",
+  "bail": true,
+  "verbose": true
+}
diff --git a/RNTester/e2e/init.js b/RNTester/e2e/init.js
new file mode 100644
index 00000000000000..051d52567256ea
--- /dev/null
+++ b/RNTester/e2e/init.js
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+const detox = require('detox');
+const config = require('../../package.json').detox;
+const adapter = require('detox/runners/jest/adapter');
+
+jest.setTimeout(480000);
+jasmine.getEnv().addReporter(adapter);
+
+beforeAll(async () => {
+  await detox.init(config);
+});
+
+beforeEach(async function() {
+  await adapter.beforeEach();
+});
+
+afterAll(async () => {
+  await adapter.afterAll();
+  await detox.cleanup();
+});
+
+process.on('unhandledRejection', (reason, p) => {
+  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
diff --git a/RNTester/e2e/sanity.test.js b/RNTester/e2e/sanity.test.js
new file mode 100644
index 00000000000000..36bc0f577a60f3
--- /dev/null
+++ b/RNTester/e2e/sanity.test.js
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/* global device, element, by, expect */
+
+describe('Sanity', () => {
+  beforeEach(async () => {
+    await device.reloadReactNative();
+    await element(by.label(`<Button> Simple React Native button component.`)).tap();
+  });
+
+  afterEach(async () => {
+    //TODO - remove app state persistency, till then, we must go back to main screen,
+    await element(by.label('Back')).tap();
+  });
+
+  it('Simple button should be tappable', async () => {
+    await element(by.label('Press Me')).tap();
+    await expect(element(by.text('Simple has been pressed!'))).toBeVisible();
+    await element(by.text('OK')).tap();
+  });
+
+  it('Adjusted color button should be tappable', async () => {
+    await element(by.label('Press Purple')).tap();
+    await expect(element(by.text('Purple has been pressed!'))).toBeVisible();
+    await element(by.text('OK')).tap();
+  });
+
+  it(`Two buttons with JustifyContent:'space-between' should be tappable`, async () => {
+    await element(by.label('This looks great!')).tap();
+    await expect(element(by.text('Left has been pressed!'))).toBeVisible();
+    await element(by.text('OK')).tap();
+
+    await element(by.label('Ok!')).tap();
+    await expect(element(by.text('Right has been pressed!'))).toBeVisible();
+    await element(by.text('OK')).tap();
+  });
+
+  it('Disabled button should not interact', async () => {
+    await element(by.label('I Am Disabled')).tap();
+    await expect(element(by.text('Disabled has been pressed!'))).toBeNotVisible();
+  });
+});
diff --git a/RNTester/js/ARTExample.js b/RNTester/js/ARTExample.js
index 1a0745ec43f210..06d483a5b1ea68 100644
--- a/RNTester/js/ARTExample.js
+++ b/RNTester/js/ARTExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/AccessibilityAndroidExample.android.js b/RNTester/js/AccessibilityAndroidExample.android.js
index e193d339347ba7..9e42a1e57ca411 100644
--- a/RNTester/js/AccessibilityAndroidExample.android.js
+++ b/RNTester/js/AccessibilityAndroidExample.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -114,12 +114,12 @@ class AccessibilityAndroidExample extends React.Component {
           </View>
         </RNTesterBlock>
 
-        <RNTesterBlock title="Touchable with component type = button">
+        <RNTesterBlock title="Touchable with accessibilityRole = button">
           <TouchableWithoutFeedback
             onPress={() =>
               ToastAndroid.show('Toasts work by default', ToastAndroid.SHORT)
             }
-            accessibilityComponentType="button">
+            accessibilityRole="button">
             <View style={styles.embedded}>
               <Text>Click me</Text>
               <Text>Or not</Text>
@@ -127,6 +127,68 @@ class AccessibilityAndroidExample extends React.Component {
           </TouchableWithoutFeedback>
         </RNTesterBlock>
 
+        <RNTesterBlock title="Disabled Touchable with accessibilityRole = button">
+          <TouchableWithoutFeedback
+            onPress={() =>
+              ToastAndroid.show('Toasts work by default', ToastAndroid.SHORT)
+            }
+            accessibilityRole="button"
+            accessibilityStates={['disabled']}
+            disabled={true}>
+            <View>
+              <Text>I am disabled</Text>
+              <Text>Clicking me will not trigger any action.</Text>
+            </View>
+          </TouchableWithoutFeedback>
+        </RNTesterBlock>
+
+        <RNTesterBlock title="Touchable with accessibilityRole = button and accessibilityHint">
+          <TouchableWithoutFeedback
+            onPress={() =>
+              ToastAndroid.show('Toasts work by default', ToastAndroid.SHORT)
+            }
+            accessibilityRole="button"
+            accessibilityHint="Triggers
+            Toasts">
+            <View>
+              <Text>Click Me!</Text>
+            </View>
+          </TouchableWithoutFeedback>
+        </RNTesterBlock>
+
+        <RNTesterBlock title="Accessible View with hint, role, and state">
+          <View
+            accessible={true}
+            accessibilityRole="button"
+            accessibilityStates={['selected']}
+            accessibilityHint="accessibility hint">
+            <Text>Accessible view with hint, role, and state</Text>
+            <Text style={{color: 'gray'}}>
+              Talkback will say: accessibility hint button, selected{' '}
+            </Text>
+          </View>
+        </RNTesterBlock>
+
+        <RNTesterBlock title="Accessible View with label, hint, role, and state">
+          <View
+            accessible={true}
+            accessibilityLabel="accessibility Label"
+            accessibilityRole="button"
+            accessibilityStates={['selected']}
+            accessibilityHint="accessibility Hint">
+            <Text>Accessible view with label, hint, role, and state</Text>
+            <Text style={{color: 'gray'}}>
+              Talkback will say: accessibility label, hint button, selected{' '}
+            </Text>
+          </View>
+        </RNTesterBlock>
+
+        <RNTesterBlock title="Accessible View with no other properties set">
+          <View accessible={true}>
+            <Text>This accessible view has no label, so the text is read.</Text>
+          </View>
+        </RNTesterBlock>
+
         <RNTesterBlock title="LiveRegion">
           <TouchableWithoutFeedback onPress={this._addOne}>
             <View style={styles.embedded}>
diff --git a/RNTester/js/AccessibilityIOSExample.js b/RNTester/js/AccessibilityIOSExample.js
index 60d9ceeeddcb7c..76a05adb026558 100644
--- a/RNTester/js/AccessibilityIOSExample.js
+++ b/RNTester/js/AccessibilityIOSExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,7 +12,7 @@
 
 var React = require('react');
 var ReactNative = require('react-native');
-var {AccessibilityInfo, Text, View} = ReactNative;
+var {AccessibilityInfo, Text, View, TouchableOpacity} = ReactNative;
 
 class AccessibilityIOSExample extends React.Component<{}> {
   render() {
@@ -29,7 +29,10 @@ class AccessibilityIOSExample extends React.Component<{}> {
         <View accessibilityLabel="Some announcement" accessible={true}>
           <Text>Accessibility label example</Text>
         </View>
-        <View accessibilityTraits={['button', 'selected']} accessible={true}>
+        <View
+          accessibilityRole="button"
+          accessibilityStates={['selected']}
+          accessible={true}>
           <Text>Accessibility traits example</Text>
         </View>
         <Text>
@@ -39,6 +42,31 @@ class AccessibilityIOSExample extends React.Component<{}> {
         <Text accessibilityLabel="Test of accessibilityLabel" accessible={true}>
           This text component's accessibilityLabel is set explicitly.
         </Text>
+        <View
+          accessibilityLabel="Test of accessibilityHint"
+          accessibilityHint="The hint provides more info than the label does"
+          accessible={true}>
+          <Text>
+            This view component has both an accessibilityLabel and an
+            accessibilityHint explicitly set.
+          </Text>
+        </View>
+        <Text
+          accessibilityLabel="Test of accessibilityHint"
+          accessibilityHint="The hint provides more info than the label does">
+          This text component has both an accessibilityLabel and an
+          accessibilityHint explicitly set.
+        </Text>
+        <TouchableOpacity
+          accessibilityLabel="Test of accessibilityHint"
+          accessibilityHint="The hint provides more info than the label does">
+          <View>
+            <Text>
+              This button has both an accessibilityLabel and an
+              accessibilityHint explicitly set.
+            </Text>
+          </View>
+        </TouchableOpacity>
         <View accessibilityElementsHidden={true}>
           <Text>
             This view's children are hidden from the accessibility tree
diff --git a/RNTester/js/ActionSheetIOSExample.js b/RNTester/js/ActionSheetIOSExample.js
index 2c1788864c943f..e0850aced1f647 100644
--- a/RNTester/js/ActionSheetIOSExample.js
+++ b/RNTester/js/ActionSheetIOSExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/ActivityIndicatorExample.js b/RNTester/js/ActivityIndicatorExample.js
index 2f81857cfcfdb0..1e8fee82a16b13 100644
--- a/RNTester/js/ActivityIndicatorExample.js
+++ b/RNTester/js/ActivityIndicatorExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/AlertExample.js b/RNTester/js/AlertExample.js
index b573356919d898..3f399d6716d50c 100644
--- a/RNTester/js/AlertExample.js
+++ b/RNTester/js/AlertExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/AlertIOSExample.js b/RNTester/js/AlertIOSExample.js
index 4f58c00ada4d43..03777a8b713fa6 100644
--- a/RNTester/js/AlertIOSExample.js
+++ b/RNTester/js/AlertIOSExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/AnimatedExample.js b/RNTester/js/AnimatedExample.js
index 490f70371696e7..0510efe7a0e260 100644
--- a/RNTester/js/AnimatedExample.js
+++ b/RNTester/js/AnimatedExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExApp.js b/RNTester/js/AnimatedGratuitousApp/AnExApp.js
index 5131f9641ca5d6..ca24eac844008d 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExApp.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExApp.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExBobble.js b/RNTester/js/AnimatedGratuitousApp/AnExBobble.js
index 14d4c839abe7c9..68b5a136094c33 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExBobble.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExBobble.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExChained.js b/RNTester/js/AnimatedGratuitousApp/AnExChained.js
index b3c09570362a51..0a74da47d0bbaa 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExChained.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExChained.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExScroll.js b/RNTester/js/AnimatedGratuitousApp/AnExScroll.js
index 0dde543196d7f3..b51d889442aaf7 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExScroll.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExScroll.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExSet.js b/RNTester/js/AnimatedGratuitousApp/AnExSet.js
index 83bc5bfdb5f3f4..f42702cc29a9d6 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExSet.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExSet.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExTilt.js b/RNTester/js/AnimatedGratuitousApp/AnExTilt.js
index dbd823843486b5..6b518ee75e84b7 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExTilt.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExTilt.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/AppStateExample.js b/RNTester/js/AppStateExample.js
index b4ed67c27ba907..8309aac323febd 100644
--- a/RNTester/js/AppStateExample.js
+++ b/RNTester/js/AppStateExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/AssetScaledImageExample.js b/RNTester/js/AssetScaledImageExample.js
index d3a295a27e8277..ae74d599c72db8 100644
--- a/RNTester/js/AssetScaledImageExample.js
+++ b/RNTester/js/AssetScaledImageExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
@@ -14,10 +14,17 @@ var React = require('react');
 var ReactNative = require('react-native');
 var {Image, StyleSheet, View, ScrollView} = ReactNative;
 
-class AssetScaledImageExample extends React.Component<
-  $FlowFixMeProps,
-  $FlowFixMeState,
-> {
+import type {PhotoIdentifier} from 'CameraRoll';
+
+type Props = $ReadOnly<{|
+  asset: PhotoIdentifier,
+|}>;
+
+type State = {|
+  asset: PhotoIdentifier,
+|};
+
+class AssetScaledImageExample extends React.Component<Props, State> {
   state = {
     asset: this.props.asset,
   };
diff --git a/RNTester/js/AsyncStorageExample.js b/RNTester/js/AsyncStorageExample.js
index 14b7780220464d..27ba9d87fc4819 100644
--- a/RNTester/js/AsyncStorageExample.js
+++ b/RNTester/js/AsyncStorageExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/BorderExample.js b/RNTester/js/BorderExample.js
index 388fc68fef4938..c6650eea09c2a2 100644
--- a/RNTester/js/BorderExample.js
+++ b/RNTester/js/BorderExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/BoxShadowExample.js b/RNTester/js/BoxShadowExample.js
index 42fe0aaad5aec2..0370b52d3627d1 100644
--- a/RNTester/js/BoxShadowExample.js
+++ b/RNTester/js/BoxShadowExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/ButtonExample.js b/RNTester/js/ButtonExample.js
index 1d72519869722d..361913960c8773 100644
--- a/RNTester/js/ButtonExample.js
+++ b/RNTester/js/ButtonExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
@@ -14,9 +14,9 @@ const React = require('react');
 const ReactNative = require('react-native');
 const {Alert, Button, View} = ReactNative;
 
-const onButtonPress = () => {
-  Alert.alert('Button has been pressed!');
-};
+function onButtonPress(buttonName) {
+  Alert.alert(`${buttonName} has been pressed!`);
+}
 
 exports.displayName = 'ButtonExample';
 exports.framework = 'React';
@@ -33,7 +33,7 @@ exports.examples = [
     render: function() {
       return (
         <Button
-          onPress={onButtonPress}
+          onPress={() => onButtonPress('Simple')}
           title="Press Me"
           accessibilityLabel="See an informative alert"
         />
@@ -49,7 +49,7 @@ exports.examples = [
     render: function() {
       return (
         <Button
-          onPress={onButtonPress}
+          onPress={() => onButtonPress('Purple')}
           title="Press Purple"
           color="#841584"
           accessibilityLabel="Learn more about purple"
@@ -65,12 +65,12 @@ exports.examples = [
       return (
         <View style={{flexDirection: 'row', justifyContent: 'space-between'}}>
           <Button
-            onPress={onButtonPress}
+            onPress={() => onButtonPress('Left')}
             title="This looks great!"
             accessibilityLabel="This sounds great!"
           />
           <Button
-            onPress={onButtonPress}
+            onPress={() => onButtonPress('Right')}
             title="Ok!"
             color="#841584"
             accessibilityLabel="Ok, Great!"
@@ -86,7 +86,7 @@ exports.examples = [
       return (
         <Button
           disabled
-          onPress={onButtonPress}
+          onPress={() => onButtonPress('Disabled')}
           title="I Am Disabled"
           accessibilityLabel="See an informative alert"
         />
diff --git a/RNTester/js/CameraRollExample.js b/RNTester/js/CameraRollExample.js
index f289a2b610771f..322f73c9736622 100644
--- a/RNTester/js/CameraRollExample.js
+++ b/RNTester/js/CameraRollExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -28,16 +28,32 @@ const CameraRollView = require('./CameraRollView');
 
 const AssetScaledImageExampleView = require('./AssetScaledImageExample');
 
-class CameraRollExample extends React.Component<
-  $FlowFixMeProps,
-  $FlowFixMeState,
-> {
+import type {PhotoIdentifier, GroupTypes} from 'CameraRoll';
+
+type Props = $ReadOnly<{|
+  navigator?: ?Array<
+    $ReadOnly<{|
+      title: string,
+      component: Class<React.Component<any, any>>,
+      backButtonTitle: string,
+      passProps: $ReadOnly<{|asset: PhotoIdentifier|}>,
+    |}>,
+  >,
+|}>;
+
+type State = {|
+  groupTypes: GroupTypes,
+  sliderValue: number,
+  bigImages: boolean,
+|};
+
+class CameraRollExample extends React.Component<Props, State> {
   state = {
     groupTypes: 'SavedPhotos',
     sliderValue: 1,
     bigImages: true,
   };
-  _cameraRollView: ?CameraRollView;
+  _cameraRollView: ?React.ElementRef<typeof CameraRollView>;
   render() {
     return (
       <View>
@@ -74,7 +90,7 @@ class CameraRollExample extends React.Component<
     }
   }
 
-  _renderImage = asset => {
+  _renderImage = (asset: PhotoIdentifier) => {
     const imageSize = this.state.bigImages ? 150 : 75;
     const imageStyle = [styles.image, {width: imageSize, height: imageSize}];
     const {location} = asset.node;
@@ -82,7 +98,9 @@ class CameraRollExample extends React.Component<
       ? JSON.stringify(location)
       : 'Unknown location';
     return (
-      <TouchableOpacity key={asset} onPress={this.loadAsset.bind(this, asset)}>
+      <TouchableOpacity
+        key={asset.node.image.uri}
+        onPress={this.loadAsset.bind(this, asset)}>
         <View style={styles.row}>
           <Image source={asset.node.image} style={imageStyle} />
           <View style={styles.info}>
@@ -135,7 +153,7 @@ exports.description =
 exports.examples = [
   {
     title: 'Photos',
-    render(): React.Element<any> {
+    render(): React.Node {
       return <CameraRollExample />;
     },
   },
diff --git a/RNTester/js/CameraRollView.js b/RNTester/js/CameraRollView.js
index 1568585ea89cf4..7220008f79faff 100644
--- a/RNTester/js/CameraRollView.js
+++ b/RNTester/js/CameraRollView.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,11 +10,9 @@
 
 'use strict';
 
-var React = require('react');
-var createReactClass = require('create-react-class');
-const PropTypes = require('prop-types');
-var ReactNative = require('react-native');
-var {
+const React = require('react');
+const ReactNative = require('react-native');
+const {
   ActivityIndicator,
   Alert,
   CameraRoll,
@@ -25,105 +23,123 @@ var {
   StyleSheet,
   View,
 } = ReactNative;
+const ListViewDataSource = require('ListViewDataSource');
 
-var groupByEveryN = require('groupByEveryN');
-var logError = require('logError');
+const groupByEveryN = require('groupByEveryN');
+const logError = require('logError');
 
-var propTypes = {
+import type {
+  PhotoIdentifier,
+  PhotoIdentifiersPage,
+  GetPhotosParams,
+} from 'CameraRoll';
+
+function rowHasChanged<T>(r1: Array<T>, r2: Array<T>): boolean {
+  if (r1.length !== r2.length) {
+    return true;
+  }
+
+  for (var i = 0; i < r1.length; i++) {
+    if (r1[i] !== r2[i]) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+type Props = $ReadOnly<{|
   /**
    * The group where the photos will be fetched from. Possible
    * values are 'Album', 'All', 'Event', 'Faces', 'Library', 'PhotoStream'
    * and SavedPhotos.
    */
-  groupTypes: PropTypes.oneOf([
-    'Album',
-    'All',
-    'Event',
-    'Faces',
-    'Library',
-    'PhotoStream',
-    'SavedPhotos',
-  ]),
+  groupTypes:
+    | 'Album'
+    | 'All'
+    | 'Event'
+    | 'Faces'
+    | 'Library'
+    | 'PhotoStream'
+    | 'SavedPhotos',
 
   /**
    * Number of images that will be fetched in one page.
    */
-  batchSize: PropTypes.number,
+  batchSize: number,
 
   /**
    * A function that takes a single image as a parameter and renders it.
    */
-  renderImage: PropTypes.func,
+  renderImage: PhotoIdentifier => React.Node,
 
   /**
    * imagesPerRow: Number of images to be shown in each row.
    */
-  imagesPerRow: PropTypes.number,
+
+  imagesPerRow: number,
 
   /**
    * The asset type, one of 'Photos', 'Videos' or 'All'
    */
-  assetType: PropTypes.oneOf(['Photos', 'Videos', 'All']),
-};
-
-var CameraRollView = createReactClass({
-  displayName: 'CameraRollView',
-  propTypes: propTypes,
-
-  getDefaultProps: function(): Object {
+  assetType: 'Photos' | 'Videos' | 'All',
+|}>;
+
+type State = {|
+  assets: Array<PhotoIdentifier>,
+  lastCursor: ?string,
+  noMore: boolean,
+  loadingMore: boolean,
+  dataSource: ListViewDataSource,
+|};
+
+class CameraRollView extends React.Component<Props, State> {
+  static defaultProps = {
+    groupTypes: 'SavedPhotos',
+    batchSize: 5,
+    imagesPerRow: 1,
+    assetType: 'Photos',
+    renderImage: function(asset: PhotoIdentifier) {
+      const imageSize = 150;
+      const imageStyle = [styles.image, {width: imageSize, height: imageSize}];
+      return <Image source={asset.node.image} style={imageStyle} />;
+    },
+  };
+
+  state = this.getInitialState();
+
+  getInitialState() {
     return {
-      groupTypes: 'SavedPhotos',
-      batchSize: 5,
-      imagesPerRow: 1,
-      assetType: 'Photos',
-      renderImage: function(asset) {
-        var imageSize = 150;
-        var imageStyle = [styles.image, {width: imageSize, height: imageSize}];
-        return <Image source={asset.node.image} style={imageStyle} />;
-      },
-    };
-  },
-
-  getInitialState: function() {
-    var ds = new ListView.DataSource({rowHasChanged: this._rowHasChanged});
-
-    return {
-      assets: ([]: Array<Image>),
-      groupTypes: this.props.groupTypes,
-      lastCursor: (null: ?string),
-      assetType: this.props.assetType,
+      assets: [],
+      lastCursor: null,
       noMore: false,
       loadingMore: false,
-      dataSource: ds,
+      dataSource: new ListView.DataSource({rowHasChanged: rowHasChanged}),
     };
-  },
+  }
 
   /**
    * This should be called when the image renderer is changed to tell the
    * component to re-render its assets.
    */
-  rendererChanged: function() {
-    var ds = new ListView.DataSource({rowHasChanged: this._rowHasChanged});
+  rendererChanged() {
+    const ds = new ListView.DataSource({rowHasChanged: rowHasChanged});
     this.state.dataSource = ds.cloneWithRows(
-      // $FlowFixMe(>=0.41.0)
       groupByEveryN(this.state.assets, this.props.imagesPerRow),
     );
-  },
+  }
 
-  componentDidMount: function() {
+  componentDidMount() {
     this.fetch();
-  },
+  }
 
-  /* $FlowFixMe(>=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. */
-  UNSAFE_componentWillReceiveProps: function(nextProps: {groupTypes?: string}) {
+  UNSAFE_componentWillReceiveProps(nextProps: Props) {
     if (this.props.groupTypes !== nextProps.groupTypes) {
       this.fetch(true);
     }
-  },
+  }
 
-  _fetch: async function(clear?: boolean) {
+  async _fetch(clear?: boolean) {
     if (clear) {
       this.setState(this.getInitialState(), this.fetch);
       return;
@@ -143,7 +159,7 @@ var CameraRollView = createReactClass({
       }
     }
 
-    const fetchParams: Object = {
+    const fetchParams: GetPhotosParams = {
       first: this.props.batchSize,
       groupTypes: this.props.groupTypes,
       assetType: this.props.assetType,
@@ -162,21 +178,21 @@ var CameraRollView = createReactClass({
     } catch (e) {
       logError(e);
     }
-  },
+  }
 
   /**
    * Fetches more images from the camera roll. If clear is set to true, it will
    * set the component to its initial state and re-fetch the images.
    */
-  fetch: function(clear?: boolean) {
+  fetch = (clear?: boolean) => {
     if (!this.state.loadingMore) {
       this.setState({loadingMore: true}, () => {
         this._fetch(clear);
       });
     }
-  },
+  };
 
-  render: function() {
+  render() {
     return (
       <ListView
         renderRow={this._renderRow}
@@ -187,49 +203,34 @@ var CameraRollView = createReactClass({
         enableEmptySections
       />
     );
-  },
-
-  _rowHasChanged: function(r1: Array<Image>, r2: Array<Image>): boolean {
-    if (r1.length !== r2.length) {
-      return true;
-    }
-
-    for (var i = 0; i < r1.length; i++) {
-      if (r1[i] !== r2[i]) {
-        return true;
-      }
-    }
+  }
 
-    return false;
-  },
-
-  _renderFooterSpinner: function() {
+  _renderFooterSpinner = () => {
     if (!this.state.noMore) {
       return <ActivityIndicator />;
     }
     return null;
-  },
+  };
 
   // rowData is an array of images
-  _renderRow: function(
-    rowData: Array<Image>,
+  _renderRow = (
+    rowData: Array<PhotoIdentifier>,
     sectionID: string,
     rowID: string,
-  ) {
-    var images = rowData.map(image => {
+  ) => {
+    const images = rowData.map(image => {
       if (image === null) {
         return null;
       }
-      // $FlowFixMe(>=0.41.0)
       return this.props.renderImage(image);
     });
 
     return <View style={styles.row}>{images}</View>;
-  },
+  };
 
-  _appendAssets: function(data: Object) {
-    var assets = data.edges;
-    var newState: Object = {loadingMore: false};
+  _appendAssets(data: PhotoIdentifiersPage) {
+    const assets = data.edges;
+    const newState: $Shape<State> = {loadingMore: false};
 
     if (!data.page_info.has_next_page) {
       newState.noMore = true;
@@ -239,22 +240,21 @@ var CameraRollView = createReactClass({
       newState.lastCursor = data.page_info.end_cursor;
       newState.assets = this.state.assets.concat(assets);
       newState.dataSource = this.state.dataSource.cloneWithRows(
-        // $FlowFixMe(>=0.41.0)
         groupByEveryN(newState.assets, this.props.imagesPerRow),
       );
     }
 
     this.setState(newState);
-  },
+  }
 
-  _onEndReached: function() {
+  _onEndReached = () => {
     if (!this.state.noMore) {
       this.fetch();
     }
-  },
-});
+  };
+}
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   row: {
     flexDirection: 'row',
     flex: 1,
diff --git a/RNTester/js/CheckBoxExample.js b/RNTester/js/CheckBoxExample.js
index 1ef830cabd1248..867df34469a9db 100644
--- a/RNTester/js/CheckBoxExample.js
+++ b/RNTester/js/CheckBoxExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/ClipboardExample.js b/RNTester/js/ClipboardExample.js
index 13309df37493c7..1d0317ded4fa8d 100644
--- a/RNTester/js/ClipboardExample.js
+++ b/RNTester/js/ClipboardExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/DatePickerAndroidExample.js b/RNTester/js/DatePickerAndroidExample.js
index fc63ca20e6b168..2ef17fc89098c4 100644
--- a/RNTester/js/DatePickerAndroidExample.js
+++ b/RNTester/js/DatePickerAndroidExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/DatePickerIOSExample.js b/RNTester/js/DatePickerIOSExample.js
index ec338471d6937a..94afc7abb9403b 100644
--- a/RNTester/js/DatePickerIOSExample.js
+++ b/RNTester/js/DatePickerIOSExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/DimensionsExample.js b/RNTester/js/DimensionsExample.js
index 436968c3b34a9c..db90288656ae1b 100644
--- a/RNTester/js/DimensionsExample.js
+++ b/RNTester/js/DimensionsExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/ExampleTypes.js b/RNTester/js/ExampleTypes.js
index 5d7e2a55795a04..0bfe107c92b28b 100644
--- a/RNTester/js/ExampleTypes.js
+++ b/RNTester/js/ExampleTypes.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/FlatListExample.js b/RNTester/js/FlatListExample.js
index 4098934dc0b63d..d8eeb4626cf7ba 100644
--- a/RNTester/js/FlatListExample.js
+++ b/RNTester/js/FlatListExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,7 +13,7 @@
 const Alert = require('Alert');
 const React = require('react');
 const ReactNative = require('react-native');
-const {Animated, FlatList, StyleSheet, View} = ReactNative;
+const {Animated, StyleSheet, View} = ReactNative;
 
 const RNTesterPage = require('./RNTesterPage');
 
@@ -34,8 +34,6 @@ const {
   renderSmallSwitchOption,
 } = require('./ListExampleShared');
 
-const AnimatedFlatList = Animated.createAnimatedComponent(FlatList);
-
 const VIEWABILITY_CONFIG = {
   minimumViewTime: 3000,
   viewAreaCoveragePercentThreshold: 100,
@@ -114,7 +112,7 @@ class FlatListExample extends React.PureComponent<{}, $FlowFixMeState> {
             </View>
           </View>
           <SeparatorComponent />
-          <AnimatedFlatList
+          <Animated.FlatList
             ItemSeparatorComponent={ItemSeparatorComponent}
             ListHeaderComponent={<HeaderComponent />}
             ListFooterComponent={FooterComponent}
@@ -133,7 +131,6 @@ class FlatListExample extends React.PureComponent<{}, $FlowFixMeState> {
             }
             keyboardShouldPersistTaps="always"
             keyboardDismissMode="on-drag"
-            legacyImplementation={false}
             numColumns={1}
             onEndReached={this._onEndReached}
             onRefresh={this._onRefresh}
@@ -201,7 +198,7 @@ class FlatListExample extends React.PureComponent<{}, $FlowFixMeState> {
     this._listRef.getNode().recordInteraction();
     pressItem(this, key);
   };
-  _listRef: AnimatedFlatList;
+  _listRef: Animated.FlatList;
 }
 
 const styles = StyleSheet.create({
diff --git a/RNTester/js/GeolocationExample.js b/RNTester/js/GeolocationExample.js
index 73b5deeed92904..bcb300ecba042f 100644
--- a/RNTester/js/GeolocationExample.js
+++ b/RNTester/js/GeolocationExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/ImageCapInsetsExample.js b/RNTester/js/ImageCapInsetsExample.js
index 76705f4d7e60d9..e55b308dd0aff2 100644
--- a/RNTester/js/ImageCapInsetsExample.js
+++ b/RNTester/js/ImageCapInsetsExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/ImageEditingExample.js b/RNTester/js/ImageEditingExample.js
index 0bc25ce26d7743..c34c5d3ff5a57b 100644
--- a/RNTester/js/ImageEditingExample.js
+++ b/RNTester/js/ImageEditingExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -25,24 +25,27 @@ var {
 
 var PAGE_SIZE = 20;
 
-type ImageOffset = {
+type ImageOffset = {|
   x: number,
   y: number,
-};
+|};
 
-type ImageSize = {
+type ImageSize = {|
   width: number,
   height: number,
-};
+|};
 
-type ImageCropData = {
+type ImageCropData = {|
   offset: ImageOffset,
   size: ImageSize,
   displaySize?: ?ImageSize,
   resizeMode?: ?any,
-};
+|};
 
-class SquareImageCropper extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
+class SquareImageCropper extends React.Component<
+  $FlowFixMeProps,
+  $FlowFixMeState,
+> {
   state: any;
   _isMounted: boolean;
   _transformData: ImageCropData;
diff --git a/RNTester/js/ImageExample.js b/RNTester/js/ImageExample.js
index fdabeae355dd9a..f6c62b540e8bee 100644
--- a/RNTester/js/ImageExample.js
+++ b/RNTester/js/ImageExample.js
@@ -1,56 +1,71 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
 
-var React = require('react');
-var createReactClass = require('create-react-class');
-var ReactNative = require('react-native');
-var {
+const React = require('react');
+const ReactNative = require('react-native');
+const {
   ActivityIndicator,
   Image,
-  Platform,
   StyleSheet,
   Text,
   View,
   ImageBackground,
 } = ReactNative;
 
-var base64Icon =
+const base64Icon =
   'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABLCAQAAACSR7JhAAADtUlEQVR4Ac3YA2Bj6QLH0XPT1Fzbtm29tW3btm3bfLZtv7e2ObZnms7d8Uw098tuetPzrxv8wiISrtVudrG2JXQZ4VOv+qUfmqCGGl1mqLhoA52oZlb0mrjsnhKpgeUNEs91Z0pd1kvihA3ULGVHiQO2narKSHKkEMulm9VgUyE60s1aWoMQUbpZOWE+kaqs4eLEjdIlZTcFZB0ndc1+lhB1lZrIuk5P2aib1NBpZaL+JaOGIt0ls47SKzLC7CqrlGF6RZ09HGoNy1lYl2aRSWL5GuzqWU1KafRdoRp0iOQEiDzgZPnG6DbldcomadViflnl/cL93tOoVbsOLVM2jylvdWjXolWX1hmfZbGR/wjypDjFLSZIRov09BgYmtUqPQPlQrPapecLgTIy0jMgPKtTeob2zWtrGH3xvjUkPCtNg/tm1rjwrMa+mdUkPd3hWbH0jArPGiU9ufCsNNWFZ40wpwn+62/66R2RUtoso1OB34tnLOcy7YB1fUdc9e0q3yru8PGM773vXsuZ5YIZX+5xmHwHGVvlrGPN6ZSiP1smOsMMde40wKv2VmwPPVXNut4sVpUreZiLBHi0qln/VQeI/LTMYXpsJtFiclUN+5HVZazim+Ky+7sAvxWnvjXrJFneVtLWLyPJu9K3cXLWeOlbMTlrIelbMDlrLenrjEQOtIF+fuI9xRp9ZBFp6+b6WT8RrxEpdK64BuvHgDk+vUy+b5hYk6zfyfs051gRoNO1usU12WWRWL73/MMEy9pMi9qIrR4ZpV16Rrvduxazmy1FSvuFXRkqTnE7m2kdb5U8xGjLw/spRr1uTov4uOgQE+0N/DvFrG/Jt7i/FzwxbA9kDanhf2w+t4V97G8lrT7wc08aA2QNUkuTfW/KimT01wdlfK4yEw030VfT0RtZbzjeMprNq8m8tnSTASrTLti64oBNdpmMQm0eEwvfPwRbUBywG5TzjPCsdwk3IeAXjQblLCoXnDVeoAz6SfJNk5TTzytCNZk/POtTSV40NwOFWzw86wNJRpubpXsn60NJFlHeqlYRbslqZm2jnEZ3qcSKgm0kTli3zZVS7y/iivZTweYXJ26Y+RTbV1zh3hYkgyFGSTKPfRVbRqWWVReaxYeSLarYv1Qqsmh1s95S7G+eEWK0f3jYKTbV6bOwepjfhtafsvUsqrQvrGC8YhmnO9cSCk3yuY984F1vesdHYhWJ5FvASlacshUsajFt2mUM9pqzvKGcyNJW0arTKN1GGGzQlH0tXwLDgQTurS8eIQAAAABJRU5ErkJggg==';
 
-var ImageCapInsetsExample = require('./ImageCapInsetsExample');
+const ImageCapInsetsExample = require('./ImageCapInsetsExample');
 const IMAGE_PREFETCH_URL =
   'http://origami.design/public/images/bird-logo.png?r=1&t=' + Date.now();
-var prefetchTask = Image.prefetch(IMAGE_PREFETCH_URL);
+const prefetchTask = Image.prefetch(IMAGE_PREFETCH_URL);
 
-/* $FlowFixMe(>=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. */
-var NetworkImageCallbackExample = createReactClass({
-  displayName: 'NetworkImageCallbackExample',
-  getInitialState: function() {
-    return {
-      events: [],
-      startLoadPrefetched: false,
-      mountTime: new Date(),
-    };
-  },
+type ImageSource = $ReadOnly<{|
+  uri: string,
+|}>;
+
+type NetworkImageCallbackExampleState = {|
+  events: Array<string>,
+  startLoadPrefetched: boolean,
+  mountTime: Date,
+|};
+
+type NetworkImageCallbackExampleProps = $ReadOnly<{|
+  source: ImageSource,
+  prefetchedSource: ImageSource,
+|}>;
+
+class NetworkImageCallbackExample extends React.Component<
+  NetworkImageCallbackExampleProps,
+  NetworkImageCallbackExampleState,
+> {
+  state = {
+    events: [],
+    startLoadPrefetched: false,
+    mountTime: new Date(),
+  };
 
   UNSAFE_componentWillMount() {
     this.setState({mountTime: new Date()});
-  },
+  }
 
-  render: function() {
-    var {mountTime} = this.state;
+  _loadEventFired = (event: string) => {
+    this.setState(state => ({
+      events: [...state.events, event],
+    }));
+  };
 
+  render() {
+    const {mountTime} = this.state;
     return (
       <View>
         <Image
@@ -77,6 +92,19 @@ var NetworkImageCallbackExample = createReactClass({
                   this._loadEventFired(
                     `✔ Prefetch OK (+${new Date() - mountTime}ms)`,
                   );
+                  Image.queryCache([IMAGE_PREFETCH_URL]).then(map => {
+                    var result = map.get(IMAGE_PREFETCH_URL);
+                    if (result) {
+                      this._loadEventFired(
+                        `✔ queryCache "${result}" (+${new Date() -
+                          mountTime}ms)`,
+                      );
+                    } else {
+                      this._loadEventFired(
+                        `✘ queryCache (+${new Date() - mountTime}ms)`,
+                      );
+                    }
+                  });
                 },
                 error => {
                   this._loadEventFired(
@@ -120,24 +148,30 @@ var NetworkImageCallbackExample = createReactClass({
         <Text style={{marginTop: 20}}>{this.state.events.join('\n')}</Text>
       </View>
     );
-  },
+  }
+}
 
-  _loadEventFired(event) {
-    this.setState(state => {
-      return (state.events = [...state.events, event]);
-    });
-  },
-});
+type NetworkImageExampleState = {|
+  error: boolean,
+  loading: boolean,
+  progress: number,
+|};
+
+type NetworkImageExampleProps = $ReadOnly<{|
+  source: ImageSource,
+|}>;
+
+class NetworkImageExample extends React.Component<
+  NetworkImageExampleProps,
+  NetworkImageExampleState,
+> {
+  state = {
+    error: false,
+    loading: false,
+    progress: 0,
+  };
 
-var NetworkImageExample = createReactClass({
-  getInitialState: function() {
-    return {
-      error: false,
-      loading: false,
-      progress: 0,
-    };
-  },
-  render: function() {
+  render() {
     var loader = this.state.loading ? (
       <View style={styles.progress}>
         <Text>{this.state.progress}%</Text>
@@ -165,22 +199,34 @@ var NetworkImageExample = createReactClass({
         {loader}
       </ImageBackground>
     );
-  },
-});
+  }
+}
+
+type ImageSizeExampleState = {|
+  width: number,
+  height: number,
+|};
 
-var ImageSizeExample = createReactClass({
-  getInitialState: function() {
-    return {
-      width: 0,
-      height: 0,
-    };
-  },
-  componentDidMount: function() {
+type ImageSizeExampleProps = $ReadOnly<{|
+  source: ImageSource,
+|}>;
+
+class ImageSizeExample extends React.Component<
+  ImageSizeExampleProps,
+  ImageSizeExampleState,
+> {
+  state = {
+    width: 0,
+    height: 0,
+  };
+
+  componentDidMount() {
     Image.getSize(this.props.source.uri, (width, height) => {
       this.setState({width, height});
     });
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <View style={{flexDirection: 'row'}}>
         <Image
@@ -198,17 +244,56 @@ var ImageSizeExample = createReactClass({
         </Text>
       </View>
     );
-  },
-});
+  }
+}
+
+type MultipleSourcesExampleState = {|
+  width: number,
+  height: number,
+|};
+
+type MultipleSourcesExampleProps = $ReadOnly<{||}>;
+
+class MultipleSourcesExample extends React.Component<
+  MultipleSourcesExampleProps,
+  MultipleSourcesExampleState,
+> {
+  state = {
+    width: 30,
+    height: 30,
+  };
+
+  increaseImageSize = () => {
+    if (this.state.width >= 100) {
+      return;
+    }
+    this.setState({
+      width: this.state.width + 10,
+      height: this.state.height + 10,
+    });
+  };
+
+  increaseImageSize = () => {
+    if (this.state.width >= 100) {
+      return;
+    }
+    this.setState({
+      width: this.state.width + 10,
+      height: this.state.height + 10,
+    });
+  };
+
+  decreaseImageSize = () => {
+    if (this.state.width <= 10) {
+      return;
+    }
+    this.setState({
+      width: this.state.width - 10,
+      height: this.state.height - 10,
+    });
+  };
 
-var MultipleSourcesExample = createReactClass({
-  getInitialState: function() {
-    return {
-      width: 30,
-      height: 30,
-    };
-  },
-  render: function() {
+  render() {
     return (
       <View>
         <View style={{flexDirection: 'row', justifyContent: 'space-between'}}>
@@ -247,26 +332,8 @@ var MultipleSourcesExample = createReactClass({
         </View>
       </View>
     );
-  },
-  increaseImageSize: function() {
-    if (this.state.width >= 100) {
-      return;
-    }
-    this.setState({
-      width: this.state.width + 10,
-      height: this.state.height + 10,
-    });
-  },
-  decreaseImageSize: function() {
-    if (this.state.width <= 10) {
-      return;
-    }
-    this.setState({
-      width: this.state.width - 10,
-      height: this.state.height - 10,
-    });
-  },
-});
+  }
+}
 
 exports.displayName = (undefined: ?string);
 exports.framework = 'React';
@@ -443,6 +510,38 @@ exports.examples = [
             style={[styles.base, styles.leftMargin, {borderRadius: 19}]}
             source={fullImage}
           />
+          <Image
+            style={[styles.base, styles.leftMargin, {borderTopLeftRadius: 20}]}
+            source={fullImage}
+          />
+          <Image
+            style={[
+              styles.base,
+              styles.leftMargin,
+              {
+                borderWidth: 10,
+                borderTopLeftRadius: 10,
+                borderBottomRightRadius: 20,
+                borderColor: 'green',
+              },
+            ]}
+            source={fullImage}
+          />
+          <Image
+            style={[
+              styles.base,
+              styles.leftMargin,
+              {
+                borderWidth: 5,
+                borderTopLeftRadius: 10,
+                borderTopRightRadius: 20,
+                borderBottomRightRadius: 30,
+                borderBottomLeftRadius: 40,
+                borderColor: 'red',
+              },
+            ]}
+            source={fullImage}
+          />
         </View>
       );
     },
diff --git a/RNTester/js/InputAccessoryViewExample.js b/RNTester/js/InputAccessoryViewExample.js
index a848b961436e4e..70f9b572945144 100644
--- a/RNTester/js/InputAccessoryViewExample.js
+++ b/RNTester/js/InputAccessoryViewExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -58,6 +58,8 @@ class TextInputBar extends React.PureComponent<*, *> {
   }
 }
 
+const BAR_HEIGHT = 44;
+
 class InputAccessoryViewExample extends React.Component<*> {
   static title = '<InputAccessoryView>';
   static description =
@@ -65,8 +67,8 @@ class InputAccessoryViewExample extends React.Component<*> {
 
   render() {
     return (
-      <View>
-        <ScrollView keyboardDismissMode="interactive">
+      <>
+        <ScrollView style={styles.fill} keyboardDismissMode="interactive">
           {Array(15)
             .fill()
             .map((_, i) => <Message key={i} />)}
@@ -74,14 +76,21 @@ class InputAccessoryViewExample extends React.Component<*> {
         <InputAccessoryView backgroundColor="#fffffff7">
           <TextInputBar />
         </InputAccessoryView>
-      </View>
+      </>
     );
   }
 }
 
 const styles = StyleSheet.create({
+  fill: {
+    flex: 1,
+  },
   textInputContainer: {
     flexDirection: 'row',
+    alignItems: 'center',
+    borderTopWidth: 1,
+    borderTopColor: '#eee',
+    height: BAR_HEIGHT,
   },
   textInput: {
     flex: 1,
diff --git a/RNTester/js/KeyboardAvoidingViewExample.js b/RNTester/js/KeyboardAvoidingViewExample.js
index 0e86e432d79f58..5a959c8618e3cf 100644
--- a/RNTester/js/KeyboardAvoidingViewExample.js
+++ b/RNTester/js/KeyboardAvoidingViewExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/LayoutAnimationExample.js b/RNTester/js/LayoutAnimationExample.js
index 47f5889834bd4c..6b8c0272e63bba 100644
--- a/RNTester/js/LayoutAnimationExample.js
+++ b/RNTester/js/LayoutAnimationExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/LayoutEventsExample.js b/RNTester/js/LayoutEventsExample.js
index f5556a868175b2..c921f90087457c 100644
--- a/RNTester/js/LayoutEventsExample.js
+++ b/RNTester/js/LayoutEventsExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,12 +17,12 @@ var {Image, LayoutAnimation, StyleSheet, Text, View} = ReactNative;
 import type {ViewLayout, ViewLayoutEvent} from 'ViewPropTypes';
 
 type State = {
-  containerStyle?: {width: number},
+  containerStyle?: {|width: number|},
   extraText?: string,
   imageLayout?: ViewLayout,
   textLayout?: ViewLayout,
   viewLayout?: ViewLayout,
-  viewStyle: {margin: number},
+  viewStyle: {|margin: number|},
 };
 
 class LayoutEventExample extends React.Component<{}, State> {
diff --git a/RNTester/js/LayoutExample.js b/RNTester/js/LayoutExample.js
index 3803fcf9002810..9b32ec60c4443e 100644
--- a/RNTester/js/LayoutExample.js
+++ b/RNTester/js/LayoutExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/LinkingExample.js b/RNTester/js/LinkingExample.js
index 5f6724f95bb16e..89ac48ca8320e5 100644
--- a/RNTester/js/LinkingExample.js
+++ b/RNTester/js/LinkingExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,17 +9,22 @@
 
 'use strict';
 
-var React = require('react');
-var PropTypes = require('prop-types');
-var ReactNative = require('react-native');
-var {Linking, StyleSheet, Text, TouchableOpacity, View} = ReactNative;
-var RNTesterBlock = require('./RNTesterBlock');
+const React = require('react');
+const {
+  Linking,
+  StyleSheet,
+  Text,
+  TouchableOpacity,
+  View,
+} = require('react-native');
 
-class OpenURLButton extends React.Component {
-  static propTypes = {
-    url: PropTypes.string,
-  };
+const RNTesterBlock = require('./RNTesterBlock');
+
+type Props = $ReadOnly<{|
+  url?: ?string,
+|}>;
 
+class OpenURLButton extends React.Component<Props> {
   handleClick = () => {
     Linking.canOpenURL(this.props.url).then(supported => {
       if (supported) {
@@ -59,7 +64,7 @@ class IntentAndroidExample extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   container: {
     flex: 1,
     backgroundColor: 'white',
diff --git a/RNTester/js/ListExampleShared.js b/RNTester/js/ListExampleShared.js
index 62654e78e18192..ee1bdad03411e6 100644
--- a/RNTester/js/ListExampleShared.js
+++ b/RNTester/js/ListExampleShared.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/ListViewExample.js b/RNTester/js/ListViewExample.js
index a274c353949f59..f52f3dfb461af1 100644
--- a/RNTester/js/ListViewExample.js
+++ b/RNTester/js/ListViewExample.js
@@ -1,43 +1,54 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
 
-var React = require('react');
-var createReactClass = require('create-react-class');
-var ReactNative = require('react-native');
-var {Image, ListView, TouchableHighlight, StyleSheet, Text, View} = ReactNative;
-
-var RNTesterPage = require('./RNTesterPage');
-
-var ListViewSimpleExample = createReactClass({
-  displayName: 'ListViewSimpleExample',
-  statics: {
-    title: '<ListView>',
-    description: 'Performant, scrollable list of data.',
-  },
-
-  getInitialState: function() {
-    var ds = new ListView.DataSource({rowHasChanged: (r1, r2) => r1 !== r2});
-    return {
-      dataSource: ds.cloneWithRows(this._genRows({})),
-    };
-  },
-
-  _pressData: ({}: {[key: number]: boolean}),
+const React = require('react');
+const ReactNative = require('react-native');
+const {
+  Image,
+  ListView,
+  TouchableHighlight,
+  StyleSheet,
+  Text,
+  View,
+} = ReactNative;
+const ListViewDataSource = require('ListViewDataSource');
+const RNTesterPage = require('./RNTesterPage');
+
+import type {RNTesterProps} from 'RNTesterTypes';
+
+type State = {|
+  dataSource: ListViewDataSource,
+|};
+
+class ListViewSimpleExample extends React.Component<RNTesterProps, State> {
+  static title = '<ListView>';
+  static description = 'Performant, scrollable list of data.';
+
+  state = {
+    dataSource: this.getInitialDataSource(),
+  };
+
+  _pressData: {[key: number]: boolean} = {};
+
+  getInitialDataSource() {
+    const ds = new ListView.DataSource({rowHasChanged: (r1, r2) => r1 !== r2});
+    return ds.cloneWithRows(this._genRows({}));
+  }
 
-  UNSAFE_componentWillMount: function() {
+  UNSAFE_componentWillMount() {
     this._pressData = {};
-  },
+  }
 
-  render: function() {
+  render() {
     return (
       <RNTesterPage
         title={this.props.navigator ? null : '<ListView>'}
@@ -50,14 +61,14 @@ var ListViewSimpleExample = createReactClass({
         />
       </RNTesterPage>
     );
-  },
+  }
 
-  _renderRow: function(
+  _renderRow = (
     rowData: string,
     sectionID: number,
     rowID: number,
     highlightRow: (sectionID: number, rowID: number) => void,
-  ) {
+  ) => {
     var rowHash = Math.abs(hashCode(rowData));
     var imgSource = THUMB_URLS[rowHash % THUMB_URLS.length];
     return (
@@ -76,27 +87,27 @@ var ListViewSimpleExample = createReactClass({
         </View>
       </TouchableHighlight>
     );
-  },
+  };
 
-  _genRows: function(pressData: {[key: number]: boolean}): Array<string> {
+  _genRows(pressData: {[key: number]: boolean}): Array<string> {
     var dataBlob = [];
     for (var ii = 0; ii < 100; ii++) {
       var pressedText = pressData[ii] ? ' (pressed)' : '';
       dataBlob.push('Row ' + ii + pressedText);
     }
     return dataBlob;
-  },
+  }
 
-  _pressRow: function(rowID: number) {
+  _pressRow = (rowID: number) => {
     this._pressData[rowID] = !this._pressData[rowID];
     this.setState({
       dataSource: this.state.dataSource.cloneWithRows(
         this._genRows(this._pressData),
       ),
     });
-  },
+  };
 
-  _renderSeparator: function(
+  _renderSeparator(
     sectionID: number,
     rowID: number,
     adjacentRowHighlighted: boolean,
@@ -110,8 +121,8 @@ var ListViewSimpleExample = createReactClass({
         }}
       />
     );
-  },
-});
+  }
+}
 
 var THUMB_URLS = [
   require('./Thumbnails/like.png'),
diff --git a/RNTester/js/ListViewGridLayoutExample.js b/RNTester/js/ListViewGridLayoutExample.js
index 65a407f4d19e90..2f3340d151af5d 100644
--- a/RNTester/js/ListViewGridLayoutExample.js
+++ b/RNTester/js/ListViewGridLayoutExample.js
@@ -1,19 +1,28 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
 
-var React = require('react');
-var createReactClass = require('create-react-class');
-var ReactNative = require('react-native');
-var {Image, ListView, TouchableHighlight, StyleSheet, Text, View} = ReactNative;
+const React = require('react');
+const ReactNative = require('react-native');
+const {
+  Image,
+  ListView,
+  TouchableHighlight,
+  StyleSheet,
+  Text,
+  View,
+} = ReactNative;
+const ListViewDataSource = require('ListViewDataSource');
+
+import type {RNTesterProps} from 'RNTesterTypes';
 
 var THUMB_URLS = [
   require('./Thumbnails/like.png'),
@@ -30,28 +39,30 @@ var THUMB_URLS = [
   require('./Thumbnails/victory.png'),
 ];
 
-var ListViewGridLayoutExample = createReactClass({
-  displayName: 'ListViewGridLayoutExample',
+type State = {|
+  dataSource: ListViewDataSource,
+|};
 
-  statics: {
-    title: '<ListView> - Grid Layout',
-    description: 'Flexbox grid layout.',
-  },
+class ListViewGridLayoutExample extends React.Component<RNTesterProps, State> {
+  static title = '<ListView> - Grid Layout';
+  static description = 'Flexbox grid layout.';
 
-  getInitialState: function() {
-    var ds = new ListView.DataSource({rowHasChanged: (r1, r2) => r1 !== r2});
-    return {
-      dataSource: ds.cloneWithRows(this._genRows({})),
-    };
-  },
+  state = {
+    dataSource: this.getInitialDataSource(),
+  };
 
-  _pressData: ({}: {[key: number]: boolean}),
+  getInitialDataSource() {
+    const ds = new ListView.DataSource({rowHasChanged: (r1, r2) => r1 !== r2});
+    return ds.cloneWithRows(this._genRows({}));
+  }
 
-  UNSAFE_componentWillMount: function() {
+  _pressData: {[key: number]: boolean} = {};
+
+  UNSAFE_componentWillMount() {
     this._pressData = {};
-  },
+  }
 
-  render: function() {
+  render() {
     return (
       // ListView wraps ScrollView and so takes on its properties.
       // With that in mind you can use the ScrollView's contentContainerStyle prop to style the items.
@@ -64,9 +75,9 @@ var ListViewGridLayoutExample = createReactClass({
         renderRow={this._renderRow}
       />
     );
-  },
+  }
 
-  _renderRow: function(rowData: string, sectionID: number, rowID: number) {
+  _renderRow = (rowData: string, sectionID: number, rowID: number) => {
     var rowHash = Math.abs(hashCode(rowData));
     var imgSource = THUMB_URLS[rowHash % THUMB_URLS.length];
     return (
@@ -81,26 +92,26 @@ var ListViewGridLayoutExample = createReactClass({
         </View>
       </TouchableHighlight>
     );
-  },
+  };
 
-  _genRows: function(pressData: {[key: number]: boolean}): Array<string> {
+  _genRows(pressData: {[key: number]: boolean}): Array<string> {
     var dataBlob = [];
     for (var ii = 0; ii < 100; ii++) {
       var pressedText = pressData[ii] ? ' (X)' : '';
       dataBlob.push('Cell ' + ii + pressedText);
     }
     return dataBlob;
-  },
+  }
 
-  _pressRow: function(rowID: number) {
+  _pressRow = (rowID: number) => {
     this._pressData[rowID] = !this._pressData[rowID];
     this.setState({
       dataSource: this.state.dataSource.cloneWithRows(
         this._genRows(this._pressData),
       ),
     });
-  },
-});
+  };
+}
 
 /* eslint no-bitwise: 0 */
 var hashCode = function(str) {
diff --git a/RNTester/js/ListViewPagingExample.js b/RNTester/js/ListViewPagingExample.js
index 5ff64ec6c136b6..85598c2ae5fb75 100644
--- a/RNTester/js/ListViewPagingExample.js
+++ b/RNTester/js/ListViewPagingExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/MaskedViewExample.js b/RNTester/js/MaskedViewExample.js
index b944fbc16f7366..8a2ebd71116a20 100644
--- a/RNTester/js/MaskedViewExample.js
+++ b/RNTester/js/MaskedViewExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/ModalExample.js b/RNTester/js/ModalExample.js
index a66d331d03c9cc..34025634360242 100644
--- a/RNTester/js/ModalExample.js
+++ b/RNTester/js/ModalExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/MultiColumnExample.js b/RNTester/js/MultiColumnExample.js
index 468bc74406555d..1266cf1b6f771e 100644
--- a/RNTester/js/MultiColumnExample.js
+++ b/RNTester/js/MultiColumnExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -96,7 +96,6 @@ class MultiColumnExample extends React.PureComponent<
           renderItem={this._renderItemComponent}
           disableVirtualization={!this.state.virtualized}
           onViewableItemsChanged={this._onViewableItemsChanged}
-          legacyImplementation={false}
         />
       </RNTesterPage>
     );
diff --git a/RNTester/js/NativeAnimationsExample.js b/RNTester/js/NativeAnimationsExample.js
index 44d5416c4a3e7d..4c5a094033a4e5 100644
--- a/RNTester/js/NativeAnimationsExample.js
+++ b/RNTester/js/NativeAnimationsExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/NavigatorIOSBarStyleExample.js b/RNTester/js/NavigatorIOSBarStyleExample.js
deleted file mode 100644
index 07ca90edc05c1b..00000000000000
--- a/RNTester/js/NavigatorIOSBarStyleExample.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @format
- */
-
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {NavigatorIOS, StatusBar, StyleSheet, Text, View} = ReactNative;
-
-class EmptyPage extends React.Component<{
-  text: string,
-}> {
-  render() {
-    return (
-      <View style={styles.emptyPage}>
-        <Text style={styles.emptyPageText}>{this.props.text}</Text>
-      </View>
-    );
-  }
-}
-
-class NavigatorIOSColors extends React.Component<{}> {
-  static title = '<NavigatorIOS> - Custom Bar Style';
-  static description = 'iOS navigation with custom nav bar colors';
-
-  render() {
-    // Set StatusBar with light contents to get better contrast
-    StatusBar.setBarStyle('light-content');
-
-    return (
-      <NavigatorIOS
-        style={styles.container}
-        initialRoute={{
-          component: EmptyPage,
-          title: '<NavigatorIOS>',
-          rightButtonTitle: 'Done',
-          onRightButtonPress: () => {
-            StatusBar.setBarStyle('default');
-            this.props.onExampleExit();
-          },
-          passProps: {
-            text: 'The nav bar is black with barStyle prop.',
-          },
-        }}
-        barStyle="black"
-      />
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  container: {
-    flex: 1,
-  },
-  emptyPage: {
-    flex: 1,
-    paddingTop: 64,
-  },
-  emptyPageText: {
-    margin: 10,
-  },
-});
-
-NavigatorIOSColors.external = true;
-
-module.exports = NavigatorIOSColors;
diff --git a/RNTester/js/NavigatorIOSColorsExample.js b/RNTester/js/NavigatorIOSColorsExample.js
deleted file mode 100644
index d9a7cbb29e0cb4..00000000000000
--- a/RNTester/js/NavigatorIOSColorsExample.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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';
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {NavigatorIOS, StatusBar, StyleSheet, Text, View} = ReactNative;
-
-class EmptyPage extends React.Component {
-  render() {
-    return (
-      <View style={styles.emptyPage}>
-        <Text style={styles.emptyPageText}>{this.props.text}</Text>
-      </View>
-    );
-  }
-}
-
-class NavigatorIOSColors extends React.Component {
-  static title = '<NavigatorIOS> - Custom Colors';
-  static description = 'iOS navigation with custom nav bar colors';
-
-  render() {
-    // Set StatusBar with light contents to get better contrast
-    StatusBar.setBarStyle('light-content');
-
-    return (
-      <NavigatorIOS
-        style={styles.container}
-        initialRoute={{
-          component: EmptyPage,
-          title: '<NavigatorIOS>',
-          rightButtonTitle: 'Done',
-          onRightButtonPress: () => {
-            StatusBar.setBarStyle('default');
-            this.props.onExampleExit();
-          },
-          passProps: {
-            text:
-              'The nav bar has custom colors with tintColor, ' +
-              'barTintColor and titleTextColor props.',
-          },
-        }}
-        tintColor="#FFFFFF"
-        barTintColor="#183E63"
-        titleTextColor="#FFFFFF"
-        translucent={true}
-      />
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  container: {
-    flex: 1,
-  },
-  emptyPage: {
-    flex: 1,
-    paddingTop: 64,
-  },
-  emptyPageText: {
-    margin: 10,
-  },
-});
-
-NavigatorIOSColors.external = true;
-
-module.exports = NavigatorIOSColors;
diff --git a/RNTester/js/NavigatorIOSExample.js b/RNTester/js/NavigatorIOSExample.js
deleted file mode 100644
index 252bf0e9e96511..00000000000000
--- a/RNTester/js/NavigatorIOSExample.js
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 ViewExample = require('./ViewExample');
-
-const createExamplePage = require('./createExamplePage');
-const nativeImageSource = require('nativeImageSource');
-const {
-  AlertIOS,
-  NavigatorIOS,
-  ScrollView,
-  StyleSheet,
-  Text,
-  TouchableHighlight,
-  View,
-} = ReactNative;
-
-class EmptyPage extends React.Component<$FlowFixMeProps> {
-  render() {
-    return (
-      <View style={styles.emptyPage}>
-        <Text style={styles.emptyPageText}>{this.props.text}</Text>
-      </View>
-    );
-  }
-}
-
-class NavigatorIOSExamplePage extends React.Component<$FlowFixMeProps> {
-  render() {
-    var recurseTitle = 'Recurse Navigation';
-    if (!this.props.depth || this.props.depth === 1) {
-      recurseTitle += ' - more examples here';
-    }
-    return (
-      <ScrollView style={styles.list}>
-        <View style={styles.line} />
-        <View style={styles.group}>
-          {this._renderRow(recurseTitle, () => {
-            this.props.navigator.push({
-              title: NavigatorIOSExample.title,
-              component: NavigatorIOSExamplePage,
-              backButtonTitle: 'Custom Back',
-              passProps: {depth: this.props.depth ? this.props.depth + 1 : 1},
-            });
-          })}
-          {this._renderRow('Push View Example', () => {
-            this.props.navigator.push({
-              title: 'Very Long Custom View Example Title',
-              component: createExamplePage(null, ViewExample),
-            });
-          })}
-          {this._renderRow('Custom title image Example', () => {
-            this.props.navigator.push({
-              title: 'Custom title image Example',
-              titleImage: require('./relay.png'),
-              component: createExamplePage(null, ViewExample),
-            });
-          })}
-          {this._renderRow('Custom Right Button', () => {
-            this.props.navigator.push({
-              title: NavigatorIOSExample.title,
-              component: EmptyPage,
-              rightButtonTitle: 'Cancel',
-              onRightButtonPress: () => this.props.navigator.pop(),
-              passProps: {
-                text: 'This page has a right button in the nav bar',
-              },
-            });
-          })}
-          {this._renderRow('Custom Right System Button', () => {
-            this.props.navigator.push({
-              title: NavigatorIOSExample.title,
-              component: EmptyPage,
-              rightButtonSystemIcon: 'bookmarks',
-              onRightButtonPress: () => this.props.navigator.pop(),
-              passProps: {
-                text: 'This page has a right system button in the nav bar',
-              },
-            });
-          })}
-          {this._renderRow('Custom Left & Right Icons', () => {
-            this.props.navigator.push({
-              title: NavigatorIOSExample.title,
-              component: EmptyPage,
-              leftButtonTitle: 'Custom Left',
-              onLeftButtonPress: () => this.props.navigator.pop(),
-              rightButtonIcon: nativeImageSource({
-                ios: 'NavBarButtonPlus',
-                width: 17,
-                height: 17,
-              }),
-              onRightButtonPress: () => {
-                AlertIOS.alert(
-                  'Bar Button Action',
-                  'Recognized a tap on the bar button icon',
-                  [
-                    {
-                      text: 'OK',
-                      onPress: () => console.log('Tapped OK'),
-                    },
-                  ],
-                );
-              },
-              passProps: {
-                text:
-                  'This page has an icon for the right button in the nav bar',
-              },
-            });
-          })}
-          {this._renderRow('Custom Left & Right System Icons', () => {
-            this.props.navigator.push({
-              title: NavigatorIOSExample.title,
-              component: EmptyPage,
-              leftButtonSystemIcon: 'cancel',
-              onLeftButtonPress: () => this.props.navigator.pop(),
-              rightButtonSystemIcon: 'search',
-              onRightButtonPress: () => {
-                AlertIOS.alert(
-                  'Bar Button Action',
-                  'Recognized a tap on the bar button icon',
-                  [
-                    {
-                      text: 'OK',
-                      onPress: () => console.log('Tapped OK'),
-                    },
-                  ],
-                );
-              },
-              passProps: {
-                text:
-                  'This page has an icon for the right button in the nav bar',
-              },
-            });
-          })}
-          {this._renderRow('Pop', () => {
-            this.props.navigator.pop();
-          })}
-          {this._renderRow('Pop to top', () => {
-            this.props.navigator.popToTop();
-          })}
-          {this._renderReplace()}
-          {this._renderReplacePrevious()}
-          {this._renderReplacePreviousAndPop()}
-          {this._renderRow(
-            'Exit NavigatorIOS Example',
-            this.props.onExampleExit,
-          )}
-        </View>
-        <View style={styles.line} />
-      </ScrollView>
-    );
-  }
-
-  _renderReplace = () => {
-    if (!this.props.depth) {
-      // this is to avoid replacing the top of the stack
-      return null;
-    }
-    return this._renderRow('Replace here', () => {
-      var prevRoute = this.props.route;
-      this.props.navigator.replace({
-        title: 'New Navigation',
-        component: EmptyPage,
-        rightButtonTitle: 'Undo',
-        onRightButtonPress: () => this.props.navigator.replace(prevRoute),
-        passProps: {
-          text:
-            'The component is replaced, but there is currently no ' +
-            'way to change the right button or title of the current route',
-        },
-      });
-    });
-  };
-
-  _renderReplacePrevious = () => {
-    if (!this.props.depth || this.props.depth < 2) {
-      // this is to avoid replacing the top of the stack
-      return null;
-    }
-    return this._renderRow('Replace previous', () => {
-      this.props.navigator.replacePrevious({
-        title: 'Replaced',
-        component: EmptyPage,
-        passProps: {
-          text: 'This is a replaced "previous" page',
-        },
-        wrapperStyle: styles.customWrapperStyle,
-      });
-    });
-  };
-
-  _renderReplacePreviousAndPop = () => {
-    if (!this.props.depth || this.props.depth < 2) {
-      // this is to avoid replacing the top of the stack
-      return null;
-    }
-    return this._renderRow('Replace previous and pop', () => {
-      this.props.navigator.replacePreviousAndPop({
-        title: 'Replaced and Popped',
-        component: EmptyPage,
-        passProps: {
-          text: 'This is a replaced "previous" page',
-        },
-        wrapperStyle: styles.customWrapperStyle,
-      });
-    });
-  };
-
-  _renderRow = (title: string, onPress: Function) => {
-    return (
-      <View>
-        <TouchableHighlight onPress={onPress}>
-          <View style={styles.row}>
-            <Text style={styles.rowText}>{title}</Text>
-          </View>
-        </TouchableHighlight>
-        <View style={styles.separator} />
-      </View>
-    );
-  };
-}
-
-class NavigatorIOSExample extends React.Component<$FlowFixMeProps> {
-  static title = '<NavigatorIOS>';
-  static description = 'iOS navigation capabilities';
-  static external = true;
-
-  render() {
-    const {onExampleExit} = this.props;
-    return (
-      <NavigatorIOS
-        style={styles.container}
-        initialRoute={{
-          title: NavigatorIOSExample.title,
-          component: NavigatorIOSExamplePage,
-          passProps: {onExampleExit},
-        }}
-        tintColor="#008888"
-      />
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-  },
-  customWrapperStyle: {
-    backgroundColor: '#bbdddd',
-  },
-  emptyPage: {
-    flex: 1,
-    paddingTop: 64,
-  },
-  emptyPageText: {
-    margin: 10,
-  },
-  list: {
-    backgroundColor: '#eeeeee',
-    marginTop: 10,
-  },
-  group: {
-    backgroundColor: 'white',
-  },
-  groupSpace: {
-    height: 15,
-  },
-  line: {
-    backgroundColor: '#bbbbbb',
-    height: StyleSheet.hairlineWidth,
-  },
-  row: {
-    backgroundColor: 'white',
-    justifyContent: 'center',
-    paddingHorizontal: 15,
-    paddingVertical: 15,
-  },
-  separator: {
-    height: StyleSheet.hairlineWidth,
-    backgroundColor: '#bbbbbb',
-    marginLeft: 15,
-  },
-  rowNote: {
-    fontSize: 17,
-  },
-  rowText: {
-    fontSize: 17,
-    fontWeight: '500',
-  },
-});
-
-module.exports = NavigatorIOSExample;
diff --git a/RNTester/js/NetInfoExample.js b/RNTester/js/NetInfoExample.js
index c3b62afdfdbe81..ae8f0976dd74d0 100644
--- a/RNTester/js/NetInfoExample.js
+++ b/RNTester/js/NetInfoExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/OrientationChangeExample.js b/RNTester/js/OrientationChangeExample.js
index cb2bee02c33d60..933745f060c512 100644
--- a/RNTester/js/OrientationChangeExample.js
+++ b/RNTester/js/OrientationChangeExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/PanResponderExample.js b/RNTester/js/PanResponderExample.js
index 8e0d44a35f2d84..82e0ecf0134ee5 100644
--- a/RNTester/js/PanResponderExample.js
+++ b/RNTester/js/PanResponderExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,37 +10,78 @@
 
 'use strict';
 
-var React = require('react');
-var createReactClass = require('create-react-class');
-var ReactNative = require('react-native');
-var {PanResponder, StyleSheet, View} = ReactNative;
+const React = require('react');
+const ReactNative = require('react-native');
+const {PanResponder, StyleSheet, View} = ReactNative;
 
-var CIRCLE_SIZE = 80;
+import type {PanResponderInstance, GestureState} from 'PanResponder';
+import type {PressEvent} from 'CoreEventTypes';
 
-var PanResponderExample = createReactClass({
-  displayName: 'PanResponderExample',
+type CircleStyles = {
+  backgroundColor?: string,
+  left?: number,
+  top?: number,
+};
 
-  statics: {
-    title: 'PanResponder Sample',
-    description:
-      'Shows the use of PanResponder to provide basic gesture handling.',
-  },
+const CIRCLE_SIZE = 80;
+
+type Props = $ReadOnly<{||}>;
+
+class PanResponderExample extends React.Component<Props> {
+  static title = 'PanResponder Sample';
+  static description =
+    'Shows the Use of PanResponder to provide basic gesture handling';
+
+  _handleStartShouldSetPanResponder = (
+    event: PressEvent,
+    gestureState: GestureState,
+  ): boolean => {
+    // Should we become active when the user presses down on the circle?
+    return true;
+  };
+
+  _handleMoveShouldSetPanResponder = (
+    event: PressEvent,
+    gestureState: GestureState,
+  ): boolean => {
+    // Should we become active when the user moves a touch over the circle?
+    return true;
+  };
+
+  _handlePanResponderGrant = (
+    event: PressEvent,
+    gestureState: GestureState,
+  ) => {
+    this._highlight();
+  };
+
+  _handlePanResponderMove = (event: PressEvent, gestureState: GestureState) => {
+    this._circleStyles.style.left = this._previousLeft + gestureState.dx;
+    this._circleStyles.style.top = this._previousTop + gestureState.dy;
+    this._updateNativeStyles();
+  };
 
-  _panResponder: {},
-  _previousLeft: 0,
-  _previousTop: 0,
-  _circleStyles: {},
-  circle: (null: ?{setNativeProps(props: Object): void}),
-
-  UNSAFE_componentWillMount: function() {
-    this._panResponder = PanResponder.create({
-      onStartShouldSetPanResponder: this._handleStartShouldSetPanResponder,
-      onMoveShouldSetPanResponder: this._handleMoveShouldSetPanResponder,
-      onPanResponderGrant: this._handlePanResponderGrant,
-      onPanResponderMove: this._handlePanResponderMove,
-      onPanResponderRelease: this._handlePanResponderEnd,
-      onPanResponderTerminate: this._handlePanResponderEnd,
-    });
+  _handlePanResponderEnd = (event: PressEvent, gestureState: GestureState) => {
+    this._unHighlight();
+    this._previousLeft += gestureState.dx;
+    this._previousTop += gestureState.dy;
+  };
+
+  _panResponder: PanResponderInstance = PanResponder.create({
+    onStartShouldSetPanResponder: this._handleStartShouldSetPanResponder,
+    onMoveShouldSetPanResponder: this._handleMoveShouldSetPanResponder,
+    onPanResponderGrant: this._handlePanResponderGrant,
+    onPanResponderMove: this._handlePanResponderMove,
+    onPanResponderRelease: this._handlePanResponderEnd,
+    onPanResponderTerminate: this._handlePanResponderEnd,
+  });
+
+  _previousLeft: number = 0;
+  _previousTop: number = 0;
+  _circleStyles: {|style: CircleStyles|} = {style: {}};
+  circle: ?React.ElementRef<typeof View> = null;
+
+  UNSAFE_componentWillMount() {
     this._previousLeft = 20;
     this._previousTop = 84;
     this._circleStyles = {
@@ -50,13 +91,27 @@ var PanResponderExample = createReactClass({
         backgroundColor: 'green',
       },
     };
-  },
+  }
 
-  componentDidMount: function() {
+  componentDidMount() {
     this._updateNativeStyles();
-  },
+  }
+
+  _highlight() {
+    this._circleStyles.style.backgroundColor = 'blue';
+    this._updateNativeStyles();
+  }
 
-  render: function() {
+  _unHighlight() {
+    this._circleStyles.style.backgroundColor = 'green';
+    this._updateNativeStyles();
+  }
+
+  _updateNativeStyles() {
+    this.circle && this.circle.setNativeProps(this._circleStyles);
+  }
+
+  render() {
     return (
       <View style={styles.container}>
         <View
@@ -68,52 +123,8 @@ var PanResponderExample = createReactClass({
         />
       </View>
     );
-  },
-
-  _highlight: function() {
-    this._circleStyles.style.backgroundColor = 'blue';
-    this._updateNativeStyles();
-  },
-
-  _unHighlight: function() {
-    this._circleStyles.style.backgroundColor = 'green';
-    this._updateNativeStyles();
-  },
-
-  _updateNativeStyles: function() {
-    this.circle && this.circle.setNativeProps(this._circleStyles);
-  },
-
-  _handleStartShouldSetPanResponder: function(
-    e: Object,
-    gestureState: Object,
-  ): boolean {
-    // Should we become active when the user presses down on the circle?
-    return true;
-  },
-
-  _handleMoveShouldSetPanResponder: function(
-    e: Object,
-    gestureState: Object,
-  ): boolean {
-    // Should we become active when the user moves a touch over the circle?
-    return true;
-  },
-
-  _handlePanResponderGrant: function(e: Object, gestureState: Object) {
-    this._highlight();
-  },
-  _handlePanResponderMove: function(e: Object, gestureState: Object) {
-    this._circleStyles.style.left = this._previousLeft + gestureState.dx;
-    this._circleStyles.style.top = this._previousTop + gestureState.dy;
-    this._updateNativeStyles();
-  },
-  _handlePanResponderEnd: function(e: Object, gestureState: Object) {
-    this._unHighlight();
-    this._previousLeft += gestureState.dx;
-    this._previousTop += gestureState.dy;
-  },
-});
+  }
+}
 
 var styles = StyleSheet.create({
   circle: {
diff --git a/RNTester/js/PermissionsExampleAndroid.android.js b/RNTester/js/PermissionsExampleAndroid.android.js
index 81a7ec5b1a6d23..b58251d9aef13d 100644
--- a/RNTester/js/PermissionsExampleAndroid.android.js
+++ b/RNTester/js/PermissionsExampleAndroid.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/PickerExample.js b/RNTester/js/PickerExample.js
index 0fd21fc7de32ea..f4bfe5f23b61fe 100644
--- a/RNTester/js/PickerExample.js
+++ b/RNTester/js/PickerExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/PickerIOSExample.js b/RNTester/js/PickerIOSExample.js
index 0ca1f61452a9df..0965e29f1b04ed 100644
--- a/RNTester/js/PickerIOSExample.js
+++ b/RNTester/js/PickerIOSExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/PointerEventsExample.js b/RNTester/js/PointerEventsExample.js
index b22fb8b3324a8d..ddc9a9cf0ccf8b 100644
--- a/RNTester/js/PointerEventsExample.js
+++ b/RNTester/js/PointerEventsExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/ProgressBarAndroidExample.android.js b/RNTester/js/ProgressBarAndroidExample.android.js
index 2b3d7feeafcc88..81c0a4554253ad 100644
--- a/RNTester/js/ProgressBarAndroidExample.android.js
+++ b/RNTester/js/ProgressBarAndroidExample.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -16,11 +16,9 @@ var createReactClass = require('create-react-class');
 var RNTesterBlock = require('RNTesterBlock');
 var RNTesterPage = require('RNTesterPage');
 
-var TimerMixin = require('react-timer-mixin');
-
 var MovingBar = createReactClass({
   displayName: 'MovingBar',
-  mixins: [TimerMixin],
+  _intervalID: (null: ?IntervalID),
 
   getInitialState: function() {
     return {
@@ -29,12 +27,18 @@ var MovingBar = createReactClass({
   },
 
   componentDidMount: function() {
-    this.setInterval(() => {
+    this._intervalID = setInterval(() => {
       var progress = (this.state.progress + 0.02) % 1;
       this.setState({progress: progress});
     }, 50);
   },
 
+  componentWillUnmount: function() {
+    if (this._intervalID != null) {
+      clearInterval(this._intervalID);
+    }
+  },
+
   render: function() {
     return <ProgressBar progress={this.state.progress} {...this.props} />;
   },
@@ -48,6 +52,8 @@ class ProgressBarAndroidExample extends React.Component<{}> {
     return (
       <RNTesterPage title="ProgressBar Examples">
         <RNTesterBlock title="Horizontal Indeterminate ProgressBar">
+          {/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+            * found when making Flow check .android.js files. */}
           <ProgressBar styleAttr="Horizontal" />
         </RNTesterBlock>
 
@@ -56,6 +62,8 @@ class ProgressBarAndroidExample extends React.Component<{}> {
         </RNTesterBlock>
 
         <RNTesterBlock title="Horizontal Black Indeterminate ProgressBar">
+          {/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+            * found when making Flow check .android.js files. */}
           <ProgressBar styleAttr="Horizontal" color="black" />
         </RNTesterBlock>
 
diff --git a/RNTester/js/ProgressViewIOSExample.js b/RNTester/js/ProgressViewIOSExample.js
index f691d9d3f98e5f..7c6ebfe6c2a5ab 100644
--- a/RNTester/js/ProgressViewIOSExample.js
+++ b/RNTester/js/ProgressViewIOSExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,39 +10,42 @@
 
 'use strict';
 
-var React = require('react');
-var createReactClass = require('create-react-class');
-var ReactNative = require('react-native');
-var {ProgressViewIOS, StyleSheet, View} = ReactNative;
-/* $FlowFixMe(>=0.54.0 site=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. */
-var TimerMixin = require('react-timer-mixin');
+const React = require('react');
+const ReactNative = require('react-native');
+const {ProgressViewIOS, StyleSheet, View} = ReactNative;
 
-var ProgressViewExample = createReactClass({
-  displayName: 'ProgressViewExample',
-  mixins: [TimerMixin],
+type Props = {||};
+type State = {|
+  progress: number,
+|};
 
-  getInitialState() {
-    return {
-      progress: 0,
-    };
-  },
+class ProgressViewExample extends React.Component<Props, State> {
+  _rafId: ?AnimationFrameID = null;
+
+  state = {
+    progress: 0,
+  };
 
   componentDidMount() {
     this.updateProgress();
-  },
+  }
+
+  componentWillUnmount() {
+    if (this._rafId != null) {
+      cancelAnimationFrame(this._rafId);
+    }
+  }
 
-  updateProgress() {
+  updateProgress = () => {
     var progress = this.state.progress + 0.01;
     this.setState({progress});
-    this.requestAnimationFrame(() => this.updateProgress());
-  },
+    this._rafId = requestAnimationFrame(() => this.updateProgress());
+  };
 
-  getProgress(offset) {
+  getProgress = offset => {
     var progress = this.state.progress + offset;
     return Math.sin(progress % Math.PI) % 1;
-  },
+  };
 
   render() {
     return (
@@ -73,8 +76,8 @@ var ProgressViewExample = createReactClass({
         />
       </View>
     );
-  },
-});
+  }
+}
 
 exports.displayName = (undefined: ?string);
 exports.framework = 'React';
diff --git a/RNTester/js/PushNotificationIOSExample.js b/RNTester/js/PushNotificationIOSExample.js
index f4e86ef5dddddb..ba85c879488c6a 100644
--- a/RNTester/js/PushNotificationIOSExample.js
+++ b/RNTester/js/PushNotificationIOSExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/RCTRootViewIOSExample.js b/RNTester/js/RCTRootViewIOSExample.js
index 0314507bc5b587..397dfe22e5fedb 100644
--- a/RNTester/js/RCTRootViewIOSExample.js
+++ b/RNTester/js/RCTRootViewIOSExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/RNTesterActions.js b/RNTester/js/RNTesterActions.js
index d121569ab36abc..2b23ab53b14c51 100644
--- a/RNTester/js/RNTesterActions.js
+++ b/RNTester/js/RNTesterActions.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/RNTesterApp.android.js b/RNTester/js/RNTesterApp.android.js
index 42c43b81aa8ca1..6a731611466e4c 100644
--- a/RNTester/js/RNTesterApp.android.js
+++ b/RNTester/js/RNTesterApp.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -23,6 +23,8 @@ const ToolbarAndroid = require('ToolbarAndroid');
 const RNTesterActions = require('./RNTesterActions');
 const RNTesterExampleContainer = require('./RNTesterExampleContainer');
 const RNTesterExampleList = require('./RNTesterExampleList');
+/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found when
+ * making Flow check .android.js files. */
 const RNTesterList = require('./RNTesterList');
 const RNTesterNavigationReducer = require('./RNTesterNavigationReducer');
 const UIManager = require('UIManager');
@@ -96,12 +98,18 @@ class RNTesterApp extends React.Component<Props, RNTesterNavigationState> {
         drawerWidth={Dimensions.get('window').width - DRAWER_WIDTH_LEFT}
         keyboardDismissMode="on-drag"
         onDrawerOpen={() => {
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           this._overrideBackPressForDrawerLayout = true;
         }}
         onDrawerClose={() => {
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           this._overrideBackPressForDrawerLayout = false;
         }}
         ref={drawer => {
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           this.drawer = drawer;
         }}
         renderNavigationView={this._renderDrawerContent}
@@ -114,6 +122,8 @@ class RNTesterApp extends React.Component<Props, RNTesterNavigationState> {
   _renderDrawerContent = () => {
     return (
       <View style={styles.drawerContentWrapper}>
+        {/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+          * found when making Flow check .android.js files. */}
         <RNTesterExampleList
           list={RNTesterList}
           displayTitleRow={true}
@@ -136,6 +146,8 @@ class RNTesterApp extends React.Component<Props, RNTesterNavigationState> {
               this._handleAction(RNTesterActions.Back());
             }}
             ref={example => {
+              /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue
+               * was found when making Flow check .android.js files. */
               this._exampleRef = example;
             }}
           />
@@ -146,6 +158,8 @@ class RNTesterApp extends React.Component<Props, RNTesterNavigationState> {
             <ToolbarAndroid
               logo={HEADER_LOGO_ICON}
               navIcon={HEADER_NAV_ICON}
+              /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue
+               * was found when making Flow check .android.js files. */
               onIconClicked={() => this.drawer.openDrawer()}
               style={styles.toolbar}
               title={ExampleModule.title}
@@ -153,6 +167,8 @@ class RNTesterApp extends React.Component<Props, RNTesterNavigationState> {
             <RNTesterExampleContainer
               module={ExampleModule}
               ref={example => {
+                /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue
+                 * was found when making Flow check .android.js files. */
                 this._exampleRef = example;
               }}
             />
@@ -166,10 +182,14 @@ class RNTesterApp extends React.Component<Props, RNTesterNavigationState> {
         <ToolbarAndroid
           logo={HEADER_LOGO_ICON}
           navIcon={HEADER_NAV_ICON}
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           onIconClicked={() => this.drawer.openDrawer()}
           style={styles.toolbar}
           title="RNTester"
         />
+        {/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+          * found when making Flow check .android.js files. */}
         <RNTesterExampleList
           onNavigate={this._handleAction}
           list={RNTesterList}
@@ -179,6 +199,8 @@ class RNTesterApp extends React.Component<Props, RNTesterNavigationState> {
   }
 
   _handleAction = (action: Object): boolean => {
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     this.drawer && this.drawer.closeDrawer();
     const newState = RNTesterNavigationReducer(this.state, action);
     if (this.state !== newState) {
@@ -191,16 +213,24 @@ class RNTesterApp extends React.Component<Props, RNTesterNavigationState> {
   };
 
   _handleBackButtonPress = () => {
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     if (this._overrideBackPressForDrawerLayout) {
       // This hack is necessary because drawer layout provides an imperative API
       // with open and close methods. This code would be cleaner if the drawer
       // layout provided an `isOpen` prop and allowed us to pass a `onDrawerClose` handler.
+      /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+       * when making Flow check .android.js files. */
       this.drawer && this.drawer.closeDrawer();
       return true;
     }
     if (
+      /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+       * when making Flow check .android.js files. */
       this._exampleRef &&
       this._exampleRef.handleBackAction &&
+      /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+       * when making Flow check .android.js files. */
       this._exampleRef.handleBackAction()
     ) {
       return true;
diff --git a/RNTester/js/RNTesterApp.ios.js b/RNTester/js/RNTesterApp.ios.js
index 7d5b1a1b23910a..9472863fc14769 100644
--- a/RNTester/js/RNTesterApp.ios.js
+++ b/RNTester/js/RNTesterApp.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/RNTesterBlock.js b/RNTester/js/RNTesterBlock.js
index 591b26b68a672f..483d1b68da24a1 100644
--- a/RNTester/js/RNTesterBlock.js
+++ b/RNTester/js/RNTesterBlock.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,32 +10,26 @@
 
 'use strict';
 
-var React = require('react');
-var PropTypes = require('prop-types');
-var ReactNative = require('react-native');
-var {StyleSheet, Text, View} = ReactNative;
+const React = require('react');
+const {StyleSheet, Text, View} = require('react-native');
 
-class RNTesterBlock extends React.Component<
-  {
-    title?: string,
-    description?: string,
-  },
-  $FlowFixMeState,
-> {
-  static propTypes = {
-    title: PropTypes.string,
-    description: PropTypes.string,
-  };
+type Props = $ReadOnly<{|
+  children?: React.Node,
+  title?: ?string,
+  description?: ?string,
+|}>;
+
+type State = {|
+  description: ?string,
+|};
 
-  state = {description: (null: ?string)};
+class RNTesterBlock extends React.Component<Props, State> {
+  state = {description: null};
 
   render() {
-    var description;
-    if (this.props.description) {
-      description = (
-        <Text style={styles.descriptionText}>{this.props.description}</Text>
-      );
-    }
+    const description = this.props.description ? (
+      <Text style={styles.descriptionText}>{this.props.description}</Text>
+    ) : null;
 
     return (
       <View style={styles.container}>
@@ -43,18 +37,13 @@ class RNTesterBlock extends React.Component<
           <Text style={styles.titleText}>{this.props.title}</Text>
           {description}
         </View>
-        <View style={styles.children}>
-          {
-            // $FlowFixMe found when converting React.createClass to ES6
-            this.props.children
-          }
-        </View>
+        <View style={styles.children}>{this.props.children}</View>
       </View>
     );
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   container: {
     borderRadius: 3,
     borderWidth: 0.5,
diff --git a/RNTester/js/RNTesterButton.js b/RNTester/js/RNTesterButton.js
index 57ac204b2242bf..0cc77abe6ae8cb 100644
--- a/RNTester/js/RNTesterButton.js
+++ b/RNTester/js/RNTesterButton.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,34 +10,30 @@
 
 'use strict';
 
-var React = require('react');
-var PropTypes = require('prop-types');
-var ReactNative = require('react-native');
-var {StyleSheet, Text, TouchableHighlight} = ReactNative;
+const React = require('react');
+const {StyleSheet, Text, TouchableHighlight} = require('react-native');
 
-class RNTesterButton extends React.Component<{onPress?: Function}> {
-  static propTypes = {
-    onPress: PropTypes.func,
-  };
+import type {PressEvent} from 'CoreEventTypes';
 
+type Props = $ReadOnly<{|
+  children?: React.Node,
+  onPress?: ?(event: PressEvent) => mixed,
+|}>;
+
+class RNTesterButton extends React.Component<Props> {
   render() {
     return (
       <TouchableHighlight
         onPress={this.props.onPress}
         style={styles.button}
         underlayColor="grey">
-        <Text>
-          {
-            // $FlowFixMe found when converting React.createClass to ES6
-            this.props.children
-          }
-        </Text>
+        <Text>{this.props.children}</Text>
       </TouchableHighlight>
     );
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   button: {
     borderColor: '#696969',
     borderRadius: 8,
diff --git a/RNTester/js/RNTesterExampleContainer.js b/RNTester/js/RNTesterExampleContainer.js
index 0b3e3d2331b9f9..012923869b241b 100644
--- a/RNTester/js/RNTesterExampleContainer.js
+++ b/RNTester/js/RNTesterExampleContainer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/RNTesterExampleList.js b/RNTester/js/RNTesterExampleList.js
index 325a5bce88a50c..5b8071a11dcc2c 100644
--- a/RNTester/js/RNTesterExampleList.js
+++ b/RNTester/js/RNTesterExampleList.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -21,9 +21,11 @@ const RNTesterActions = require('./RNTesterActions');
 const RNTesterStatePersister = require('./RNTesterStatePersister');
 const View = require('View');
 
+/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found when
+ * making Flow check .android.js files. */
 import type {RNTesterExample} from './RNTesterList.ios';
 import type {PassProps} from './RNTesterStatePersister';
-import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
+import type {TextStyleProp, ViewStyleProp} from 'StyleSheet';
 
 type Props = {
   onNavigate: Function,
@@ -32,8 +34,8 @@ type Props = {
     APIExamples: Array<RNTesterExample>,
   },
   persister: PassProps<*>,
-  searchTextInputStyle: DangerouslyImpreciseStyleProp,
-  style?: ?DangerouslyImpreciseStyleProp,
+  searchTextInputStyle: TextStyleProp,
+  style?: ?ViewStyleProp,
 };
 
 class RowComponent extends React.PureComponent<{
@@ -73,7 +75,18 @@ const renderSectionHeader = ({section}) => (
 class RNTesterExampleList extends React.Component<Props, $FlowFixMeState> {
   render() {
     const filterText = this.props.persister.state.filter;
-    const filterRegex = new RegExp(String(filterText), 'i');
+    let filterRegex = /.*/;
+
+    try {
+      filterRegex = new RegExp(String(filterText), 'i');
+    } catch (error) {
+      console.warn(
+        'Failed to create RegExp: %s\n%s',
+        filterText,
+        error.message,
+      );
+    }
+
     const filter = example =>
       /* $FlowFixMe(>=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
@@ -109,7 +122,6 @@ class RNTesterExampleList extends React.Component<Props, $FlowFixMeState> {
           keyboardShouldPersistTaps="handled"
           automaticallyAdjustContentInsets={false}
           keyboardDismissMode="on-drag"
-          legacyImplementation={false}
           renderSectionHeader={renderSectionHeader}
         />
       </View>
diff --git a/RNTester/js/RNTesterList.android.js b/RNTester/js/RNTesterList.android.js
index 8e8f6b791b8f4c..8657fc43061012 100644
--- a/RNTester/js/RNTesterList.android.js
+++ b/RNTester/js/RNTesterList.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -62,6 +62,8 @@ const ComponentExamples: Array<RNTesterExample> = [
   },
   {
     key: 'ProgressBarAndroidExample',
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     module: require('./ProgressBarAndroidExample'),
   },
   {
@@ -98,14 +100,20 @@ const ComponentExamples: Array<RNTesterExample> = [
   },
   {
     key: 'TextExample',
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     module: require('./TextExample'),
   },
   {
     key: 'TextInputExample',
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     module: require('./TextInputExample'),
   },
   {
     key: 'ToolbarAndroidExample',
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     module: require('./ToolbarAndroidExample'),
   },
   {
@@ -118,6 +126,8 @@ const ComponentExamples: Array<RNTesterExample> = [
   },
   {
     key: 'ViewPagerAndroidExample',
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     module: require('./ViewPagerAndroidExample'),
   },
   {
@@ -129,6 +139,8 @@ const ComponentExamples: Array<RNTesterExample> = [
 const APIExamples: Array<RNTesterExample> = [
   {
     key: 'AccessibilityAndroidExample',
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     module: require('./AccessibilityAndroidExample'),
   },
   {
@@ -205,6 +217,8 @@ const APIExamples: Array<RNTesterExample> = [
   },
   {
     key: 'PermissionsExampleAndroid',
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     module: require('./PermissionsExampleAndroid'),
   },
   {
@@ -229,6 +243,8 @@ const APIExamples: Array<RNTesterExample> = [
   },
   {
     key: 'ToastAndroidExample',
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     module: require('./ToastAndroidExample'),
   },
   {
diff --git a/RNTester/js/RNTesterList.ios.js b/RNTester/js/RNTesterList.ios.js
index f7a62efaa05f73..bcf31b320b9f29 100644
--- a/RNTester/js/RNTesterList.ios.js
+++ b/RNTester/js/RNTesterList.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -92,21 +92,6 @@ const ComponentExamples: Array<RNTesterExample> = [
     module: require('./MultiColumnExample'),
     supportsTVOS: true,
   },
-  {
-    key: 'NavigatorIOSColorsExample',
-    module: require('./NavigatorIOSColorsExample'),
-    supportsTVOS: false,
-  },
-  {
-    key: 'NavigatorIOSBarStyleExample',
-    module: require('./NavigatorIOSBarStyleExample'),
-    supportsTVOS: false,
-  },
-  {
-    key: 'NavigatorIOSExample',
-    module: require('./NavigatorIOSExample'),
-    supportsTVOS: true,
-  },
   {
     key: 'PickerExample',
     module: require('./PickerExample'),
@@ -127,6 +112,11 @@ const ComponentExamples: Array<RNTesterExample> = [
     module: require('./RefreshControlExample'),
     supportsTVOS: false,
   },
+  {
+    key: 'ScrollViewSimpleExample',
+    module: require('./ScrollViewSimpleExample'),
+    supportsTVOS: true,
+  },
   {
     key: 'SafeAreaViewExample',
     module: require('./SafeAreaViewExample'),
diff --git a/RNTester/js/RNTesterNavigationReducer.js b/RNTester/js/RNTesterNavigationReducer.js
index 7dc222eee1797a..a7b68d6bc9b68d 100644
--- a/RNTester/js/RNTesterNavigationReducer.js
+++ b/RNTester/js/RNTesterNavigationReducer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/RNTesterPage.js b/RNTester/js/RNTesterPage.js
index 580bd959800ddf..6b1b0fe1db6112 100644
--- a/RNTester/js/RNTesterPage.js
+++ b/RNTester/js/RNTesterPage.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,49 +10,39 @@
 
 'use strict';
 
-var PropTypes = require('prop-types');
-var React = require('react');
-var ReactNative = require('react-native');
-var {ScrollView, StyleSheet, View} = ReactNative;
+const React = require('react');
+const {ScrollView, StyleSheet, View} = require('react-native');
 
-var RNTesterTitle = require('./RNTesterTitle');
+const RNTesterTitle = require('./RNTesterTitle');
 
-class RNTesterPage extends React.Component<{
-  noScroll?: boolean,
-  noSpacer?: boolean,
-}> {
-  static propTypes = {
-    noScroll: PropTypes.bool,
-    noSpacer: PropTypes.bool,
-  };
+type Props = $ReadOnly<{|
+  children?: React.Node,
+  title?: ?string,
+  noScroll?: ?boolean,
+  noSpacer?: ?boolean,
+|}>;
 
+class RNTesterPage extends React.Component<Props> {
   render() {
-    var ContentWrapper;
-    var wrapperProps = {};
+    let ContentWrapper;
+    let wrapperProps = {};
     if (this.props.noScroll) {
       ContentWrapper = ((View: any): React.ComponentType<any>);
     } else {
       ContentWrapper = (ScrollView: React.ComponentType<any>);
-      // $FlowFixMe found when converting React.createClass to ES6
       wrapperProps.automaticallyAdjustContentInsets = !this.props.title;
       wrapperProps.keyboardShouldPersistTaps = 'handled';
       wrapperProps.keyboardDismissMode = 'interactive';
     }
-    /* $FlowFixMe(>=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. */
-    var title = this.props.title ? (
+    const title = this.props.title ? (
       <RNTesterTitle title={this.props.title} />
     ) : null;
-    var spacer = this.props.noSpacer ? null : <View style={styles.spacer} />;
+    const spacer = this.props.noSpacer ? null : <View style={styles.spacer} />;
     return (
       <View style={styles.container}>
         {title}
         <ContentWrapper style={styles.wrapper} {...wrapperProps}>
-          {
-            // $FlowFixMe found when converting React.createClass to ES6
-            this.props.children
-          }
+          {this.props.children}
           {spacer}
         </ContentWrapper>
       </View>
@@ -60,7 +50,7 @@ class RNTesterPage extends React.Component<{
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   container: {
     backgroundColor: '#e9eaed',
     flex: 1,
diff --git a/RNTester/js/RNTesterSettingSwitchRow.js b/RNTester/js/RNTesterSettingSwitchRow.js
index 423ccf23b24288..c44a6a82e46fa2 100644
--- a/RNTester/js/RNTesterSettingSwitchRow.js
+++ b/RNTester/js/RNTesterSettingSwitchRow.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/RNTesterStatePersister.js b/RNTester/js/RNTesterStatePersister.js
index fb697e7d77ee1b..720e2616f414d1 100644
--- a/RNTester/js/RNTesterStatePersister.js
+++ b/RNTester/js/RNTesterStatePersister.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/RNTesterTitle.js b/RNTester/js/RNTesterTitle.js
index 39d36a3a029f92..b9f5a77c838dff 100644
--- a/RNTester/js/RNTesterTitle.js
+++ b/RNTester/js/RNTesterTitle.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/RTLExample.js b/RNTester/js/RTLExample.js
index bab56a1d36919a..1d27fb4cab81c7 100644
--- a/RNTester/js/RTLExample.js
+++ b/RNTester/js/RTLExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/RefreshControlExample.js b/RNTester/js/RefreshControlExample.js
index bb69fff63a8527..30f20cf03cae8c 100644
--- a/RNTester/js/RefreshControlExample.js
+++ b/RNTester/js/RefreshControlExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/RootViewSizeFlexibilityExampleApp.js b/RNTester/js/RootViewSizeFlexibilityExampleApp.js
index bfcce23e6b8ff0..42ec22a18dc4e4 100644
--- a/RNTester/js/RootViewSizeFlexibilityExampleApp.js
+++ b/RNTester/js/RootViewSizeFlexibilityExampleApp.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/SafeAreaViewExample.js b/RNTester/js/SafeAreaViewExample.js
index be7ce97fa3b6aa..ed66587d733189 100644
--- a/RNTester/js/SafeAreaViewExample.js
+++ b/RNTester/js/SafeAreaViewExample.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  */
 'use strict';
@@ -15,6 +15,7 @@ const Modal = require('Modal');
 const React = require('react');
 const SafeAreaView = require('SafeAreaView');
 const StyleSheet = require('StyleSheet');
+const Switch = require('Switch');
 const Text = require('Text');
 const View = require('View');
 
@@ -26,10 +27,14 @@ exports.description =
 
 class SafeAreaViewExample extends React.Component<
   {},
-  {|modalVisible: boolean|},
+  {|
+    modalVisible: boolean,
+    emulateUnlessSupported: boolean,
+  |},
 > {
   state = {
     modalVisible: false,
+    emulateUnlessSupported: true,
   };
 
   _setModalVisible = visible => {
@@ -45,12 +50,21 @@ class SafeAreaViewExample extends React.Component<
           animationType="slide"
           supportedOrientations={['portrait', 'landscape']}>
           <View style={styles.modal}>
-            <SafeAreaView style={styles.safeArea}>
+            <SafeAreaView
+              style={styles.safeArea}
+              emulateUnlessSupported={this.state.emulateUnlessSupported}>
               <View style={styles.safeAreaContent}>
                 <Button
                   onPress={this._setModalVisible.bind(this, false)}
                   title="Close"
                 />
+                <Text>emulateUnlessSupported:</Text>
+                <Switch
+                  onValueChange={value =>
+                    this.setState({emulateUnlessSupported: value})
+                  }
+                  value={this.state.emulateUnlessSupported}
+                />
               </View>
             </SafeAreaView>
           </View>
@@ -59,6 +73,13 @@ class SafeAreaViewExample extends React.Component<
           onPress={this._setModalVisible.bind(this, true)}
           title="Present Modal Screen with SafeAreaView"
         />
+        <Text>emulateUnlessSupported:</Text>
+        <Switch
+          onValueChange={value =>
+            this.setState({emulateUnlessSupported: value})
+          }
+          value={this.state.emulateUnlessSupported}
+        />
       </View>
     );
   }
diff --git a/RNTester/js/ScrollViewExample.js b/RNTester/js/ScrollViewExample.js
index 6d70a62624a20f..9f93e0267cea64 100644
--- a/RNTester/js/ScrollViewExample.js
+++ b/RNTester/js/ScrollViewExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,8 +9,6 @@
  */
 'use strict';
 
-import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
-
 const ActivityIndicator = require('ActivityIndicator');
 const Platform = require('Platform');
 const React = require('react');
@@ -24,6 +22,8 @@ const {
   Image,
 } = ReactNative;
 
+import type {ViewStyleProp} from 'StyleSheet';
+
 exports.displayName = 'ScrollViewExample';
 exports.title = '<ScrollView>';
 exports.description =
@@ -79,7 +79,7 @@ exports.examples = [
     render: function() {
       function renderScrollView(
         title: string,
-        additionalStyles: typeof StyleSheet,
+        additionalStyles: ViewStyleProp,
       ) {
         let _scrollView: ?ScrollView;
         return (
@@ -121,14 +121,8 @@ exports.examples = [
 
       return (
         <View>
-          {/* $FlowFixMe(>=0.70.0 site=react_native_fb) This comment
-             * suppresses an error found when Flow v0.70 was deployed. To see
-             * the error delete this comment and run Flow. */
-          renderScrollView('LTR layout', {direction: 'ltr'})}
-          {/* $FlowFixMe(>=0.70.0 site=react_native_fb) This comment
-             * suppresses an error found when Flow v0.70 was deployed. To see
-             * the error delete this comment and run Flow. */
-          renderScrollView('RTL layout', {direction: 'rtl'})}
+          {renderScrollView('LTR layout', {direction: 'ltr'})}
+          {renderScrollView('RTL layout', {direction: 'rtl'})}
         </View>
       );
     },
@@ -261,7 +255,7 @@ if (Platform.OS === 'ios') {
 class Thumb extends React.PureComponent<{|
   source?: string | number,
   msg?: string,
-  style?: DangerouslyImpreciseStyleProp,
+  style?: ViewStyleProp,
 |}> {
   render() {
     const {source} = this.props;
diff --git a/RNTester/js/ScrollViewSimpleExample.js b/RNTester/js/ScrollViewSimpleExample.js
index b7d95b2fb2f929..2f157c215d9e01 100644
--- a/RNTester/js/ScrollViewSimpleExample.js
+++ b/RNTester/js/ScrollViewSimpleExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/SectionListExample.js b/RNTester/js/SectionListExample.js
index 5d3f73f70c2bde..0d72c60fab2fad 100644
--- a/RNTester/js/SectionListExample.js
+++ b/RNTester/js/SectionListExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,15 +12,7 @@
 
 const React = require('react');
 const ReactNative = require('react-native');
-const {
-  Alert,
-  Animated,
-  Button,
-  SectionList,
-  StyleSheet,
-  Text,
-  View,
-} = ReactNative;
+const {Alert, Animated, Button, StyleSheet, Text, View} = ReactNative;
 
 const RNTesterPage = require('./RNTesterPage');
 
@@ -39,8 +31,6 @@ const {
   renderStackedItem,
 } = require('./ListExampleShared');
 
-const AnimatedSectionList = Animated.createAnimatedComponent(SectionList);
-
 const VIEWABILITY_CONFIG = {
   minimumViewTime: 3000,
   viewAreaCoveragePercentThreshold: 100,
@@ -90,7 +80,7 @@ class SectionListExample extends React.PureComponent<{}, $FlowFixMeState> {
     {useNativeDriver: true},
   );
 
-  _sectionListRef: any;
+  _sectionListRef: Animated.SectionList;
   _captureRef = ref => {
     this._sectionListRef = ref;
   };
@@ -150,7 +140,7 @@ class SectionListExample extends React.PureComponent<{}, $FlowFixMeState> {
           </View>
         </View>
         <SeparatorComponent />
-        <AnimatedSectionList
+        <Animated.SectionList
           ref={this._captureRef}
           ListHeaderComponent={HeaderComponent}
           ListFooterComponent={FooterComponent}
diff --git a/RNTester/js/SegmentedControlIOSExample.js b/RNTester/js/SegmentedControlIOSExample.js
index 6dd00376956513..9021a95b7f4026 100644
--- a/RNTester/js/SegmentedControlIOSExample.js
+++ b/RNTester/js/SegmentedControlIOSExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/SetPropertiesExampleApp.js b/RNTester/js/SetPropertiesExampleApp.js
index 2b8e3fe5bf26e8..a7ea32204be7dd 100644
--- a/RNTester/js/SetPropertiesExampleApp.js
+++ b/RNTester/js/SetPropertiesExampleApp.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/ShareExample.js b/RNTester/js/ShareExample.js
index ac3aa22ee2f428..9f1a824368cb2d 100644
--- a/RNTester/js/ShareExample.js
+++ b/RNTester/js/ShareExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/Shared/RNTesterTypes.js b/RNTester/js/Shared/RNTesterTypes.js
new file mode 100644
index 00000000000000..00b91ea0ae7109
--- /dev/null
+++ b/RNTester/js/Shared/RNTesterTypes.js
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 {ComponentType} from 'React';
+
+export type RNTesterProps = $ReadOnly<{|
+  navigator?: ?$ReadOnlyArray<
+    $ReadOnly<{|
+      title: string,
+      component: ComponentType<any>,
+      backButtonTitle: string,
+      passProps: any,
+    |}>,
+  >,
+|}>;
diff --git a/RNTester/js/Shared/TextLegend.js b/RNTester/js/Shared/TextLegend.js
new file mode 100644
index 00000000000000..56cf17607c6b64
--- /dev/null
+++ b/RNTester/js/Shared/TextLegend.js
@@ -0,0 +1,242 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 {Picker, Text, View} = require('react-native');
+
+class TextLegend extends React.Component<*, *> {
+  state = {
+    textMetrics: [],
+    language: 'english',
+    alignment: 'left',
+    fontSize: 50,
+  };
+
+  render() {
+    const PANGRAMS = {
+      arabic:
+        'صِف خَلقَ خَودِ كَمِثلِ الشَمسِ إِذ بَزَغَت — يَحظى الضَجيعُ بِها نَجلاءَ مِعطارِ',
+      chinese: 'Innovation in China 中国智造，慧及全球 0123456789',
+      english: 'The quick brown fox jumps over the lazy dog.',
+      emoji: '🙏🏾🚗💩😍🤯👩🏽‍🔧🇨🇦💯',
+      german: 'Falsches Üben von Xylophonmusik quält jeden größeren Zwerg',
+      greek: 'Ταχίστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός',
+      hebrew: 'דג סקרן שט בים מאוכזב ולפתע מצא חברה',
+      hindi:
+        'ऋषियों को सताने वाले दुष्ट राक्षसों के राजा रावण का सर्वनाश करने वाले विष्णुवतार भगवान श्रीराम, अयोध्या के महाराज दशरथ के बड़े सपुत्र थे।',
+      igbo:
+        'Nne, nna, wepụ he’l’ụjọ dum n’ime ọzụzụ ụmụ, vufesi obi nye Chukwu, ṅụrịanụ, gbakọọnụ kpaa, kwee ya ka o guzoshie ike; ọ ghaghị ito, nwapụta ezi agwa',
+      irish:
+        'D’fhuascail Íosa Úrmhac na hÓighe Beannaithe pór Éava agus Ádhaimh',
+      japanese:
+        '色は匂へど 散りぬるを 我が世誰ぞ 常ならむ 有為の奥山 今日越えて 浅き夢見じ 酔ひもせず',
+      korean:
+        '키스의 고유조건은 입술끼리 만나야 하고 특별한 기술은 필요치 않다',
+      norwegian:
+        'Vår sære Zulu fra badeøya spilte jo whist og quickstep i min taxi.',
+      polish: 'Jeżu klątw, spłódź Finom część gry hańb!',
+      romanian: 'Muzicologă în bej vând whisky și tequila, preț fix.',
+      russian: 'Эх, чужак, общий съём цен шляп (юфть) – вдрызг!',
+      swedish: 'Yxskaftbud, ge vår WC-zonmö IQ-hjälp.',
+      thai:
+        'เป็นมนุษย์สุดประเสริฐเลิศคุณค่า กว่าบรรดาฝูงสัตว์เดรัจฉาน จงฝ่าฟันพัฒนาวิชาการ อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า หัดอภัยเหมือนกีฬาอัชฌาสัย ปฏิบัติประพฤติกฎกำหนดใจ พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอยฯ',
+    };
+    return (
+      <View>
+        <Text
+          onPress={() =>
+            this.setState(prevState => ({fontSize: prevState.fontSize + 3}))
+          }>
+          Increase size
+        </Text>
+        <Text
+          onPress={() =>
+            this.setState(prevState => ({fontSize: prevState.fontSize - 3}))
+          }>
+          Decrease size
+        </Text>
+        <Picker
+          selectedValue={this.state.language}
+          onValueChange={itemValue => this.setState({language: itemValue})}>
+          {Object.keys(PANGRAMS).map(x => (
+            <Picker.Item
+              label={x[0].toUpperCase() + x.substring(1)}
+              key={x}
+              value={x}
+            />
+          ))}
+        </Picker>
+        <View>
+          {this.state.textMetrics.map(
+            ({
+              x,
+              y,
+              width,
+              height,
+              capHeight,
+              ascender,
+              descender,
+              xHeight,
+            }) => {
+              return [
+                <View
+                  key="baseline view"
+                  style={{
+                    top: y + ascender,
+                    height: 1,
+                    left: 0,
+                    right: 0,
+                    position: 'absolute',
+                    backgroundColor: 'red',
+                  }}
+                />,
+                <Text
+                  key="baseline text"
+                  style={{
+                    top: y + ascender,
+                    right: 0,
+                    position: 'absolute',
+                    color: 'red',
+                  }}>
+                  Baseline
+                </Text>,
+                <View
+                  key="capheight view"
+                  style={{
+                    top: y + ascender - capHeight,
+                    height: 1,
+                    left: 0,
+                    right: 0,
+                    position: 'absolute',
+                    backgroundColor: 'green',
+                  }}
+                />,
+                <Text
+                  key="capheight text"
+                  style={{
+                    top: y + ascender - capHeight,
+                    right: 0,
+                    position: 'absolute',
+                    color: 'green',
+                  }}>
+                  Capheight
+                </Text>,
+                <View
+                  key="xheight view"
+                  style={{
+                    top: y + ascender - xHeight,
+                    height: 1,
+                    left: 0,
+                    right: 0,
+                    position: 'absolute',
+                    backgroundColor: 'blue',
+                  }}
+                />,
+                <Text
+                  key="xheight text"
+                  style={{
+                    top: y + ascender - xHeight,
+                    right: 0,
+                    position: 'absolute',
+                    color: 'blue',
+                  }}>
+                  X-height
+                </Text>,
+                <View
+                  key="descender view"
+                  style={{
+                    top: y + ascender + descender,
+                    height: 1,
+                    left: 0,
+                    right: 0,
+                    position: 'absolute',
+                    backgroundColor: 'orange',
+                  }}
+                />,
+                <Text
+                  key="descender text"
+                  style={{
+                    top: y + ascender + descender,
+                    right: 0,
+                    position: 'absolute',
+                    color: 'orange',
+                  }}>
+                  Descender
+                </Text>,
+                <View
+                  key="end of text view"
+                  style={{
+                    top: y,
+                    height: height,
+                    width: 1,
+                    left: x + width,
+                    position: 'absolute',
+                    backgroundColor: 'brown',
+                  }}
+                />,
+                <Text
+                  key="end of text text"
+                  style={{
+                    top: y,
+                    left: x + width + 5,
+                    position: 'absolute',
+                    color: 'brown',
+                  }}>
+                  End of text
+                </Text>,
+                <View
+                  key="start of text view"
+                  style={{
+                    top: y,
+                    height: height,
+                    width: 1,
+                    left: x,
+                    position: 'absolute',
+                    backgroundColor: 'brown',
+                  }}
+                />,
+                <Text
+                  key="start of text text"
+                  style={{
+                    top: y,
+                    left: x + 5,
+                    position: 'absolute',
+                    color: 'brown',
+                  }}>
+                  Start of text
+                </Text>,
+              ];
+            },
+          )}
+          <Text
+            onTextLayout={event => {
+              this.setState({textMetrics: event.nativeEvent.lines});
+            }}
+            style={{
+              fontSize: this.state.fontSize,
+              textAlign: this.state.alignment,
+            }}>
+            {PANGRAMS[this.state.language]}
+          </Text>
+        </View>
+        <Picker
+          selectedValue={this.state.alignment}
+          onValueChange={itemValue => this.setState({alignment: itemValue})}>
+          <Picker.Item label="Left align" value="left" />
+          <Picker.Item label="Center align" value="center" />
+          <Picker.Item label="Right align" value="right" />
+        </Picker>
+      </View>
+    );
+  }
+}
+module.exports = TextLegend;
diff --git a/RNTester/js/SliderExample.js b/RNTester/js/SliderExample.js
index a6d95103363647..f4129b2f3ba50b 100644
--- a/RNTester/js/SliderExample.js
+++ b/RNTester/js/SliderExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/SnapshotExample.js b/RNTester/js/SnapshotExample.js
index f77277a53cbf32..6a6a90451fffd9 100644
--- a/RNTester/js/SnapshotExample.js
+++ b/RNTester/js/SnapshotExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/StatusBarExample.js b/RNTester/js/StatusBarExample.js
index 3247567111c9a6..77f51a4242cc02 100644
--- a/RNTester/js/StatusBarExample.js
+++ b/RNTester/js/StatusBarExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/SwipeableFlatListExample.js b/RNTester/js/SwipeableFlatListExample.js
index 4c8716e8c838a3..7f27b4dc2c9804 100644
--- a/RNTester/js/SwipeableFlatListExample.js
+++ b/RNTester/js/SwipeableFlatListExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,6 @@
 'use strict';
 
 const React = require('react');
-const createReactClass = require('create-react-class');
 const ReactNative = require('react-native');
 const {
   Image,
@@ -24,6 +23,8 @@ const {
 
 const RNTesterPage = require('./RNTesterPage');
 
+import type {RNTesterProps} from 'RNTesterTypes';
+
 const data = [
   {
     key: 'like',
@@ -42,14 +43,11 @@ const data = [
   },
 ];
 
-const SwipeableFlatListExample = createReactClass({
-  displayName: 'SwipeableFlatListExample',
-  statics: {
-    title: '<SwipeableFlatList>',
-    description: 'Performant, scrollable, swipeable list of data.',
-  },
+class SwipeableFlatListExample extends React.Component<RNTesterProps> {
+  static title = '<SwipeableFlatList>';
+  static description = 'Performant, scrollable, swipeable list of data.';
 
-  render: function() {
+  render() {
     return (
       <RNTesterPage
         title={this.props.navigator ? null : '<SwipeableListView>'}
@@ -64,9 +62,9 @@ const SwipeableFlatListExample = createReactClass({
         />
       </RNTesterPage>
     );
-  },
+  }
 
-  _renderItem: function({item}): ?React.Element<any> {
+  _renderItem({item}): ?React.Element<any> {
     return (
       <View style={styles.row}>
         <Image style={styles.rowIcon} source={item.icon} />
@@ -75,9 +73,9 @@ const SwipeableFlatListExample = createReactClass({
         </View>
       </View>
     );
-  },
+  }
 
-  _renderQuickActions: function({item}: Object): ?React.Element<any> {
+  _renderQuickActions({item}: Object): ?React.Element<any> {
     return (
       <View style={styles.actionsContainer}>
         <TouchableHighlight
@@ -102,8 +100,8 @@ const SwipeableFlatListExample = createReactClass({
         </TouchableHighlight>
       </View>
     );
-  },
-});
+  }
+}
 
 var styles = StyleSheet.create({
   row: {
diff --git a/RNTester/js/SwipeableListViewExample.js b/RNTester/js/SwipeableListViewExample.js
index ee359ed1fcf6d9..d8d82306e47b61 100644
--- a/RNTester/js/SwipeableListViewExample.js
+++ b/RNTester/js/SwipeableListViewExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,10 +10,8 @@
 
 'use strict';
 
-var React = require('react');
-var createReactClass = require('create-react-class');
-var ReactNative = require('react-native');
-var {
+const React = require('react');
+const {
   Image,
   SwipeableListView,
   TouchableHighlight,
@@ -21,31 +19,33 @@ var {
   Text,
   View,
   Alert,
-} = ReactNative;
+} = require('react-native');
 
-var RNTesterPage = require('./RNTesterPage');
+const RNTesterPage = require('./RNTesterPage');
 
-var SwipeableListViewSimpleExample = createReactClass({
-  displayName: 'SwipeableListViewSimpleExample',
-  statics: {
-    title: '<SwipeableListView>',
-    description: 'Performant, scrollable, swipeable list of data.',
-  },
+import type {RNTesterProps} from 'RNTesterTypes';
+import type {SwipeableListViewDataSource} from 'SwipeableListViewDataSource';
 
-  getInitialState: function() {
-    var ds = SwipeableListView.getNewDataSource();
-    return {
-      dataSource: ds.cloneWithRowsAndSections(...this._genDataSource({})),
-    };
-  },
+type State = {|
+  dataSource: SwipeableListViewDataSource,
+|};
 
-  _pressData: ({}: {[key: number]: boolean}),
+class SwipeableListViewSimpleExample extends React.Component<
+  RNTesterProps,
+  State,
+> {
+  static title = '<SwipeableListView>';
+  static description = 'Performant, scrollable, swipeable list of data.';
 
-  UNSAFE_componentWillMount: function() {
-    this._pressData = {};
-  },
+  state = {
+    dataSource: SwipeableListView.getNewDataSource().cloneWithRowsAndSections(
+      ...this._genDataSource({}),
+    ),
+  };
+
+  _pressData: {[key: number]: boolean} = {};
 
-  render: function() {
+  render(): React.Node {
     return (
       <RNTesterPage
         title={this.props.navigator ? null : '<SwipeableListView>'}
@@ -78,16 +78,11 @@ var SwipeableListViewSimpleExample = createReactClass({
         />
       </RNTesterPage>
     );
-  },
+  }
 
-  _renderRow: function(
-    rowData: Object,
-    sectionID: number,
-    rowID: number,
-    highlightRow: (sectionID: number, rowID: number) => void,
-  ) {
-    var rowHash = Math.abs(hashCode(rowData.id));
-    var imgSource = THUMB_URLS[rowHash % THUMB_URLS.length];
+  _renderRow(rowData: Object, sectionID: string, rowID: string) {
+    const rowHash = Math.abs(hashCode(rowData.id));
+    const imgSource = THUMB_URLS[rowHash % THUMB_URLS.length];
     return (
       <TouchableHighlight onPress={() => {}}>
         <View>
@@ -100,31 +95,32 @@ var SwipeableListViewSimpleExample = createReactClass({
         </View>
       </TouchableHighlight>
     );
-  },
+  }
 
-  _genDataSource: function(pressData: {[key: number]: boolean}): Array<any> {
-    var dataBlob = {};
-    var sectionIDs = ['Section 0'];
-    var rowIDs = [[]];
+  _genDataSource(pressData: {[key: number]: boolean}) {
+    const dataBlob = {};
+    const sectionIDs = ['Section 0'];
+    const rowIDs = [[]];
     /**
      * dataBlob example below:
-      {
-        'Section 0': {
-          'Row 0': {
-            id: '0',
-            text: 'row 0 text'
-          },
-          'Row 1': {
-            id: '1',
-            text: 'row 1 text'
-          }
-        }
-      }
-    */
-    // only one section in this example
+     *   {
+     *     'Section 0': {
+     *       'Row 0': {
+     *         id: '0',
+     *         text: 'row 0 text'
+     *       },
+     *       'Row 1': {
+     *         id: '1',
+     *         text: 'row 1 text'
+     *       }
+     *     }
+     *   }
+     */
+
+    // Only one section in this example
     dataBlob['Section 0'] = {};
-    for (var ii = 0; ii < 100; ii++) {
-      var pressedText = pressData[ii] ? ' (pressed)' : '';
+    for (let ii = 0; ii < 100; ii++) {
+      const pressedText = pressData[ii] ? ' (pressed)' : '';
       dataBlob[sectionIDs[0]]['Row ' + ii] = {
         id: 'Row ' + ii,
         text: 'Row ' + ii + pressedText,
@@ -132,11 +128,11 @@ var SwipeableListViewSimpleExample = createReactClass({
       rowIDs[0].push('Row ' + ii);
     }
     return [dataBlob, sectionIDs, rowIDs];
-  },
+  }
 
-  _renderSeperator: function(
-    sectionID: number,
-    rowID: number,
+  _renderSeperator(
+    sectionID: string,
+    rowID: string,
     adjacentRowHighlighted: boolean,
   ) {
     return (
@@ -148,10 +144,10 @@ var SwipeableListViewSimpleExample = createReactClass({
         }}
       />
     );
-  },
-});
+  }
+}
 
-var THUMB_URLS = [
+const THUMB_URLS = [
   require('./Thumbnails/like.png'),
   require('./Thumbnails/dislike.png'),
   require('./Thumbnails/call.png'),
@@ -165,19 +161,27 @@ var THUMB_URLS = [
   require('./Thumbnails/superlike.png'),
   require('./Thumbnails/victory.png'),
 ];
-var LOREM_IPSUM =
-  'Lorem ipsum dolor sit amet, ius ad pertinax oportere accommodare, an vix civibus corrumpit referrentur. Te nam case ludus inciderint, te mea facilisi adipiscing. Sea id integre luptatum. In tota sale consequuntur nec. Erat ocurreret mei ei. Eu paulo sapientem vulputate est, vel an accusam intellegam interesset. Nam eu stet pericula reprimique, ea vim illud modus, putant invidunt reprehendunt ne qui.';
 
-/* eslint no-bitwise: 0 */
-var hashCode = function(str) {
-  var hash = 15;
-  for (var ii = str.length - 1; ii >= 0; ii--) {
+const LOREM_IPSUM = [
+  'Lorem ipsum dolor sit amet, ius ad pertinax oportere accommodare, an vix ',
+  'civibus corrumpit referrentur. Te nam case ludus inciderint, te mea facilisi ',
+  'adipiscing. Sea id integre luptatum. In tota sale consequuntur nec. Erat ',
+  'ocurreret mei ei. Eu paulo sapientem vulputate est, vel an accusam ',
+  'intellegam interesset. Nam eu stet pericula reprimique, ea vim illud modus, ',
+  'putant invidunt reprehendunt ne qui.',
+].join('');
+
+/* eslint-disable no-bitwise */
+const hashCode = str => {
+  let hash = 15;
+  for (let ii = str.length - 1; ii >= 0; ii--) {
     hash = (hash << 5) - hash + str.charCodeAt(ii);
   }
   return hash;
 };
+/* eslint-enable no-bitwise */
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   row: {
     flexDirection: 'row',
     justifyContent: 'center',
diff --git a/RNTester/js/SwitchExample.js b/RNTester/js/SwitchExample.js
index a8116ff243cf18..22e224bb16c3ad 100644
--- a/RNTester/js/SwitchExample.js
+++ b/RNTester/js/SwitchExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -59,17 +59,21 @@ class ColorSwitchExample extends React.Component<{}, $FlowFixMeState> {
       <View>
         <Switch
           onValueChange={value => this.setState({colorFalseSwitchIsOn: value})}
-          onTintColor="#00ff00"
           style={{marginBottom: 10}}
-          thumbTintColor="#0000ff"
-          tintColor="#ff0000"
+          thumbColor="#0000ff"
+          trackColor={{
+            false: '#ff0000',
+            true: '#00ff00',
+          }}
           value={this.state.colorFalseSwitchIsOn}
         />
         <Switch
           onValueChange={value => this.setState({colorTrueSwitchIsOn: value})}
-          onTintColor="#00ff00"
-          thumbTintColor="#0000ff"
-          tintColor="#ff0000"
+          thumbColor="#0000ff"
+          trackColor={{
+            false: '#ff0000',
+            true: '#00ff00',
+          }}
           value={this.state.colorTrueSwitchIsOn}
         />
       </View>
diff --git a/RNTester/js/TVEventHandlerExample.js b/RNTester/js/TVEventHandlerExample.js
index 757a27ef9466cb..1b71a1001d48cd 100644
--- a/RNTester/js/TVEventHandlerExample.js
+++ b/RNTester/js/TVEventHandlerExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/TabBarIOSBarStyleExample.js b/RNTester/js/TabBarIOSBarStyleExample.js
index d6a035aed3e151..0cf0df73b1c1a4 100644
--- a/RNTester/js/TabBarIOSBarStyleExample.js
+++ b/RNTester/js/TabBarIOSBarStyleExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,7 +17,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * @format
- * @flow
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/TabBarIOSExample.js b/RNTester/js/TabBarIOSExample.js
index 38fcbc64f81505..9dafdf3b3479f8 100644
--- a/RNTester/js/TabBarIOSExample.js
+++ b/RNTester/js/TabBarIOSExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/TextExample.android.js b/RNTester/js/TextExample.android.js
index e38a9270219349..283d5f25fc0f47 100644
--- a/RNTester/js/TextExample.android.js
+++ b/RNTester/js/TextExample.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -15,6 +15,7 @@ var ReactNative = require('react-native');
 var {Image, StyleSheet, Text, View} = ReactNative;
 var RNTesterBlock = require('./RNTesterBlock');
 var RNTesterPage = require('./RNTesterPage');
+const TextLegend = require('./Shared/TextLegend');
 
 class Entity extends React.Component<$FlowFixMeProps> {
   render() {
@@ -87,6 +88,9 @@ class TextExample extends React.Component<{}> {
             This text is indented by 10px padding on all sides.
           </Text>
         </RNTesterBlock>
+        <RNTesterBlock title="Text metrics legend">
+          <TextLegend />
+        </RNTesterBlock>
         <RNTesterBlock title="Font Family">
           <Text style={{fontFamily: 'sans-serif'}}>Sans-Serif</Text>
           <Text style={{fontFamily: 'sans-serif', fontWeight: 'bold'}}>
@@ -531,6 +535,56 @@ class TextExample extends React.Component<{}> {
             make text look slightly misaligned when centered vertically.
           </Text>
         </RNTesterBlock>
+        <RNTesterBlock title="Text transform">
+          <Text style={{textTransform: 'uppercase'}}>
+            This text should be uppercased.
+          </Text>
+          <Text style={{textTransform: 'lowercase'}}>
+            This TEXT SHOULD be lowercased.
+          </Text>
+          <Text style={{textTransform: 'capitalize'}}>
+            This text should be CAPITALIZED.
+          </Text>
+          <Text style={{textTransform: 'capitalize'}}>
+            Mixed: <Text style={{textTransform: 'uppercase'}}>uppercase </Text>
+            <Text style={{textTransform: 'lowercase'}}>LoWeRcAsE </Text>
+            <Text style={{textTransform: 'capitalize'}}>
+              capitalize each word
+            </Text>
+          </Text>
+          <Text>
+            Should be "ABC":
+            <Text style={{textTransform: 'uppercase'}}>
+              a<Text>b</Text>c
+            </Text>
+          </Text>
+          <Text>
+            Should be "AbC":
+            <Text style={{textTransform: 'uppercase'}}>
+              a<Text style={{textTransform: 'none'}}>b</Text>c
+            </Text>
+          </Text>
+          <Text style={{textTransform: 'none'}}>
+            {
+              '.aa\tbb\t\tcc  dd EE \r\nZZ I like to eat apples. \n中文éé 我喜欢吃苹果。awdawd   '
+            }
+          </Text>
+          <Text style={{textTransform: 'uppercase'}}>
+            {
+              '.aa\tbb\t\tcc  dd EE \r\nZZ I like to eat apples. \n中文éé 我喜欢吃苹果。awdawd   '
+            }
+          </Text>
+          <Text style={{textTransform: 'lowercase'}}>
+            {
+              '.aa\tbb\t\tcc  dd EE \r\nZZ I like to eat apples. \n中文éé 我喜欢吃苹果。awdawd   '
+            }
+          </Text>
+          <Text style={{textTransform: 'capitalize'}}>
+            {
+              '.aa\tbb\t\tcc  dd EE \r\nZZ I like to eat apples. \n中文éé 我喜欢吃苹果。awdawd   '
+            }
+          </Text>
+        </RNTesterBlock>
       </RNTesterPage>
     );
   }
diff --git a/RNTester/js/TextExample.ios.js b/RNTester/js/TextExample.ios.js
index 52274d7c032c16..760d450fac3e05 100644
--- a/RNTester/js/TextExample.ios.js
+++ b/RNTester/js/TextExample.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,10 +11,10 @@
 'use strict';
 
 const Platform = require('Platform');
-var React = require('react');
-var createReactClass = require('create-react-class');
-var ReactNative = require('react-native');
-var {Image, Text, TextInput, View, LayoutAnimation, Button} = ReactNative;
+const React = require('react');
+const ReactNative = require('react-native');
+const {Text, TextInput, View, LayoutAnimation, Button} = ReactNative;
+const TextLegend = require('./Shared/TextLegend');
 
 type TextAlignExampleRTLState = {|
   isRTL: boolean,
@@ -121,12 +121,23 @@ class AttributeToggler extends React.Component<{}, $FlowFixMeState> {
   }
 }
 
-var AdjustingFontSize = createReactClass({
-  displayName: 'AdjustingFontSize',
-  getInitialState: function() {
-    return {dynamicText: '', shouldRender: true};
-  },
-  reset: function() {
+type AdjustingFontSizeProps = $ReadOnly<{||}>;
+
+type AdjustingFontSizeState = {|
+  dynamicText: string,
+  shouldRender: boolean,
+|};
+
+class AdjustingFontSize extends React.Component<
+  AdjustingFontSizeProps,
+  AdjustingFontSizeState,
+> {
+  state = {
+    dynamicText: '',
+    shouldRender: true,
+  };
+
+  reset = () => {
     LayoutAnimation.easeInEaseOut();
     this.setState({
       shouldRender: false,
@@ -138,23 +149,26 @@ var AdjustingFontSize = createReactClass({
         shouldRender: true,
       });
     }, 300);
-  },
-  addText: function() {
+  };
+
+  addText = () => {
     this.setState({
       dynamicText:
         this.state.dynamicText +
         (Math.floor((Math.random() * 10) % 2) ? ' foo' : ' bar'),
     });
-  },
-  removeText: function() {
+  };
+
+  removeText = () => {
     this.setState({
       dynamicText: this.state.dynamicText.slice(
         0,
         this.state.dynamicText.length - 4,
       ),
     });
-  },
-  render: function() {
+  };
+
+  render() {
     if (!this.state.shouldRender) {
       return <View />;
     }
@@ -220,8 +234,8 @@ var AdjustingFontSize = createReactClass({
         </View>
       </View>
     );
-  },
-});
+  }
+}
 
 class TextBaseLineLayoutExample extends React.Component<*, *> {
   render() {
@@ -255,25 +269,6 @@ class TextBaseLineLayoutExample extends React.Component<*, *> {
           {marker}
         </View>
 
-        <Text style={subtitleStyle}>{'Interleaving <View> and <Text>:'}</Text>
-        <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
-          {marker}
-          <Text selectable={true}>
-            Some text.
-            <View
-              style={{
-                flexDirection: 'row',
-                alignItems: 'baseline',
-                backgroundColor: '#eee',
-              }}>
-              {marker}
-              <Text>Text inside View.</Text>
-              {marker}
-            </View>
-          </Text>
-          {marker}
-        </View>
-
         <Text style={subtitleStyle}>{'<TextInput/>:'}</Text>
         <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
           {marker}
@@ -294,6 +289,130 @@ class TextBaseLineLayoutExample extends React.Component<*, *> {
   }
 }
 
+class TextRenderInfoExample extends React.Component<*, *> {
+  state = {
+    textMetrics: {
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+      capHeight: 0,
+      descender: 0,
+      ascender: 0,
+      xHeight: 0,
+    },
+    numberOfTextBlocks: 1,
+    fontSize: 14,
+  };
+
+  render() {
+    const topOfBox =
+      this.state.textMetrics.y +
+      this.state.textMetrics.height -
+      (this.state.textMetrics.descender + this.state.textMetrics.capHeight);
+    return (
+      <View>
+        <View>
+          <View
+            style={{
+              position: 'absolute',
+              left: this.state.textMetrics.x + this.state.textMetrics.width,
+              top: topOfBox,
+              width: 5,
+              height: Math.ceil(
+                this.state.textMetrics.capHeight -
+                  this.state.textMetrics.xHeight,
+              ),
+              backgroundColor: 'red',
+            }}
+          />
+          <View
+            style={{
+              position: 'absolute',
+              left: this.state.textMetrics.x + this.state.textMetrics.width,
+              top:
+                topOfBox +
+                (this.state.textMetrics.capHeight -
+                  this.state.textMetrics.xHeight),
+              width: 5,
+              height: Math.ceil(this.state.textMetrics.xHeight),
+              backgroundColor: 'green',
+            }}
+          />
+          <Text
+            style={{fontSize: this.state.fontSize}}
+            onTextLayout={event => {
+              const {lines} = event.nativeEvent;
+              if (lines.length > 0) {
+                this.setState({textMetrics: lines[lines.length - 1]});
+              }
+            }}>
+            {new Array(this.state.numberOfTextBlocks)
+              .fill('A tiny block of text.')
+              .join(' ')}
+          </Text>
+        </View>
+        <Text
+          onPress={() =>
+            this.setState({
+              numberOfTextBlocks: this.state.numberOfTextBlocks + 1,
+            })
+          }>
+          More text
+        </Text>
+        <Text
+          onPress={() => this.setState({fontSize: this.state.fontSize + 1})}>
+          Increase size
+        </Text>
+        <Text
+          onPress={() => this.setState({fontSize: this.state.fontSize - 1})}>
+          Decrease size
+        </Text>
+      </View>
+    );
+  }
+}
+
+class TextWithCapBaseBox extends React.Component<*, *> {
+  state = {
+    textMetrics: {
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+      capHeight: 0,
+      descender: 0,
+      ascender: 0,
+      xHeight: 0,
+    },
+  };
+  render() {
+    return (
+      <Text
+        onTextLayout={event => {
+          const {lines} = event.nativeEvent;
+          if (lines.length > 0) {
+            this.setState({textMetrics: lines[0]});
+          }
+        }}
+        style={[
+          {
+            marginTop: Math.ceil(
+              -(
+                this.state.textMetrics.ascender -
+                this.state.textMetrics.capHeight
+              ),
+            ),
+            marginBottom: Math.ceil(-this.state.textMetrics.descender),
+          },
+          this.props.style,
+        ]}>
+        {this.props.children}
+      </Text>
+    );
+  }
+}
+
 exports.title = '<Text>';
 exports.description = 'Base component for rendering styled text.';
 exports.displayName = 'TextExample';
@@ -309,6 +428,24 @@ exports.examples = [
       );
     },
   },
+  {
+    title: 'Text metrics',
+    render: function() {
+      return <TextRenderInfoExample />;
+    },
+  },
+  {
+    title: 'Text metrics legend',
+    render: () => <TextLegend />,
+  },
+  {
+    title: 'Baseline capheight box',
+    render: () => (
+      <View style={{backgroundColor: 'red'}}>
+        <TextWithCapBaseBox>Some example text.</TextWithCapBaseBox>
+      </View>
+    ),
+  },
   {
     title: 'Padding',
     render: function() {
@@ -750,26 +887,6 @@ exports.examples = [
       );
     },
   },
-  {
-    title: 'Inline views',
-    render: function() {
-      return (
-        <View>
-          <Text>
-            This text contains an inline blue view{' '}
-            <View
-              style={{width: 25, height: 25, backgroundColor: 'steelblue'}}
-            />{' '}
-            and an inline image{' '}
-            <Image
-              source={require('./flux.png')}
-              style={{width: 30, height: 11, resizeMode: 'cover'}}
-            />. Neat, huh?
-          </Text>
-        </View>
-      );
-    },
-  },
   {
     title: 'Text shadow',
     render: function() {
@@ -843,31 +960,6 @@ exports.examples = [
       );
     },
   },
-  {
-    title: 'Nested content',
-    render: function() {
-      return (
-        <Text>
-          This text has a view
-          <View style={{borderColor: 'red', borderWidth: 1}}>
-            <Text style={{borderColor: 'blue', borderWidth: 1}}>which has</Text>
-            <Text style={{borderColor: 'green', borderWidth: 1}}>
-              another text inside.
-            </Text>
-            <Text style={{borderColor: 'yellow', borderWidth: 1}}>
-              And moreover, it has another view
-              <View style={{borderColor: 'red', borderWidth: 1}}>
-                <Text style={{borderColor: 'blue', borderWidth: 1}}>
-                  with another text inside!
-                </Text>
-              </View>
-            </Text>
-          </View>
-          Because we need to go deeper.
-        </Text>
-      );
-    },
-  },
   {
     title: 'Dynamic Font Size Adjustment',
     render: function(): React.Element<any> {
diff --git a/RNTester/js/TextInputExample.android.js b/RNTester/js/TextInputExample.android.js
index 30cee2eb29aca4..882c343e8459e6 100644
--- a/RNTester/js/TextInputExample.android.js
+++ b/RNTester/js/TextInputExample.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -84,6 +84,8 @@ class RewriteExample extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
     var remainder = limit - this.state.text.length;
     var remainderColor = remainder > 5 ? 'blue' : 'red';
     return (
+      /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+       * when making Flow check .android.js files. */
       <View style={styles.rewriteContainer}>
         <TextInput
           multiline={false}
@@ -92,9 +94,13 @@ class RewriteExample extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
             text = text.replace(/ /g, '_');
             this.setState({text});
           }}
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           style={styles.default}
           value={this.state.text}
         />
+        {/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+          * found when making Flow check .android.js files. */}
         <Text style={[styles.remainder, {color: remainderColor}]}>
           {remainder}
         </Text>
@@ -299,6 +305,8 @@ class SelectionExample extends React.Component<
           onChangeText={value => this.setState({value})}
           onSelectionChange={this.onSelectionChange.bind(this)}
           ref={textInput => (this._textInput = textInput)}
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           selection={this.state.selection}
           style={this.props.style}
           value={this.state.value}
@@ -324,6 +332,8 @@ class AutogrowingTextInputExample extends React.Component<{}> {
   constructor(props) {
     super(props);
 
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     this.state = {
       width: 100,
       multiline: true,
@@ -336,12 +346,18 @@ class AutogrowingTextInputExample extends React.Component<{}> {
   }
 
   UNSAFE_componentWillReceiveProps(props) {
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     this.setState({
+      /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+       * when making Flow check .android.js files. */
       multiline: props.multiline,
     });
   }
 
   render() {
+    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+     * when making Flow check .android.js files. */
     var {style, multiline, ...props} = this.props;
     return (
       <View>
@@ -351,25 +367,43 @@ class AutogrowingTextInputExample extends React.Component<{}> {
           minimumValue={0}
           maximumValue={100}
           step={10}
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           onValueChange={value => this.setState({width: value})}
         />
         <Text>Multiline:</Text>
         <Switch
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           value={this.state.multiline}
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           onValueChange={value => this.setState({multiline: value})}
         />
         <Text>TextInput:</Text>
         <TextInput
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           multiline={this.state.multiline}
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           style={[style, {width: this.state.width + '%'}]}
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           onChangeText={value => this.setState({text: value})}
           onContentSizeChange={event =>
+            /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+             * found when making Flow check .android.js files. */
             this.setState({contentSize: event.nativeEvent.contentSize})
           }
           {...props}
         />
         <Text>Plain text value representation:</Text>
+        {/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+          * found when making Flow check .android.js files. */}
         <Text>{this.state.text}</Text>
+        {/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+          * found when making Flow check .android.js files. */}
         <Text>Content Size: {JSON.stringify(this.state.contentSize)}</Text>
       </View>
     );
@@ -407,6 +441,8 @@ exports.examples = [
         <TextInput
           autoFocus={true}
           multiline={true}
+          /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+           * found when making Flow check .android.js files. */
           style={styles.input}
           accessibilityLabel="I am the accessibility label for text input"
         />
@@ -801,6 +837,8 @@ exports.examples = [
       return (
         <View>
           <SelectionExample
+            /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was
+             * found when making Flow check .android.js files. */
             style={styles.default}
             value="text selection can be changed"
           />
diff --git a/RNTester/js/TextInputExample.ios.js b/RNTester/js/TextInputExample.ios.js
index d536d46d8b235c..88eb0dc0132ae7 100644
--- a/RNTester/js/TextInputExample.ios.js
+++ b/RNTester/js/TextInputExample.ios.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -173,6 +173,48 @@ class RewriteExampleInvalidCharacters extends React.Component<
   }
 }
 
+class RewriteExampleKana extends React.Component<$FlowFixMeProps, any> {
+  constructor(props) {
+    super(props);
+    this.state = {text: ''};
+  }
+  render() {
+    return (
+      <View style={styles.rewriteContainer}>
+        <TextInput
+          multiline={false}
+          onChangeText={text => {
+            this.setState({text: text.replace(/ひ/g, '日')});
+          }}
+          style={styles.default}
+          value={this.state.text}
+        />
+      </View>
+    );
+  }
+}
+
+class SecureEntryExample extends React.Component<$FlowFixMeProps, any> {
+  constructor(props) {
+    super(props);
+    this.state = {text: ''};
+  }
+  render() {
+    return (
+      <View>
+        <TextInput
+          secureTextEntry={true}
+          style={styles.default}
+          defaultValue="abc"
+          onChangeText={text => this.setState({text})}
+          value={this.state.text}
+        />
+        <Text>Current text is: {this.state.text}</Text>
+      </View>
+    );
+  }
+}
+
 class TokenizedTextExample extends React.Component<$FlowFixMeProps, any> {
   constructor(props) {
     super(props);
@@ -524,6 +566,12 @@ exports.examples = [
       return <RewriteExampleInvalidCharacters />;
     },
   },
+  {
+    title: 'Live Re-Write (ひ -> 日)',
+    render: function() {
+      return <RewriteExampleKana />;
+    },
+  },
   {
     title: 'Keyboard Accessory View',
     render: function() {
@@ -677,17 +725,7 @@ exports.examples = [
   {
     title: 'Secure text entry',
     render: function() {
-      return (
-        <View>
-          <WithLabel label="true">
-            <TextInput
-              secureTextEntry={true}
-              style={styles.default}
-              defaultValue="abc"
-            />
-          </WithLabel>
-        </View>
-      );
+      return <SecureEntryExample />;
     },
   },
   {
diff --git a/RNTester/js/TimePickerAndroidExample.js b/RNTester/js/TimePickerAndroidExample.js
index a72bcdafbff046..76232ecf86a89b 100644
--- a/RNTester/js/TimePickerAndroidExample.js
+++ b/RNTester/js/TimePickerAndroidExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/TimerExample.js b/RNTester/js/TimerExample.js
index 3b930c800f6543..023b2decfe9247 100644
--- a/RNTester/js/TimerExample.js
+++ b/RNTester/js/TimerExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,17 +11,9 @@
 'use strict';
 
 var React = require('react');
-var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var {AlertIOS, Platform, ToastAndroid, Text, View} = ReactNative;
-/* $FlowFixMe(>=0.54.0 site=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. */
-var TimerMixin = require('react-timer-mixin');
 var RNTesterButton = require('./RNTesterButton');
-/* $FlowFixMe(>=0.54.0 site=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. */
 var performanceNow = require('fbjs/lib/performanceNow');
 
 function burnCPU(milliseconds) {
@@ -29,16 +21,25 @@ function burnCPU(milliseconds) {
   while (performanceNow() < start + milliseconds) {}
 }
 
-class RequestIdleCallbackTester extends React.Component<{}, $FlowFixMeState> {
+type RequestIdleCallbackTesterProps = $ReadOnly<{||}>;
+type RequestIdleCallbackTesterState = {|message: string|};
+
+class RequestIdleCallbackTester extends React.Component<
+  RequestIdleCallbackTesterProps,
+  RequestIdleCallbackTesterState,
+> {
   state = {
     message: '-',
   };
 
-  _idleTimer: any = null;
+  _idleTimer: ?IdleCallbackID = null;
   _iters = 0;
 
   componentWillUnmount() {
-    cancelIdleCallback(this._idleTimer);
+    if (this._idleTimer != null) {
+      cancelIdleCallback(this._idleTimer);
+      this._idleTimer = null;
+    }
   }
 
   render() {
@@ -52,7 +53,7 @@ class RequestIdleCallbackTester extends React.Component<{}, $FlowFixMeState> {
           Burn CPU inside of requestIdleCallback
         </RNTesterButton>
 
-        <RNTesterButton onPress={this._runWithTimeout.bind(this)}>
+        <RNTesterButton onPress={this._runWithTimeout}>
           Run requestIdleCallback with timeout option
         </RNTesterButton>
 
@@ -69,8 +70,12 @@ class RequestIdleCallbackTester extends React.Component<{}, $FlowFixMeState> {
     );
   }
 
-  _run = shouldBurnCPU => {
-    cancelIdleCallback(this._idleTimer);
+  _run(shouldBurnCPU: boolean) {
+    if (this._idleTimer != null) {
+      cancelIdleCallback(this._idleTimer);
+      this._idleTimer = null;
+    }
+
     this._idleTimer = requestIdleCallback(deadline => {
       let message = '';
 
@@ -82,10 +87,14 @@ class RequestIdleCallbackTester extends React.Component<{}, $FlowFixMeState> {
         message: `${message} ${deadline.timeRemaining()}ms remaining in frame`,
       });
     });
-  };
+  }
 
   _runWithTimeout = () => {
-    cancelIdleCallback(this._idleTimer);
+    if (this._idleTimer != null) {
+      cancelIdleCallback(this._idleTimer);
+      this._idleTimer = null;
+    }
+
     this._idleTimer = requestIdleCallback(
       deadline => {
         this.setState({
@@ -100,7 +109,11 @@ class RequestIdleCallbackTester extends React.Component<{}, $FlowFixMeState> {
   };
 
   _runBackground = () => {
-    cancelIdleCallback(this._idleTimer);
+    if (this._idleTimer != null) {
+      cancelIdleCallback(this._idleTimer);
+      this._idleTimer = null;
+    }
+
     const handler = deadline => {
       while (deadline.timeRemaining() > 5) {
         burnCPU(5);
@@ -117,54 +130,90 @@ class RequestIdleCallbackTester extends React.Component<{}, $FlowFixMeState> {
 
   _stopBackground = () => {
     this._iters = 0;
-    cancelIdleCallback(this._idleTimer);
+    if (this._idleTimer != null) {
+      cancelIdleCallback(this._idleTimer);
+      this._idleTimer = null;
+    }
   };
 }
 
-var TimerTester = createReactClass({
-  displayName: 'TimerTester',
-  mixins: [TimerMixin],
+type TimerTesterProps = $ReadOnly<{|
+  dt?: number,
+  type: string,
+|}>;
 
-  _ii: 0,
-  _iters: 0,
-  _start: 0,
-  _timerFn: (null: ?() => any),
-  _handle: (null: any),
+class TimerTester extends React.Component<TimerTesterProps> {
+  _ii = 0;
+  _iters = 0;
+  _start = 0;
+  _timerId: ?TimeoutID = null;
+  _rafId: ?AnimationFrameID = null;
+  _intervalId: ?IntervalID = null;
+  _immediateId: ?Object = null;
+  _timerFn: ?() => any = null;
 
-  render: function() {
+  render() {
     var args = 'fn' + (this.props.dt !== undefined ? ', ' + this.props.dt : '');
     return (
       <RNTesterButton onPress={this._run}>
         Measure: {this.props.type}({args}) - {this._ii || 0}
       </RNTesterButton>
     );
-  },
+  }
 
-  _run: function() {
+  componentWillUnmount() {
+    if (this._timerId != null) {
+      clearTimeout(this._timerId);
+      this._timerId = null;
+    }
+
+    if (this._rafId != null) {
+      cancelAnimationFrame(this._rafId);
+      this._rafId = null;
+    }
+
+    if (this._immediateId != null) {
+      clearImmediate(this._immediateId);
+      this._immediateId = null;
+    }
+
+    if (this._intervalId != null) {
+      clearInterval(this._intervalId);
+      this._intervalId = null;
+    }
+  }
+
+  _run = () => {
     if (!this._start) {
       var d = new Date();
       this._start = d.getTime();
       this._iters = 100;
       this._ii = 0;
       if (this.props.type === 'setTimeout') {
-        if (this.props.dt < 1) {
+        if (this.props.dt !== undefined && this.props.dt < 1) {
           this._iters = 5000;
-        } else if (this.props.dt > 20) {
+        } else if (this.props.dt !== undefined && this.props.dt > 20) {
           this._iters = 10;
         }
-        this._timerFn = () => this.setTimeout(this._run, this.props.dt);
+        this._timerFn = () => {
+          this._timerId = setTimeout(this._run, this.props.dt);
+        };
       } else if (this.props.type === 'requestAnimationFrame') {
-        this._timerFn = () => this.requestAnimationFrame(this._run);
+        this._timerFn = () => {
+          this._rafId = requestAnimationFrame(this._run);
+        };
       } else if (this.props.type === 'setImmediate') {
         this._iters = 5000;
-        this._timerFn = () => this.setImmediate(this._run);
+        this._timerFn = () => {
+          this._immediateId = setImmediate(this._run);
+        };
       } else if (this.props.type === 'setInterval') {
         this._iters = 30; // Only used for forceUpdate periodicidy
         this._timerFn = null;
-        this._handle = this.setInterval(this._run, this.props.dt);
+        this._intervalId = setInterval(this._run, this.props.dt);
       }
     }
-    if (this._ii >= this._iters && !this._handle) {
+    if (this._ii >= this._iters && this._intervalId == null) {
       var d = new Date();
       var e = d.getTime() - this._start;
       var msg =
@@ -195,25 +244,25 @@ var TimerTester = createReactClass({
     if (this._ii % (this._iters / 5) === 0) {
       this.forceUpdate();
     }
-    this._timerFn && this._timerFn();
-  },
+    if (this._timerFn) {
+      this._timerId = this._timerFn();
+    }
+  };
 
-  clear: function() {
-    this.clearInterval(this._handle); // invalid handles are ignored
-    if (this._handle) {
+  clear = () => {
+    if (this._intervalId != null) {
+      clearInterval(this._intervalId);
       // Configure things so we can do a final run to update UI and reset state.
-      this._handle = null;
+      this._intervalId = null;
       this._iters = this._ii;
       this._run();
     }
-  },
-});
+  };
+}
 
 exports.framework = 'React';
-exports.title = 'Timers, TimerMixin';
-exports.description =
-  'The TimerMixin provides timer functions for executing ' +
-  'code in the future that are safely cleaned up when the component unmounts.';
+exports.title = 'Timers';
+exports.description = 'A demonstration of Timers in React Native.';
 
 exports.examples = [
   {
@@ -270,12 +319,22 @@ exports.examples = [
     description:
       'Execute function fn every t milliseconds until cancelled ' +
       'or component is unmounted.',
-    render: function(): React.Element<any> {
-      class IntervalExample extends React.Component<{}, $FlowFixMeState> {
+    render: function() {
+      type IntervalExampleProps = $ReadOnly<{||}>;
+      type IntervalExampleState = {|
+        showTimer: boolean,
+      |};
+
+      class IntervalExample extends React.Component<
+        IntervalExampleProps,
+        IntervalExampleState,
+      > {
         state = {
           showTimer: true,
         };
 
+        _timerTester: ?React.ElementRef<typeof TimerTester>;
+
         render() {
           return (
             <View>
@@ -290,8 +349,13 @@ exports.examples = [
         _renderTimer = () => {
           return (
             <View>
-              <TimerTester ref="interval" dt={25} type="setInterval" />
-              <RNTesterButton onPress={() => this.refs.interval.clear()}>
+              <TimerTester
+                ref={ref => (this._timerTester = ref)}
+                dt={25}
+                type="setInterval"
+              />
+              <RNTesterButton
+                onPress={() => this._timerTester && this._timerTester.clear()}>
                 Clear interval
               </RNTesterButton>
             </View>
diff --git a/RNTester/js/ToastAndroidExample.android.js b/RNTester/js/ToastAndroidExample.android.js
index 80ea97715ba30b..fb440f73683dce 100644
--- a/RNTester/js/ToastAndroidExample.android.js
+++ b/RNTester/js/ToastAndroidExample.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/ToolbarAndroidExample.android.js b/RNTester/js/ToolbarAndroidExample.android.js
index 4043c054f3fbf9..8c39831e6c5b3d 100644
--- a/RNTester/js/ToolbarAndroidExample.android.js
+++ b/RNTester/js/ToolbarAndroidExample.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/ToolbarAndroidExample.ios.js b/RNTester/js/ToolbarAndroidExample.ios.js
index 25bf7dba0fe729..0162198954717e 100644
--- a/RNTester/js/ToolbarAndroidExample.ios.js
+++ b/RNTester/js/ToolbarAndroidExample.ios.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/TouchableExample.js b/RNTester/js/TouchableExample.js
index 711bd8bc1dae23..fa52cac64e75fb 100644
--- a/RNTester/js/TouchableExample.js
+++ b/RNTester/js/TouchableExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -21,6 +21,7 @@ var {
   TouchableOpacity,
   Platform,
   TouchableNativeFeedback,
+  TouchableWithoutFeedback,
   View,
 } = ReactNative;
 
@@ -70,6 +71,12 @@ exports.examples = [
       );
     },
   },
+  {
+    title: '<TouchableWithoutFeedback>',
+    render: function() {
+      return <TouchableWithoutFeedbackBox />;
+    },
+  },
   {
     title: 'TouchableNativeFeedback with Animated child',
     description:
@@ -150,6 +157,40 @@ exports.examples = [
   },
 ];
 
+class TouchableWithoutFeedbackBox extends React.Component<{}, $FlowFixMeState> {
+  state = {
+    timesPressed: 0,
+  };
+
+  textOnPress = () => {
+    this.setState({
+      timesPressed: this.state.timesPressed + 1,
+    });
+  };
+
+  render() {
+    var textLog = '';
+    if (this.state.timesPressed > 1) {
+      textLog = this.state.timesPressed + 'x TouchableWithoutFeedback onPress';
+    } else if (this.state.timesPressed > 0) {
+      textLog = 'TouchableWithoutFeedback onPress';
+    }
+
+    return (
+      <View>
+        <TouchableWithoutFeedback onPress={this.textOnPress}>
+          <View style={styles.wrapperCustom}>
+            <Text style={styles.text}>Tap Here For No Feedback!</Text>
+          </View>
+        </TouchableWithoutFeedback>
+        <View style={styles.logBox}>
+          <Text>{textLog}</Text>
+        </View>
+      </View>
+    );
+  }
+}
+
 class TextOnPressBox extends React.Component<{}, $FlowFixMeState> {
   state = {
     timesPressed: 0,
@@ -195,8 +236,7 @@ class TouchableFeedbackEvents extends React.Component<{}, $FlowFixMeState> {
             style={styles.wrapper}
             testID="touchable_feedback_events_button"
             accessibilityLabel="touchable feedback events"
-            accessibilityTraits="button"
-            accessibilityComponentType="button"
+            accessibilityRole="button"
             onPress={() => this._appendEvent('press')}
             onPressIn={() => this._appendEvent('pressIn')}
             onPressOut={() => this._appendEvent('pressOut')}
@@ -361,6 +401,31 @@ class TouchableDisabled extends React.Component<{}> {
           <Text style={styles.button}>Enabled TouchableHighlight</Text>
         </TouchableHighlight>
 
+        <TouchableWithoutFeedback
+          onPress={() => console.log('TWOF has been clicked')}
+          disabled={true}>
+          <View style={styles.wrapperCustom}>
+            <Text
+              style={[
+                styles.button,
+                styles.nativeFeedbackButton,
+                styles.disabledButton,
+              ]}>
+              Disabled TouchableWithoutFeedback
+            </Text>
+          </View>
+        </TouchableWithoutFeedback>
+
+        <TouchableWithoutFeedback
+          onPress={() => console.log('TWOF has been clicked')}
+          disabled={false}>
+          <View style={styles.wrapperCustom}>
+            <Text style={[styles.button, styles.nativeFeedbackButton]}>
+              Enabled TouchableWithoutFeedback
+            </Text>
+          </View>
+        </TouchableWithoutFeedback>
+
         {Platform.OS === 'android' && (
           <TouchableNativeFeedback
             style={[styles.row, styles.block]}
diff --git a/RNTester/js/TransformExample.js b/RNTester/js/TransformExample.js
index 8af5fc55d2824c..7359462c809fd4 100644
--- a/RNTester/js/TransformExample.js
+++ b/RNTester/js/TransformExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/TransparentHitTestExample.js b/RNTester/js/TransparentHitTestExample.js
index 7ba595bee16e4d..50c49b9ab422ae 100644
--- a/RNTester/js/TransparentHitTestExample.js
+++ b/RNTester/js/TransparentHitTestExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/URIActionMap.js b/RNTester/js/URIActionMap.js
index cf33d010434699..3dba73d27bf8ca 100644
--- a/RNTester/js/URIActionMap.js
+++ b/RNTester/js/URIActionMap.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/VibrationExample.js b/RNTester/js/VibrationExample.js
index ed12bd1e5491f7..550809483a8dd3 100644
--- a/RNTester/js/VibrationExample.js
+++ b/RNTester/js/VibrationExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/VibrationIOSExample.js b/RNTester/js/VibrationIOSExample.js
index 59e96b673977a0..15f3414de90dc8 100644
--- a/RNTester/js/VibrationIOSExample.js
+++ b/RNTester/js/VibrationIOSExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/ViewExample.js b/RNTester/js/ViewExample.js
index 5115a08d5ac785..58d537008589aa 100644
--- a/RNTester/js/ViewExample.js
+++ b/RNTester/js/ViewExample.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
@@ -104,21 +104,33 @@ exports.examples = [
             <TouchableWithoutFeedback onPress={this._handlePress}>
               <View>
                 <View
-                  style={{
-                    borderWidth: 1,
-                    borderStyle: this.state.showBorder ? 'dashed' : null,
-                    padding: 5,
-                  }}>
+                  style={[
+                    {
+                      borderWidth: 1,
+                      padding: 5,
+                    },
+                    this.state.showBorder
+                      ? {
+                          borderStyle: 'dashed',
+                        }
+                      : null,
+                  ]}>
                   <Text style={{fontSize: 11}}>Dashed border style</Text>
                 </View>
                 <View
-                  style={{
-                    marginTop: 5,
-                    borderWidth: 1,
-                    borderRadius: 5,
-                    borderStyle: this.state.showBorder ? 'dotted' : null,
-                    padding: 5,
-                  }}>
+                  style={[
+                    {
+                      marginTop: 5,
+                      borderWidth: 1,
+                      borderRadius: 5,
+                      padding: 5,
+                    },
+                    this.state.showBorder
+                      ? {
+                          borderStyle: 'dotted',
+                        }
+                      : null,
+                  ]}>
                   <Text style={{fontSize: 11}}>Dotted border style</Text>
                 </View>
               </View>
@@ -299,4 +311,72 @@ exports.examples = [
       return <ZIndexExample />;
     },
   },
+  {
+    title: 'BackfaceVisibility',
+    render: function() {
+      return (
+        <>
+          <Text style={{paddingBottom: 10}}>
+            View #1, front is visible, back is hidden.
+          </Text>
+          <View style={{justifyContent: 'center', alignItems: 'center'}}>
+            <View
+              style={{
+                height: 200,
+                width: 200,
+                justifyContent: 'center',
+                alignItems: 'center',
+                backgroundColor: 'blue',
+                backfaceVisibility: 'hidden',
+              }}>
+              <Text>Front</Text>
+            </View>
+            <View
+              style={{
+                height: 200,
+                width: 200,
+                justifyContent: 'center',
+                alignItems: 'center',
+                backgroundColor: 'red',
+                backfaceVisibility: 'hidden',
+                transform: [{rotateY: '180deg'}],
+                position: 'absolute',
+                top: 0,
+              }}>
+              <Text>Back (You should not see this)</Text>
+            </View>
+          </View>
+          <Text style={{paddingVertical: 10}}>
+            View #2, front is hidden, back is visible.
+          </Text>
+          <View style={{justifyContent: 'center', alignItems: 'center'}}>
+            <View
+              style={{
+                height: 200,
+                width: 200,
+                justifyContent: 'center',
+                alignItems: 'center',
+                backgroundColor: 'blue',
+                backfaceVisibility: 'hidden',
+              }}>
+              <Text>Front (You should not see this)</Text>
+            </View>
+            <View
+              style={{
+                height: 200,
+                width: 200,
+                justifyContent: 'center',
+                alignItems: 'center',
+                backgroundColor: 'red',
+                backfaceVisibility: 'hidden',
+                position: 'absolute',
+                top: 0,
+              }}>
+              <Text>Back</Text>
+            </View>
+          </View>
+        </>
+      );
+    },
+  },
 ];
diff --git a/RNTester/js/ViewPagerAndroidExample.android.js b/RNTester/js/ViewPagerAndroidExample.android.js
index f4aaca4a098411..0a666fdf080a9e 100644
--- a/RNTester/js/ViewPagerAndroidExample.android.js
+++ b/RNTester/js/ViewPagerAndroidExample.android.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/WebSocketExample.js b/RNTester/js/WebSocketExample.js
index b1cffe3e5dc6d4..fdb35ca69adbe6 100644
--- a/RNTester/js/WebSocketExample.js
+++ b/RNTester/js/WebSocketExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/WebViewExample.js b/RNTester/js/WebViewExample.js
index fdb0abb61d49d0..025d0348c6847c 100644
--- a/RNTester/js/WebViewExample.js
+++ b/RNTester/js/WebViewExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -436,6 +436,7 @@ exports.examples = [
             backgroundColor: BGWASH,
             height: 100,
           }}
+          allowFileAccess={true}
           originWhitelist={FILE_SYSTEM_ORIGIN_WHITE_LIST}
           source={require('./helloworld.html')}
           scalesPageToFit={true}
diff --git a/RNTester/js/XHRExample.js b/RNTester/js/XHRExample.js
index 5cec37c1debca8..72078dea6020f7 100644
--- a/RNTester/js/XHRExample.js
+++ b/RNTester/js/XHRExample.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/XHRExampleBinaryUpload.js b/RNTester/js/XHRExampleBinaryUpload.js
index 1321522ccaf75c..00a9b46a01e174 100644
--- a/RNTester/js/XHRExampleBinaryUpload.js
+++ b/RNTester/js/XHRExampleBinaryUpload.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/RNTester/js/XHRExampleCookies.js b/RNTester/js/XHRExampleCookies.js
index 6008e7a1a3c220..89a43c8372dd14 100644
--- a/RNTester/js/XHRExampleCookies.js
+++ b/RNTester/js/XHRExampleCookies.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/XHRExampleDownload.js b/RNTester/js/XHRExampleDownload.js
index 3cc4b34c5bc011..4adac0d125493c 100644
--- a/RNTester/js/XHRExampleDownload.js
+++ b/RNTester/js/XHRExampleDownload.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/XHRExampleFetch.js b/RNTester/js/XHRExampleFetch.js
index 72f1f7e43b11df..c7d5aef7787fe5 100644
--- a/RNTester/js/XHRExampleFetch.js
+++ b/RNTester/js/XHRExampleFetch.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/XHRExampleFormData.js b/RNTester/js/XHRExampleFormData.js
index bc2e43b0762885..408030f2e6563c 100644
--- a/RNTester/js/XHRExampleFormData.js
+++ b/RNTester/js/XHRExampleFormData.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/XHRExampleHeaders.js b/RNTester/js/XHRExampleHeaders.js
index 6fb4e28dbf03be..ea3c95f5be3f27 100644
--- a/RNTester/js/XHRExampleHeaders.js
+++ b/RNTester/js/XHRExampleHeaders.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/XHRExampleOnTimeOut.js b/RNTester/js/XHRExampleOnTimeOut.js
index 57a918b53c10ec..5721774bda3eb4 100644
--- a/RNTester/js/XHRExampleOnTimeOut.js
+++ b/RNTester/js/XHRExampleOnTimeOut.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/createExamplePage.js b/RNTester/js/createExamplePage.js
index eba5a495287c2f..781ac727e396c9 100644
--- a/RNTester/js/createExamplePage.js
+++ b/RNTester/js/createExamplePage.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/http_test_server.js b/RNTester/js/http_test_server.js
index c9a4be5753948a..bd25e24cd8bc70 100755
--- a/RNTester/js/http_test_server.js
+++ b/RNTester/js/http_test_server.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/RNTester/js/websocket_test_server.js b/RNTester/js/websocket_test_server.js
index eacab9e219775f..fee92917fd37eb 100755
--- a/RNTester/js/websocket_test_server.js
+++ b/RNTester/js/websocket_test_server.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React.podspec b/React.podspec
index 946d461b20c92a..8d20a4a1e40865 100644
--- a/React.podspec
+++ b/React.podspec
@@ -1,4 +1,9 @@
 # coding: utf-8
+# Copyright (c) Facebook, Inc. and its 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")))
@@ -71,6 +76,7 @@ Pod::Spec.new do |s|
     ss.dependency             "Folly", folly_version
     ss.dependency             "React/Core"
     ss.dependency             "React/cxxreact"
+    ss.dependency             "React/jsiexecutor"
     ss.compiler_flags       = folly_compiler_flags
     ss.private_header_files = "React/Cxx*/*.h"
     ss.source_files         = "React/Cxx*/*.{h,m,mm}"
@@ -100,19 +106,29 @@ Pod::Spec.new do |s|
     ss.source_files         = "React/**/RCTTV*.{h,m}"
   end
 
-  s.subspec "jschelpers" do |ss|
+  s.subspec "jsinspector" do |ss|
+    ss.source_files         = "ReactCommon/jsinspector/*.{cpp,h}"
+    ss.private_header_files = "ReactCommon/jsinspector/*.h"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
+  end
+
+  s.subspec "jsiexecutor" do |ss|
+    ss.dependency             "React/cxxreact"
+    ss.dependency             "React/jsi"
     ss.dependency             "Folly", folly_version
-    ss.dependency             "React/PrivateDatabase"
     ss.compiler_flags       = folly_compiler_flags
-    ss.source_files         = "ReactCommon/jschelpers/*.{cpp,h}"
-    ss.private_header_files = "ReactCommon/jschelpers/*.h"
+    ss.source_files         = "ReactCommon/jsiexecutor/jsireact/*.{cpp,h}"
+    ss.private_header_files = "ReactCommon/jsiexecutor/jsireact/*.h"
+    ss.header_dir           = "jsireact"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
-    ss.framework            = "JavaScriptCore"
   end
 
-  s.subspec "jsinspector" do |ss|
-    ss.source_files         = "ReactCommon/jsinspector/*.{cpp,h}"
-    ss.private_header_files = "ReactCommon/jsinspector/*.h"
+  s.subspec "jsi" do |ss|
+    ss.dependency             "Folly", folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "ReactCommon/jsi/*.{cpp,h}"
+    ss.private_header_files = "ReactCommon/jsi/*.h"
+    ss.framework            = "JavaScriptCore"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
   end
 
@@ -123,7 +139,6 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "cxxreact" do |ss|
-    ss.dependency             "React/jschelpers"
     ss.dependency             "React/jsinspector"
     ss.dependency             "boost-for-react-native", "1.63.0"
     ss.dependency             "Folly", folly_version
diff --git a/React/Base/RCTAssert.h b/React/Base/RCTAssert.h
index 6117390db44804..4a6580676971f5 100644
--- a/React/Base/RCTAssert.h
+++ b/React/Base/RCTAssert.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTAssert.m b/React/Base/RCTAssert.m
index 61cefe2ad5fca2..6746a38079ee5d 100644
--- a/React/Base/RCTAssert.m
+++ b/React/Base/RCTAssert.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTBridge+Private.h b/React/Base/RCTBridge+Private.h
index 1995801ffcaaea..0e4ef5762b2295 100644
--- a/React/Base/RCTBridge+Private.h
+++ b/React/Base/RCTBridge+Private.h
@@ -1,13 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <JavaScriptCore/JavaScriptCore.h>
-#import <JavaScriptCore/JSBase.h>
-
 #import <React/RCTBridge.h>
 
 @class RCTModuleData;
@@ -15,12 +12,12 @@
 
 RCT_EXTERN NSArray<Class> *RCTGetModuleClasses(void);
 
-RCT_EXTERN __attribute__((weak)) void RCTFBQuickPerformanceLoggerConfigureHooks(JSGlobalContextRef ctx);
-
 #if RCT_DEBUG
 RCT_EXTERN void RCTVerifyAllModulesExported(NSArray *extraModules);
 #endif
 
+RCT_EXTERN void RCTRegisterModule(Class);
+
 @interface RCTBridge ()
 
 // Private designated initializer
@@ -139,15 +136,6 @@ RCT_EXTERN void RCTVerifyAllModulesExported(NSArray *extraModules);
 
 @end
 
-@interface RCTBridge (JavaScriptCore)
-
-/**
- * The raw JSGlobalContextRef used by the bridge.
- */
-@property (nonatomic, readonly, assign) JSGlobalContextRef jsContextRef;
-
-@end
-
 @interface RCTBridge (Inspector)
 
 @property (nonatomic, readonly, getter=isInspectable) BOOL inspectable;
diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index 5222a15b5ca714..3af1a19767cb8d 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -93,6 +93,13 @@ typedef NSArray<id<RCTBridgeModule>> *(^RCTBridgeModuleListProvider)(void);
  */
 RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
 
+/**
+ * Experimental.
+ * Check/set if JSI-bound NativeModule is enabled. By default it's off.
+ */
+RCT_EXTERN BOOL RCTJSINativeModuleEnabled(void);
+RCT_EXTERN void RCTEnableJSINativeModule(BOOL enabled);
+
 /**
  * Async batched bridge used to communicate with the JavaScript application.
  */
@@ -162,11 +169,6 @@ RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
  */
 - (BOOL)moduleIsInitialized:(Class)moduleClass;
 
-/**
- * Retrieve an extra module that gets bound to the JS context, if any.
- */
-- (id)jsBoundExtraModuleForClass:(Class)moduleClass;
-
 /**
  * All registered bridge module classes.
  */
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index acfc09dd376c60..5171f2ae220fd7 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -44,8 +44,6 @@
   return result;
 }
 
-void RCTFBQuickPerformanceLoggerConfigureHooks(__unused JSGlobalContextRef ctx) { }
-
 /**
  * Register the given class as a bridge module. All modules must be registered
  * prior to the first bridge initialization.
@@ -93,6 +91,16 @@ void RCTRegisterModule(Class moduleClass)
   return name;
 }
 
+static BOOL jsiNativeModuleEnabled = NO;
+BOOL RCTJSINativeModuleEnabled(void)
+{
+  return jsiNativeModuleEnabled;
+}
+
+void RCTEnableJSINativeModule(BOOL enabled) {
+  jsiNativeModuleEnabled = enabled;
+}
+
 #if RCT_DEBUG
 void RCTVerifyAllModulesExported(NSArray *extraModules)
 {
@@ -246,7 +254,7 @@ - (id)moduleForClass:(Class)moduleClass
 - (NSArray *)modulesConformingToProtocol:(Protocol *)protocol
 {
   NSMutableArray *modules = [NSMutableArray new];
-  for (Class moduleClass in self.moduleClasses) {
+  for (Class moduleClass in [self.moduleClasses copy]) {
     if ([moduleClass conformsToProtocol:protocol]) {
       id module = [self moduleForClass:moduleClass];
       if (module) {
@@ -262,11 +270,6 @@ - (BOOL)moduleIsInitialized:(Class)moduleClass
   return [self.batchedBridge moduleIsInitialized:moduleClass];
 }
 
-- (id)jsBoundExtraModuleForClass:(Class)moduleClass
-{
-  return [self.batchedBridge jsBoundExtraModuleForClass:moduleClass];
-}
-
 - (void)reload
 {
   #if RCT_ENABLE_INSPECTOR
@@ -382,9 +385,4 @@ - (void)registerSegmentWithId:(NSUInteger)segmentId path:(NSString *)path
   [self.batchedBridge registerSegmentWithId:segmentId path:path];
 }
 
-- (JSGlobalContextRef)jsContextRef
-{
-  return [self.batchedBridge jsContextRef];
-}
-
 @end
diff --git a/React/Base/RCTBridgeDelegate.h b/React/Base/RCTBridgeDelegate.h
index b457e87dbc143c..c237b9880fa7be 100644
--- a/React/Base/RCTBridgeDelegate.h
+++ b/React/Base/RCTBridgeDelegate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTBridgeMethod.h b/React/Base/RCTBridgeMethod.h
index 04202c6a5f0663..c67799e0eaf820 100644
--- a/React/Base/RCTBridgeMethod.h
+++ b/React/Base/RCTBridgeMethod.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h
index 75908a1b0f797d..5b5357668c5e47 100644
--- a/React/Base/RCTBridgeModule.h
+++ b/React/Base/RCTBridgeModule.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -73,6 +73,16 @@ RCT_EXTERN void RCTRegisterModule(Class); \
 + (NSString *)moduleName { return @#js_name; } \
 + (void)load { RCTRegisterModule(self); }
 
+/**
+ * To improve startup performance users may want to generate their module lists
+ * at build time and hook the delegate to merge with the runtime list. This
+ * macro takes the place of the above for those cases by omitting the +load
+ * generation.
+ *
+ */
+#define RCT_EXPORT_PRE_REGISTERED_MODULE(js_name) \
++ (NSString *)moduleName { return @#js_name; }
+
 // Implemented by RCT_EXPORT_MODULE
 + (NSString *)moduleName;
 
@@ -311,3 +321,12 @@ RCT_EXTERN void RCTRegisterModule(Class); \
 - (void)partialBatchDidFlush;
 
 @end
+
+/**
+ * Experimental.
+ * A protocol to declare that a class supports JSI-bound NativeModule.
+ * This may be removed in the future.
+ */
+@protocol RCTJSINativeModule <NSObject>
+
+@end
diff --git a/React/Base/RCTBundleURLProvider.h b/React/Base/RCTBundleURLProvider.h
index 23ed40cbfccba8..75be4f732e8280 100644
--- a/React/Base/RCTBundleURLProvider.h
+++ b/React/Base/RCTBundleURLProvider.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTBundleURLProvider.m b/React/Base/RCTBundleURLProvider.m
index 53af54d93efff0..c3142bae8711f9 100644
--- a/React/Base/RCTBundleURLProvider.m
+++ b/React/Base/RCTBundleURLProvider.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
index 5780c5f5f676a8..219a06a7621829 100644
--- a/React/Base/RCTConvert.h
+++ b/React/Base/RCTConvert.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -15,6 +15,9 @@
 #import <React/RCTPointerEvents.h>
 #import <React/RCTTextDecorationLineType.h>
 #import <yoga/Yoga.h>
+#if TARGET_OS_IPHONE && WEBKIT_IOS_10_APIS_AVAILABLE
+#import <WebKit/WebKit.h>
+#endif
 
 /**
  * This class provides a collection of conversion functions for mapping
@@ -70,6 +73,10 @@ typedef NSURL RCTFileURL;
 + (UIDataDetectorTypes)UIDataDetectorTypes:(id)json;
 #endif
 
+#if TARGET_OS_IPHONE && WEBKIT_IOS_10_APIS_AVAILABLE
++ (WKDataDetectorTypes)WKDataDetectorTypes:(id)json;
+#endif
+
 + (UIViewContentMode)UIViewContentMode:(id)json;
 #if !TARGET_OS_TV
 + (UIBarStyle)UIBarStyle:(id)json;
diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
index 7528259fda00ad..fb0ca4cf7e6f1f 100644
--- a/React/Base/RCTConvert.m
+++ b/React/Base/RCTConvert.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -361,7 +361,22 @@ + (NSLocale *)NSLocale:(id)json
   @"none": @(UIDataDetectorTypeNone),
   @"all": @(UIDataDetectorTypeAll),
 }), UIDataDetectorTypePhoneNumber, unsignedLongLongValue)
-#endif
+
+#if WEBKIT_IOS_10_APIS_AVAILABLE
+RCT_MULTI_ENUM_CONVERTER(WKDataDetectorTypes, (@{
+ @"phoneNumber": @(WKDataDetectorTypePhoneNumber),
+ @"link": @(WKDataDetectorTypeLink),
+ @"address": @(WKDataDetectorTypeAddress),
+ @"calendarEvent": @(WKDataDetectorTypeCalendarEvent),
+ @"trackingNumber": @(WKDataDetectorTypeTrackingNumber),
+ @"flightNumber": @(WKDataDetectorTypeFlightNumber),
+ @"lookupSuggestion": @(WKDataDetectorTypeLookupSuggestion),
+ @"none": @(WKDataDetectorTypeNone),
+ @"all": @(WKDataDetectorTypeAll),
+ }), WKDataDetectorTypePhoneNumber, unsignedLongLongValue)
+ #endif // WEBKIT_IOS_10_APIS_AVAILABLE
+
+ #endif // !TARGET_OS_TV
 
 RCT_ENUM_CONVERTER(UIKeyboardAppearance, (@{
   @"default": @(UIKeyboardAppearanceDefault),
diff --git a/React/Base/RCTCxxConvert.h b/React/Base/RCTCxxConvert.h
index 8519e774a79c3b..65c156ff936cbf 100644
--- a/React/Base/RCTCxxConvert.h
+++ b/React/Base/RCTCxxConvert.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTCxxConvert.m b/React/Base/RCTCxxConvert.m
index 458a1b90846863..b27359b3f4154b 100644
--- a/React/Base/RCTCxxConvert.m
+++ b/React/Base/RCTCxxConvert.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTDefines.h b/React/Base/RCTDefines.h
index 881af139d85c92..9a860ed78239a9 100644
--- a/React/Base/RCTDefines.h
+++ b/React/Base/RCTDefines.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -125,3 +125,8 @@ _Pragma("clang diagnostic ignored \"-Wunused-parameter\"") \
 RCT_EXTERN NSException *_RCTNotImplementedException(SEL, Class); \
 method NS_UNAVAILABLE { @throw _RCTNotImplementedException(_cmd, [self class]); } \
 _Pragma("clang diagnostic pop")
+
+/**
+ * Check if WebKit iOS 10.0 APIs are available.
+ */
+#define WEBKIT_IOS_10_APIS_AVAILABLE __has_include(<WebKit/WKAudiovisualMediaTypes.h>)
diff --git a/React/Base/RCTDisplayLink.h b/React/Base/RCTDisplayLink.h
index e6d850ef83dc4c..b64146dc24915f 100644
--- a/React/Base/RCTDisplayLink.h
+++ b/React/Base/RCTDisplayLink.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTDisplayLink.m b/React/Base/RCTDisplayLink.m
index 9a4df006f05b46..d1448d290b8205 100644
--- a/React/Base/RCTDisplayLink.m
+++ b/React/Base/RCTDisplayLink.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTErrorCustomizer.h b/React/Base/RCTErrorCustomizer.h
index b7d9e391bd8a9e..d47ac8d19028e6 100644
--- a/React/Base/RCTErrorCustomizer.h
+++ b/React/Base/RCTErrorCustomizer.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTErrorInfo.h b/React/Base/RCTErrorInfo.h
index aff6b208d23e49..129ef2c4aafa64 100644
--- a/React/Base/RCTErrorInfo.h
+++ b/React/Base/RCTErrorInfo.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTErrorInfo.m b/React/Base/RCTErrorInfo.m
index f3a25560cdad77..d6628c5c61858b 100644
--- a/React/Base/RCTErrorInfo.m
+++ b/React/Base/RCTErrorInfo.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTEventDispatcher.h b/React/Base/RCTEventDispatcher.h
index f91e66e218b47f..ff6e75049dd722 100644
--- a/React/Base/RCTEventDispatcher.h
+++ b/React/Base/RCTEventDispatcher.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTEventDispatcher.m b/React/Base/RCTEventDispatcher.m
index 00ec08f2f95df7..4e05e2b43eb2c3 100644
--- a/React/Base/RCTEventDispatcher.m
+++ b/React/Base/RCTEventDispatcher.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTFrameUpdate.h b/React/Base/RCTFrameUpdate.h
index 197aef68983757..1e93491552f5b4 100644
--- a/React/Base/RCTFrameUpdate.h
+++ b/React/Base/RCTFrameUpdate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTFrameUpdate.m b/React/Base/RCTFrameUpdate.m
index a5dea324c559d9..0d3e9d0a0621d5 100644
--- a/React/Base/RCTFrameUpdate.m
+++ b/React/Base/RCTFrameUpdate.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTImageSource.h b/React/Base/RCTImageSource.h
index 81f184e3e0b2df..f989111bffc5aa 100644
--- a/React/Base/RCTImageSource.h
+++ b/React/Base/RCTImageSource.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTImageSource.m b/React/Base/RCTImageSource.m
index feb2f5abd24fe4..0916a4d5167c3b 100644
--- a/React/Base/RCTImageSource.m
+++ b/React/Base/RCTImageSource.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTInvalidating.h b/React/Base/RCTInvalidating.h
index 89b7162d7d58aa..02e8938fa3adfe 100644
--- a/React/Base/RCTInvalidating.h
+++ b/React/Base/RCTInvalidating.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTJSCErrorHandling.h b/React/Base/RCTJSCErrorHandling.h
deleted file mode 100644
index cd3c11400c2f0a..00000000000000
--- a/React/Base/RCTJSCErrorHandling.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <JavaScriptCore/JavaScriptCore.h>
-
-#import <React/RCTDefines.h>
-
-/**
- Translates a given exception into an NSError.
-
- @param exception The JavaScript exception object to translate into an NSError. This must be
- a JavaScript Error object, otherwise no stack trace information will be available.
-
- @return The translated NSError object
-
- - The JS exception's name property is incorporated in the NSError's localized description
- - The JS exception's message property is the NSError's failure reason
- - The JS exception's unsymbolicated stack trace is available via the NSError userInfo's RCTJSExceptionUnsymbolicatedStackTraceKey
- */
-RCT_EXTERN NSError *RCTNSErrorFromJSError(JSValue *exception);
-
-/**
- Translates a given exception into an NSError.
-
- @see RCTNSErrorFromJSError for details
- */
-RCT_EXTERN NSError *RCTNSErrorFromJSErrorRef(JSValueRef exceptionRef, JSGlobalContextRef ctx);
diff --git a/React/Base/RCTJSCErrorHandling.mm b/React/Base/RCTJSCErrorHandling.mm
deleted file mode 100644
index ed0490d94766e3..00000000000000
--- a/React/Base/RCTJSCErrorHandling.mm
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "RCTJSCErrorHandling.h"
-
-#import <jschelpers/JavaScriptCore.h>
-
-#import "RCTAssert.h"
-#import "RCTJSStackFrame.h"
-#import "RCTLog.h"
-
-NSString *const RCTJSExceptionUnsymbolicatedStackTraceKey = @"RCTJSExceptionUnsymbolicatedStackTraceKey";
-
-NSError *RCTNSErrorFromJSError(JSValue *exception)
-{
-  NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
-  userInfo[NSLocalizedDescriptionKey] = [NSString stringWithFormat:@"Unhandled JS Exception: %@", [exception[@"name"] toString] ?: @"Unknown"];
-  NSString *const exceptionMessage = [exception[@"message"] toString];
-  if ([exceptionMessage length]) {
-    userInfo[NSLocalizedFailureReasonErrorKey] = exceptionMessage;
-  }
-  NSString *const stack = [exception[@"stack"] toString];
-  if ([@"undefined" isEqualToString:stack]) {
-    RCTLogWarn(@"Couldn't get stack trace for %@:%@", exception[@"sourceURL"], exception[@"line"]);
-  } else if ([stack length]) {
-    NSArray<RCTJSStackFrame *> *const unsymbolicatedFrames = [RCTJSStackFrame stackFramesWithLines:stack];
-    userInfo[RCTJSStackTraceKey] = unsymbolicatedFrames;
-  }
-  return [NSError errorWithDomain:RCTErrorDomain code:1 userInfo:userInfo];
-}
-
-NSError *RCTNSErrorFromJSErrorRef(JSValueRef exceptionRef, JSGlobalContextRef ctx)
-{
-  JSContext *context = [JSC_JSContext(ctx) contextWithJSGlobalContextRef:ctx];
-  JSValue *exception = [JSC_JSValue(ctx) valueWithJSValueRef:exceptionRef inContext:context];
-  return RCTNSErrorFromJSError(exception);
-}
diff --git a/React/Base/RCTJSStackFrame.h b/React/Base/RCTJSStackFrame.h
index 3a4504c7ed75a0..ee46def2077cbb 100644
--- a/React/Base/RCTJSStackFrame.h
+++ b/React/Base/RCTJSStackFrame.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTJSStackFrame.m b/React/Base/RCTJSStackFrame.m
index a60d78b1093b4c..ed2ea22e88d7a0 100644
--- a/React/Base/RCTJSStackFrame.m
+++ b/React/Base/RCTJSStackFrame.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTJavaScriptExecutor.h b/React/Base/RCTJavaScriptExecutor.h
index b7c8f7421d9ac9..d3739cb663dddb 100644
--- a/React/Base/RCTJavaScriptExecutor.h
+++ b/React/Base/RCTJavaScriptExecutor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,8 +7,6 @@
 
 #import <objc/runtime.h>
 
-#import <JavaScriptCore/JavaScriptCore.h>
-
 #import <React/RCTBridgeModule.h>
 #import <React/RCTInvalidating.h>
 
diff --git a/React/Base/RCTJavaScriptLoader.h b/React/Base/RCTJavaScriptLoader.h
index 17e88212021dca..eee7de18ced030 100755
--- a/React/Base/RCTJavaScriptLoader.h
+++ b/React/Base/RCTJavaScriptLoader.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTJavaScriptLoader.mm b/React/Base/RCTJavaScriptLoader.mm
index 983555dbd1a4b2..5f14bd22ac4d60 100755
--- a/React/Base/RCTJavaScriptLoader.mm
+++ b/React/Base/RCTJavaScriptLoader.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,6 @@
 #import <sys/stat.h>
 
 #import <cxxreact/JSBundleType.h>
-#import <jschelpers/JavaScriptCore.h>
 
 #import "RCTBridge.h"
 #import "RCTConvert.h"
@@ -20,6 +19,8 @@
 
 NSString *const RCTJavaScriptLoaderErrorDomain = @"RCTJavaScriptLoaderErrorDomain";
 
+static const int32_t JSNoBytecodeFileFormatVersion = -1;
+
 @interface RCTSource()
 {
 @public
diff --git a/React/Base/RCTKeyCommands.h b/React/Base/RCTKeyCommands.h
index 111031ba64c018..4c9c1fede01837 100644
--- a/React/Base/RCTKeyCommands.h
+++ b/React/Base/RCTKeyCommands.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTKeyCommands.m b/React/Base/RCTKeyCommands.m
index 581e937433e793..4bde8957cb7cf9 100644
--- a/React/Base/RCTKeyCommands.m
+++ b/React/Base/RCTKeyCommands.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTLog.h b/React/Base/RCTLog.h
index 9f9317da410c66..3477b48c616deb 100644
--- a/React/Base/RCTLog.h
+++ b/React/Base/RCTLog.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTLog.mm b/React/Base/RCTLog.mm
index edb92fe0146879..dd11bc38b00e8a 100644
--- a/React/Base/RCTLog.mm
+++ b/React/Base/RCTLog.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTManagedPointer.h b/React/Base/RCTManagedPointer.h
index 5e7ef3a199f0bb..038590787ef53b 100644
--- a/React/Base/RCTManagedPointer.h
+++ b/React/Base/RCTManagedPointer.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTManagedPointer.mm b/React/Base/RCTManagedPointer.mm
index 5cdb120f429f2d..0d0c19c3d5681c 100644
--- a/React/Base/RCTManagedPointer.mm
+++ b/React/Base/RCTManagedPointer.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTModuleData.h b/React/Base/RCTModuleData.h
index 14fa0a8ded7690..844ea922ce6b8f 100644
--- a/React/Base/RCTModuleData.h
+++ b/React/Base/RCTModuleData.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTModuleData.mm b/React/Base/RCTModuleData.mm
index b248d51b728bb1..ba2dbd5196f9d4 100644
--- a/React/Base/RCTModuleData.mm
+++ b/React/Base/RCTModuleData.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTModuleMethod.h b/React/Base/RCTModuleMethod.h
index 1882e2259151ac..472b755afc606d 100644
--- a/React/Base/RCTModuleMethod.h
+++ b/React/Base/RCTModuleMethod.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTModuleMethod.mm b/React/Base/RCTModuleMethod.mm
index 1a151577914724..e9a36575849c11 100644
--- a/React/Base/RCTModuleMethod.mm
+++ b/React/Base/RCTModuleMethod.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -302,6 +302,12 @@ - (void)processMethodSignature
 
           [argumentBlocks addObject:^(__unused RCTBridge *bridge, NSUInteger index, id json) {
             void *returnValue = malloc(typeSignature.methodReturnLength);
+            if (!returnValue) {
+              // CWE - 391 : Unchecked error condition
+              // https://www.cvedetails.com/cwe-details/391/Unchecked-Error-Condition.html
+              // https://eli.thegreenplace.net/2009/10/30/handling-out-of-memory-conditions-in-c
+              abort();
+            }
             [typeInvocation setArgument:&json atIndex:2];
             [typeInvocation invoke];
             [typeInvocation getReturnValue:returnValue];
diff --git a/React/Base/RCTMultipartDataTask.h b/React/Base/RCTMultipartDataTask.h
index 92967e2ae3ad65..276d4175cb4b74 100644
--- a/React/Base/RCTMultipartDataTask.h
+++ b/React/Base/RCTMultipartDataTask.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTMultipartDataTask.m b/React/Base/RCTMultipartDataTask.m
index c87a590fee70a4..3708a7d3575c34 100644
--- a/React/Base/RCTMultipartDataTask.m
+++ b/React/Base/RCTMultipartDataTask.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTMultipartStreamReader.h b/React/Base/RCTMultipartStreamReader.h
index 7f7c6f95b27cd5..775c3ec6318050 100644
--- a/React/Base/RCTMultipartStreamReader.h
+++ b/React/Base/RCTMultipartStreamReader.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTMultipartStreamReader.m b/React/Base/RCTMultipartStreamReader.m
index 53a16305a8d5a5..5c0e7c88e590ac 100644
--- a/React/Base/RCTMultipartStreamReader.m
+++ b/React/Base/RCTMultipartStreamReader.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTNullability.h b/React/Base/RCTNullability.h
index 9994a075617653..436fafcc897ce1 100644
--- a/React/Base/RCTNullability.h
+++ b/React/Base/RCTNullability.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTParserUtils.h b/React/Base/RCTParserUtils.h
index 56945b34851004..438ccfbb135a5b 100644
--- a/React/Base/RCTParserUtils.h
+++ b/React/Base/RCTParserUtils.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTParserUtils.m b/React/Base/RCTParserUtils.m
index aa13b6344ac4cb..2a6fea6c8700e2 100644
--- a/React/Base/RCTParserUtils.m
+++ b/React/Base/RCTParserUtils.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTPerformanceLogger.h b/React/Base/RCTPerformanceLogger.h
index 92ede0c0c9d2b1..8b2d89d068e13d 100644
--- a/React/Base/RCTPerformanceLogger.h
+++ b/React/Base/RCTPerformanceLogger.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTPerformanceLogger.m b/React/Base/RCTPerformanceLogger.m
index 2427d7a8a64505..af7cc7118c8fdf 100644
--- a/React/Base/RCTPerformanceLogger.m
+++ b/React/Base/RCTPerformanceLogger.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTPlatform.h b/React/Base/RCTPlatform.h
index 5eae2a8c50c65d..63e8a7f1b45f1e 100644
--- a/React/Base/RCTPlatform.h
+++ b/React/Base/RCTPlatform.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTPlatform.m b/React/Base/RCTPlatform.m
index 4c1124b54cce58..7d9a999e46776f 100644
--- a/React/Base/RCTPlatform.m
+++ b/React/Base/RCTPlatform.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTReloadCommand.h b/React/Base/RCTReloadCommand.h
index d70492fe52e8b6..ddf0bd87205e58 100644
--- a/React/Base/RCTReloadCommand.h
+++ b/React/Base/RCTReloadCommand.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTReloadCommand.m b/React/Base/RCTReloadCommand.m
index 98c0f2f8da7244..2e69165d97f5ae 100644
--- a/React/Base/RCTReloadCommand.m
+++ b/React/Base/RCTReloadCommand.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTRootContentView.h b/React/Base/RCTRootContentView.h
index 28a0646cfed752..139f19199f982f 100644
--- a/React/Base/RCTRootContentView.h
+++ b/React/Base/RCTRootContentView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTRootContentView.m b/React/Base/RCTRootContentView.m
index 67b1f8b7002151..15d0bf82163373 100644
--- a/React/Base/RCTRootContentView.m
+++ b/React/Base/RCTRootContentView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTRootView.h b/React/Base/RCTRootView.h
index 35561f68a8e45d..01c1d979319c28 100644
--- a/React/Base/RCTRootView.h
+++ b/React/Base/RCTRootView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTRootView.m b/React/Base/RCTRootView.m
index 204dd5871be16b..ca40eec261f2b1 100644
--- a/React/Base/RCTRootView.m
+++ b/React/Base/RCTRootView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTRootViewDelegate.h b/React/Base/RCTRootViewDelegate.h
index 55630a2fa317c4..bd3a4f9ac0ce87 100644
--- a/React/Base/RCTRootViewDelegate.h
+++ b/React/Base/RCTRootViewDelegate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTRootViewInternal.h b/React/Base/RCTRootViewInternal.h
index 93f7a88ef6bc51..7ddabdaae16279 100644
--- a/React/Base/RCTRootViewInternal.h
+++ b/React/Base/RCTRootViewInternal.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTTVRemoteHandler.h b/React/Base/RCTTVRemoteHandler.h
index b220414a4bd5a4..30390c94fedabf 100644
--- a/React/Base/RCTTVRemoteHandler.h
+++ b/React/Base/RCTTVRemoteHandler.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTTVRemoteHandler.m b/React/Base/RCTTVRemoteHandler.m
index 68d365c9166f93..48a65ed91ac052 100644
--- a/React/Base/RCTTVRemoteHandler.m
+++ b/React/Base/RCTTVRemoteHandler.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTTouchEvent.h b/React/Base/RCTTouchEvent.h
index 2d259b15f28fff..5ba6715573ca59 100644
--- a/React/Base/RCTTouchEvent.h
+++ b/React/Base/RCTTouchEvent.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTTouchEvent.m b/React/Base/RCTTouchEvent.m
index 0f1fdc30552f32..f5ea609a40c590 100644
--- a/React/Base/RCTTouchEvent.m
+++ b/React/Base/RCTTouchEvent.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTTouchHandler.h b/React/Base/RCTTouchHandler.h
index a4c2cf3af5d20b..a1a11918bcf518 100644
--- a/React/Base/RCTTouchHandler.h
+++ b/React/Base/RCTTouchHandler.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTTouchHandler.m b/React/Base/RCTTouchHandler.m
index 5447a9a8a9f7ea..dee8526e1746ca 100644
--- a/React/Base/RCTTouchHandler.m
+++ b/React/Base/RCTTouchHandler.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,6 +13,7 @@
 #import "RCTBridge.h"
 #import "RCTEventDispatcher.h"
 #import "RCTLog.h"
+#import "RCTSurfaceView.h"
 #import "RCTTouchEvent.h"
 #import "RCTUIManager.h"
 #import "RCTUtils.h"
@@ -246,7 +247,7 @@ - (void)_updateAndDispatchTouches:(NSSet<UITouch *> *)touches
 - (void)_cacheRootView
 {
   UIView *rootView = self.view;
-  while (rootView.superview && ![rootView isReactRootView]) {
+  while (rootView.superview && ![rootView isReactRootView] && ![rootView isKindOfClass:[RCTSurfaceView class]]) {
     rootView = rootView.superview;
   }
   _cachedRootView = rootView;
diff --git a/React/Base/RCTURLRequestDelegate.h b/React/Base/RCTURLRequestDelegate.h
index 6bc7afcd3824ff..ab8e24f9f38e61 100644
--- a/React/Base/RCTURLRequestDelegate.h
+++ b/React/Base/RCTURLRequestDelegate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTURLRequestHandler.h b/React/Base/RCTURLRequestHandler.h
index acf0c2c489fc3d..b176bd2a2b5044 100644
--- a/React/Base/RCTURLRequestHandler.h
+++ b/React/Base/RCTURLRequestHandler.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTUtils.h b/React/Base/RCTUtils.h
index 910953f5b18acf..f55ef47430ed8d 100644
--- a/React/Base/RCTUtils.h
+++ b/React/Base/RCTUtils.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTUtils.m b/React/Base/RCTUtils.m
index 22c426addcab0b..7c59b947555865 100644
--- a/React/Base/RCTUtils.m
+++ b/React/Base/RCTUtils.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -806,9 +806,11 @@ static void RCTGetRGBAColorComponents(CGColorRef color, CGFloat rgba[4])
     case kCGColorSpaceModelLab:
     case kCGColorSpaceModelPattern:
     case kCGColorSpaceModelUnknown:
+    // TODO: kCGColorSpaceModelXYZ should be added sometime after Xcode 10 release.
+    default:
     {
 
-#ifdef RCT_DEBUG
+#if RCT_DEBUG
       //unsupported format
       RCTLogError(@"Unsupported color model: %i", model);
 #endif
diff --git a/React/Base/RCTVersion.h b/React/Base/RCTVersion.h
index ca46f31421eac3..e0e53692c34c01 100644
--- a/React/Base/RCTVersion.h
+++ b/React/Base/RCTVersion.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
index 41f178395c9018..8073c42e1670d9 100644
--- a/React/Base/RCTVersion.m
+++ b/React/Base/RCTVersion.m
@@ -1,7 +1,7 @@
 /**
  * @generated by scripts/bump-oss-version.js
  *
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/RCTSurface.h b/React/Base/Surface/RCTSurface.h
index 5c3566725e49b5..cb3772af4ee023 100644
--- a/React/Base/Surface/RCTSurface.h
+++ b/React/Base/Surface/RCTSurface.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -34,7 +34,6 @@ NS_ASSUME_NONNULL_BEGIN
 @interface RCTSurface : NSObject
 
 @property (atomic, readonly) RCTSurfaceStage stage;
-@property (atomic, readonly) RCTBridge *bridge;
 @property (atomic, readonly) NSString *moduleName;
 @property (atomic, readonly) NSNumber *rootViewTag;
 
@@ -115,6 +114,15 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (BOOL)synchronouslyWaitForStage:(RCTSurfaceStage)stage timeout:(NSTimeInterval)timeout;
 
+#pragma mark - Start & Stop
+
+/**
+ * Starts or stops the Surface.
+ * Those methods are not implemented yet for regular RCTSurface.
+ */
+- (BOOL)start;
+- (BOOL)stop;
+
 #pragma mark - Mounting/Unmounting of React components
 
 /**
diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index 30110ceae42e71..8b62fea663d29b 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -560,6 +560,20 @@ - (void)uiManagerDidPerformMounting:(RCTUIManager *)manager
   }
 }
 
+- (BOOL)start
+{
+  // Does nothing.
+  // The Start&Stop feature is not implemented for regular Surface yet.
+  return YES;
+}
+
+- (BOOL)stop
+{
+  // Does nothing.
+  // The Start&Stop feature is not implemented for regular Surface yet.
+  return YES;
+}
+
 #pragma mark - Mounting/Unmounting of React components
 
 - (void)mountReactComponentWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName params:(NSDictionary *)params
diff --git a/React/Base/Surface/RCTSurfaceDelegate.h b/React/Base/Surface/RCTSurfaceDelegate.h
index adfea477bf6cf7..b006ecf03a7fa1 100644
--- a/React/Base/Surface/RCTSurfaceDelegate.h
+++ b/React/Base/Surface/RCTSurfaceDelegate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.h b/React/Base/Surface/RCTSurfaceRootShadowView.h
index 09a9015996f2c4..c277f36e824781 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.h
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.m b/React/Base/Surface/RCTSurfaceRootShadowView.m
index a0765583b3fa79..5a706928d89b56 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.m
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h b/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h
index bfc38f4ba9435a..f1bb29bbb7fc46 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h
+++ b/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/RCTSurfaceRootView.h b/React/Base/Surface/RCTSurfaceRootView.h
index 0d8a8fd1e7df50..53ebe47ec685b5 100644
--- a/React/Base/Surface/RCTSurfaceRootView.h
+++ b/React/Base/Surface/RCTSurfaceRootView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/RCTSurfaceRootView.mm b/React/Base/Surface/RCTSurfaceRootView.mm
index 25f67d5f267d4f..9b889431433f21 100644
--- a/React/Base/Surface/RCTSurfaceRootView.mm
+++ b/React/Base/Surface/RCTSurfaceRootView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/RCTSurfaceStage.h b/React/Base/Surface/RCTSurfaceStage.h
index 08fd6663d2cc0d..354cf850f9bede 100644
--- a/React/Base/Surface/RCTSurfaceStage.h
+++ b/React/Base/Surface/RCTSurfaceStage.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -21,6 +21,18 @@ typedef NS_OPTIONS(NSInteger, RCTSurfaceStage) {
   RCTSurfaceStageSurfaceDidInitialLayout = 1 << 5,     // UIManager completed the first layout pass
   RCTSurfaceStageSurfaceDidInitialMounting = 1 << 6,   // UIManager completed the first mounting pass
   RCTSurfaceStageSurfaceDidStop = 1 << 7,              // Surface stopped
+
+  // Most of the previously existed stages make no sense in the new architecture;
+  // now Surface exposes only three simple stages:
+  //
+  // Surface object was constructed and still valid.
+  RCTSurfaceStageInitialized = RCTSurfaceStageSurfaceDidInitialize,
+  // Surface was started.
+  RCTSurfaceStageStarted = 1 << 8,
+  // All off-main-thread work is done; we are ready to mount the UI.
+  RCTSurfaceStagePrepared = RCTSurfaceStageBridgeDidLoad | RCTSurfaceStageModuleDidLoad | RCTSurfaceStageSurfaceDidRun | RCTSurfaceStageSurfaceDidInitialRendering | RCTSurfaceStageSurfaceDidInitialLayout,
+  // All main-thread work is done, the UI was mounted.
+  RCTSurfaceStageMounted = RCTSurfaceStageSurfaceDidInitialMounting,
 };
 
 /**
diff --git a/React/Base/Surface/RCTSurfaceStage.m b/React/Base/Surface/RCTSurfaceStage.m
index bf1234fa9017ab..53054dd70e71bf 100644
--- a/React/Base/Surface/RCTSurfaceStage.m
+++ b/React/Base/Surface/RCTSurfaceStage.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/RCTSurfaceView+Internal.h b/React/Base/Surface/RCTSurfaceView+Internal.h
index 512bf3fb88c4f6..ed2a4b832dea12 100644
--- a/React/Base/Surface/RCTSurfaceView+Internal.h
+++ b/React/Base/Surface/RCTSurfaceView+Internal.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/RCTSurfaceView.h b/React/Base/Surface/RCTSurfaceView.h
index eff7051045df6d..9a92bfeb8ef360 100644
--- a/React/Base/Surface/RCTSurfaceView.h
+++ b/React/Base/Surface/RCTSurfaceView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/RCTSurfaceView.mm b/React/Base/Surface/RCTSurfaceView.mm
index 0c78f54eaa4b74..f519da112092a6 100644
--- a/React/Base/Surface/RCTSurfaceView.mm
+++ b/React/Base/Surface/RCTSurfaceView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
index 6e07b1ac0a8f7b..702746dbd7f5b8 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
index 14466297473e5c..3f72b057d7da5a 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -57,6 +57,9 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   RCTAssert(moduleName, @"A moduleName is required to create an RCTSurfaceHostingProxyRootView");
 
   RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTSurfaceHostingProxyRootView init]", nil);
+
+  _bridge = bridge;
+
   if (!bridge.isLoading) {
     [bridge.performanceLogger markStartForTag:RCTPLTTI];
   }
@@ -95,11 +98,6 @@ - (NSString *)moduleName
   return super.surface.moduleName;
 }
 
-- (RCTBridge *)bridge
-{
-  return super.surface.bridge;
-}
-
 - (UIView *)contentView
 {
   return self;
@@ -148,7 +146,7 @@ - (void)surface:(RCTSurface *)surface didChangeStage:(RCTSurfaceStage)stage
 {
   [super surface:surface didChangeStage:stage];
   if (RCTSurfaceStageIsRunning(stage)) {
-    [super.surface.bridge.performanceLogger markStopForTag:RCTPLTTI];
+    [_bridge.performanceLogger markStopForTag:RCTPLTTI];
     dispatch_async(dispatch_get_main_queue(), ^{
       [[NSNotificationCenter defaultCenter] postNotificationName:RCTContentDidAppearNotification
                                                           object:self];
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
index 25894ec0015611..67ea6ee8102d59 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -26,6 +26,13 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface RCTSurfaceHostingView : UIView <RCTSurfaceDelegate>
 
+/**
+ * Create an instance of RCTSurface to be hosted.
+ */
++ (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge
+                             moduleName:(NSString *)moduleName
+                      initialProperties:(NSDictionary *)initialProperties;
+
 /**
  * Designated initializer.
  * Instanciates a view with given Surface object.
@@ -44,13 +51,6 @@ NS_ASSUME_NONNULL_BEGIN
              initialProperties:(NSDictionary *)initialProperties
                sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode;
 
-/**
- * Create an instance of RCTSurface to be hosted.
- */
-- (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge
-                             moduleName:(NSString *)moduleName
-                      initialProperties:(NSDictionary *)initialProperties;
-
 /**
  * Surface object which is currently using to power the view.
  * Read-only.
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
index f8c3a5d6981391..f3d999d978302b 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -26,6 +26,13 @@ @implementation RCTSurfaceHostingView {
   RCTSurfaceStage _stage;
 }
 
++ (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge
+                             moduleName:(NSString *)moduleName
+                      initialProperties:(NSDictionary *)initialProperties
+{
+  return [[RCTSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+}
+
 RCT_NOT_IMPLEMENTED(- (instancetype)init)
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 RCT_NOT_IMPLEMENTED(- (nullable instancetype)initWithCoder:(NSCoder *)coder)
@@ -35,7 +42,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
              initialProperties:(NSDictionary *)initialProperties
                sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
 {
-  RCTSurface *surface = [self createSurfaceWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+  RCTSurface *surface = [[self class] createSurfaceWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
   return [self initWithSurface:surface sizeMeasureMode:sizeMeasureMode];
 }
 
@@ -43,6 +50,7 @@ - (instancetype)initWithSurface:(RCTSurface *)surface sizeMeasureMode:(RCTSurfac
 {
   if (self = [super initWithFrame:CGRectZero]) {
     _surface = surface;
+    [_surface start];
     _sizeMeasureMode = sizeMeasureMode;
 
     _surface.delegate = self;
@@ -53,11 +61,9 @@ - (instancetype)initWithSurface:(RCTSurface *)surface sizeMeasureMode:(RCTSurfac
   return self;
 }
 
-- (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge
-                             moduleName:(NSString *)moduleName
-                      initialProperties:(NSDictionary *)initialProperties
+- (void)dealloc
 {
-  return [[RCTSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+  [_surface stop];
 }
 
 - (void)setFrame:(CGRect)frame
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
index ead7429b557419..594645540d997c 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
index 946b027d8c0ac1..05bd50c36ed032 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxBridge/NSDataBigString.h b/React/CxxBridge/NSDataBigString.h
index c11d26efa92bf7..473496c3a5431b 100644
--- a/React/CxxBridge/NSDataBigString.h
+++ b/React/CxxBridge/NSDataBigString.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxBridge/NSDataBigString.mm b/React/CxxBridge/NSDataBigString.mm
index bea45458cdeeb1..31a92586739af0 100644
--- a/React/CxxBridge/NSDataBigString.mm
+++ b/React/CxxBridge/NSDataBigString.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 184612f1c1fc21..a15d61ea28ead7 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -29,15 +29,14 @@
 #import <cxxreact/CxxNativeModule.h>
 #import <cxxreact/Instance.h>
 #import <cxxreact/JSBundleType.h>
-#import <cxxreact/JSCExecutor.h>
 #import <cxxreact/JSIndexedRAMBundle.h>
 #import <cxxreact/ModuleRegistry.h>
-#import <cxxreact/Platform.h>
 #import <cxxreact/RAMBundleRegistry.h>
-#import <jschelpers/Value.h>
+#import <cxxreact/ReactMarker.h>
+#import <jsi/JSCRuntime.h>
+#import <jsireact/JSIExecutor.h>
 
 #import "NSDataBigString.h"
-#import "RCTJSCHelpers.h"
 #import "RCTMessageThread.h"
 #import "RCTObjcExecutor.h"
 
@@ -57,6 +56,7 @@
 
 typedef void (^RCTPendingCall)();
 
+using namespace facebook::jsc;
 using namespace facebook::react;
 
 /**
@@ -121,6 +121,8 @@ static void registerPerformanceLoggerHooks(RCTPerformanceLogger *performanceLogg
       case ReactMarker::JS_BUNDLE_STRING_CONVERT_STOP:
       case ReactMarker::NATIVE_MODULE_SETUP_START:
       case ReactMarker::NATIVE_MODULE_SETUP_STOP:
+      case ReactMarker::REGISTER_JS_SEGMENT_START:
+      case ReactMarker::REGISTER_JS_SEGMENT_STOP:
         // These are not used on iOS.
         break;
     }
@@ -176,18 +178,6 @@ @implementation RCTCxxBridge
 @synthesize performanceLogger = _performanceLogger;
 @synthesize valid = _valid;
 
-+ (void)initialize
-{
-  if (self == [RCTCxxBridge class]) {
-    RCTPrepareJSCExecutor();
-  }
-}
-
-- (JSGlobalContextRef)jsContextRef
-{
-  return (JSGlobalContextRef)(_reactInstance ? _reactInstance->getJavaScriptContext() : nullptr);
-}
-
 - (std::shared_ptr<MessageQueueThread>)jsMessageThread
 {
   return _jsMessageThread;
@@ -326,22 +316,13 @@ - (void)start
       executorFactory = [cxxDelegate jsExecutorFactoryForBridge:self];
     }
     if (!executorFactory) {
-      BOOL useCustomJSC =
-        [self.delegate respondsToSelector:@selector(shouldBridgeUseCustomJSC:)] &&
-        [self.delegate shouldBridgeUseCustomJSC:self];
-      // We use the name of the device and the app for debugging & metrics
-      NSString *deviceName = [[UIDevice currentDevice] name];
-      NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
-      // The arg is a cache dir.  It's not used with standard JSC.
-      executorFactory.reset(new JSCExecutorFactory(folly::dynamic::object
-        ("OwnerIdentity", "ReactNative")
-        ("AppIdentity", [(appName ?: @"unknown") UTF8String])
-        ("DeviceIdentity", [(deviceName ?: @"unknown") UTF8String])
-        ("UseCustomJSC", (bool)useCustomJSC)
-  #if RCT_PROFILE
-        ("StartSamplingProfilerOnInit", (bool)self.devSettings.startSamplingProfilerOnLaunch)
-  #endif
-      ));
+      executorFactory = std::make_shared<JSIExecutorFactory>(
+          makeJSCRuntime(),
+          [](const std::string &message, unsigned int logLevel) {
+              _RCTLogJavaScriptInternal(
+                  static_cast<RCTLogLevel>(logLevel),
+                  [NSString stringWithUTF8String:message.c_str()]);
+          }, nullptr);
     }
   } else {
     id<RCTJavaScriptExecutor> objcExecutor = [self moduleForClass:self.executorClass];
@@ -459,18 +440,6 @@ - (BOOL)moduleIsInitialized:(Class)moduleClass
   return _moduleDataByName[RCTBridgeModuleNameForClass(moduleClass)].hasInstance;
 }
 
-- (id)jsBoundExtraModuleForClass:(Class)moduleClass
-{
-  if ([self.delegate conformsToProtocol:@protocol(RCTCxxBridgeDelegate)]) {
-    id<RCTCxxBridgeDelegate> cxxDelegate = (id<RCTCxxBridgeDelegate>) self.delegate;
-    if ([cxxDelegate respondsToSelector:@selector(jsBoundExtraModuleForClass:)]) {
-      return [cxxDelegate jsBoundExtraModuleForClass:moduleClass];
-    }
-  }
-
-  return nil;
-}
-
 - (std::shared_ptr<ModuleRegistry>)_buildModuleRegistry
 {
   if (!self.valid) {
@@ -532,8 +501,6 @@ - (void)_initializeBridge:(std::shared_ptr<JSExecutorFactory>)executorFactory
         std::make_unique<JSBigStdString>("true"));
     }
 #endif
-
-    [self installExtraJSBinding];
   }
 
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
@@ -544,8 +511,12 @@ - (void)_initializeBridge:(std::shared_ptr<JSExecutorFactory>)executorFactory
   RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways,
                           @"-[RCTCxxBridge initModulesWithDispatchGroup:] autoexported moduleData", nil);
 
-  NSMutableArray<RCTModuleData *> *moduleDataByID = [NSMutableArray arrayWithCapacity:moduleClasses.count];
-  for (Class moduleClass in moduleClasses) {
+  NSArray *moduleClassesCopy = [moduleClasses copy];
+  NSMutableArray<RCTModuleData *> *moduleDataByID = [NSMutableArray arrayWithCapacity:moduleClassesCopy.count];
+  for (Class moduleClass in moduleClassesCopy) {
+    if (RCTJSINativeModuleEnabled() && [moduleClass conformsToProtocol:@protocol(RCTJSINativeModule)]) {
+      continue;
+    }
     NSString *moduleName = RCTBridgeModuleNameForClass(moduleClass);
 
     // Check for module name collisions
@@ -628,27 +599,15 @@ - (void)registerExtraModules
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
 }
 
-- (void)installExtraJSBinding
-{
-  if ([self.delegate conformsToProtocol:@protocol(RCTCxxBridgeDelegate)]) {
-    id<RCTCxxBridgeDelegate> cxxDelegate = (id<RCTCxxBridgeDelegate>) self.delegate;
-    if ([cxxDelegate respondsToSelector:@selector(installExtraJSBinding:)]) {
-      [cxxDelegate installExtraJSBinding:self.jsContextRef];
-    }
-  }
-}
-
 - (NSArray<RCTModuleData *> *)_initializeModules:(NSArray<id<RCTBridgeModule>> *)modules
                                withDispatchGroup:(dispatch_group_t)dispatchGroup
                                 lazilyDiscovered:(BOOL)lazilyDiscovered
 {
-  RCTAssert(!(RCTIsMainQueue() && lazilyDiscovered), @"Lazy discovery can only happen off the Main Queue");
-
   // Set up moduleData for automatically-exported modules
   NSArray<RCTModuleData *> *moduleDataById = [self registerModulesForClasses:modules];
 
-#ifdef RCT_DEBUG
   if (lazilyDiscovered) {
+#if RCT_DEBUG
     // Lazily discovered modules do not require instantiation here,
     // as they are not allowed to have pre-instantiated instance
     // and must not require the main queue.
@@ -656,10 +615,8 @@ - (void)installExtraJSBinding
       RCTAssert(!(moduleData.requiresMainQueueSetup || moduleData.hasInstance),
         @"Module \'%@\' requires initialization on the Main Queue or has pre-instantiated, which is not supported for the lazily discovered modules.", moduleData.name);
     }
-  }
-  else
 #endif
-  {
+  } else {
     RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways,
                             @"-[RCTCxxBridge initModulesWithDispatchGroup:] moduleData.hasInstance", nil);
     // Dispatch module init onto main thread for those modules that require it
@@ -1257,6 +1214,10 @@ - (void)stopProfiling:(void (^)(NSData *))callback
       NSData *logData = [log dataUsingEncoding:NSUTF8StringEncoding];
       callback(logData);
       #if WITH_FBSYSTRACE
+      if (![RCTFBSystrace verifyTraceSize:logData.length]) {
+        RCTLogWarn(@"Your FBSystrace trace might be truncated, try to bump up the buffer size"
+                   " in RCTFBSystrace.m or capture a shorter trace");
+      }
       [RCTFBSystrace unregisterCallbacks];
       #endif
     });
diff --git a/React/CxxBridge/RCTCxxBridgeDelegate.h b/React/CxxBridge/RCTCxxBridgeDelegate.h
index cbb56b75a85121..cc75608b0ac2fd 100644
--- a/React/CxxBridge/RCTCxxBridgeDelegate.h
+++ b/React/CxxBridge/RCTCxxBridgeDelegate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,7 +8,6 @@
 #include <memory>
 
 #import <React/RCTBridgeDelegate.h>
-#import <jschelpers/JavaScriptCore.h>
 
 namespace facebook {
 namespace react {
@@ -26,21 +25,9 @@ class JSExecutorFactory;
 /**
  * In the RCTCxxBridge, if this method is implemented, return a
  * ExecutorFactory instance which can be used to create the executor.
- * If not implemented, or returns an empty pointer, JSCExecutorFactory
- * will be used.
+ * If not implemented, or returns an empty pointer, JSIExecutorFactory
+ * will be used with a JSCRuntime.
  */
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge;
 
-@optional
-
-/**
- * Experimental: Perform installation of extra JS binding on the given JS context, as appropriate.
- */
-- (void)installExtraJSBinding:(JSGlobalContextRef)jsContextRef;
-
-/**
- * Experimental: Get the instance of the extra module/class which gets bound via `installExtraJSBinding:`
- */
-- (id)jsBoundExtraModuleForClass:(Class)moduleClass;
-
 @end
diff --git a/React/CxxBridge/RCTJSCHelpers.h b/React/CxxBridge/RCTJSCHelpers.h
deleted file mode 100644
index b58ccbf58efd6e..00000000000000
--- a/React/CxxBridge/RCTJSCHelpers.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 must be invoked on iOS to set up platform dependencies before
- * creating an instance of JSCExecutor.
- */
-
-void RCTPrepareJSCExecutor();
diff --git a/React/CxxBridge/RCTJSCHelpers.mm b/React/CxxBridge/RCTJSCHelpers.mm
deleted file mode 100644
index a7e7a8a9b723c5..00000000000000
--- a/React/CxxBridge/RCTJSCHelpers.mm
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "RCTJSCHelpers.h"
-
-#import <Foundation/Foundation.h>
-
-#import <React/RCTBridge+Private.h>
-#import <React/RCTCxxUtils.h>
-#import <React/RCTLog.h>
-#import <cxxreact/Platform.h>
-#import <jschelpers/Value.h>
-
-using namespace facebook::react;
-
-namespace {
-
-JSValueRef nativeLoggingHook(
-    JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount,
-    const JSValueRef arguments[], JSValueRef *exception) {
-  RCTLogLevel level = RCTLogLevelInfo;
-  if (argumentCount > 1) {
-    level = MAX(level, (RCTLogLevel)Value(ctx, arguments[1]).asNumber());
-  }
-  if (argumentCount > 0) {
-    JSContext *contextObj = contextForGlobalContextRef(JSC_JSContextGetGlobalContext(ctx));
-    JSValue *msg = [JSC_JSValue(ctx) valueWithJSValueRef:arguments[0] inContext:contextObj];
-    _RCTLogJavaScriptInternal(level, [msg toString]);
-  }
-  return Value::makeUndefined(ctx);
-}
-
-JSValueRef nativePerformanceNow(
-    JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount,
-    const JSValueRef arguments[], JSValueRef *exception) {
-  return Value::makeNumber(ctx, CACurrentMediaTime() * 1000);
-}
-
-}
-
-void RCTPrepareJSCExecutor() {
-  ReactMarker::logTaggedMarker = [](const ReactMarker::ReactMarkerId, const char *tag) {};
-  JSCNativeHooks::loggingHook = nativeLoggingHook;
-  JSCNativeHooks::nowHook = nativePerformanceNow;
-  JSCNativeHooks::installPerfHooks = RCTFBQuickPerformanceLoggerConfigureHooks;
-}
diff --git a/React/CxxBridge/RCTMessageThread.h b/React/CxxBridge/RCTMessageThread.h
index d87bb5256f94b7..1e1f8cd28b6f97 100644
--- a/React/CxxBridge/RCTMessageThread.h
+++ b/React/CxxBridge/RCTMessageThread.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxBridge/RCTMessageThread.mm b/React/CxxBridge/RCTMessageThread.mm
index a1214051db35da..5017bbb4e35fdc 100644
--- a/React/CxxBridge/RCTMessageThread.mm
+++ b/React/CxxBridge/RCTMessageThread.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,7 +12,6 @@
 
 #import <React/RCTCxxUtils.h>
 #import <React/RCTUtils.h>
-#include <jschelpers/JSCHelpers.h>
 
 // A note about the implementation: This class is not used
 // generically.  It's a thin wrapper around a run loop which
diff --git a/React/CxxBridge/RCTObjcExecutor.h b/React/CxxBridge/RCTObjcExecutor.h
index 08a6f922215867..eddb94bf5510d4 100644
--- a/React/CxxBridge/RCTObjcExecutor.h
+++ b/React/CxxBridge/RCTObjcExecutor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxBridge/RCTObjcExecutor.mm b/React/CxxBridge/RCTObjcExecutor.mm
index 6039ef24a50ad3..448562f5935ec7 100644
--- a/React/CxxBridge/RCTObjcExecutor.mm
+++ b/React/CxxBridge/RCTObjcExecutor.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxModule/DispatchMessageQueueThread.h b/React/CxxModule/DispatchMessageQueueThread.h
index 4c8be7b502c675..5fa1c5caa790f2 100644
--- a/React/CxxModule/DispatchMessageQueueThread.h
+++ b/React/CxxModule/DispatchMessageQueueThread.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxModule/RCTCxxMethod.h b/React/CxxModule/RCTCxxMethod.h
index 3d0d6aa9587e6c..da1ed8a6bed497 100644
--- a/React/CxxModule/RCTCxxMethod.h
+++ b/React/CxxModule/RCTCxxMethod.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxModule/RCTCxxMethod.mm b/React/CxxModule/RCTCxxMethod.mm
index 82ee01dce771cb..2559a9ccac91f3 100644
--- a/React/CxxModule/RCTCxxMethod.mm
+++ b/React/CxxModule/RCTCxxMethod.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxModule/RCTCxxModule.h b/React/CxxModule/RCTCxxModule.h
index 7bce985a57b9e2..f7ed461a1d56dd 100644
--- a/React/CxxModule/RCTCxxModule.h
+++ b/React/CxxModule/RCTCxxModule.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxModule/RCTCxxModule.mm b/React/CxxModule/RCTCxxModule.mm
index 98cd09860cec05..708fb46e679424 100644
--- a/React/CxxModule/RCTCxxModule.mm
+++ b/React/CxxModule/RCTCxxModule.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxModule/RCTCxxUtils.h b/React/CxxModule/RCTCxxUtils.h
index 5e38a8a3a8e5c7..ac24636e9a1df6 100644
--- a/React/CxxModule/RCTCxxUtils.h
+++ b/React/CxxModule/RCTCxxUtils.h
@@ -1,16 +1,14 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <functional>
 #include <memory>
 
-#import <JavaScriptCore/JavaScriptCore.h>
-
-#import <cxxreact/JSCExecutor.h>
-#import <jschelpers/JavaScriptCore.h>
+#import <Foundation/Foundation.h>
 
 @class RCTBridge;
 @class RCTModuleData;
@@ -19,19 +17,10 @@ namespace facebook {
 namespace react {
 
 class Instance;
+class NativeModule;
 
 std::vector<std::unique_ptr<NativeModule>> createNativeModules(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const std::shared_ptr<Instance> &instance);
 
-JSContext *contextForGlobalContextRef(JSGlobalContextRef contextRef);
-
-template<>
-struct JSCValueEncoder<id> {
-  static Value toJSCValue(JSGlobalContextRef ctx, id obj) {
-    JSValue *value = [JSC_JSValue(ctx) valueWithObject:obj inContext:contextForGlobalContextRef(ctx)];
-    return {ctx, [value JSValueRef]};
-  }
-};
-
 NSError *tryAndReturnError(const std::function<void()>& func);
 NSString *deriveSourceURL(NSURL *url);
 
diff --git a/React/CxxModule/RCTCxxUtils.mm b/React/CxxModule/RCTCxxUtils.mm
index 2bc43a37c9710e..72dfa60ce69619 100644
--- a/React/CxxModule/RCTCxxUtils.mm
+++ b/React/CxxModule/RCTCxxUtils.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,7 +11,7 @@
 #import <React/RCTModuleData.h>
 #import <React/RCTUtils.h>
 #import <cxxreact/CxxNativeModule.h>
-#import <jschelpers/Value.h>
+#import <jsi/jsi.h>
 
 #import "DispatchMessageQueueThread.h"
 #import "RCTCxxModule.h"
@@ -20,6 +20,8 @@
 namespace facebook {
 namespace react {
 
+using facebook::jsi::JSError;
+
 std::vector<std::unique_ptr<NativeModule>> createNativeModules(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const std::shared_ptr<Instance> &instance)
 {
   std::vector<std::unique_ptr<NativeModule>> nativeModules;
@@ -37,39 +39,14 @@
   return nativeModules;
 }
 
-JSContext *contextForGlobalContextRef(JSGlobalContextRef contextRef)
-{
-  static std::mutex s_mutex;
-  static NSMapTable *s_contextCache;
-
-  if (!contextRef) {
-    return nil;
-  }
-
-  // Adding our own lock here, since JSC internal ones are insufficient
-  std::lock_guard<std::mutex> lock(s_mutex);
-  if (!s_contextCache) {
-    NSPointerFunctionsOptions keyOptions = NSPointerFunctionsOpaqueMemory | NSPointerFunctionsOpaquePersonality;
-    NSPointerFunctionsOptions valueOptions = NSPointerFunctionsWeakMemory | NSPointerFunctionsObjectPersonality;
-    s_contextCache = [[NSMapTable alloc] initWithKeyOptions:keyOptions valueOptions:valueOptions capacity:0];
-  }
-
-  JSContext *ctx = [s_contextCache objectForKey:(__bridge id)contextRef];
-  if (!ctx) {
-    ctx = [JSC_JSContext(contextRef) contextWithJSGlobalContextRef:contextRef];
-    [s_contextCache setObject:ctx forKey:(__bridge id)contextRef];
-  }
-  return ctx;
-}
-
 static NSError *errorWithException(const std::exception &e)
 {
   NSString *msg = @(e.what());
   NSMutableDictionary *errorInfo = [NSMutableDictionary dictionary];
 
-  const JSException *jsException = dynamic_cast<const JSException*>(&e);
-  if (jsException) {
-    errorInfo[RCTJSRawStackTraceKey] = @(jsException->getStack().c_str());
+  const auto *jsError = dynamic_cast<const JSError*>(&e);
+  if (jsError) {
+    errorInfo[RCTJSRawStackTraceKey] = @(jsError->getStack().c_str());
     msg = [@"Unhandled JS Exception: " stringByAppendingString:msg];
   }
 
diff --git a/React/CxxModule/RCTNativeModule.h b/React/CxxModule/RCTNativeModule.h
index 76e9e406575396..de876cab4cb167 100644
--- a/React/CxxModule/RCTNativeModule.h
+++ b/React/CxxModule/RCTNativeModule.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxModule/RCTNativeModule.mm b/React/CxxModule/RCTNativeModule.mm
index 077b729789d29b..5d4a2b8736e912 100644
--- a/React/CxxModule/RCTNativeModule.mm
+++ b/React/CxxModule/RCTNativeModule.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -71,11 +71,16 @@
     invokeInner(weakBridge, weakModuleData, methodId, std::move(params));
   };
 
-  dispatch_queue_t queue = m_moduleData.methodQueue;
-  if (queue == RCTJSThread) {
-    block();
-  } else if (queue) {
-    dispatch_async(queue, block);
+  if (m_bridge.valid) {
+    dispatch_queue_t queue = m_moduleData.methodQueue;
+    if (queue == RCTJSThread) {
+      block();
+    } else if (queue) {
+      dispatch_async(queue, block);
+    }
+  } else {
+    RCTLogWarn(@"Attempted to invoke `%u` (method ID) on `%@` (NativeModule name) with an invalid bridge.",
+               methodId, m_moduleData.name);
   }
 }
 
diff --git a/React/CxxUtils/RCTFollyConvert.h b/React/CxxUtils/RCTFollyConvert.h
index 589b688da8d9a6..2821bd8557ef22 100644
--- a/React/CxxUtils/RCTFollyConvert.h
+++ b/React/CxxUtils/RCTFollyConvert.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/CxxUtils/RCTFollyConvert.mm b/React/CxxUtils/RCTFollyConvert.mm
index 0c6e08bb568939..2e3ec327dd9481 100644
--- a/React/CxxUtils/RCTFollyConvert.mm
+++ b/React/CxxUtils/RCTFollyConvert.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/DevSupport/RCTDevLoadingView.h b/React/DevSupport/RCTDevLoadingView.h
index 61a7121c5476a0..2a4a7d4c5c512f 100644
--- a/React/DevSupport/RCTDevLoadingView.h
+++ b/React/DevSupport/RCTDevLoadingView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/DevSupport/RCTDevLoadingView.m b/React/DevSupport/RCTDevLoadingView.m
index 15480ad6a69391..08ae65b0ccba69 100644
--- a/React/DevSupport/RCTDevLoadingView.m
+++ b/React/DevSupport/RCTDevLoadingView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -72,7 +72,7 @@ - (void)setBridge:(RCTBridge *)bridge
     self->_showDate = [NSDate date];
     if (!self->_window && !RCTRunningInTestEnvironment()) {
       CGSize screenSize = [UIScreen mainScreen].bounds.size;
-      
+
       if (@available(iOS 11.0, *)) {
         UIWindow *window = UIApplication.sharedApplication.keyWindow;
         self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, window.safeAreaInsets.top + 30)];
@@ -131,6 +131,10 @@ - (void)showWithURL:(NSURL *)URL
   UIColor *backgroundColor;
   NSString *source;
   if (URL.fileURL) {
+    // If dev mode is not enabled, we don't want to show this kind of notification
+#if !RCT_DEV
+    return;
+#endif
     color = [UIColor grayColor];
     backgroundColor = [UIColor blackColor];
     source = @"pre-bundled file";
diff --git a/React/DevSupport/RCTDevMenu.h b/React/DevSupport/RCTDevMenu.h
index cd60f87e108be8..a7979c8a4d3a87 100644
--- a/React/DevSupport/RCTDevMenu.h
+++ b/React/DevSupport/RCTDevMenu.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/DevSupport/RCTDevMenu.m b/React/DevSupport/RCTDevMenu.m
index 24b2f47e5127a9..48dda3f1fe74af 100644
--- a/React/DevSupport/RCTDevMenu.m
+++ b/React/DevSupport/RCTDevMenu.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -269,12 +269,6 @@ - (void)addItem:(RCTDevMenuItem *)item
     }]];
   }
 
-  if (devSettings.isJSCSamplingProfilerAvailable) {
-    [items addObject:[RCTDevMenuItem buttonItemWithTitle:@"Start / Stop JS Sampling Profiler" handler:^{
-      [devSettings toggleJSCSamplingProfiler];
-    }]];
-  }
-
   [items addObject:[RCTDevMenuItem buttonItemWithTitleBlock:^NSString *{
     return @"Toggle Inspector";
   } handler:^{
diff --git a/React/DevSupport/RCTInspectorDevServerHelper.h b/React/DevSupport/RCTInspectorDevServerHelper.h
index f377926bb1263b..c718dfd3b55e77 100644
--- a/React/DevSupport/RCTInspectorDevServerHelper.h
+++ b/React/DevSupport/RCTInspectorDevServerHelper.h
@@ -1,10 +1,9 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its 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 <JavaScriptCore/JSBase.h>
 #import <UIKit/UIKit.h>
 
 #import <React/RCTDefines.h>
diff --git a/React/DevSupport/RCTInspectorDevServerHelper.mm b/React/DevSupport/RCTInspectorDevServerHelper.mm
index 0a3c1bfc1cdbf5..7aad19bc286404 100644
--- a/React/DevSupport/RCTInspectorDevServerHelper.mm
+++ b/React/DevSupport/RCTInspectorDevServerHelper.mm
@@ -2,15 +2,12 @@
 
 #if RCT_DEV
 
-#import <jschelpers/JSCWrapper.h>
 #import <UIKit/UIKit.h>
 #import <React/RCTLog.h>
 
 #import "RCTDefines.h"
 #import "RCTInspectorPackagerConnection.h"
 
-using namespace facebook::react;
-
 static NSString *const kDebuggerMsgDisable = @"{ \"id\":1,\"method\":\"Debugger.disable\" }";
 
 static NSString *getServerHost(NSURL *bundleURL, NSNumber *port)
diff --git a/React/DevSupport/RCTPackagerClient.h b/React/DevSupport/RCTPackagerClient.h
index 230d685f4e2a11..e0877bbbc0b362 100644
--- a/React/DevSupport/RCTPackagerClient.h
+++ b/React/DevSupport/RCTPackagerClient.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/DevSupport/RCTPackagerClient.m b/React/DevSupport/RCTPackagerClient.m
index a15c01fbe5f3da..66c086f39183f8 100644
--- a/React/DevSupport/RCTPackagerClient.m
+++ b/React/DevSupport/RCTPackagerClient.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/DevSupport/RCTPackagerConnection.h b/React/DevSupport/RCTPackagerConnection.h
index ed3f464b6bdfff..67832ca91808f1 100644
--- a/React/DevSupport/RCTPackagerConnection.h
+++ b/React/DevSupport/RCTPackagerConnection.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/DevSupport/RCTPackagerConnection.mm b/React/DevSupport/RCTPackagerConnection.mm
index 10fbca844e3fd0..de9ab999b10bc8 100644
--- a/React/DevSupport/RCTPackagerConnection.mm
+++ b/React/DevSupport/RCTPackagerConnection.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h
index a1af3f7679d941..d7534d944251ce 100644
--- a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
index e275169a1c38e2..9fc0faa5d3a90c 100644
--- a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,7 +7,7 @@
 
 #import "RCTActivityIndicatorViewComponentView.h"
 
-#import <fabric/activityindicator/ActivityIndicatorViewProps.h>
+#import <fabric/components/activityindicator/ActivityIndicatorViewProps.h>
 
 using namespace facebook::react;
 
@@ -27,19 +27,20 @@ @implementation RCTActivityIndicatorViewComponentView {
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const ActivityIndicatorViewProps>();
+    _props = defaultProps;
+
     _activityIndicatorView = [[UIActivityIndicatorView alloc] initWithFrame:self.bounds];
     _activityIndicatorView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
-    const auto &defaultProps = ActivityIndicatorViewProps();
-
-    if (defaultProps.animating) {
+    if (defaultProps->animating) {
       [_activityIndicatorView startAnimating];
     } else {
       [_activityIndicatorView stopAnimating];
     }
-    _activityIndicatorView.color = [UIColor colorWithCGColor:defaultProps.color.get()];
-    _activityIndicatorView.hidesWhenStopped = defaultProps.hidesWhenStopped;
-    _activityIndicatorView.activityIndicatorViewStyle = convertActivityIndicatorViewStyle(defaultProps.size);
+    _activityIndicatorView.color = [UIColor colorWithCGColor:defaultProps->color.get()];
+    _activityIndicatorView.hidesWhenStopped = defaultProps->hidesWhenStopped;
+    _activityIndicatorView.activityIndicatorViewStyle = convertActivityIndicatorViewStyle(defaultProps->size);
 
     [self addSubview:_activityIndicatorView];
   }
@@ -49,16 +50,11 @@ - (instancetype)initWithFrame:(CGRect)frame
 
 - (void)updateProps:(SharedProps)props oldProps:(SharedProps)oldProps
 {
-  if (!oldProps) {
-    oldProps = _props ?: std::make_shared<ActivityIndicatorViewProps>();
-  }
-  _props = props;
+  const auto &oldViewProps = *std::static_pointer_cast<const ActivityIndicatorViewProps>(oldProps ?: _props);
+  const auto &newViewProps = *std::static_pointer_cast<const ActivityIndicatorViewProps>(props);
 
   [super updateProps:props oldProps:oldProps];
 
-  auto oldViewProps = *std::dynamic_pointer_cast<const ActivityIndicatorViewProps>(oldProps);
-  auto newViewProps = *std::dynamic_pointer_cast<const ActivityIndicatorViewProps>(props);
-
   if (oldViewProps.animating != newViewProps.animating) {
     if (newViewProps.animating) {
       [_activityIndicatorView startAnimating];
diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h
index a9bcf7d392b93f..ebeea523d24f59 100644
--- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
index cb8dcd7fc0ecd0..0ef3440e27b390 100644
--- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -27,11 +27,13 @@ @implementation RCTImageComponentView {
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const ImageProps>();
+    _props = defaultProps;
+
     _imageView = [[UIImageView alloc] initWithFrame:self.bounds];
     _imageView.clipsToBounds = YES;
 
-    auto defaultProps = ImageProps();
-    _imageView.contentMode = (UIViewContentMode)RCTResizeModeFromImageResizeMode(defaultProps.resizeMode);
+    _imageView.contentMode = (UIViewContentMode)RCTResizeModeFromImageResizeMode(defaultProps->resizeMode);
 
     self.contentView = _imageView;
   }
@@ -43,16 +45,11 @@ - (instancetype)initWithFrame:(CGRect)frame
 
 - (void)updateProps:(SharedProps)props oldProps:(SharedProps)oldProps
 {
-  if (!oldProps) {
-    oldProps = _props ?: std::make_shared<const ImageProps>();
-  }
-  _props = props;
+  const auto &oldImageProps = *std::static_pointer_cast<const ImageProps>(oldProps ?: _props);
+  const auto &newImageProps = *std::static_pointer_cast<const ImageProps>(props);
 
   [super updateProps:props oldProps:oldProps];
 
-  const auto &oldImageProps = *std::dynamic_pointer_cast<const ImageProps>(oldProps);
-  const auto &newImageProps = *std::dynamic_pointer_cast<const ImageProps>(props);
-
   // `resizeMode`
   if (oldImageProps.resizeMode != newImageProps.resizeMode) {
     if (newImageProps.resizeMode == ImageResizeMode::Repeat) {
@@ -77,7 +74,7 @@ - (void)updateLocalData:(SharedLocalData)localData
   assert(_imageLocalData);
   auto future = _imageLocalData->getImageRequest().getResponseFuture();
   future.via(&MainQueueExecutor::instance()).then([self](ImageResponse &&imageResponse) {
-    self.image = (__bridge_transfer UIImage *)imageResponse.getImage().get();
+    self.image = (__bridge UIImage *)imageResponse.getImage().get();
   });
 }
 
@@ -85,6 +82,7 @@ - (void)prepareForRecycle
 {
   [super prepareForRecycle];
   _imageView.image = nil;
+  _imageLocalData.reset();
 }
 
 #pragma mark - Other
diff --git a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h
index 687d4f73a72ba7..ef647bc1555e39 100644
--- a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm
index 703c03e5ddfe5d..6364c561b0d801 100644
--- a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,20 @@
 
 #import "RCTRootComponentView.h"
 
+#import <fabric/components/root/RootProps.h>
+
+using namespace facebook::react;
+
 @implementation RCTRootComponentView
 
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RootProps>();
+    _props = defaultProps;
+  }
+
+  return self;
+}
+
 @end
diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h
index 0795a78991d168..8416d2b902dd4b 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,7 +12,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- * `UIScrollView` subclass which has some improvements and tweeks
+ * `UIScrollView` subclass which has some improvements and tweaks
  * wich are not directly related to React.
  */
 @interface RCTEnhancedScrollView : UIScrollView
diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm
index 62ecd203d9862e..eab20fea9939b0 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h
index b031d6d760b85b..5840a9d3d36fe4 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
index 90e47e77f5d695..92d1d603ac2b2d 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,10 +8,10 @@
 #import "RCTScrollViewComponentView.h"
 
 #import <React/RCTAssert.h>
+#import <fabric/components/scrollview/ScrollViewLocalData.h>
+#import <fabric/components/scrollview/ScrollViewProps.h>
+#import <fabric/components/scrollview/ScrollViewEventEmitter.h>
 #import <fabric/graphics/Geometry.h>
-#import <fabric/scrollview/ScrollViewLocalData.h>
-#import <fabric/scrollview/ScrollViewProps.h>
-#import <fabric/scrollview/ScrollViewEventEmitter.h>
 
 #import "RCTConversions.h"
 #import "RCTEnhancedScrollView.h"
@@ -33,6 +33,9 @@ @implementation RCTScrollViewComponentView {
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const ScrollViewProps>();
+    _props = defaultProps;
+
     _scrollView = [[RCTEnhancedScrollView alloc] initWithFrame:self.bounds];
     _scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     _scrollView.delegate = self;
@@ -49,15 +52,10 @@ - (instancetype)initWithFrame:(CGRect)frame
 
 - (void)updateProps:(SharedProps)props oldProps:(SharedProps)oldProps
 {
-  [super updateProps:props oldProps:oldProps];
+  const auto &oldScrollViewProps = *std::static_pointer_cast<const ScrollViewProps>(oldProps ?: _props);
+  const auto &newScrollViewProps = *std::static_pointer_cast<const ScrollViewProps>(props);
 
-  if (!oldProps) {
-    oldProps = _props ?: std::make_shared<ScrollViewProps>();
-  }
-  _props = props;
-
-  auto oldScrollViewProps = *std::dynamic_pointer_cast<const ScrollViewProps>(oldProps);
-  auto newScrollViewProps = *std::dynamic_pointer_cast<const ScrollViewProps>(props);
+  [super updateProps:props oldProps:oldProps];
 
 #define REMAP_PROP(reactName, localName, target) \
   if (oldScrollViewProps.reactName != newScrollViewProps.reactName) { \
diff --git a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h
index 470a3e7e0ee22f..b18ea4b2148627 100644
--- a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
index f58ac227c43009..ee7fb5f89f9b40 100644
--- a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,15 +20,16 @@ @implementation RCTSwitchComponentView {
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const SwitchProps>();
+    _props = defaultProps;
+
     _switchView = [[UISwitch alloc] initWithFrame:self.bounds];
 
     [_switchView addTarget:self
-                 action:@selector(onChange:)
-       forControlEvents:UIControlEventValueChanged];
-
-    const auto &defaultProps = SwitchProps();
+                    action:@selector(onChange:)
+          forControlEvents:UIControlEventValueChanged];
 
-    _switchView.on = defaultProps.value;
+    _switchView.on = defaultProps->value;
 
     self.contentView = _switchView;
   }
@@ -38,16 +39,11 @@ - (instancetype)initWithFrame:(CGRect)frame
 
 - (void)updateProps:(SharedProps)props oldProps:(SharedProps)oldProps
 {
-  if (!oldProps) {
-    oldProps = _props ?: std::make_shared<SwitchProps>();
-  }
-  _props = props;
+  const auto &oldSwitchProps = *std::static_pointer_cast<const SwitchProps>(oldProps ?: _props);
+  const auto &newSwitchProps = *std::static_pointer_cast<const SwitchProps>(props);
 
   [super updateProps:props oldProps:oldProps];
 
-  auto oldSwitchProps = *std::dynamic_pointer_cast<const SwitchProps>(oldProps);
-  auto newSwitchProps = *std::dynamic_pointer_cast<const SwitchProps>(props);
-
   // `value`
   if (oldSwitchProps.value != newSwitchProps.value) {
     _switchView.on = newSwitchProps.value;
diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h
index 92700da77d642c..9e9573a58f3495 100644
--- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
index 770913113ec32a..f75223fbcc992e 100644
--- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,10 +7,10 @@
 
 #import "RCTParagraphComponentView.h"
 
+#import <fabric/components/text/ParagraphLocalData.h>
+#import <fabric/components/text/ParagraphProps.h>
 #import <fabric/core/LocalData.h>
 #import <fabric/graphics/Geometry.h>
-#import <fabric/text/ParagraphLocalData.h>
-#import <fabric/text/ParagraphProps.h>
 #import <fabric/textlayoutmanager/TextLayoutManager.h>
 #import <fabric/textlayoutmanager/RCTTextLayoutManager.h>
 #import "RCTConversions.h"
@@ -25,6 +25,9 @@ @implementation RCTParagraphComponentView {
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const ParagraphProps>();
+    _props = defaultProps;
+
     self.isAccessibilityElement = YES;
     self.accessibilityTraits |= UIAccessibilityTraitStaticText;
     self.opaque = NO;
@@ -36,8 +39,10 @@ - (instancetype)initWithFrame:(CGRect)frame
 
 - (void)updateProps:(SharedProps)props oldProps:(SharedProps)oldProps
 {
+  const auto &paragraphProps = std::static_pointer_cast<const ParagraphProps>(props);
+
   [super updateProps:props oldProps:oldProps];
-  auto paragraphProps = std::static_pointer_cast<const ParagraphProps>(props);
+
   assert(paragraphProps);
   _paragraphAttributes = paragraphProps->paragraphAttributes;
 }
@@ -68,4 +73,45 @@ - (void)drawRect:(CGRect)rect
                                           frame:frame];
 }
 
-@end
+#pragma mark - Accessibility
+
+- (NSString *)accessibilityLabel
+{
+  NSString *superAccessibilityLabel =
+    RCTNSStringFromStringNilIfEmpty(_props->accessibilityLabel);
+  if (superAccessibilityLabel) {
+    return superAccessibilityLabel;
+  }
+
+  if (!_paragraphLocalData) {
+    return nil;
+  }
+
+  return RCTNSStringFromString(_paragraphLocalData->getAttributedString().getString());
+}
+
+- (SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point
+{
+  if (!_paragraphLocalData) {
+    return _eventEmitter;
+  }
+
+  SharedTextLayoutManager textLayoutManager = _paragraphLocalData->getTextLayoutManager();
+  RCTTextLayoutManager *nativeTextLayoutManager = (__bridge RCTTextLayoutManager *)textLayoutManager->getNativeTextLayoutManager();
+  CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
+
+  SharedShadowNode textShadowNode = [nativeTextLayoutManager getParentShadowNodeWithAttributeString:_paragraphLocalData->getAttributedString()
+                                                                                paragraphAttributes:_paragraphAttributes
+                                                                                              frame:frame
+                                                                                            atPoint:point];
+
+  if (!textShadowNode) {
+    return _eventEmitter;
+  }
+
+  SharedEventEmitter eventEmitter = textShadowNode->getEventEmitter();
+  assert(std::dynamic_pointer_cast<const TouchEventEmitter>(eventEmitter));
+  return std::static_pointer_cast<const TouchEventEmitter>(eventEmitter);
+}
+
+ @end
diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h
index d43973049dc7be..3ecf900767d2e3 100644
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,20 +9,22 @@
 
 #import <React/RCTComponentViewProtocol.h>
 #import <React/UIView+ComponentViewProtocol.h>
-#import <fabric/core/EventEmitter.h>
 #import <fabric/core/LayoutMetrics.h>
 #import <fabric/core/Props.h>
-#import <fabric/view/ViewEventEmitter.h>
+#import <fabric/components/view/ViewEventEmitter.h>
+#import <fabric/components/view/ViewProps.h>
+#import <fabric/events/EventEmitter.h>
+#import <React/RCTTouchableComponentViewProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
  * UIView class for <View> component.
  */
-@interface RCTViewComponentView : UIView <RCTComponentViewProtocol> {
+@interface RCTViewComponentView : UIView <RCTComponentViewProtocol, RCTTouchableComponentViewProtocol> {
 @protected
   facebook::react::LayoutMetrics _layoutMetrics;
-  facebook::react::SharedProps _props;
+  facebook::react::SharedViewProps _props;
   facebook::react::SharedViewEventEmitter _eventEmitter;
 }
 
diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
index 61ce1ccdc235d0..7e4489abe8b370 100644
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,8 +7,11 @@
 
 #import "RCTViewComponentView.h"
 
-#import <fabric/view/ViewProps.h>
-#import <fabric/view/ViewEventEmitter.h>
+#import <fabric/components/view/ViewProps.h>
+#import <fabric/components/view/ViewEventEmitter.h>
+#import <objc/runtime.h>
+#import <React/RCTAssert.h>
+#import <React/RCTBorderDrawing.h>
 
 #import "RCTConversions.h"
 
@@ -16,7 +19,18 @@
 
 @implementation RCTViewComponentView
 {
-  BOOL _isCoreAnimationBorderRenderingEnabled;
+  UIColor *_backgroundColor;
+  CALayer *_borderLayer;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const ViewProps>();
+    _props = defaultProps;
+  }
+
+  return self;
 }
 
 - (void)setContentView:(UIView *)contentView
@@ -36,6 +50,10 @@ - (void)layoutSubviews
 {
   [super layoutSubviews];
 
+  if (_borderLayer) {
+    _borderLayer.frame = self.layer.bounds;
+  }
+
   if (_contentView) {
     _contentView.frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
   }
@@ -50,25 +68,49 @@ - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
   return CGRectContainsPoint(hitFrame, point);
 }
 
+- (UIColor *)backgroundColor
+{
+  return _backgroundColor;
+}
+
+- (void)setBackgroundColor:(UIColor *)backgroundColor
+{
+  _backgroundColor = backgroundColor;
+}
+
 - (void)updateProps:(SharedProps)props
            oldProps:(SharedProps)oldProps
 {
-  if (!oldProps) {
-    oldProps = _props ?: std::make_shared<ViewProps>();
-  }
-  _props = props;
-
-  auto oldViewProps = *std::dynamic_pointer_cast<const ViewProps>(oldProps);
-  auto newViewProps = *std::dynamic_pointer_cast<const ViewProps>(props);
+#ifndef NS_BLOCK_ASSERTIONS
+  auto propsRawPtr = _props.get();
+  RCTAssert(
+    propsRawPtr &&
+    (
+      [self class] == [RCTViewComponentView class] ||
+      typeid(*propsRawPtr).hash_code() != typeid(const ViewProps).hash_code()
+    ),
+    @"`RCTViewComponentView` subclasses (and `%@` particularly) must setup `_props`"
+      " instance variable with a default value in the constructor.", NSStringFromClass([self class])
+  );
+#endif
+
+  const auto &oldViewProps = *std::static_pointer_cast<const ViewProps>(oldProps ?: _props);
+  const auto &newViewProps = *std::static_pointer_cast<const ViewProps>(props);
+
+  _props = std::static_pointer_cast<const ViewProps>(props);
+
+  BOOL needsInvalidateLayer = NO;
 
   // `opacity`
   if (oldViewProps.opacity != newViewProps.opacity) {
     self.layer.opacity = (CGFloat)newViewProps.opacity;
+    needsInvalidateLayer = YES;
   }
 
   // `backgroundColor`
   if (oldViewProps.backgroundColor != newViewProps.backgroundColor) {
-    self.backgroundColor = RCTUIColorFromSharedColor(newViewProps.backgroundColor);
+    _backgroundColor = RCTUIColorFromSharedColor(newViewProps.backgroundColor);
+    needsInvalidateLayer = YES;
   }
 
   // `foregroundColor`
@@ -81,21 +123,25 @@ - (void)updateProps:(SharedProps)props
     CGColorRef shadowColor = RCTCGColorRefFromSharedColor(newViewProps.shadowColor);
     self.layer.shadowColor = shadowColor;
     CGColorRelease(shadowColor);
+    needsInvalidateLayer = YES;
   }
 
   // `shadowOffset`
   if (oldViewProps.shadowOffset != newViewProps.shadowOffset) {
     self.layer.shadowOffset = RCTCGSizeFromSize(newViewProps.shadowOffset);
+    needsInvalidateLayer = YES;
   }
 
   // `shadowOpacity`
   if (oldViewProps.shadowOpacity != newViewProps.shadowOpacity) {
     self.layer.shadowOpacity = (CGFloat)newViewProps.shadowOpacity;
+    needsInvalidateLayer = YES;
   }
 
   // `shadowRadius`
   if (oldViewProps.shadowRadius != newViewProps.shadowRadius) {
     self.layer.shadowRadius = (CGFloat)newViewProps.shadowRadius;
+    needsInvalidateLayer = YES;
   }
 
   // `backfaceVisibility`
@@ -125,6 +171,12 @@ - (void)updateProps:(SharedProps)props
     self.hitTestEdgeInsets = RCTUIEdgeInsetsFromEdgeInsets(newViewProps.hitSlop);
   }
 
+  // `overflow`
+  if (oldViewProps.yogaStyle.overflow != newViewProps.yogaStyle.overflow) {
+    self.clipsToBounds = newViewProps.yogaStyle.overflow != YGOverflowVisible;
+    needsInvalidateLayer = YES;
+  }
+
   // `zIndex`
   if (oldViewProps.zIndex != newViewProps.zIndex) {
     self.layer.zPosition = (CGFloat)newViewProps.zIndex;
@@ -132,23 +184,60 @@ - (void)updateProps:(SharedProps)props
 
   // `border`
   if (
-    oldViewProps.borderWidth != newViewProps.borderWidth ||
-    oldViewProps.borderStyle != newViewProps.borderStyle ||
-    oldViewProps.borderRadius != newViewProps.borderRadius ||
-    oldViewProps.borderColor != newViewProps.borderColor
+    oldViewProps.borderStyles != newViewProps.borderStyles ||
+    oldViewProps.borderRadii != newViewProps.borderRadii ||
+    oldViewProps.borderColors != newViewProps.borderColors
   ) {
-    [self invalidateBorder];
+    needsInvalidateLayer = YES;
   }
 
   // `nativeId`
   if (oldViewProps.nativeId != newViewProps.nativeId) {
-    self.nativeId = RCTNSStringFromString(newViewProps.nativeId);
+    self.nativeId = RCTNSStringFromStringNilIfEmpty(newViewProps.nativeId);
   }
 
   // `accessible`
   if (oldViewProps.accessible != newViewProps.accessible) {
     self.accessibilityElement.isAccessibilityElement = newViewProps.accessible;
   }
+
+  // `accessibilityLabel`
+  if (oldViewProps.accessibilityLabel != newViewProps.accessibilityLabel) {
+    self.accessibilityElement.accessibilityLabel = RCTNSStringFromStringNilIfEmpty(newViewProps.accessibilityLabel);
+  }
+
+  // `accessibilityHint`
+  if (oldViewProps.accessibilityHint != newViewProps.accessibilityHint) {
+    self.accessibilityElement.accessibilityHint = RCTNSStringFromStringNilIfEmpty(newViewProps.accessibilityHint);
+  }
+
+  // `accessibilityTraits`
+  if (oldViewProps.accessibilityTraits != newViewProps.accessibilityTraits) {
+    self.accessibilityElement.accessibilityTraits = RCTUIAccessibilityTraitsFromAccessibilityTraits(newViewProps.accessibilityTraits);
+  }
+
+  // `accessibilityViewIsModal`
+  if (oldViewProps.accessibilityViewIsModal != newViewProps.accessibilityViewIsModal) {
+    self.accessibilityElement.accessibilityViewIsModal = newViewProps.accessibilityViewIsModal;
+  }
+
+  // `accessibilityElementsHidden`
+  if (oldViewProps.accessibilityElementsHidden != newViewProps.accessibilityElementsHidden) {
+    self.accessibilityElement.accessibilityElementsHidden = newViewProps.accessibilityElementsHidden;
+  }
+
+  // `accessibilityIgnoresInvertColors`
+  if (oldViewProps.accessibilityIgnoresInvertColors != newViewProps.accessibilityIgnoresInvertColors) {
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
+    if (@available(iOS 11.0, *)) {
+      self.accessibilityIgnoresInvertColors = newViewProps.accessibilityIgnoresInvertColors;
+    }
+#endif
+  }
+
+  if (needsInvalidateLayer) {
+    [self invalidateLayer];
+  }
 }
 
 - (void)updateEventEmitter:(SharedEventEmitter)eventEmitter
@@ -163,35 +252,220 @@ - (void)updateLayoutMetrics:(LayoutMetrics)layoutMetrics
   _layoutMetrics = layoutMetrics;
 
   [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+
+  [self invalidateLayer];
+}
+
+- (UIView *)betterHitTest:(CGPoint)point withEvent:(UIEvent *)event
+{
+  // This is a classic textbook implementation of `hitTest:` with a couple of improvements:
+  //   * It takes layers' `zIndex` property into an account;
+  //   * It does not stop algorithm if some touch is outside the view
+  //     which does not have `clipToBounds` enabled.
+
+  if (!self.userInteractionEnabled || self.hidden || self.alpha < 0.01) {
+    return nil;
+  }
+
+  BOOL isPointInside = [self pointInside:point withEvent:event];
+
+  if (self.clipsToBounds && !isPointInside) {
+    return nil;
+  }
+
+  NSArray<__kindof UIView *> *sortedSubviews =
+    [self.subviews sortedArrayUsingComparator:^NSComparisonResult(UIView *a, UIView *b) {
+      // Ensure sorting is stable by treating equal `zIndex` as ascending so
+      // that original order is preserved.
+      return a.layer.zPosition > b.layer.zPosition ? NSOrderedDescending : NSOrderedAscending;
+    }];
+
+  for (UIView *subview in [sortedSubviews reverseObjectEnumerator]) {
+    UIView *hitView = [subview hitTest:[subview convertPoint:point fromView:self] withEvent:event];
+    if (hitView) {
+      return hitView;
+    }
+  }
+
+  return isPointInside ? self : nil;
 }
 
-- (void)invalidateBorder
+- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
-  const auto &props = *std::dynamic_pointer_cast<const ViewProps>(_props);
+  switch (_props->pointerEvents) {
+    case PointerEventsMode::Auto:
+      return [self betterHitTest:point withEvent:event];
+    case PointerEventsMode::None:
+      return nil;
+    case PointerEventsMode::BoxOnly:
+      return [self pointInside:point withEvent:event] ? self : nil;
+    case PointerEventsMode::BoxNone:
+      UIView *view = [self betterHitTest:point withEvent:event];
+      return view != self ? view : nil;
+  }
+}
 
-  bool useCoreAnimationBorderRendering =
-    props.borderStyle == BorderStyle::Solid &&
-    props.borderWidth.isUniform() &&
-    props.borderRadius.isUniform();
+static RCTCornerRadii RCTCornerRadiiFromBorderRadii(BorderRadii borderRadii) {
+  return RCTCornerRadii {
+    .topLeft = (CGFloat)borderRadii.topLeft,
+    .topRight = (CGFloat)borderRadii.topRight,
+    .bottomLeft = (CGFloat)borderRadii.bottomLeft,
+    .bottomRight = (CGFloat)borderRadii.bottomRight
+  };
+}
+
+static RCTBorderColors RCTBorderColorsFromBorderColors(BorderColors borderColors) {
+  return RCTBorderColors {
+    .left = RCTCGColorRefFromSharedColor(borderColors.left),
+    .top = RCTCGColorRefFromSharedColor(borderColors.top),
+    .bottom = RCTCGColorRefFromSharedColor(borderColors.bottom),
+    .right = RCTCGColorRefFromSharedColor(borderColors.right)
+  };
+}
+
+static UIEdgeInsets UIEdgeInsetsFromBorderInsets(EdgeInsets edgeInsets) {
+  return UIEdgeInsets {
+    .left = (CGFloat)edgeInsets.left,
+    .top = (CGFloat)edgeInsets.top,
+    .bottom = (CGFloat)edgeInsets.bottom,
+    .right = (CGFloat)edgeInsets.right
+  };
+}
+
+static RCTBorderStyle RCTBorderStyleFromBorderStyle(BorderStyle borderStyle) {
+  switch (borderStyle) {
+    case BorderStyle::Solid:
+      return RCTBorderStyleSolid;
+    case BorderStyle::Dotted:
+      return RCTBorderStyleDotted;
+    case BorderStyle::Dashed:
+      return RCTBorderStyleDashed;
+  }
+}
+
+- (void)invalidateLayer
+{
+  const auto borderMetrics =
+    _props->resolveBorderMetrics(_layoutMetrics.layoutDirection == LayoutDirection::RightToLeft);
 
   CALayer *layer = self.layer;
-  if (_isCoreAnimationBorderRenderingEnabled != useCoreAnimationBorderRendering) {
-    _isCoreAnimationBorderRenderingEnabled = useCoreAnimationBorderRendering;
-    if (!useCoreAnimationBorderRendering) {
-      layer.borderWidth = 0;
-      layer.borderColor = nil;
-      layer.cornerRadius = 0;
+
+  // Stage 1. Shadow Path
+  BOOL layerHasShadow = layer.shadowOpacity > 0 && CGColorGetAlpha(layer.shadowColor) > 0;
+  if (layerHasShadow) {
+    if (CGColorGetAlpha(_backgroundColor.CGColor) > 0.999) {
+      // If view has a solid background color, calculate shadow path from border.
+      const RCTCornerInsets cornerInsets =
+        RCTGetCornerInsets(RCTCornerRadiiFromBorderRadii(borderMetrics.borderRadii), UIEdgeInsetsZero);
+      CGPathRef shadowPath = RCTPathCreateWithRoundedRect(self.bounds, cornerInsets, nil);
+      layer.shadowPath = shadowPath;
+      CGPathRelease(shadowPath);
+    } else {
+      // Can't accurately calculate box shadow, so fall back to pixel-based shadow.
+      layer.shadowPath = nil;
     }
+  } else {
+    layer.shadowPath = nil;
   }
 
+  // Stage 2. Border Rendering
+  const bool useCoreAnimationBorderRendering =
+    borderMetrics.borderColors.isUniform() &&
+    borderMetrics.borderWidths.isUniform() &&
+    borderMetrics.borderStyles.isUniform() &&
+    borderMetrics.borderRadii.isUniform() &&
+    borderMetrics.borderStyles.left == BorderStyle::Solid &&
+    (
+      // iOS draws borders in front of the content whereas CSS draws them behind
+      // the content. For this reason, only use iOS border drawing when clipping
+      // or when the border is hidden.
+      borderMetrics.borderWidths.left == 0 ||
+      colorComponentsFromColor(borderMetrics.borderColors.left).alpha == 0 ||
+      self.clipsToBounds
+    );
+
   if (useCoreAnimationBorderRendering) {
-    layer.borderWidth = (CGFloat)props.borderWidth.left;
-    layer.borderColor = RCTCGColorRefFromSharedColor(props.borderColor);
-    layer.cornerRadius = (CGFloat)props.borderRadius.topLeft;
-    _contentView.layer.cornerRadius = (CGFloat)props.borderRadius.topLeft;
+    if (_borderLayer) {
+      [_borderLayer removeFromSuperlayer];
+      _borderLayer = nil;
+    }
+
+    layer.borderWidth = (CGFloat)borderMetrics.borderWidths.left;
+    layer.borderColor = RCTCGColorRefFromSharedColor(borderMetrics.borderColors.left);
+    layer.cornerRadius = (CGFloat)borderMetrics.borderRadii.topLeft;
+    layer.backgroundColor = _backgroundColor.CGColor;
+    _contentView.layer.cornerRadius = (CGFloat)borderMetrics.borderRadii.topLeft;
     _contentView.layer.masksToBounds = YES;
   } else {
-    // Not supported yet.
+    if (!_borderLayer) {
+      _borderLayer = [[CALayer alloc] init];
+      _borderLayer.zPosition = -1024.0f;
+      _borderLayer.frame = layer.bounds;
+      _borderLayer.magnificationFilter = kCAFilterNearest;
+      [layer addSublayer:_borderLayer];
+    }
+
+    layer.backgroundColor = nil;
+    layer.borderWidth = 0;
+    layer.borderColor = nil;
+    layer.cornerRadius = 0;
+    _contentView.layer.cornerRadius = 0;
+    _contentView.layer.masksToBounds = NO;
+
+    UIImage *image = RCTGetBorderImage(
+      RCTBorderStyleFromBorderStyle(borderMetrics.borderStyles.left),
+      layer.bounds.size,
+      RCTCornerRadiiFromBorderRadii(borderMetrics.borderRadii),
+      UIEdgeInsetsFromBorderInsets(borderMetrics.borderWidths),
+      RCTBorderColorsFromBorderColors(borderMetrics.borderColors),
+      _backgroundColor.CGColor,
+      self.clipsToBounds
+    );
+
+    if (image == nil) {
+      _borderLayer.contents = nil;
+    } else {
+      CGSize imageSize = image.size;
+      UIEdgeInsets imageCapInsets = image.capInsets;
+      CGRect contentsCenter = CGRect {
+        CGPoint {imageCapInsets.left / imageSize.width, imageCapInsets.top / imageSize.height},
+        CGSize {(CGFloat)1.0 / imageSize.width, (CGFloat)1.0 / imageSize.height}
+      };
+
+      _borderLayer.contents = (id)image.CGImage;
+      _borderLayer.contentsScale = image.scale;
+
+      const BOOL isResizable = !UIEdgeInsetsEqualToEdgeInsets(image.capInsets, UIEdgeInsetsZero);
+      if (isResizable) {
+        _borderLayer.contentsCenter = contentsCenter;
+      } else {
+        _borderLayer.contentsCenter = CGRect { CGPoint {0.0, 0.0}, CGSize {1.0, 1.0}};
+      }
+    }
+
+    // Stage 2.5. Custom Clipping Mask
+    CAShapeLayer *maskLayer = nil;
+    CGFloat cornerRadius = 0;
+    if (self.clipsToBounds) {
+      if (borderMetrics.borderRadii.isUniform()) {
+        // In this case we can simply use `cornerRadius` exclusivly.
+        cornerRadius = borderMetrics.borderRadii.topLeft;
+      } else {
+        // In this case we have to generate masking layer manually.
+        CGPathRef path = RCTPathCreateWithRoundedRect(
+          self.bounds,
+          RCTGetCornerInsets(RCTCornerRadiiFromBorderRadii(borderMetrics.borderRadii), UIEdgeInsetsZero),
+          nil
+        );
+
+        maskLayer = [CAShapeLayer layer];
+        maskLayer.path = path;
+        CGPathRelease(path);
+      }
+    }
+
+    layer.cornerRadius = cornerRadius;
+    layer.mask = maskLayer;
   }
 }
 
@@ -202,18 +476,46 @@ - (NSObject *)accessibilityElement
   return self;
 }
 
+static NSString *RCTRecursiveAccessibilityLabel(UIView *view)
+{
+  NSMutableString *result = [NSMutableString stringWithString:@""];
+  for (UIView *subview in view.subviews) {
+    NSString *label = subview.accessibilityLabel;
+    if (!label) {
+      label = RCTRecursiveAccessibilityLabel(subview);
+    }
+    if (label && label.length > 0) {
+      if (result.length > 0) {
+        [result appendString:@" "];
+      }
+      [result appendString:label];
+    }
+  }
+  return result;
+}
+
+- (NSString *)accessibilityLabel
+{
+  NSString *label = super.accessibilityLabel;
+  if (label) {
+    return label;
+  }
+
+  return RCTRecursiveAccessibilityLabel(self);
+}
+
 #pragma mark - Accessibility Events
 
 - (NSArray<UIAccessibilityCustomAction *> *)accessibilityCustomActions
 {
-  const auto &accessibilityProps = *std::dynamic_pointer_cast<const AccessibilityProps>(_props);
+  const auto &accessibilityActions = _props->accessibilityActions;
 
-  if (accessibilityProps.accessibilityActions.size() == 0) {
+  if (accessibilityActions.size() == 0) {
     return nil;
   }
 
   NSMutableArray<UIAccessibilityCustomAction *> *customActions = [NSMutableArray array];
-  for (const auto &accessibilityAction : accessibilityProps.accessibilityActions) {
+  for (const auto &accessibilityAction : accessibilityActions) {
     [customActions addObject:[[UIAccessibilityCustomAction alloc] initWithName:RCTNSStringFromString(accessibilityAction)
                                                                         target:self
                                                                       selector:@selector(didActivateAccessibilityCustomAction:)]];
@@ -240,7 +542,7 @@ - (BOOL)didActivateAccessibilityCustomAction:(UIAccessibilityCustomAction *)acti
   return YES;
 }
 
-- (SharedEventEmitter)touchEventEmitter
+- (SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point
 {
   return _eventEmitter;
 }
diff --git a/React/Fabric/Mounting/MountItems/RCTCreateMountItem.h b/React/Fabric/Mounting/MountItems/RCTCreateMountItem.h
index 6376094894d21d..a969680443bae5 100644
--- a/React/Fabric/Mounting/MountItems/RCTCreateMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTCreateMountItem.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTCreateMountItem.mm b/React/Fabric/Mounting/MountItems/RCTCreateMountItem.mm
index df04396b476039..e51642952740db 100644
--- a/React/Fabric/Mounting/MountItems/RCTCreateMountItem.mm
+++ b/React/Fabric/Mounting/MountItems/RCTCreateMountItem.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTDeleteMountItem.h b/React/Fabric/Mounting/MountItems/RCTDeleteMountItem.h
index a4c6077b56f3d4..1907023e17fc32 100644
--- a/React/Fabric/Mounting/MountItems/RCTDeleteMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTDeleteMountItem.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTDeleteMountItem.mm b/React/Fabric/Mounting/MountItems/RCTDeleteMountItem.mm
index ed4a884e411c0d..c45fba6172c984 100644
--- a/React/Fabric/Mounting/MountItems/RCTDeleteMountItem.mm
+++ b/React/Fabric/Mounting/MountItems/RCTDeleteMountItem.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTInsertMountItem.h b/React/Fabric/Mounting/MountItems/RCTInsertMountItem.h
index e3d4ac29d7aad5..dbae0a1085c229 100644
--- a/React/Fabric/Mounting/MountItems/RCTInsertMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTInsertMountItem.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTInsertMountItem.mm b/React/Fabric/Mounting/MountItems/RCTInsertMountItem.mm
index 740718b963d532..15894efe21a647 100644
--- a/React/Fabric/Mounting/MountItems/RCTInsertMountItem.mm
+++ b/React/Fabric/Mounting/MountItems/RCTInsertMountItem.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTMountItemProtocol.h b/React/Fabric/Mounting/MountItems/RCTMountItemProtocol.h
index f46c397498b456..4f3d7fe4b590e0 100644
--- a/React/Fabric/Mounting/MountItems/RCTMountItemProtocol.h
+++ b/React/Fabric/Mounting/MountItems/RCTMountItemProtocol.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTRemoveMountItem.h b/React/Fabric/Mounting/MountItems/RCTRemoveMountItem.h
index 0fe9555a613ea4..3d3875192c76f2 100644
--- a/React/Fabric/Mounting/MountItems/RCTRemoveMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTRemoveMountItem.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTRemoveMountItem.mm b/React/Fabric/Mounting/MountItems/RCTRemoveMountItem.mm
index 3279b939438f62..341929cacd3e66 100644
--- a/React/Fabric/Mounting/MountItems/RCTRemoveMountItem.mm
+++ b/React/Fabric/Mounting/MountItems/RCTRemoveMountItem.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h
index 7db403b1dd33ae..f0ad4d465d365f 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,7 +9,7 @@
 
 #import <React/RCTMountItemProtocol.h>
 #import <React/RCTPrimitives.h>
-#import <fabric/core/EventEmitter.h>
+#import <fabric/events/EventEmitter.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.mm b/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.mm
index 18de9cc3a5d097..f94a0859788bba 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.mm
+++ b/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.h
index 378c179d3c46cd..f97d2d6ad44caa 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.mm b/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.mm
index c61a043626a62f..71b76c32643309 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.mm
+++ b/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.h
index b5aedcadecd125..a883b5cfb4ef3d 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.mm b/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.mm
index c10bc3c4b40f8f..80ae5af8f0c13d 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.mm
+++ b/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.h
index efdfed64ddbf32..8762bf5a7cd67e 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.mm b/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.mm
index 694b72e4046a3a..4587a5ec910632 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.mm
+++ b/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/RCTComponentViewProtocol.h b/React/Fabric/Mounting/RCTComponentViewProtocol.h
index a426bfd081fe8e..eeada911c28ecd 100644
--- a/React/Fabric/Mounting/RCTComponentViewProtocol.h
+++ b/React/Fabric/Mounting/RCTComponentViewProtocol.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,10 +7,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/core/EventEmitter.h>
 #import <fabric/core/LocalData.h>
 #import <fabric/core/Props.h>
 #import <fabric/core/LayoutMetrics.h>
+#import <fabric/events/EventEmitter.h>
 #import <React/RCTPrimitives.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.h b/React/Fabric/Mounting/RCTComponentViewRegistry.h
index a563270999cefa..ba32ec648808e7 100644
--- a/React/Fabric/Mounting/RCTComponentViewRegistry.h
+++ b/React/Fabric/Mounting/RCTComponentViewRegistry.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.mm b/React/Fabric/Mounting/RCTComponentViewRegistry.mm
index 6edbeb75d59b46..f6374a27f9ef59 100644
--- a/React/Fabric/Mounting/RCTComponentViewRegistry.mm
+++ b/React/Fabric/Mounting/RCTComponentViewRegistry.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/RCTMountingManager.h b/React/Fabric/Mounting/RCTMountingManager.h
index 89a90ccb7160a4..ac52f7f44dd57e 100644
--- a/React/Fabric/Mounting/RCTMountingManager.h
+++ b/React/Fabric/Mounting/RCTMountingManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,7 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/uimanager/TreeMutationInstruction.h>
+#import <fabric/uimanager/ShadowView.h>
+#import <fabric/uimanager/ShadowViewMutation.h>
 #import <React/RCTPrimitives.h>
 #import <React/RCTMountingManagerDelegate.h>
 
@@ -28,8 +29,8 @@ NS_ASSUME_NONNULL_BEGIN
  * The order of mutation tnstructions matters.
  * Can be called from any thread.
  */
-- (void)mutateComponentViewTreeWithMutationInstructions:(facebook::react::TreeMutationInstructionList)instructions
-                                                rootTag:(ReactTag)rootTag;
+- (void)performTransactionWithMutations:(facebook::react::ShadowViewMutationList)mutations
+                                rootTag:(ReactTag)rootTag;
 
 /**
  * Suggests preliminary creation of a component view of given type.
diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm
index 90366db3490295..4c6597779d3585 100644
--- a/React/Fabric/Mounting/RCTMountingManager.mm
+++ b/React/Fabric/Mounting/RCTMountingManager.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -38,123 +38,112 @@ - (instancetype)init
   return self;
 }
 
-- (void)mutateComponentViewTreeWithMutationInstructions:(facebook::react::TreeMutationInstructionList)instructions
-                                                rootTag:(ReactTag)rootTag
+- (void)performTransactionWithMutations:(facebook::react::ShadowViewMutationList)mutations
+                                rootTag:(ReactTag)rootTag
 {
   NSMutableArray<RCTMountItemProtocol> *mountItems =
-    [[NSMutableArray<RCTMountItemProtocol> alloc] initWithCapacity:instructions.size() * 2 /* ~ the worst case */];
+    [[NSMutableArray<RCTMountItemProtocol> alloc] initWithCapacity:mutations.size() * 2 /* ~ the worst case */];
 
-  for (auto instruction : instructions) {
-    switch (instruction.getType()) {
-      case TreeMutationInstruction::Creation: {
-        NSString *componentName = RCTNSStringFromString(instruction.getNewChildNode()->getComponentName(), NSASCIIStringEncoding);
+  for (const auto &mutation : mutations) {
+    switch (mutation.type) {
+      case ShadowViewMutation::Create: {
+        NSString *componentName = RCTNSStringFromString(mutation.newChildShadowView.componentName, NSASCIIStringEncoding);
         RCTCreateMountItem *mountItem =
           [[RCTCreateMountItem alloc] initWithComponentName:componentName
-                                                        tag:instruction.getNewChildNode()->getTag()];
+                                                        tag:mutation.newChildShadowView.tag];
         [mountItems addObject:mountItem];
         break;
       }
 
-      case TreeMutationInstruction::Deletion: {
-        NSString *componentName = RCTNSStringFromString(instruction.getOldChildNode()->getComponentName(), NSASCIIStringEncoding);
+      case ShadowViewMutation::Delete: {
+        NSString *componentName = RCTNSStringFromString(mutation.oldChildShadowView.componentName, NSASCIIStringEncoding);
         RCTDeleteMountItem *mountItem =
           [[RCTDeleteMountItem alloc] initWithComponentName:componentName
-                                                        tag:instruction.getOldChildNode()->getTag()];
+                                                        tag:mutation.oldChildShadowView.tag];
         [mountItems addObject:mountItem];
         break;
       }
 
-      case TreeMutationInstruction::Insertion: {
+      case ShadowViewMutation::Insert: {
         // Props
-        [mountItems addObject:[[RCTUpdatePropsMountItem alloc] initWithTag:instruction.getNewChildNode()->getTag()
+        [mountItems addObject:[[RCTUpdatePropsMountItem alloc] initWithTag:mutation.newChildShadowView.tag
                                                                   oldProps:nullptr
-                                                                  newProps:instruction.getNewChildNode()->getProps()]];
+                                                                  newProps:mutation.newChildShadowView.props]];
 
         // EventEmitter
-        [mountItems addObject:[[RCTUpdateEventEmitterMountItem alloc] initWithTag:instruction.getNewChildNode()->getTag()
-                                                                     eventEmitter:instruction.getNewChildNode()->getEventEmitter()]];
+        [mountItems addObject:[[RCTUpdateEventEmitterMountItem alloc] initWithTag:mutation.newChildShadowView.tag
+                                                                     eventEmitter:mutation.newChildShadowView.eventEmitter]];
 
         // LocalData
-        if (instruction.getNewChildNode()->getLocalData()) {
-          [mountItems addObject:[[RCTUpdateLocalDataMountItem alloc] initWithTag:instruction.getNewChildNode()->getTag()
+        if (mutation.newChildShadowView.localData) {
+          [mountItems addObject:[[RCTUpdateLocalDataMountItem alloc] initWithTag:mutation.newChildShadowView.tag
                                                                     oldLocalData:nullptr
-                                                                    newLocalData:instruction.getNewChildNode()->getLocalData()]];
+                                                                    newLocalData:mutation.newChildShadowView.localData]];
         }
 
         // Layout
-        SharedLayoutableShadowNode layoutableNewShadowNode =
-          std::dynamic_pointer_cast<const LayoutableShadowNode>(instruction.getNewChildNode());
-
-        if (layoutableNewShadowNode) {
-          [mountItems addObject:[[RCTUpdateLayoutMetricsMountItem alloc] initWithTag:instruction.getNewChildNode()->getTag()
+        if (mutation.newChildShadowView.layoutMetrics != EmptyLayoutMetrics) {
+          [mountItems addObject:[[RCTUpdateLayoutMetricsMountItem alloc] initWithTag:mutation.newChildShadowView.tag
                                                                     oldLayoutMetrics:{}
-                                                                    newLayoutMetrics:layoutableNewShadowNode->getLayoutMetrics()]];
+                                                                    newLayoutMetrics:mutation.newChildShadowView.layoutMetrics]];
         }
 
         // Insertion
         RCTInsertMountItem *mountItem =
-        [[RCTInsertMountItem alloc] initWithChildTag:instruction.getNewChildNode()->getTag()
-                                           parentTag:instruction.getParentNode()->getTag()
-                                               index:instruction.getIndex()];
+          [[RCTInsertMountItem alloc] initWithChildTag:mutation.newChildShadowView.tag
+                                             parentTag:mutation.parentShadowView.tag
+                                                 index:mutation.index];
         [mountItems addObject:mountItem];
 
         break;
       }
 
-      case TreeMutationInstruction::Removal: {
+      case ShadowViewMutation::Remove: {
         RCTRemoveMountItem *mountItem =
-          [[RCTRemoveMountItem alloc] initWithChildTag:instruction.getOldChildNode()->getTag()
-                                             parentTag:instruction.getParentNode()->getTag()
-                                                 index:instruction.getIndex()];
+          [[RCTRemoveMountItem alloc] initWithChildTag:mutation.oldChildShadowView.tag
+                                             parentTag:mutation.parentShadowView.tag
+                                                 index:mutation.index];
         [mountItems addObject:mountItem];
         break;
       }
 
-      case TreeMutationInstruction::Replacement: {
-        SharedShadowNode oldShadowNode = instruction.getOldChildNode();
-        SharedShadowNode newShadowNode = instruction.getNewChildNode();
+      case ShadowViewMutation::Update: {
+        auto oldChildShadowView = mutation.oldChildShadowView;
+        auto newChildShadowView = mutation.newChildShadowView;
 
         // Props
-        if (oldShadowNode->getProps() != newShadowNode->getProps()) {
+        if (oldChildShadowView.props != newChildShadowView.props) {
           RCTUpdatePropsMountItem *mountItem =
-            [[RCTUpdatePropsMountItem alloc] initWithTag:instruction.getOldChildNode()->getTag()
-                                                oldProps:instruction.getOldChildNode()->getProps()
-                                                newProps:instruction.getNewChildNode()->getProps()];
+            [[RCTUpdatePropsMountItem alloc] initWithTag:mutation.oldChildShadowView.tag
+                                                oldProps:mutation.oldChildShadowView.props
+                                                newProps:mutation.newChildShadowView.props];
           [mountItems addObject:mountItem];
         }
 
         // EventEmitter
-        if (oldShadowNode->getEventEmitter() != newShadowNode->getEventEmitter()) {
+        if (oldChildShadowView.eventEmitter != newChildShadowView.eventEmitter) {
           RCTUpdateEventEmitterMountItem *mountItem =
-            [[RCTUpdateEventEmitterMountItem alloc] initWithTag:instruction.getOldChildNode()->getTag()
-                                                   eventEmitter:instruction.getOldChildNode()->getEventEmitter()];
+            [[RCTUpdateEventEmitterMountItem alloc] initWithTag:mutation.oldChildShadowView.tag
+                                                   eventEmitter:mutation.oldChildShadowView.eventEmitter];
           [mountItems addObject:mountItem];
         }
 
         // LocalData
-        if (oldShadowNode->getLocalData() != newShadowNode->getLocalData()) {
+        if (oldChildShadowView.localData != newChildShadowView.localData) {
           RCTUpdateLocalDataMountItem *mountItem =
-            [[RCTUpdateLocalDataMountItem alloc] initWithTag:newShadowNode->getTag()
-                                                oldLocalData:oldShadowNode->getLocalData()
-                                                newLocalData:newShadowNode->getLocalData()];
+            [[RCTUpdateLocalDataMountItem alloc] initWithTag:newChildShadowView.tag
+                                                oldLocalData:oldChildShadowView.localData
+                                                newLocalData:newChildShadowView.localData];
           [mountItems addObject:mountItem];
         }
 
         // Layout
-        SharedLayoutableShadowNode layoutableOldShadowNode =
-          std::dynamic_pointer_cast<const LayoutableShadowNode>(oldShadowNode);
-
-        if (layoutableOldShadowNode) {
-          SharedLayoutableShadowNode layoutableNewShadowNode =
-            std::dynamic_pointer_cast<const LayoutableShadowNode>(newShadowNode);
-
-          if (layoutableOldShadowNode->getLayoutMetrics() != layoutableNewShadowNode->getLayoutMetrics()) {
-            RCTUpdateLayoutMetricsMountItem *mountItem =
-              [[RCTUpdateLayoutMetricsMountItem alloc] initWithTag:instruction.getOldChildNode()->getTag()
-                                                  oldLayoutMetrics:layoutableOldShadowNode->getLayoutMetrics()
-                                                  newLayoutMetrics:layoutableNewShadowNode->getLayoutMetrics()];
-            [mountItems addObject:mountItem];
-          }
+        if (oldChildShadowView.layoutMetrics != newChildShadowView.layoutMetrics) {
+          RCTUpdateLayoutMetricsMountItem *mountItem =
+            [[RCTUpdateLayoutMetricsMountItem alloc] initWithTag:mutation.oldChildShadowView.tag
+                                                oldLayoutMetrics:oldChildShadowView.layoutMetrics
+                                                newLayoutMetrics:newChildShadowView.layoutMetrics];
+          [mountItems addObject:mountItem];
         }
 
         break;
diff --git a/React/Fabric/Mounting/RCTMountingManagerDelegate.h b/React/Fabric/Mounting/RCTMountingManagerDelegate.h
index 90ef6cecfa6ad0..cd0108153f8dfc 100644
--- a/React/Fabric/Mounting/RCTMountingManagerDelegate.h
+++ b/React/Fabric/Mounting/RCTMountingManagerDelegate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h
index 61c981b59563df..6c630782aa104f 100644
--- a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h
+++ b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm b/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm
index 579f4572309ab3..e60f393a1a5e62 100644
--- a/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm
+++ b/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h
index 10cb38fb899491..fa9fdd8d6422fb 100644
--- a/React/Fabric/RCTConversions.h
+++ b/React/Fabric/RCTConversions.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,14 +7,21 @@
 
 #import <UIKit/UIKit.h>
 
+#import <fabric/components/view/primitives.h>
+#import <fabric/components/view/AccessibilityPrimitives.h>
 #import <fabric/graphics/Color.h>
 #import <fabric/graphics/Geometry.h>
-#import <fabric/view/primitives.h>
 
-inline NSString *_Nullable RCTNSStringFromString(const std::string &string, const NSStringEncoding &encoding = NSUTF8StringEncoding) {
+NS_ASSUME_NONNULL_BEGIN
+
+inline NSString *RCTNSStringFromString(const std::string &string, const NSStringEncoding &encoding = NSUTF8StringEncoding) {
   return [NSString stringWithCString:string.c_str() encoding:encoding];
 }
 
+inline NSString *_Nullable RCTNSStringFromStringNilIfEmpty(const std::string &string, const NSStringEncoding &encoding = NSUTF8StringEncoding) {
+  return string.empty() ? nil : RCTNSStringFromString(string, encoding);
+}
+
 inline std::string RCTStringFromNSString(NSString *string, const NSStringEncoding &encoding = NSUTF8StringEncoding) {
   return [string cStringUsingEncoding:encoding];
 }
@@ -27,24 +34,45 @@ inline CGColorRef RCTCGColorRefFromSharedColor(const facebook::react::SharedColo
   return sharedColor ? CGColorCreateCopy(sharedColor.get()) : nil;
 }
 
-inline CGPoint RCTCGPointFromPoint(facebook::react::Point point) {
+inline CGPoint RCTCGPointFromPoint(const facebook::react::Point &point) {
   return {point.x, point.y};
 }
 
-inline CGSize RCTCGSizeFromSize(facebook::react::Size size) {
+inline CGSize RCTCGSizeFromSize(const facebook::react::Size &size) {
   return {size.width, size.height};
 }
 
-inline CGRect RCTCGRectFromRect(facebook::react::Rect rect) {
+inline CGRect RCTCGRectFromRect(const facebook::react::Rect &rect) {
   return {RCTCGPointFromPoint(rect.origin), RCTCGSizeFromSize(rect.size)};
 }
 
-inline UIEdgeInsets RCTUIEdgeInsetsFromEdgeInsets(facebook::react::EdgeInsets edgeInsets) {
+inline UIEdgeInsets RCTUIEdgeInsetsFromEdgeInsets(const facebook::react::EdgeInsets &edgeInsets) {
   return {edgeInsets.top, edgeInsets.left, edgeInsets.bottom, edgeInsets.right};
 }
 
-
-inline CATransform3D RCTCATransform3DFromTransformMatrix(facebook::react::Transform transformMatrix) {
+inline UIAccessibilityTraits RCTUIAccessibilityTraitsFromAccessibilityTraits(facebook::react::AccessibilityTraits accessibilityTraits) {
+  using AccessibilityTraits = facebook::react::AccessibilityTraits;
+  UIAccessibilityTraits result = UIAccessibilityTraitNone;
+  if ((accessibilityTraits & AccessibilityTraits::Button) != AccessibilityTraits::None) { result |= UIAccessibilityTraitButton; }
+  if ((accessibilityTraits & AccessibilityTraits::Link) != AccessibilityTraits::None) { result |= UIAccessibilityTraitLink; }
+  if ((accessibilityTraits & AccessibilityTraits::Image) != AccessibilityTraits::None) { result |= UIAccessibilityTraitImage; }
+  if ((accessibilityTraits & AccessibilityTraits::Selected) != AccessibilityTraits::None) { result |= UIAccessibilityTraitSelected; }
+  if ((accessibilityTraits & AccessibilityTraits::PlaysSound) != AccessibilityTraits::None) { result |= UIAccessibilityTraitPlaysSound; }
+  if ((accessibilityTraits & AccessibilityTraits::KeyboardKey) != AccessibilityTraits::None) { result |= UIAccessibilityTraitKeyboardKey; }
+  if ((accessibilityTraits & AccessibilityTraits::StaticText) != AccessibilityTraits::None) { result |= UIAccessibilityTraitStaticText; }
+  if ((accessibilityTraits & AccessibilityTraits::SummaryElement) != AccessibilityTraits::None) { result |= UIAccessibilityTraitSummaryElement; }
+  if ((accessibilityTraits & AccessibilityTraits::NotEnabled) != AccessibilityTraits::None) { result |= UIAccessibilityTraitNotEnabled; }
+  if ((accessibilityTraits & AccessibilityTraits::UpdatesFrequently) != AccessibilityTraits::None) { result |= UIAccessibilityTraitUpdatesFrequently; }
+  if ((accessibilityTraits & AccessibilityTraits::SearchField) != AccessibilityTraits::None) { result |= UIAccessibilityTraitSearchField; }
+  if ((accessibilityTraits & AccessibilityTraits::StartsMediaSession) != AccessibilityTraits::None) { result |= UIAccessibilityTraitStartsMediaSession; }
+  if ((accessibilityTraits & AccessibilityTraits::Adjustable) != AccessibilityTraits::None) { result |= UIAccessibilityTraitAdjustable; }
+  if ((accessibilityTraits & AccessibilityTraits::AllowsDirectInteraction) != AccessibilityTraits::None) { result |= UIAccessibilityTraitAllowsDirectInteraction; }
+  if ((accessibilityTraits & AccessibilityTraits::CausesPageTurn) != AccessibilityTraits::None) { result |= UIAccessibilityTraitCausesPageTurn; }
+  if ((accessibilityTraits & AccessibilityTraits::Header) != AccessibilityTraits::None) { result |= UIAccessibilityTraitHeader; }
+  return result;
+};
+
+inline CATransform3D RCTCATransform3DFromTransformMatrix(const facebook::react::Transform &transformMatrix) {
   return {
     (CGFloat)transformMatrix.matrix[0],
     (CGFloat)transformMatrix.matrix[1],
@@ -65,18 +93,20 @@ inline CATransform3D RCTCATransform3DFromTransformMatrix(facebook::react::Transf
   };
 }
 
-inline facebook::react::Point RCTPointFromCGPoint(CGPoint point) {
+inline facebook::react::Point RCTPointFromCGPoint(const CGPoint &point) {
   return {point.x, point.y};
 }
 
-inline facebook::react::Size RCTSizeFromCGSize(CGSize size) {
+inline facebook::react::Size RCTSizeFromCGSize(const CGSize &size) {
   return {size.width, size.height};
 }
 
-inline facebook::react::Rect RCTRectFromCGRect(CGRect rect) {
+inline facebook::react::Rect RCTRectFromCGRect(const CGRect &rect) {
   return {RCTPointFromCGPoint(rect.origin), RCTSizeFromCGSize(rect.size)};
 }
 
-inline facebook::react::EdgeInsets RCTEdgeInsetsFromUIEdgeInsets(UIEdgeInsets edgeInsets) {
+inline facebook::react::EdgeInsets RCTEdgeInsetsFromUIEdgeInsets(const UIEdgeInsets &edgeInsets) {
   return {edgeInsets.top, edgeInsets.left, edgeInsets.bottom, edgeInsets.right};
 }
+
+NS_ASSUME_NONNULL_END
diff --git a/React/Fabric/RCTPrimitives.h b/React/Fabric/RCTPrimitives.h
index 7712dabc9f1ed4..c837dd81909b49 100644
--- a/React/Fabric/RCTPrimitives.h
+++ b/React/Fabric/RCTPrimitives.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/RCTScheduler.h b/React/Fabric/RCTScheduler.h
index 6814046871d7e7..e66d0ce9b2a362 100644
--- a/React/Fabric/RCTScheduler.h
+++ b/React/Fabric/RCTScheduler.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,7 +12,7 @@
 #import <fabric/core/LayoutConstraints.h>
 #import <fabric/core/LayoutContext.h>
 #import <fabric/uimanager/FabricUIManager.h>
-#import <fabric/uimanager/TreeMutationInstruction.h>
+#import <fabric/uimanager/ShadowViewMutation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -23,7 +23,8 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @protocol RCTSchedulerDelegate
 
-- (void)schedulerDidComputeMutationInstructions:(facebook::react::TreeMutationInstructionList)instructions rootTag:(ReactTag)rootTag;
+- (void)schedulerDidFinishTransaction:(facebook::react::ShadowViewMutationList)mutations
+                              rootTag:(ReactTag)rootTag;
 
 - (void)schedulerDidRequestPreliminaryViewAllocationWithComponentName:(NSString *)componentName;
 
@@ -36,17 +37,23 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (atomic, weak, nullable) id<RCTSchedulerDelegate> delegate;
 
-- (void)registerRootTag:(ReactTag)tag;
+- (instancetype)initWithContextContainer:(std::shared_ptr<void>)contextContatiner;
 
-- (void)unregisterRootTag:(ReactTag)tag;
+- (void)startSurfaceWithSurfaceId:(facebook::react::SurfaceId)surfaceId
+                       moduleName:(NSString *)moduleName
+                     initailProps:(NSDictionary *)initialProps
+                layoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
+                    layoutContext:(facebook::react::LayoutContext)layoutContext;
 
-- (CGSize)measureWithLayoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
-                         layoutContext:(facebook::react::LayoutContext)layoutContext
-                               rootTag:(ReactTag)rootTag;
+- (void)stopSurfaceWithSurfaceId:(facebook::react::SurfaceId)surfaceId;
 
-- (void)constraintLayoutWithLayoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
+- (CGSize)measureSurfaceWithLayoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
                                 layoutContext:(facebook::react::LayoutContext)layoutContext
-                                      rootTag:(ReactTag)rootTag;
+                                    surfaceId:(facebook::react::SurfaceId)surfaceId;
+
+- (void)constraintSurfaceLayoutWithLayoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
+                                       layoutContext:(facebook::react::LayoutContext)layoutContext
+                                           surfaceId:(facebook::react::SurfaceId)surfaceId;
 
 @end
 
diff --git a/React/Fabric/RCTScheduler.mm b/React/Fabric/RCTScheduler.mm
index ce1d3b4201809b..d9ccfe8efbaa81 100644
--- a/React/Fabric/RCTScheduler.mm
+++ b/React/Fabric/RCTScheduler.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,12 +7,11 @@
 
 #import "RCTScheduler.h"
 
-#import <fabric/imagemanager/ImageManager.h>
 #import <fabric/uimanager/ContextContainer.h>
 #import <fabric/uimanager/Scheduler.h>
 #import <fabric/uimanager/SchedulerDelegate.h>
-#import <React/RCTImageLoader.h>
-#import <React/RCTBridge+Private.h>
+
+#import <React/RCTFollyConvert.h>
 
 #import "RCTConversions.h"
 
@@ -20,11 +19,12 @@
 
 class SchedulerDelegateProxy: public SchedulerDelegate {
 public:
-  SchedulerDelegateProxy(void *scheduler): scheduler_(scheduler) {}
+  SchedulerDelegateProxy(void *scheduler):
+    scheduler_(scheduler) {}
 
-  void schedulerDidComputeMutationInstructions(Tag rootTag, const TreeMutationInstructionList &instructions) override {
+  void schedulerDidFinishTransaction(Tag rootTag, const ShadowViewMutationList &mutations) override {
     RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
-    [scheduler.delegate schedulerDidComputeMutationInstructions:instructions rootTag:rootTag];
+    [scheduler.delegate schedulerDidFinishTransaction:mutations rootTag:rootTag];
   }
 
   void schedulerDidRequestPreliminaryViewAllocation(ComponentName componentName) override {
@@ -41,17 +41,11 @@ @implementation RCTScheduler {
   std::shared_ptr<SchedulerDelegateProxy> _delegateProxy;
 }
 
-- (instancetype)init
+- (instancetype)initWithContextContainer:(std::shared_ptr<void>)contextContatiner
 {
   if (self = [super init]) {
     _delegateProxy = std::make_shared<SchedulerDelegateProxy>((__bridge void *)self);
-
-    SharedContextContainer contextContainer = std::make_shared<ContextContainer>();
-
-    void *imageLoader = (__bridge void *)[[RCTBridge currentBridge] imageLoader];
-    contextContainer->registerInstance(typeid(ImageManager), std::make_shared<ImageManager>(imageLoader));
-
-    _scheduler = std::make_shared<Scheduler>(contextContainer);
+    _scheduler = std::make_shared<Scheduler>(std::static_pointer_cast<ContextContainer>(contextContatiner));
     _scheduler->setDelegate(_delegateProxy.get());
   }
 
@@ -63,28 +57,38 @@ - (void)dealloc
   _scheduler->setDelegate(nullptr);
 }
 
-- (void)registerRootTag:(ReactTag)tag
+- (void)startSurfaceWithSurfaceId:(SurfaceId)surfaceId
+                       moduleName:(NSString *)moduleName
+                     initailProps:(NSDictionary *)initialProps
+                layoutConstraints:(LayoutConstraints)layoutConstraints
+                    layoutContext:(LayoutContext)layoutContext;
 {
-  _scheduler->registerRootTag(tag);
+  _scheduler->startSurface(
+    surfaceId,
+    RCTStringFromNSString(moduleName),
+    convertIdToFollyDynamic(initialProps),
+    layoutConstraints,
+    layoutContext
+  );
 }
 
-- (void)unregisterRootTag:(ReactTag)tag
+- (void)stopSurfaceWithSurfaceId:(SurfaceId)surfaceId
 {
-  _scheduler->unregisterRootTag(tag);
+  _scheduler->stopSurface(surfaceId);
 }
 
-- (CGSize)measureWithLayoutConstraints:(LayoutConstraints)layoutConstraints
-                         layoutContext:(LayoutContext)layoutContext
-                               rootTag:(ReactTag)rootTag
+- (CGSize)measureSurfaceWithLayoutConstraints:(LayoutConstraints)layoutConstraints
+                                layoutContext:(LayoutContext)layoutContext
+                                    surfaceId:(SurfaceId)surfaceId
 {
-  return RCTCGSizeFromSize(_scheduler->measure(rootTag, layoutConstraints, layoutContext));
+  return RCTCGSizeFromSize(_scheduler->measureSurface(surfaceId, layoutConstraints, layoutContext));
 }
 
-- (void)constraintLayoutWithLayoutConstraints:(LayoutConstraints)layoutConstraints
-                                layoutContext:(LayoutContext)layoutContext
-                                      rootTag:(ReactTag)rootTag
+- (void)constraintSurfaceLayoutWithLayoutConstraints:(LayoutConstraints)layoutConstraints
+                                       layoutContext:(LayoutContext)layoutContext
+                                           surfaceId:(SurfaceId)surfaceId
 {
-  _scheduler->constraintLayout(rootTag, layoutConstraints, layoutContext);
+  _scheduler->constraintSurfaceLayout(surfaceId, layoutConstraints, layoutContext);
 }
 
 @end
diff --git a/React/Fabric/RCTSurfacePresenter.h b/React/Fabric/RCTSurfacePresenter.h
index 65e86b1289d05f..9e19318359d181 100644
--- a/React/Fabric/RCTSurfacePresenter.h
+++ b/React/Fabric/RCTSurfacePresenter.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -27,6 +27,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 
+/*
+ * Deprecated. Do not use.
+ */
+@property (nonatomic) std::function<facebook::react::UIManagerInstaller> uiManagerInstaller;
+@property (nonatomic) std::function<facebook::react::UIManagerUninstaller> uiManagerUninstaller;
+
 @end
 
 @interface RCTSurfacePresenter (Surface)
@@ -37,6 +43,9 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)registerSurface:(RCTFabricSurface *)surface;
 - (void)unregisterSurface:(RCTFabricSurface *)surface;
+- (void)setProps:(NSDictionary *)props
+         surface:(RCTFabricSurface *)surface;
+
 - (nullable RCTFabricSurface *)surfaceForRootTag:(ReactTag)rootTag;
 
 /**
@@ -63,6 +72,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (std::shared_ptr<facebook::react::FabricUIManager>)uiManager_DO_NOT_USE;
 
+/**
+ * Returns a underlying bridge.
+ */
+- (RCTBridge *)bridge_DO_NOT_USE;
+
 @end
 
 @interface RCTBridge (RCTSurfacePresenter)
diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
index e3223804d2c05c..2b102cbc0d296b 100644
--- a/React/Fabric/RCTSurfacePresenter.mm
+++ b/React/Fabric/RCTSurfacePresenter.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,10 +7,13 @@
 
 #import "RCTSurfacePresenter.h"
 
+#import <mutex>
+
 #import <React/RCTAssert.h>
 #import <React/RCTBridge+Private.h>
 #import <React/RCTComponentViewRegistry.h>
 #import <React/RCTFabricSurface.h>
+#import <React/RCTImageLoader.h>
 #import <React/RCTMountingManager.h>
 #import <React/RCTMountingManagerDelegate.h>
 #import <React/RCTScheduler.h>
@@ -20,20 +23,29 @@
 #import <React/RCTUtils.h>
 #import <fabric/core/LayoutContext.h>
 #import <fabric/core/LayoutConstraints.h>
+#import <fabric/imagemanager/ImageManager.h>
+#import <fabric/uimanager/ContextContainer.h>
 
+#import "MainRunLoopEventBeat.h"
+#import "MessageQueueEventBeat.h"
 #import "RCTConversions.h"
 
 using namespace facebook::react;
 
+@interface RCTBridge ()
+- (std::shared_ptr<facebook::react::MessageQueueThread>)jsMessageThread;
+@end
+
 @interface RCTSurfacePresenter () <RCTSchedulerDelegate, RCTMountingManagerDelegate>
 @end
 
 @implementation RCTSurfacePresenter {
-  RCTScheduler *_scheduler;
-  RCTMountingManager *_mountingManager;
-  RCTBridge *_bridge;
+  std::mutex _schedulerMutex;
+  RCTScheduler *_Nullable _scheduler; // Thread-safe. Mutation of the instance variable is protected by `_schedulerMutex`.
+  RCTMountingManager *_mountingManager; // Thread-safe.
+  RCTSurfaceRegistry *_surfaceRegistry;  // Thread-safe.
+  RCTBridge *_bridge; // Unsafe. We are moving away from Bridge.
   RCTBridge *_batchedBridge;
-  RCTSurfaceRegistry *_surfaceRegistry;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
@@ -42,10 +54,8 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _bridge = bridge;
     _batchedBridge = [_bridge batchedBridge] ?: _bridge;
 
-    _scheduler = [[RCTScheduler alloc] init];
-    _scheduler.delegate = self;
-
     _surfaceRegistry = [[RCTSurfaceRegistry alloc] init];
+
     _mountingManager = [[RCTMountingManager alloc] init];
     _mountingManager.delegate = self;
 
@@ -67,39 +77,28 @@ - (void)dealloc
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
-#pragma mark - RCTSchedulerDelegate
-
-- (void)schedulerDidComputeMutationInstructions:(facebook::react::TreeMutationInstructionList)instructions
-                                        rootTag:(ReactTag)rootTag
-{
-  [_mountingManager mutateComponentViewTreeWithMutationInstructions:instructions
-                                                            rootTag:rootTag];
-}
-
-- (void)schedulerDidRequestPreliminaryViewAllocationWithComponentName:(NSString *)componentName
-{
-  [_mountingManager preliminaryCreateComponentViewWithName:componentName];
-}
-
 #pragma mark - Internal Surface-dedicated Interface
 
 - (void)registerSurface:(RCTFabricSurface *)surface
 {
   [_surfaceRegistry registerSurface:surface];
-  [_scheduler registerRootTag:surface.rootTag];
-  [self runSurface:surface];
-
-  // FIXME: Mutation instruction MUST produce instruction for root node.
-  [_mountingManager.componentViewRegistry dequeueComponentViewWithName:@"Root" tag:surface.rootTag];
+  [self _startSurface:surface];
 }
 
 - (void)unregisterSurface:(RCTFabricSurface *)surface
 {
-  [self stopSurface:surface];
-  [_scheduler unregisterRootTag:surface.rootTag];
+  [self _stopSurface:surface];
   [_surfaceRegistry unregisterSurface:surface];
 }
 
+- (void)setProps:(NSDictionary *)props
+         surface:(RCTFabricSurface *)surface
+{
+  // This implementation is suboptimal indeed but still better than nothing for now.
+  [self _stopSurface:surface];
+  [self _startSurface:surface];
+}
+
 - (RCTFabricSurface *)surfaceForRootTag:(ReactTag)rootTag
 {
   return [_surfaceRegistry surfaceForRootTag:rootTag];
@@ -109,79 +108,178 @@ - (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize
                       maximumSize:(CGSize)maximumSize
                           surface:(RCTFabricSurface *)surface
 {
-  LayoutContext layoutContext;
-  layoutContext.pointScaleFactor = RCTScreenScale();
-  LayoutConstraints layoutConstraints = {};
-  layoutConstraints.minimumSize = RCTSizeFromCGSize(minimumSize);
-  layoutConstraints.maximumSize = RCTSizeFromCGSize(maximumSize);
+  LayoutContext layoutContext = {
+    .pointScaleFactor = RCTScreenScale()
+  };
 
-  return [_scheduler measureWithLayoutConstraints:layoutConstraints
-                                    layoutContext:layoutContext
-                                          rootTag:surface.rootTag];
+  LayoutConstraints layoutConstraints = {
+    .minimumSize = RCTSizeFromCGSize(minimumSize),
+    .maximumSize = RCTSizeFromCGSize(maximumSize)
+  };
+
+  return [self._scheduler measureSurfaceWithLayoutConstraints:layoutConstraints
+                                                layoutContext:layoutContext
+                                                    surfaceId:surface.rootTag];
 }
 
 - (void)setMinimumSize:(CGSize)minimumSize
            maximumSize:(CGSize)maximumSize
                surface:(RCTFabricSurface *)surface
 {
-  LayoutContext layoutContext;
-  layoutContext.pointScaleFactor = RCTScreenScale();
-  LayoutConstraints layoutConstraints = {};
-  layoutConstraints.minimumSize = RCTSizeFromCGSize(minimumSize);
-  layoutConstraints.maximumSize = RCTSizeFromCGSize(maximumSize);
+  LayoutContext layoutContext = {
+    .pointScaleFactor = RCTScreenScale()
+  };
+
+  LayoutConstraints layoutConstraints = {
+    .minimumSize = RCTSizeFromCGSize(minimumSize),
+    .maximumSize = RCTSizeFromCGSize(maximumSize)
+  };
+
+  [self._scheduler constraintSurfaceLayoutWithLayoutConstraints:layoutConstraints
+                                                  layoutContext:layoutContext
+                                                      surfaceId:surface.rootTag];
+}
+
+#pragma mark - Private
+
+- (RCTScheduler *)_scheduler
+{
+  std::lock_guard<std::mutex> lock(_schedulerMutex);
+
+  if (_scheduler) {
+    return _scheduler;
+  }
+
+  auto contextContainer = std::make_shared<ContextContainer>();
+
+  auto messageQueueThread = _batchedBridge.jsMessageThread;
+
+  EventBeatFactory synchronousBeatFactory = [messageQueueThread]() {
+    return std::make_unique<MainRunLoopEventBeat>(messageQueueThread);
+  };
+
+  EventBeatFactory asynchronousBeatFactory = [messageQueueThread]() {
+    return std::make_unique<MessageQueueEventBeat>(messageQueueThread);
+  };
+
+  contextContainer->registerInstance<EventBeatFactory>(synchronousBeatFactory, "synchronous");
+  contextContainer->registerInstance<EventBeatFactory>(asynchronousBeatFactory, "asynchronous");
+
+  contextContainer->registerInstance(_uiManagerInstaller, "uimanager-installer");
+  contextContainer->registerInstance(_uiManagerUninstaller, "uimanager-uninstaller");
+
+  contextContainer->registerInstance(std::make_shared<ImageManager>((__bridge void *)[_bridge imageLoader]));
+
+  _scheduler = [[RCTScheduler alloc] initWithContextContainer:contextContainer];
+  _scheduler.delegate = self;
 
-  [_scheduler constraintLayoutWithLayoutConstraints:layoutConstraints
-                                      layoutContext:layoutContext
-                                            rootTag:surface.rootTag];
+  return _scheduler;
 }
 
-- (void)runSurface:(RCTFabricSurface *)surface
+- (void)_startSurface:(RCTFabricSurface *)surface
 {
-  NSDictionary *applicationParameters = @{
-    @"rootTag": @(surface.rootTag),
-    @"initialProps": surface.properties,
+  [_mountingManager.componentViewRegistry dequeueComponentViewWithName:@"Root" tag:surface.rootTag];
+
+  LayoutContext layoutContext = {
+    .pointScaleFactor = RCTScreenScale()
   };
 
-  [_batchedBridge enqueueJSCall:@"AppRegistry" method:@"runApplication" args:@[surface.moduleName, applicationParameters] completion:NULL];
+  LayoutConstraints layoutConstraints = {
+    .minimumSize = RCTSizeFromCGSize(surface.minimumSize),
+    .maximumSize = RCTSizeFromCGSize(surface.maximumSize)
+  };
+
+  [self._scheduler startSurfaceWithSurfaceId:surface.rootTag
+                                  moduleName:surface.moduleName
+                                initailProps:surface.properties
+                           layoutConstraints:layoutConstraints
+                               layoutContext:layoutContext];
 }
 
-- (void)stopSurface:(RCTFabricSurface *)surface
+- (void)_stopSurface:(RCTFabricSurface *)surface
 {
-  [_batchedBridge enqueueJSCall:@"AppRegistry" method:@"unmountApplicationComponentAtRootTag" args:@[@(surface.rootTag)] completion:NULL];
+  [self._scheduler stopSurfaceWithSurfaceId:surface.rootTag];
+
+  UIView<RCTComponentViewProtocol> *rootView = [_mountingManager.componentViewRegistry componentViewByTag:surface.rootTag];
+  [_mountingManager.componentViewRegistry enqueueComponentViewWithName:@"Root" tag:surface.rootTag componentView:rootView];
+
+  [surface _unsetStage:(RCTSurfaceStagePrepared | RCTSurfaceStageMounted)];
 }
 
-#pragma mark - RCTMountingManagerDelegate
+- (void)_startAllSurfaces
+{
+  for (RCTFabricSurface *surface in _surfaceRegistry.enumerator) {
+    [self _startSurface:surface];
+  }
+}
 
-- (void)mountingManager:(RCTMountingManager *)mountingManager willMountComponentsWithRootTag:(ReactTag)rootTag
+- (void)_stopAllSurfaces
 {
-  RCTIsMainQueue();
-  // TODO: Propagate state change to Surface.
+  for (RCTFabricSurface *surface in _surfaceRegistry.enumerator) {
+    [self _stopSurface:surface];
+  }
 }
 
-- (void)mountingManager:(RCTMountingManager *)mountingManager didMountComponentsWithRootTag:(ReactTag)rootTag
+#pragma mark - RCTSchedulerDelegate
+
+- (void)schedulerDidFinishTransaction:(facebook::react::ShadowViewMutationList)mutations
+                                        rootTag:(ReactTag)rootTag
 {
-  RCTIsMainQueue();
   RCTFabricSurface *surface = [_surfaceRegistry surfaceForRootTag:rootTag];
 
-  // FIXME: Implement proper state propagation mechanism.
-  [surface _setStage:RCTSurfaceStageSurfaceDidInitialRendering];
-  [surface _setStage:RCTSurfaceStageSurfaceDidInitialLayout];
-  [surface _setStage:RCTSurfaceStageSurfaceDidInitialMounting];
+  [surface _setStage:RCTSurfaceStagePrepared];
+
+  [_mountingManager performTransactionWithMutations:mutations
+                                            rootTag:rootTag];
+}
+
+- (void)schedulerDidRequestPreliminaryViewAllocationWithComponentName:(NSString *)componentName
+{
+  [_mountingManager preliminaryCreateComponentViewWithName:componentName];
+}
+
+#pragma mark - RCTMountingManagerDelegate
 
-  UIView *rootComponentView = [_mountingManager.componentViewRegistry componentViewByTag:rootTag];
+- (void)mountingManager:(RCTMountingManager *)mountingManager willMountComponentsWithRootTag:(ReactTag)rootTag
+{
+  RCTAssertMainQueue();
+
+  // Does nothing.
+}
+
+- (void)mountingManager:(RCTMountingManager *)mountingManager didMountComponentsWithRootTag:(ReactTag)rootTag
+{
+  RCTAssertMainQueue();
 
-  surface.view.rootView = (RCTSurfaceRootView *)rootComponentView;
+  RCTFabricSurface *surface = [_surfaceRegistry surfaceForRootTag:rootTag];
+  RCTSurfaceStage stage = surface.stage;
+  if (stage & RCTSurfaceStagePrepared) {
+    // We have to progress the stage only if the preparing phase is done.
+    if ([surface _setStage:RCTSurfaceStageMounted]) {
+      UIView *rootComponentView = [_mountingManager.componentViewRegistry componentViewByTag:rootTag];
+      surface.view.rootView = (RCTSurfaceRootView *)rootComponentView;
+    }
+  }
 }
 
 #pragma mark - Bridge events
 
 - (void)handleBridgeWillReloadNotification:(NSNotification *)notification
 {
-  // TODO: Define a lifecycle contract for the pieces involved here including the scheduler, mounting manager, and
-  // the surface registry. For now simply recreate the scheduler on reload.
-  // The goal is to deallocate the Scheduler and its underlying references before the JS runtime is destroyed.
-  _scheduler = [[RCTScheduler alloc] init];
-  _scheduler.delegate = self;
+  {
+    std::lock_guard<std::mutex> lock(_schedulerMutex);
+    if (!_scheduler) {
+      // Seems we are already in the realoding process.
+      return;
+    }
+  }
+
+  [self _stopAllSurfaces];
+
+  {
+    std::lock_guard<std::mutex> lock(_schedulerMutex);
+    _scheduler = nil;
+  }
 }
 
 - (void)handleJavaScriptDidLoadNotification:(NSNotification *)notification
@@ -189,6 +287,8 @@ - (void)handleJavaScriptDidLoadNotification:(NSNotification *)notification
   RCTBridge *bridge = notification.userInfo[@"bridge"];
   if (bridge != _batchedBridge) {
     _batchedBridge = bridge;
+
+    [self _startAllSurfaces];
   }
 }
 
@@ -201,13 +301,9 @@ @implementation RCTSurfacePresenter (Deprecated)
   return _scheduler.uiManager_DO_NOT_USE;
 }
 
-@end
-
-@implementation RCTBridge (RCTSurfacePresenter)
-
-- (RCTSurfacePresenter *)surfacePresenter
+- (RCTBridge *)bridge_DO_NOT_USE
 {
-  return [self jsBoundExtraModuleForClass:[RCTSurfacePresenter class]];
+  return _bridge;
 }
 
 @end
diff --git a/React/Fabric/RCTSurfaceRegistry.h b/React/Fabric/RCTSurfaceRegistry.h
index 013d70f4895569..d7a3e755cbad5c 100644
--- a/React/Fabric/RCTSurfaceRegistry.h
+++ b/React/Fabric/RCTSurfaceRegistry.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -21,6 +21,8 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface RCTSurfaceRegistry : NSObject
 
+- (NSEnumerator<RCTFabricSurface *> *)enumerator;
+
 /**
  * Adds Surface object into the registry.
  * The registry does not retain Surface references.
diff --git a/React/Fabric/RCTSurfaceRegistry.mm b/React/Fabric/RCTSurfaceRegistry.mm
index d2aa3bde42d56a..727b4d0e888583 100644
--- a/React/Fabric/RCTSurfaceRegistry.mm
+++ b/React/Fabric/RCTSurfaceRegistry.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,12 +20,19 @@ - (instancetype)init
 {
   if (self = [super init]) {
     _registry = [NSMapTable mapTableWithKeyOptions:NSPointerFunctionsIntegerPersonality | NSPointerFunctionsOpaqueMemory
-                                      valueOptions:NSPointerFunctionsObjectPersonality];
+                                      valueOptions:NSPointerFunctionsObjectPersonality | NSPointerFunctionsWeakMemory];
   }
 
   return self;
 }
 
+- (NSEnumerator<RCTFabricSurface *> *)enumerator
+{
+  std::lock_guard<std::mutex> lock(_mutex);
+
+  return [_registry objectEnumerator];
+}
+
 - (void)registerSurface:(RCTFabricSurface *)surface
 {
   std::lock_guard<std::mutex> lock(_mutex);
diff --git a/React/Fabric/RCTSurfaceTouchHandler.h b/React/Fabric/RCTSurfaceTouchHandler.h
index 670ef284832ca9..3c0b68be0d8155 100644
--- a/React/Fabric/RCTSurfaceTouchHandler.h
+++ b/React/Fabric/RCTSurfaceTouchHandler.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/RCTSurfaceTouchHandler.mm b/React/Fabric/RCTSurfaceTouchHandler.mm
index c26f15bb74bfab..e51ec6dfdfd47b 100644
--- a/React/Fabric/RCTSurfaceTouchHandler.mm
+++ b/React/Fabric/RCTSurfaceTouchHandler.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,11 +8,11 @@
 #import "RCTSurfaceTouchHandler.h"
 
 #import <UIKit/UIGestureRecognizerSubclass.h>
-#import <fabric/view/ViewEventEmitter.h>
 #import <React/RCTUtils.h>
 #import <React/RCTViewComponentView.h>
 
 #import "RCTConversions.h"
+#import "RCTTouchableComponentViewProtocol.h"
 
 using namespace facebook::react;
 
@@ -46,10 +46,6 @@ void reset() {
   int lastIndex;
 };
 
-@protocol RCTTouchableComponentViewProtocol <NSObject>
-  - (SharedViewEventEmitter)touchEventEmitter;
-@end
-
 typedef NS_ENUM(NSInteger, RCTTouchEventType) {
   RCTTouchEventTypeTouchStart,
   RCTTouchEventTypeTouchMove,
@@ -59,7 +55,7 @@ typedef NS_ENUM(NSInteger, RCTTouchEventType) {
 
 struct ActiveTouch {
   Touch touch;
-  SharedViewEventEmitter eventEmitter;
+  SharedTouchEventEmitter eventEmitter;
 
   struct Hasher {
     size_t operator()(const ActiveTouch &activeTouch) const {
@@ -95,8 +91,8 @@ static ActiveTouch CreateTouchWithUITouch(UITouch *uiTouch, UIView *rootComponen
 
   ActiveTouch activeTouch = {};
 
-  if ([componentView respondsToSelector:@selector(touchEventEmitter)]) {
-    activeTouch.eventEmitter = [(id<RCTTouchableComponentViewProtocol>)componentView touchEventEmitter];
+  if ([componentView respondsToSelector:@selector(touchEventEmitterAtPoint:)]) {
+    activeTouch.eventEmitter = [(id<RCTTouchableComponentViewProtocol>)componentView touchEventEmitterAtPoint:[uiTouch locationInView:componentView]];
     activeTouch.touch.target = (Tag)componentView.tag;
   }
 
@@ -217,7 +213,7 @@ - (void)_dispatchTouches:(NSSet<UITouch *> *)touches eventType:(RCTTouchEventTyp
 {
   TouchEvent event = {};
   std::unordered_set<ActiveTouch, ActiveTouch::Hasher, ActiveTouch::Comparator> changedActiveTouches = {};
-  std::unordered_set<SharedViewEventEmitter> uniqueEventEmitter = {};
+  std::unordered_set<SharedTouchEventEmitter> uniqueEventEmitter = {};
   BOOL isEndishEventType = eventType == RCTTouchEventTypeTouchEnd || eventType == RCTTouchEventTypeTouchCancel;
 
   for (UITouch *touch in touches) {
diff --git a/React/Fabric/RCTTouchableComponentViewProtocol.h b/React/Fabric/RCTTouchableComponentViewProtocol.h
new file mode 100644
index 00000000000000..d2fee6e44c6f01
--- /dev/null
+++ b/React/Fabric/RCTTouchableComponentViewProtocol.h
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+#import <fabric/components/view/TouchEventEmitter.h>
+
+@protocol RCTTouchableComponentViewProtocol <NSObject>
+- (facebook::react::SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point;
+@end
diff --git a/React/Fabric/Surface/RCTFabricSurface.h b/React/Fabric/Surface/RCTFabricSurface.h
index c0a88c0729a375..41ca6e58973a24 100644
--- a/React/Fabric/Surface/RCTFabricSurface.h
+++ b/React/Fabric/Surface/RCTFabricSurface.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -36,7 +36,6 @@ NS_ASSUME_NONNULL_BEGIN
 @interface RCTFabricSurface : NSObject
 
 @property (atomic, readonly) RCTSurfaceStage stage;
-@property (atomic, readonly) RCTBridge *bridge;
 @property (atomic, readonly) NSString *moduleName;
 @property (atomic, readonly) ReactTag rootTag;
 
@@ -44,10 +43,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (atomic, copy, readwrite) NSDictionary *properties;
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties;
-
 - (instancetype)initWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter
                               moduleName:(NSString *)moduleName
                        initialProperties:(NSDictionary *)initialProperties;
@@ -68,6 +63,22 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (RCTSurfaceView *)view;
 
+#pragma mark - Start & Stop
+
+/**
+ * Starts or stops the Surface.
+ * A Surface object can be stopped and then restarted.
+ * The starting process includes initializing all underlying React Native
+ * infrastructure and running React app.
+ * Just initialized Surface object starts automatically, there is no need
+ * to call `start` explicitly. Surface also stops itself on deallocation
+ * automatically.
+ * Returns YES in case of success. Returns NO if the Surface is already
+ * started or stopped.
+ */
+- (BOOL)start;
+- (BOOL)stop;
+
 #pragma mark - Layout: Setting the size constrains
 
 /**
@@ -121,12 +132,24 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTFabricSurface (Internal)
 
-- (void)_setStage:(RCTSurfaceStage)stage;
+/**
+ * Sets and clears given stage flags (bitmask).
+ * Returns `YES` if the actual state was changed.
+ */
+- (BOOL)_setStage:(RCTSurfaceStage)stage;
+- (BOOL)_unsetStage:(RCTSurfaceStage)stage;
 
 @end
 
 @interface RCTFabricSurface (Deprecated)
 
+/**
+ * Deprecated. Use `initWithSurfacePresenter:moduleName:initialProperties` instead.
+ */
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties;
+
 /**
  * Deprecated. Use `rootTag` instead.
  */
diff --git a/React/Fabric/Surface/RCTFabricSurface.mm b/React/Fabric/Surface/RCTFabricSurface.mm
index d0b93710fd9f4f..dd7e5f9c938e64 100644
--- a/React/Fabric/Surface/RCTFabricSurface.mm
+++ b/React/Fabric/Surface/RCTFabricSurface.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,22 +7,18 @@
 
 #import "RCTFabricSurface.h"
 
-#import <React/RCTSurfaceView+Internal.h>
-
 #import <mutex>
-#import <stdatomic.h>
 
 #import <React/RCTAssert.h>
-#import <React/RCTBridge.h>
 #import <React/RCTSurfaceDelegate.h>
 #import <React/RCTSurfaceRootView.h>
 #import <React/RCTSurfaceView.h>
+#import <React/RCTSurfaceView+Internal.h>
 #import <React/RCTSurfaceTouchHandler.h>
 #import <React/RCTUIManagerUtils.h>
 #import <React/RCTUtils.h>
 
 #import "RCTSurfacePresenter.h"
-#import "RCTMountingManager.h"
 
 @implementation RCTFabricSurface {
   // Immutable
@@ -42,19 +38,6 @@ @implementation RCTFabricSurface {
   RCTSurfaceTouchHandler *_Nullable _touchHandler;
 }
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-{
-  RCTAssert(bridge.valid, @"Valid bridge is required to instanciate `RCTSurface`.");
-
-  self = [self initWithSurfacePresenter:bridge.surfacePresenter
-                             moduleName:moduleName
-                      initialProperties:initialProperties];
-
-  return self;
-}
-
 - (instancetype)initWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter
                               moduleName:(NSString *)moduleName
                        initialProperties:(NSDictionary *)initialProperties
@@ -68,42 +51,46 @@ - (instancetype)initWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter
     _minimumSize = CGSizeZero;
     _maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
 
-    _stage = RCTSurfaceStageSurfaceDidInitialize;
-
     _touchHandler = [RCTSurfaceTouchHandler new];
 
-    [self _run];
+    _stage = RCTSurfaceStageSurfaceDidInitialize;
 
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(handleJavaScriptWillStartLoadingNotification:)
-                                                 name:RCTJavaScriptWillStartLoadingNotification
-                                               object:_bridge];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(handleJavaScriptDidLoadNotification:)
-                                                 name:RCTJavaScriptDidLoadNotification
-                                               object:_bridge];
+    [self start];
   }
 
   return self;
 }
 
-- (void)dealloc
+- (BOOL)start
 {
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
+  if (![self _setStage:RCTSurfaceStageStarted]) {
+    return NO;
+  }
 
-  [self _stop];
+  [_surfacePresenter registerSurface:self];
+  return YES;
 }
 
-#pragma mark - Immutable Properties (no need to enforce synchonization)
+- (BOOL)stop
+{
+  if (![self _unsetStage:RCTSurfaceStageStarted]) {
+    return NO;
+  }
 
-- (NSString *)moduleName
+  [_surfacePresenter unregisterSurface:self];
+  return YES;
+}
+
+- (void)dealloc
 {
-  return _moduleName;
+  [self stop];
 }
 
-- (NSNumber *)rootViewTag
+#pragma mark - Immutable Properties (no need to enforce synchonization)
+
+- (NSString *)moduleName
 {
-  return @(_rootTag);
+  return _moduleName;
 }
 
 #pragma mark - Main-Threaded Routines
@@ -128,21 +115,37 @@ - (RCTSurfaceStage)stage
   return _stage;
 }
 
-- (void)_setStage:(RCTSurfaceStage)stage
+- (BOOL)_setStage:(RCTSurfaceStage)stage
+{
+  return [self _setStage:stage setOrUnset:YES];
+}
+
+- (BOOL)_unsetStage:(RCTSurfaceStage)stage
+{
+  return [self _setStage:stage setOrUnset:NO];
+}
+
+- (BOOL)_setStage:(RCTSurfaceStage)stage setOrUnset:(BOOL)setOrUnset
 {
   RCTSurfaceStage updatedStage;
   {
     std::lock_guard<std::mutex> lock(_mutex);
 
-    if (_stage & stage) {
-      return;
+    if (setOrUnset) {
+      updatedStage = (RCTSurfaceStage)(_stage | stage);
+    } else {
+      updatedStage = (RCTSurfaceStage)(_stage & ~stage);
+    }
+
+    if (updatedStage == _stage) {
+      return NO;
     }
 
-    updatedStage = (RCTSurfaceStage)(_stage | stage);
     _stage = updatedStage;
   }
 
   [self _propagateStageChange:updatedStage];
+  return YES;
 }
 
 - (void)_propagateStageChange:(RCTSurfaceStage)stage
@@ -179,21 +182,7 @@ - (void)setProperties:(NSDictionary *)properties
     _properties = [properties copy];
   }
 
-  [self _run];
-}
-
-#pragma mark - Running
-
-- (void)_run
-{
-  [_surfacePresenter registerSurface:self];
-  [self _setStage:RCTSurfaceStageSurfaceDidRun];
-}
-
-- (void)_stop
-{
-  [_surfacePresenter unregisterSurface:self];
-  [self _setStage:RCTSurfaceStageSurfaceDidStop];
+  [_surfacePresenter setProps:properties surface:self];
 }
 
 #pragma mark - Layout
@@ -227,9 +216,9 @@ - (void)setMinimumSize:(CGSize)minimumSize
     _minimumSize = minimumSize;
   }
 
-  return [_surfacePresenter setMinimumSize:minimumSize
-                               maximumSize:maximumSize
-                                   surface:self];
+  [_surfacePresenter setMinimumSize:minimumSize
+                        maximumSize:maximumSize
+                            surface:self];
 }
 
 - (CGSize)minimumSize
@@ -278,41 +267,20 @@ - (BOOL)synchronouslyWaitForStage:(RCTSurfaceStage)stage timeout:(NSTimeInterval
   return NO;
 }
 
-#pragma mark - Bridge events
+#pragma mark - Deprecated
 
-- (void)handleJavaScriptWillStartLoadingNotification:(NSNotification *)notification
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
 {
-  // TODO: Move the bridge lifecycle handling up to the RCTSurfacePresenter.
-
-  RCTAssertMainQueue();
-
-  // Reset states because the bridge is reloading. This is similar to initialization phase.
-  _stage = RCTSurfaceStageSurfaceDidInitialize;
-  _view = nil;
-  _touchHandler = [RCTSurfaceTouchHandler new];
-  [self _setStage:RCTSurfaceStageBridgeDidLoad];
+  return [self initWithSurfacePresenter:bridge.surfacePresenter
+                             moduleName:moduleName
+                      initialProperties:initialProperties];
 }
 
-- (void)handleJavaScriptDidLoadNotification:(NSNotification *)notification
+- (NSNumber *)rootViewTag
 {
-  // TODO: Move the bridge lifecycle handling up to the RCTSurfacePresenter.
-
-  // Note: this covers both JS reloads and initial load after the bridge starts.
-  // When it's not a reload, surface should already be running since we run it immediately in the initializer, so do
-  // nothing.
-  // When it's a reload, we rely on the `RCTJavaScriptWillStartLoadingNotification` notification to reset the stage,
-  // then we need to run the surface and update its size.
-  if (!RCTSurfaceStageIsRunning(_stage)) {
-    [self _setStage:RCTSurfaceStageModuleDidLoad];
-    [self _run];
-
-    // After a reload surfacePresenter needs to know the last min/max size for this surface, because the surface hosting
-    // view was already attached to the ViewController's view.
-    // TODO: Find a better automatic way.
-    [_surfacePresenter setMinimumSize:_minimumSize
-                          maximumSize:_maximumSize
-                              surface:self];
-  }
+  return @(_rootTag);
 }
 
 @end
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h
index 3214426e77d680..53260fcf9028fd 100644
--- a/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm
index e2210daf8cd238..115c7e2e03dde6 100644
--- a/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,7 +11,7 @@
 
 @implementation RCTFabricSurfaceHostingProxyRootView
 
-- (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName initialProperties:(NSDictionary *)initialProperties
++ (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName initialProperties:(NSDictionary *)initialProperties
 {
   return (RCTSurface *)[[RCTFabricSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
 }
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingView.h b/React/Fabric/Surface/RCTFabricSurfaceHostingView.h
index c50fa51acee97a..8dbe3086944419 100644
--- a/React/Fabric/Surface/RCTFabricSurfaceHostingView.h
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingView.mm b/React/Fabric/Surface/RCTFabricSurfaceHostingView.mm
index 0157c974b3fd74..30cff6d449f5f4 100644
--- a/React/Fabric/Surface/RCTFabricSurfaceHostingView.mm
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingView.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Utils/MainQueueExecutor.h b/React/Fabric/Utils/MainQueueExecutor.h
index b43a6d7cdb4c31..fabd81e895ac8d 100644
--- a/React/Fabric/Utils/MainQueueExecutor.h
+++ b/React/Fabric/Utils/MainQueueExecutor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Utils/MainQueueExecutor.mm b/React/Fabric/Utils/MainQueueExecutor.mm
index a80d3be1b3e561..5cc411b3d7de72 100644
--- a/React/Fabric/Utils/MainQueueExecutor.mm
+++ b/React/Fabric/Utils/MainQueueExecutor.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Fabric/Utils/MainRunLoopEventBeat.h b/React/Fabric/Utils/MainRunLoopEventBeat.h
new file mode 100644
index 00000000000000..abfd8c2300f251
--- /dev/null
+++ b/React/Fabric/Utils/MainRunLoopEventBeat.h
@@ -0,0 +1,37 @@
+// Copyright (c) Facebook, Inc. and its 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 <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CFRunLoop.h>
+#include <cxxreact/MessageQueueThread.h>
+#include <fabric/events/EventBeat.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Event beat associated with main run loop cycle.
+ * The callback is always called on the main thread.
+ */
+class MainRunLoopEventBeat final:
+  public EventBeat {
+
+public:
+  MainRunLoopEventBeat(std::shared_ptr<MessageQueueThread> messageQueueThread);
+  ~MainRunLoopEventBeat();
+
+  void induce() const override;
+
+private:
+  void blockMessageQueueAndThenBeat() const;
+
+  std::shared_ptr<MessageQueueThread> messageQueueThread_;
+  CFRunLoopObserverRef mainRunLoopObserver_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/React/Fabric/Utils/MainRunLoopEventBeat.mm b/React/Fabric/Utils/MainRunLoopEventBeat.mm
new file mode 100644
index 00000000000000..33e8e9a38eba5f
--- /dev/null
+++ b/React/Fabric/Utils/MainRunLoopEventBeat.mm
@@ -0,0 +1,77 @@
+// Copyright (c) Facebook, Inc. and its affiliates.
+
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+
+#import "MainRunLoopEventBeat.h"
+
+#import <mutex>
+#import <React/RCTUtils.h>
+
+namespace facebook {
+namespace react {
+
+MainRunLoopEventBeat::MainRunLoopEventBeat(std::shared_ptr<MessageQueueThread> messageQueueThread):
+  messageQueueThread_(std::move(messageQueueThread)) {
+
+  mainRunLoopObserver_ =
+    CFRunLoopObserverCreateWithHandler(
+      NULL /* allocator */,
+      kCFRunLoopBeforeWaiting /* activities */,
+      true /* repeats */,
+      0 /* order */,
+      ^(CFRunLoopObserverRef observer, CFRunLoopActivity activity) {
+        if (!this->isRequested_) {
+          return;
+        }
+
+        this->blockMessageQueueAndThenBeat();
+      }
+  );
+
+  assert(mainRunLoopObserver_);
+
+  CFRunLoopAddObserver(CFRunLoopGetMain(), mainRunLoopObserver_, kCFRunLoopCommonModes);
+}
+
+MainRunLoopEventBeat::~MainRunLoopEventBeat() {
+  CFRunLoopRemoveObserver(CFRunLoopGetMain(), mainRunLoopObserver_, kCFRunLoopCommonModes);
+  CFRelease(mainRunLoopObserver_);
+}
+
+void MainRunLoopEventBeat::induce() const {
+  if (!this->isRequested_) {
+    return;
+  }
+
+  RCTExecuteOnMainQueue(^{
+    this->blockMessageQueueAndThenBeat();
+  });
+}
+
+void MainRunLoopEventBeat::blockMessageQueueAndThenBeat() const {
+  // Note: We need the third mutex to get back to the main thread before
+  // the lambda is finished (because all mutexes are allocated on the stack).
+
+  std::mutex mutex1;
+  std::mutex mutex2;
+  std::mutex mutex3;
+
+  mutex1.lock();
+  mutex2.lock();
+  mutex3.lock();
+
+  messageQueueThread_->runOnQueue([&]() {
+    mutex1.unlock();
+    mutex2.lock();
+    mutex3.unlock();
+  });
+
+  mutex1.lock();
+  beat();
+  mutex2.unlock();
+  mutex3.lock();
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/React/Fabric/Utils/MessageQueueEventBeat.h b/React/Fabric/Utils/MessageQueueEventBeat.h
new file mode 100644
index 00000000000000..093798bad2a9f1
--- /dev/null
+++ b/React/Fabric/Utils/MessageQueueEventBeat.h
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CFRunLoop.h>
+#include <cxxreact/MessageQueueThread.h>
+#include <fabric/events/EventBeat.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Event beat that associated with MessageQueueThread.
+ */
+class MessageQueueEventBeat:
+  public EventBeat {
+
+public:
+  MessageQueueEventBeat(const std::shared_ptr<MessageQueueThread> &messageQueueThread);
+  ~MessageQueueEventBeat();
+
+  void induce() const override;
+
+private:
+  const std::shared_ptr<MessageQueueThread> messageQueueThread_;
+  CFRunLoopObserverRef mainRunLoopObserver_;
+  mutable std::atomic<bool> isBusy_ {false};
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/React/Fabric/Utils/MessageQueueEventBeat.mm b/React/Fabric/Utils/MessageQueueEventBeat.mm
new file mode 100644
index 00000000000000..c6b87dd346e2bd
--- /dev/null
+++ b/React/Fabric/Utils/MessageQueueEventBeat.mm
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "MessageQueueEventBeat.h"
+
+namespace facebook {
+namespace react {
+
+MessageQueueEventBeat::MessageQueueEventBeat(const std::shared_ptr<MessageQueueThread> &messageQueueThread):
+  messageQueueThread_(messageQueueThread) {
+
+  mainRunLoopObserver_ =
+    CFRunLoopObserverCreateWithHandler(
+      NULL /* allocator */,
+      kCFRunLoopBeforeWaiting /* activities */,
+      true /* repeats */,
+      0 /* order */,
+      ^(CFRunLoopObserverRef observer, CFRunLoopActivity activity) {
+        // Note: We only `induce` beat here; actual beat will be performed on
+        // a different thread.
+        this->induce();
+      }
+  );
+
+  assert(mainRunLoopObserver_);
+
+  CFRunLoopAddObserver(CFRunLoopGetMain(), mainRunLoopObserver_, kCFRunLoopCommonModes);
+}
+
+MessageQueueEventBeat::~MessageQueueEventBeat() {
+  CFRunLoopRemoveObserver(CFRunLoopGetMain(), mainRunLoopObserver_, kCFRunLoopCommonModes);
+  CFRelease(mainRunLoopObserver_);
+}
+
+void MessageQueueEventBeat::induce() const {
+  if (!isRequested_ || isBusy_) {
+    return;
+  }
+
+#ifndef NDEBUG
+  // We do a trick here.
+  // If `wasExecuted` was destroyed before set to `true`,
+  // it means that the execution block was deallocated not being executed.
+  // This indicates that `messageQueueThread_` is being deallocated.
+  // This trick is quite expensive due to deallocation and messing with atomic
+  // counters. Seems we need this only for making hot-reloading mechanism
+  // thread-safe. Hence, let's leave it to be DEBUG-only for now.
+  auto wasExecuted = std::shared_ptr<bool>(new bool {false}, [this](bool *wasExecuted) {
+    if (!*wasExecuted && failCallback_) {
+      failCallback_();
+    }
+    delete wasExecuted;
+  });
+#endif
+
+  isBusy_ = true;
+  messageQueueThread_->runOnQueue([=]() mutable {
+    this->beat();
+    isBusy_ = false;
+#ifndef NDEBUG
+    *wasExecuted = true;
+#endif
+  });
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/React/Inspector/RCTInspector.h b/React/Inspector/RCTInspector.h
index e653f917886f21..d346934efdd9e3 100644
--- a/React/Inspector/RCTInspector.h
+++ b/React/Inspector/RCTInspector.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/React/Inspector/RCTInspector.mm b/React/Inspector/RCTInspector.mm
index 0bb83db45675ab..79c1431f0faa00 100644
--- a/React/Inspector/RCTInspector.mm
+++ b/React/Inspector/RCTInspector.mm
@@ -3,7 +3,6 @@
 
 #if RCT_DEV
 
-#include <jschelpers/JavaScriptCore.h>
 #include <jsinspector/InspectorInterfaces.h>
 
 #import "RCTDefines.h"
diff --git a/React/Inspector/RCTInspectorPackagerConnection.h b/React/Inspector/RCTInspectorPackagerConnection.h
index ad15e043c30781..2259293635db90 100644
--- a/React/Inspector/RCTInspectorPackagerConnection.h
+++ b/React/Inspector/RCTInspectorPackagerConnection.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/React/Inspector/RCTInspectorPackagerConnection.m b/React/Inspector/RCTInspectorPackagerConnection.m
index 1b2663403ce2e3..8852d921bcd4d2 100644
--- a/React/Inspector/RCTInspectorPackagerConnection.m
+++ b/React/Inspector/RCTInspectorPackagerConnection.m
@@ -95,9 +95,11 @@ - (void)closeAllConnections
 - (void)handleConnect:(NSDictionary *)payload
 {
   NSString *pageId = payload[@"pageId"];
-  if (_inspectorConnections[pageId]) {
+  RCTInspectorLocalConnection *existingConnection = _inspectorConnections[pageId];
+  if (existingConnection) {
     [_inspectorConnections removeObjectForKey:pageId];
-    RCTLogError(@"Already connected: %@", pageId);
+    [existingConnection disconnect];
+    RCTLogWarn(@"Already connected: %@", pageId);
     return;
   }
 
diff --git a/React/Modules/RCTAccessibilityManager.h b/React/Modules/RCTAccessibilityManager.h
index 0e153afbfb7e0e..35f03280e47f3c 100644
--- a/React/Modules/RCTAccessibilityManager.h
+++ b/React/Modules/RCTAccessibilityManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTAccessibilityManager.m b/React/Modules/RCTAccessibilityManager.m
index e79fc4232eebb0..74adf9e41a758c 100644
--- a/React/Modules/RCTAccessibilityManager.m
+++ b/React/Modules/RCTAccessibilityManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTAlertManager.h b/React/Modules/RCTAlertManager.h
index 7999dd1c09a320..520481e35ab2c7 100644
--- a/React/Modules/RCTAlertManager.h
+++ b/React/Modules/RCTAlertManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTAlertManager.m b/React/Modules/RCTAlertManager.m
index b92f915c11373e..a8f30b10a4bdac 100644
--- a/React/Modules/RCTAlertManager.m
+++ b/React/Modules/RCTAlertManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTAppState.h b/React/Modules/RCTAppState.h
index 7d56cab63ab34e..9f8f9987a4aca1 100644
--- a/React/Modules/RCTAppState.h
+++ b/React/Modules/RCTAppState.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTAppState.m b/React/Modules/RCTAppState.m
index 686e5ab42f5be6..d8f6bd78ca2ea4 100644
--- a/React/Modules/RCTAppState.m
+++ b/React/Modules/RCTAppState.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTAsyncLocalStorage.h b/React/Modules/RCTAsyncLocalStorage.h
index 446a54f76218ba..386f9f5ed99e87 100644
--- a/React/Modules/RCTAsyncLocalStorage.h
+++ b/React/Modules/RCTAsyncLocalStorage.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTAsyncLocalStorage.m b/React/Modules/RCTAsyncLocalStorage.m
index c33ddb25d4a957..dff7d903f25bfc 100644
--- a/React/Modules/RCTAsyncLocalStorage.m
+++ b/React/Modules/RCTAsyncLocalStorage.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTClipboard.h b/React/Modules/RCTClipboard.h
index 317716816291fb..49374d0ab291bf 100644
--- a/React/Modules/RCTClipboard.h
+++ b/React/Modules/RCTClipboard.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTClipboard.m b/React/Modules/RCTClipboard.m
index e624904d7d1059..47805acd5b1ff4 100644
--- a/React/Modules/RCTClipboard.m
+++ b/React/Modules/RCTClipboard.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTDevSettings.h b/React/Modules/RCTDevSettings.h
index bdf30324aeb877..24c14a4cbc28c0 100644
--- a/React/Modules/RCTDevSettings.h
+++ b/React/Modules/RCTDevSettings.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -71,11 +71,6 @@
  */
 - (void)toggleElementInspector;
 
-/**
- * Toggle JSC's sampling profiler.
- */
-- (void)toggleJSCSamplingProfiler;
-
 /**
  * Enables starting of profiling sampler on launch
  */
diff --git a/React/Modules/RCTDevSettings.mm b/React/Modules/RCTDevSettings.mm
index 684e5d2238f2e0..70454aebc1147e 100644
--- a/React/Modules/RCTDevSettings.mm
+++ b/React/Modules/RCTDevSettings.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,14 +9,9 @@
 
 #import <objc/runtime.h>
 
-#import <JavaScriptCore/JavaScriptCore.h>
-
-#import <jschelpers/JavaScriptCore.h>
-
 #import "RCTBridge+Private.h"
 #import "RCTBridgeModule.h"
 #import "RCTEventDispatcher.h"
-#import "RCTJSCSamplingProfiler.h"
 #import "RCTLog.h"
 #import "RCTProfile.h"
 #import "RCTUtils.h"
@@ -29,7 +24,6 @@
 static NSString *const kRCTDevSettingExecutorOverrideClass = @"executor-override";
 static NSString *const kRCTDevSettingShakeToShowDevMenu = @"shakeToShow";
 static NSString *const kRCTDevSettingIsPerfMonitorShown = @"RCTPerfMonitorKey";
-static NSString *const kRCTDevSettingStartSamplingProfilerOnLaunch = @"startSamplingProfilerOnLaunch";
 
 static NSString *const kRCTDevSettingsUserDefaultsKey = @"RCTDevMenu";
 
@@ -40,7 +34,6 @@
 
 #if RCT_ENABLE_INSPECTOR
 #import "RCTInspectorDevServerHelper.h"
-#import <jschelpers/JSCWrapper.h>
 #endif
 
 #if RCT_DEV
@@ -112,7 +105,6 @@ @interface RCTDevSettings () <RCTBridgeModule, RCTInvalidating>
   BOOL _isJSLoaded;
 #if ENABLE_PACKAGER_CONNECTION
   RCTHandlerToken _reloadToken;
-  RCTHandlerToken _pokeSamplingProfilerToken;
 #endif
 }
 
@@ -177,14 +169,6 @@ - (void)setBridge:(RCTBridge *)bridge
    }
    queue:dispatch_get_main_queue()
    forMethod:@"reload"];
-
-  _pokeSamplingProfilerToken =
-  [[RCTPackagerConnection sharedPackagerConnection]
-   addRequestHandler:^(NSDictionary<NSString *, id> *params, RCTPackagerClientResponder *responder) {
-     pokeSamplingProfiler(weakBridge, responder);
-   }
-   queue:dispatch_get_main_queue()
-   forMethod:@"pokeSamplingProfiler"];
 #endif
 
 #if RCT_ENABLE_INSPECTOR
@@ -201,32 +185,6 @@ - (void)setBridge:(RCTBridge *)bridge
 #endif
 }
 
-#if ENABLE_PACKAGER_CONNECTION
-static void pokeSamplingProfiler(RCTBridge *const bridge, RCTPackagerClientResponder *const responder)
-{
-  if (!bridge) {
-    [responder respondWithError:@"The bridge is nil. Try again."];
-    return;
-  }
-
-  JSGlobalContextRef globalContext = bridge.jsContextRef;
-  if (!JSC_JSSamplingProfilerEnabled(globalContext)) {
-    [responder respondWithError:@"The JSSamplingProfiler is disabled. See 'iOS specific setup' section here https://fburl.com/u4lw7xeq for some help"];
-    return;
-  }
-
-  // JSPokeSamplingProfiler() toggles the profiling process
-  JSValueRef jsResult = JSC_JSPokeSamplingProfiler(globalContext);
-  if (JSC_JSValueGetType(globalContext, jsResult) == kJSTypeNull) {
-    [responder respondWithResult:@"started"];
-  } else {
-    JSContext *context = [JSC_JSContext(globalContext) contextWithJSGlobalContextRef:globalContext];
-    NSString *results = [[JSC_JSValue(globalContext) valueWithJSValueRef:jsResult inContext:context] toObject];
-    [responder respondWithResult:results];
-  }
-}
-#endif
-
 - (dispatch_queue_t)methodQueue
 {
   return dispatch_get_main_queue();
@@ -237,7 +195,6 @@ - (void)invalidate
   [_liveReloadUpdateTask cancel];
 #if ENABLE_PACKAGER_CONNECTION
   [[RCTPackagerConnection sharedPackagerConnection] removeHandler:_reloadToken];
-  [[RCTPackagerConnection sharedPackagerConnection] removeHandler:_pokeSamplingProfilerToken];
 #endif
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
@@ -277,11 +234,6 @@ - (BOOL)isLiveReloadAvailable
   return (_liveReloadURL != nil);
 }
 
-- (BOOL)isJSCSamplingProfilerAvailable
-{
-  return JSC_JSSamplingProfilerEnabled(_bridge.jsContextRef);
-}
-
 RCT_EXPORT_METHOD(reload)
 {
   [_bridge reload];
@@ -394,20 +346,6 @@ - (BOOL)isHotLoadingEnabled
   }
 }
 
-- (void)toggleJSCSamplingProfiler
-{
-  JSGlobalContextRef globalContext = _bridge.jsContextRef;
-  // JSPokeSamplingProfiler() toggles the profiling process
-  JSValueRef jsResult = JSC_JSPokeSamplingProfiler(globalContext);
-
-  if (JSC_JSValueGetType(globalContext, jsResult) != kJSTypeNull) {
-    JSContext *context = [JSC_JSContext(globalContext) contextWithJSGlobalContextRef:globalContext];
-    NSString *results = [[JSC_JSValue(globalContext) valueWithJSValueRef:jsResult inContext:context] toObject];
-    RCTJSCSamplingProfiler *profilerModule = [_bridge moduleForClass:[RCTJSCSamplingProfiler class]];
-    [profilerModule operationCompletedWithResults:results];
-  }
-}
-
 - (BOOL)isElementInspectorShown
 {
   return [[self settingForKey:kRCTDevSettingIsInspectorShown] boolValue];
@@ -423,16 +361,6 @@ - (BOOL)isPerfMonitorShown
   return [[self settingForKey:kRCTDevSettingIsPerfMonitorShown] boolValue];
 }
 
-- (void)setStartSamplingProfilerOnLaunch:(BOOL)startSamplingProfilerOnLaunch
-{
-  [self _updateSettingWithValue:@(startSamplingProfilerOnLaunch) forKey:kRCTDevSettingStartSamplingProfilerOnLaunch];
-}
-
-- (BOOL)startSamplingProfilerOnLaunch
-{
-  return [[self settingForKey:kRCTDevSettingStartSamplingProfilerOnLaunch] boolValue];
-}
-
 - (void)setExecutorClass:(Class)executorClass
 {
   _executorClass = executorClass;
@@ -554,7 +482,6 @@ - (BOOL)isRemoteDebuggingAvailable { return NO; }
 - (id)settingForKey:(NSString *)key { return nil; }
 - (void)reload {}
 - (void)toggleElementInspector {}
-- (void)toggleJSCSamplingProfiler {}
 
 @end
 
diff --git a/React/Modules/RCTDeviceInfo.h b/React/Modules/RCTDeviceInfo.h
index a21750e7cd4b2a..e245c8edc91076 100644
--- a/React/Modules/RCTDeviceInfo.h
+++ b/React/Modules/RCTDeviceInfo.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTDeviceInfo.m b/React/Modules/RCTDeviceInfo.m
index 72803f3e121d50..1be4fcd873689c 100644
--- a/React/Modules/RCTDeviceInfo.m
+++ b/React/Modules/RCTDeviceInfo.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -58,10 +58,15 @@ static BOOL RCTIsIPhoneX() {
   dispatch_once(&onceToken, ^{
     RCTAssertMainQueue();
 
-    isIPhoneX = CGSizeEqualToSize(
-      [UIScreen mainScreen].nativeBounds.size,
-      CGSizeMake(1125, 2436)
-    );
+    CGSize screenSize = [UIScreen mainScreen].nativeBounds.size;
+    CGSize iPhoneXScreenSize = CGSizeMake(1125, 2436);
+    CGSize iPhoneXMaxScreenSize = CGSizeMake(1242, 2688);
+    CGSize iPhoneXRScreenSize = CGSizeMake(828, 1792);
+
+    isIPhoneX =
+      CGSizeEqualToSize(screenSize, iPhoneXScreenSize) ||
+      CGSizeEqualToSize(screenSize, iPhoneXMaxScreenSize) ||
+      CGSizeEqualToSize(screenSize, iPhoneXRScreenSize);
   });
 
   return isIPhoneX;
diff --git a/React/Modules/RCTEventEmitter.h b/React/Modules/RCTEventEmitter.h
index 3192d473cf07aa..3507c78e33ea23 100644
--- a/React/Modules/RCTEventEmitter.h
+++ b/React/Modules/RCTEventEmitter.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTEventEmitter.m b/React/Modules/RCTEventEmitter.m
index 1b4478566d4776..01116f89e1f8e8 100644
--- a/React/Modules/RCTEventEmitter.m
+++ b/React/Modules/RCTEventEmitter.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTExceptionsManager.h b/React/Modules/RCTExceptionsManager.h
index 950cdaeab29623..3574bc71b4c3d3 100644
--- a/React/Modules/RCTExceptionsManager.h
+++ b/React/Modules/RCTExceptionsManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTExceptionsManager.m b/React/Modules/RCTExceptionsManager.m
index 192675bf39af1c..5108f36ebc8648 100644
--- a/React/Modules/RCTExceptionsManager.m
+++ b/React/Modules/RCTExceptionsManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTI18nManager.h b/React/Modules/RCTI18nManager.h
index c99a3b1ac56bcf..b4afa99586ffb7 100644
--- a/React/Modules/RCTI18nManager.h
+++ b/React/Modules/RCTI18nManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTI18nManager.m b/React/Modules/RCTI18nManager.m
index 4059ea5d85aa70..c58d4a78c78434 100644
--- a/React/Modules/RCTI18nManager.m
+++ b/React/Modules/RCTI18nManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTI18nUtil.h b/React/Modules/RCTI18nUtil.h
index 967e90d4c9089d..791d911e077122 100644
--- a/React/Modules/RCTI18nUtil.h
+++ b/React/Modules/RCTI18nUtil.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTI18nUtil.m b/React/Modules/RCTI18nUtil.m
index 804154e2af8251..0206f1a0bc95ef 100644
--- a/React/Modules/RCTI18nUtil.m
+++ b/React/Modules/RCTI18nUtil.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTJSCSamplingProfiler.h b/React/Modules/RCTJSCSamplingProfiler.h
deleted file mode 100644
index 8facaa674c6ad2..00000000000000
--- a/React/Modules/RCTJSCSamplingProfiler.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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/RCTBridgeModule.h>
-
-@interface RCTJSCSamplingProfiler : NSObject <RCTBridgeModule>
-
-/**
- * Receives a JSON string containing the result of a JSC CPU Profiling run,
- *  and sends them to the packager to be symbolicated and saved to disk.
- * It is safe to call this method from any thread.
- */
-- (void)operationCompletedWithResults:(NSString *)results;
-
-@end
diff --git a/React/Modules/RCTJSCSamplingProfiler.m b/React/Modules/RCTJSCSamplingProfiler.m
deleted file mode 100644
index 1d06e053829591..00000000000000
--- a/React/Modules/RCTJSCSamplingProfiler.m
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTJSCSamplingProfiler.h"
-
-#import "RCTBridge.h"
-#import "RCTLog.h"
-
-@implementation RCTJSCSamplingProfiler
-
-@synthesize methodQueue = _methodQueue;
-@synthesize bridge = _bridge;
-
-RCT_EXPORT_MODULE(RCTJSCSamplingProfiler);
-
-#ifdef RCT_PROFILE
-RCT_EXPORT_METHOD(operationComplete:(__unused int)token result:(id)profileData error:(id)error)
-{
-  if (error) {
-    RCTLogError(@"JSC Sampling profiler ended with error: %@", error);
-    return;
-  }
-
-  // Create a POST request with all of the datas
-  NSURL *url = [NSURL URLWithString:@"/jsc-profile" relativeToURL:self.bridge.bundleURL];
-  NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url
-                                                         cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData
-                                                     timeoutInterval:60];
-  [request setHTTPMethod:@"POST"];
-  [request setHTTPBody:[profileData dataUsingEncoding:NSUTF8StringEncoding]];
-
-  // Send the request
-  NSURLSession *session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
-  NSURLSessionDataTask *sessionDataTask = [session dataTaskWithRequest:request completionHandler:^(__unused NSData *data, __unused NSURLResponse *response, NSError *sessionError) {
-    if (sessionError) {
-      RCTLogWarn(@"JS CPU Profile data failed to send. Is the packager server running locally?\nDetails: %@", error);
-    } else {
-      RCTLogInfo(@"JS CPU Profile data sent successfully.");
-    }
-  }];
-
-  [sessionDataTask resume];
-}
-
-- (void)operationCompletedWithResults:(NSString *)results
-{
-  // Send the results to the packager, using the module's queue.
-  dispatch_async(self.methodQueue, ^{
-    [self operationComplete:0 result:results error:nil];
-  });
-}
-
-#endif
-
-@end
diff --git a/React/Modules/RCTKeyboardObserver.h b/React/Modules/RCTKeyboardObserver.h
index 891e174225e20f..1ea35d530c31f4 100644
--- a/React/Modules/RCTKeyboardObserver.h
+++ b/React/Modules/RCTKeyboardObserver.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTKeyboardObserver.m b/React/Modules/RCTKeyboardObserver.m
index bef74f7fefdf62..ea04868cb1064f 100644
--- a/React/Modules/RCTKeyboardObserver.m
+++ b/React/Modules/RCTKeyboardObserver.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTLayoutAnimation.h b/React/Modules/RCTLayoutAnimation.h
index 04f966f4d03e3b..9f33e3b7babd9f 100644
--- a/React/Modules/RCTLayoutAnimation.h
+++ b/React/Modules/RCTLayoutAnimation.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTLayoutAnimation.m b/React/Modules/RCTLayoutAnimation.m
index 9834103feb5083..65eca543675e68 100644
--- a/React/Modules/RCTLayoutAnimation.m
+++ b/React/Modules/RCTLayoutAnimation.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTLayoutAnimationGroup.h b/React/Modules/RCTLayoutAnimationGroup.h
index 5b4635af718f50..c593cb64699af7 100644
--- a/React/Modules/RCTLayoutAnimationGroup.h
+++ b/React/Modules/RCTLayoutAnimationGroup.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTLayoutAnimationGroup.m b/React/Modules/RCTLayoutAnimationGroup.m
index 73db8b68c6b133..ac72ccf72e599b 100644
--- a/React/Modules/RCTLayoutAnimationGroup.m
+++ b/React/Modules/RCTLayoutAnimationGroup.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTRedBox.h b/React/Modules/RCTRedBox.h
index 29ed3958cefa9f..0f4349535b30bb 100644
--- a/React/Modules/RCTRedBox.h
+++ b/React/Modules/RCTRedBox.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTRedBox.m b/React/Modules/RCTRedBox.m
index 0cbd1fc5aced9a..f44f4fd0245b63 100644
--- a/React/Modules/RCTRedBox.m
+++ b/React/Modules/RCTRedBox.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTRedBoxExtraDataViewController.h b/React/Modules/RCTRedBoxExtraDataViewController.h
index 17575a15aca103..00ba25a809d682 100644
--- a/React/Modules/RCTRedBoxExtraDataViewController.h
+++ b/React/Modules/RCTRedBoxExtraDataViewController.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTRedBoxExtraDataViewController.m b/React/Modules/RCTRedBoxExtraDataViewController.m
index 94d371249b9b2e..c9e1274ae08b9c 100644
--- a/React/Modules/RCTRedBoxExtraDataViewController.m
+++ b/React/Modules/RCTRedBoxExtraDataViewController.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -43,7 +43,7 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style
         self.keyLabel.textColor = [UIColor whiteColor];
         self.keyLabel.numberOfLines = 0;
 #if !TARGET_OS_TV
-        self.keyLabel.lineBreakMode = UILineBreakModeWordWrap;
+        self.keyLabel.lineBreakMode = NSLineBreakByWordWrapping;
         self.keyLabel.font = [UIFont fontWithName:@"Menlo-Regular" size:12.0f];
 #endif
         self.valueLabel = [UILabel new];
@@ -63,7 +63,7 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style
         self.valueLabel.textColor = [UIColor whiteColor];
         self.valueLabel.numberOfLines = 0;
 #if !TARGET_OS_TV
-        self.valueLabel.lineBreakMode = UILineBreakModeWordWrap;
+        self.valueLabel.lineBreakMode = NSLineBreakByWordWrapping;
         self.valueLabel.font = [UIFont fontWithName:@"Menlo-Regular" size:12.0f];
 #endif
     }
diff --git a/React/Modules/RCTSourceCode.h b/React/Modules/RCTSourceCode.h
index f0f60cc0d951ad..6ed602cb1ff57b 100644
--- a/React/Modules/RCTSourceCode.h
+++ b/React/Modules/RCTSourceCode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTSourceCode.m b/React/Modules/RCTSourceCode.m
index 1886476bd7552d..375930b7d463a8 100644
--- a/React/Modules/RCTSourceCode.m
+++ b/React/Modules/RCTSourceCode.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTStatusBarManager.h b/React/Modules/RCTStatusBarManager.h
index 237d3518f0259a..74893bc68f4932 100644
--- a/React/Modules/RCTStatusBarManager.h
+++ b/React/Modules/RCTStatusBarManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTStatusBarManager.m b/React/Modules/RCTStatusBarManager.m
index 18bd5b0a66cd0b..5136b36907ccdd 100644
--- a/React/Modules/RCTStatusBarManager.m
+++ b/React/Modules/RCTStatusBarManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTTVNavigationEventEmitter.h b/React/Modules/RCTTVNavigationEventEmitter.h
index 05b19f1b6f7844..78dfcae1e44c23 100644
--- a/React/Modules/RCTTVNavigationEventEmitter.h
+++ b/React/Modules/RCTTVNavigationEventEmitter.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTTVNavigationEventEmitter.m b/React/Modules/RCTTVNavigationEventEmitter.m
index 3ebe46381d1899..cd92d18789aebe 100644
--- a/React/Modules/RCTTVNavigationEventEmitter.m
+++ b/React/Modules/RCTTVNavigationEventEmitter.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTTiming.h b/React/Modules/RCTTiming.h
index b126dca18d5e5b..5130b6339bb1c8 100644
--- a/React/Modules/RCTTiming.h
+++ b/React/Modules/RCTTiming.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTTiming.m b/React/Modules/RCTTiming.m
index d1dafdc11c9d44..3a2474af806f54 100644
--- a/React/Modules/RCTTiming.m
+++ b/React/Modules/RCTTiming.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTUIManager.h b/React/Modules/RCTUIManager.h
index 05308fcfc8bcc4..63f85bd1987fe5 100644
--- a/React/Modules/RCTUIManager.h
+++ b/React/Modules/RCTUIManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 217c43a481b24f..9429f135d4eae7 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -68,7 +68,7 @@ @implementation RCTUIManager
   NSHashTable<RCTShadowView *> *_shadowViewsWithUpdatedChildren; // UIManager queue only.
 
   // Keyed by viewName
-  NSDictionary *_componentDataByName;
+  NSMutableDictionary *_componentDataByName;
 }
 
 @synthesize bridge = _bridge;
@@ -148,18 +148,16 @@ - (void)setBridge:(RCTBridge *)bridge
 
   _observerCoordinator = [RCTUIManagerObserverCoordinator new];
 
-  // Get view managers from bridge
-  NSMutableDictionary *componentDataByName = [NSMutableDictionary new];
+  // Get view managers from bridge=
+  _componentDataByName = [NSMutableDictionary new];
   for (Class moduleClass in _bridge.moduleClasses) {
     if ([moduleClass isSubclassOfClass:[RCTViewManager class]]) {
       RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:moduleClass
                                                                                 bridge:_bridge];
-      componentDataByName[componentData.name] = componentData;
+      _componentDataByName[componentData.name] = componentData;
     }
   }
 
-  _componentDataByName = [componentDataByName copy];
-
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(didReceiveNewContentSizeMultiplier)
                                                name:RCTAccessibilityManagerDidUpdateMultiplierNotification
@@ -1485,6 +1483,62 @@ static void RCTMeasureLayout(RCTShadowView *view,
   }];
 }
 
+static NSMutableDictionary<NSString *, id> *moduleConstantsForComponent(
+    NSMutableDictionary<NSString *, NSDictionary *> *directEvents,
+    NSMutableDictionary<NSString *, NSDictionary *> *bubblingEvents,
+    RCTComponentData *componentData) {
+  NSMutableDictionary<NSString *, id> *moduleConstants = [NSMutableDictionary new];
+
+  // Register which event-types this view dispatches.
+  // React needs this for the event plugin.
+  NSMutableDictionary<NSString *, NSDictionary *> *bubblingEventTypes = [NSMutableDictionary new];
+  NSMutableDictionary<NSString *, NSDictionary *> *directEventTypes = [NSMutableDictionary new];
+
+  // Add manager class
+  moduleConstants[@"Manager"] = RCTBridgeModuleNameForClass(componentData.managerClass);
+
+  // Add native props
+  NSDictionary<NSString *, id> *viewConfig = [componentData viewConfig];
+  moduleConstants[@"NativeProps"] = viewConfig[@"propTypes"];
+  moduleConstants[@"baseModuleName"] = viewConfig[@"baseModuleName"];
+  moduleConstants[@"bubblingEventTypes"] = bubblingEventTypes;
+  moduleConstants[@"directEventTypes"] = directEventTypes;
+
+  // Add direct events
+  for (NSString *eventName in viewConfig[@"directEvents"]) {
+    if (!directEvents[eventName]) {
+      directEvents[eventName] = @{
+                                  @"registrationName": [eventName stringByReplacingCharactersInRange:(NSRange){0, 3} withString:@"on"],
+                                  };
+    }
+    directEventTypes[eventName] = directEvents[eventName];
+    if (RCT_DEBUG && bubblingEvents[eventName]) {
+      RCTLogError(@"Component '%@' re-registered bubbling event '%@' as a "
+                  "direct event", componentData.name, eventName);
+    }
+  }
+
+  // Add bubbling events
+  for (NSString *eventName in viewConfig[@"bubblingEvents"]) {
+    if (!bubblingEvents[eventName]) {
+      NSString *bubbleName = [eventName stringByReplacingCharactersInRange:(NSRange){0, 3} withString:@"on"];
+      bubblingEvents[eventName] = @{
+                                    @"phasedRegistrationNames": @{
+                                        @"bubbled": bubbleName,
+                                        @"captured": [bubbleName stringByAppendingString:@"Capture"],
+                                        }
+                                    };
+    }
+    bubblingEventTypes[eventName] = bubblingEvents[eventName];
+    if (RCT_DEBUG && directEvents[eventName]) {
+      RCTLogError(@"Component '%@' re-registered direct event '%@' as a "
+                  "bubbling event", componentData.name, eventName);
+    }
+  }
+
+  return moduleConstants;
+}
+
 - (NSDictionary<NSString *, id> *)constantsToExport
 {
   NSMutableDictionary<NSString *, NSDictionary *> *constants = [NSMutableDictionary new];
@@ -1492,62 +1546,43 @@ static void RCTMeasureLayout(RCTShadowView *view,
   NSMutableDictionary<NSString *, NSDictionary *> *bubblingEvents = [NSMutableDictionary new];
 
   [_componentDataByName enumerateKeysAndObjectsUsingBlock:^(NSString *name, RCTComponentData *componentData, __unused BOOL *stop) {
-     NSMutableDictionary<NSString *, id> *moduleConstants = [NSMutableDictionary new];
-
-     // Register which event-types this view dispatches.
-     // React needs this for the event plugin.
-     NSMutableDictionary<NSString *, NSDictionary *> *bubblingEventTypes = [NSMutableDictionary new];
-     NSMutableDictionary<NSString *, NSDictionary *> *directEventTypes = [NSMutableDictionary new];
-
-     // Add manager class
-     moduleConstants[@"Manager"] = RCTBridgeModuleNameForClass(componentData.managerClass);
-
-     // Add native props
-     NSDictionary<NSString *, id> *viewConfig = [componentData viewConfig];
-     moduleConstants[@"NativeProps"] = viewConfig[@"propTypes"];
-     moduleConstants[@"baseModuleName"] = viewConfig[@"baseModuleName"];
-     moduleConstants[@"bubblingEventTypes"] = bubblingEventTypes;
-     moduleConstants[@"directEventTypes"] = directEventTypes;
-
-     // Add direct events
-     for (NSString *eventName in viewConfig[@"directEvents"]) {
-       if (!directEvents[eventName]) {
-         directEvents[eventName] = @{
-           @"registrationName": [eventName stringByReplacingCharactersInRange:(NSRange){0, 3} withString:@"on"],
-         };
-       }
-       directEventTypes[eventName] = directEvents[eventName];
-       if (RCT_DEBUG && bubblingEvents[eventName]) {
-         RCTLogError(@"Component '%@' re-registered bubbling event '%@' as a "
-                     "direct event", componentData.name, eventName);
-       }
-     }
-
-     // Add bubbling events
-     for (NSString *eventName in viewConfig[@"bubblingEvents"]) {
-       if (!bubblingEvents[eventName]) {
-         NSString *bubbleName = [eventName stringByReplacingCharactersInRange:(NSRange){0, 3} withString:@"on"];
-         bubblingEvents[eventName] = @{
-           @"phasedRegistrationNames": @{
-             @"bubbled": bubbleName,
-             @"captured": [bubbleName stringByAppendingString:@"Capture"],
-           }
-         };
-       }
-       bubblingEventTypes[eventName] = bubblingEvents[eventName];
-       if (RCT_DEBUG && directEvents[eventName]) {
-         RCTLogError(@"Component '%@' re-registered direct event '%@' as a "
-                     "bubbling event", componentData.name, eventName);
-       }
-     }
-
-     RCTAssert(!constants[name], @"UIManager already has constants for %@", componentData.name);
-     constants[name] = moduleConstants;
+    RCTAssert(!constants[name], @"UIManager already has constants for %@", componentData.name);
+    NSMutableDictionary<NSString *, id> *moduleConstants = moduleConstantsForComponent(directEvents, bubblingEvents, componentData);
+    constants[name] = moduleConstants;
   }];
 
   return constants;
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(lazilyLoadView:(NSString *)name)
+{
+  if (_componentDataByName[name]) {
+    return @{};
+  }
+
+  id<RCTBridgeDelegate> delegate = self.bridge.delegate;
+  if (![delegate respondsToSelector:@selector(bridge:didNotFindModule:)]) {
+    return @{};
+  }
+
+  NSString *moduleName = [name stringByAppendingString:@"Manager"];
+  BOOL result = [delegate bridge:self.bridge didNotFindModule:moduleName];
+  if (!result) {
+    return @{};
+  }
+
+  id module = [self.bridge moduleForName:moduleName];
+  RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:[module class] bridge:self.bridge];
+  _componentDataByName[componentData.name] = componentData;
+  NSMutableDictionary *directEvents = [NSMutableDictionary new];
+  NSMutableDictionary *bubblingEvents = [NSMutableDictionary new];
+  NSMutableDictionary<NSString *, id> *moduleConstants = moduleConstantsForComponent(directEvents, bubblingEvents, componentData);
+  return
+  @{
+    @"viewConfig": moduleConstants,
+    };
+}
+
 RCT_EXPORT_METHOD(configureNextLayoutAnimation:(NSDictionary *)config
                   withCallback:(RCTResponseSenderBlock)callback
                   errorCallback:(__unused RCTResponseSenderBlock)errorCallback)
diff --git a/React/Modules/RCTUIManagerObserverCoordinator.h b/React/Modules/RCTUIManagerObserverCoordinator.h
index fc40640270af37..efbcdeed361353 100644
--- a/React/Modules/RCTUIManagerObserverCoordinator.h
+++ b/React/Modules/RCTUIManagerObserverCoordinator.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTUIManagerObserverCoordinator.mm b/React/Modules/RCTUIManagerObserverCoordinator.mm
index a8fa5f6db3b048..1a08cd697568e4 100644
--- a/React/Modules/RCTUIManagerObserverCoordinator.mm
+++ b/React/Modules/RCTUIManagerObserverCoordinator.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTUIManagerUtils.h b/React/Modules/RCTUIManagerUtils.h
index c063ab8f51ec7c..9edbe4b1cf171a 100644
--- a/React/Modules/RCTUIManagerUtils.h
+++ b/React/Modules/RCTUIManagerUtils.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Modules/RCTUIManagerUtils.m b/React/Modules/RCTUIManagerUtils.m
index a62445650c4625..48e71eb8e0435f 100644
--- a/React/Modules/RCTUIManagerUtils.m
+++ b/React/Modules/RCTUIManagerUtils.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Profiler/RCTFPSGraph.h b/React/Profiler/RCTFPSGraph.h
index a71ac9ab33f400..b3092aba828d31 100644
--- a/React/Profiler/RCTFPSGraph.h
+++ b/React/Profiler/RCTFPSGraph.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Profiler/RCTFPSGraph.m b/React/Profiler/RCTFPSGraph.m
index 6b22ef349f4c61..634671338b47a6 100644
--- a/React/Profiler/RCTFPSGraph.m
+++ b/React/Profiler/RCTFPSGraph.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Profiler/RCTMacros.h b/React/Profiler/RCTMacros.h
index ea4c5f40e8c521..1eb534314f5e51 100644
--- a/React/Profiler/RCTMacros.h
+++ b/React/Profiler/RCTMacros.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Profiler/RCTPerfMonitor.m b/React/Profiler/RCTPerfMonitor.m
index 768142437b0bd5..57bd0f9adf42f7 100644
--- a/React/Profiler/RCTPerfMonitor.m
+++ b/React/Profiler/RCTPerfMonitor.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -62,17 +62,14 @@ static BOOL RCTJSCSetOption(const char *option)
 
 static vm_size_t RCTGetResidentMemorySize(void)
 {
-  struct task_basic_info info;
-  mach_msg_type_number_t size = sizeof(info);
-  kern_return_t kerr = task_info(mach_task_self(),
-                                 TASK_BASIC_INFO,
-                                 (task_info_t)&info,
-                                 &size);
-  if (kerr != KERN_SUCCESS) {
-    return 0;
-  }
-
-  return info.resident_size;
+    vm_size_t memoryUsageInByte = 0;
+    task_vm_info_data_t vmInfo;
+    mach_msg_type_number_t count = TASK_VM_INFO_COUNT;
+    kern_return_t kernelReturn = task_info(mach_task_self(), TASK_VM_INFO, (task_info_t) &vmInfo, &count);
+    if(kernelReturn == KERN_SUCCESS) {
+        memoryUsageInByte = (vm_size_t) vmInfo.phys_footprint;
+    } 
+    return memoryUsageInByte;
 }
 
 @interface RCTPerfMonitor : NSObject <RCTBridgeModule, RCTInvalidating, UITableViewDataSource, UITableViewDelegate>
diff --git a/React/Profiler/RCTProfile.h b/React/Profiler/RCTProfile.h
index 88ff3d41f32ff4..1b07e979bfeb1b 100644
--- a/React/Profiler/RCTProfile.h
+++ b/React/Profiler/RCTProfile.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
index 3b255505800c1f..98ba2e84333354 100644
--- a/React/Profiler/RCTProfile.m
+++ b/React/Profiler/RCTProfile.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -76,14 +76,16 @@
   }
 
   systrace_arg_t *systrace_args = malloc(sizeof(systrace_arg_t) * args.count);
-  __block size_t i = 0;
-  [args enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, __unused BOOL *stop) {
-    systrace_args[i].key = [key UTF8String];
-    systrace_args[i].key_len = [key length];
-    systrace_args[i].value = [value UTF8String];
-    systrace_args[i].value_len = [value length];
-    i++;
-  }];
+  if (systrace_args) {
+    __block size_t i = 0;
+    [args enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, __unused BOOL *stop) {
+      systrace_args[i].key = [key UTF8String];
+      systrace_args[i].key_len = [key length];
+      systrace_args[i].value = [value UTF8String];
+      systrace_args[i].value_len = [value length];
+      i++;
+    }];
+  }
   return systrace_args;
 }
 
diff --git a/React/Profiler/RCTProfileTrampoline-arm.S b/React/Profiler/RCTProfileTrampoline-arm.S
index d4061fed883199..47934922303115 100644
--- a/React/Profiler/RCTProfileTrampoline-arm.S
+++ b/React/Profiler/RCTProfileTrampoline-arm.S
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Profiler/RCTProfileTrampoline-arm64.S b/React/Profiler/RCTProfileTrampoline-arm64.S
index af4733b5bf6331..8aa24ffd107849 100644
--- a/React/Profiler/RCTProfileTrampoline-arm64.S
+++ b/React/Profiler/RCTProfileTrampoline-arm64.S
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Profiler/RCTProfileTrampoline-i386.S b/React/Profiler/RCTProfileTrampoline-i386.S
index a33e8a21f2c752..d213c46321aca2 100644
--- a/React/Profiler/RCTProfileTrampoline-i386.S
+++ b/React/Profiler/RCTProfileTrampoline-i386.S
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Profiler/RCTProfileTrampoline-x86_64.S b/React/Profiler/RCTProfileTrampoline-x86_64.S
index d687214193adce..a40795c81b7df9 100644
--- a/React/Profiler/RCTProfileTrampoline-x86_64.S
+++ b/React/Profiler/RCTProfileTrampoline-x86_64.S
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index b0b6cc74e33689..bd76e15c7e6a75 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -56,16 +56,6 @@
 		134D63C31F1FEC4B008872B5 /* RCTCxxBridgeDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 134D63C21F1FEC4B008872B5 /* RCTCxxBridgeDelegate.h */; };
 		134D63C41F1FEC65008872B5 /* RCTCxxBridgeDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 134D63C21F1FEC4B008872B5 /* RCTCxxBridgeDelegate.h */; };
 		13513F3C1B1F43F400FCE529 /* RCTProgressViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13513F3B1B1F43F400FCE529 /* RCTProgressViewManager.m */; };
-		135A9BFB1E7B0EAE00587AEB /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 135A9BF91E7B0EAE00587AEB /* RCTJSCErrorHandling.h */; };
-		135A9BFC1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 135A9BFA1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm */; };
-		135A9BFF1E7B0EE600587AEB /* RCTJSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 135A9BFD1E7B0EE600587AEB /* RCTJSCHelpers.h */; };
-		135A9C001E7B0EE600587AEB /* RCTJSCHelpers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 135A9BFE1E7B0EE600587AEB /* RCTJSCHelpers.mm */; };
-		135A9C011E7B0F4700587AEB /* systemJSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */; };
-		135A9C021E7B0F4800587AEB /* systemJSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */; };
-		135A9C031E7B0F6100587AEB /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 135A9BF91E7B0EAE00587AEB /* RCTJSCErrorHandling.h */; };
-		135A9C041E7B0F6400587AEB /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 135A9BFA1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm */; };
-		135A9C051E7B0F7500587AEB /* RCTJSCHelpers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 135A9BFE1E7B0EE600587AEB /* RCTJSCHelpers.mm */; };
-		135A9C061E7B0F7800587AEB /* RCTJSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 135A9BFD1E7B0EE600587AEB /* RCTJSCHelpers.h */; };
 		13723B501A82FD3C00F88898 /* RCTStatusBarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13723B4F1A82FD3C00F88898 /* RCTStatusBarManager.m */; };
 		1372B70A1AB030C200659ED6 /* RCTAppState.m in Sources */ = {isa = PBXBuildFile; fileRef = 1372B7091AB030C200659ED6 /* RCTAppState.m */; };
 		137327E71AA5CF210034F82E /* RCTTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 137327E01AA5CF210034F82E /* RCTTabBar.m */; };
@@ -114,10 +104,6 @@
 		13B07FEF1A69327A00A75B9A /* RCTAlertManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FE81A69327A00A75B9A /* RCTAlertManager.m */; };
 		13B07FF01A69327A00A75B9A /* RCTExceptionsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FEA1A69327A00A75B9A /* RCTExceptionsManager.m */; };
 		13B07FF21A69327A00A75B9A /* RCTTiming.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FEE1A69327A00A75B9A /* RCTTiming.m */; };
-		13B0801A1A69489C00A75B9A /* RCTNavigator.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B0800D1A69489C00A75B9A /* RCTNavigator.m */; };
-		13B0801B1A69489C00A75B9A /* RCTNavigatorManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B0800F1A69489C00A75B9A /* RCTNavigatorManager.m */; };
-		13B0801C1A69489C00A75B9A /* RCTNavItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B080111A69489C00A75B9A /* RCTNavItem.m */; };
-		13B0801D1A69489C00A75B9A /* RCTNavItemManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B080131A69489C00A75B9A /* RCTNavItemManager.m */; };
 		13B080201A69489C00A75B9A /* RCTActivityIndicatorViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B080191A69489C00A75B9A /* RCTActivityIndicatorViewManager.m */; };
 		13B080261A694A8400A75B9A /* RCTWrapperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B080241A694A8400A75B9A /* RCTWrapperViewController.m */; };
 		13BB3D021BECD54500932C10 /* RCTImageSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BB3D011BECD54500932C10 /* RCTImageSource.m */; };
@@ -137,53 +123,24 @@
 		13E067571A70F44B002CDEE1 /* RCTView.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E067501A70F44B002CDEE1 /* RCTView.m */; };
 		13E067591A70F44B002CDEE1 /* UIView+React.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E067541A70F44B002CDEE1 /* UIView+React.m */; };
 		13E41EEB1C05CA0B00CD8DAC /* RCTProfileTrampoline-i386.S in Sources */ = {isa = PBXBuildFile; fileRef = 14BF717F1C04793D00C97D0C /* RCTProfileTrampoline-i386.S */; };
-		13EBC6711E2870DE00880AC5 /* JSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */; };
-		13EBC6731E2870DE00880AC5 /* Value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B10C1E0369AD0018521A /* Value.cpp */; };
-		13EBC6771E2870E400880AC5 /* JSCHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B1071E0369AD0018521A /* JSCHelpers.cpp */; };
-		13EBC6781E2870E400880AC5 /* JSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */; };
-		13EBC6791E2870E400880AC5 /* Unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B10A1E0369AD0018521A /* Unicode.cpp */; };
-		13EBC67A1E2870E400880AC5 /* Value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B10C1E0369AD0018521A /* Value.cpp */; };
-		13EBC67B1E28723000880AC5 /* Unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B10A1E0369AD0018521A /* Unicode.cpp */; };
-		13EBC67D1E28725900880AC5 /* JSCHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B1071E0369AD0018521A /* JSCHelpers.cpp */; };
-		13EBC67E1E28726000880AC5 /* JSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1081E0369AD0018521A /* JSCHelpers.h */; };
-		13EBC6801E28733C00880AC5 /* noncopyable.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1091E0369AD0018521A /* noncopyable.h */; };
-		13EBC6811E28733C00880AC5 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; };
-		13EBC6821E28733C00880AC5 /* Value.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; };
 		13F17A851B8493E5007D4C75 /* RCTRedBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 13F17A841B8493E5007D4C75 /* RCTRedBox.m */; };
-		13F880381E296D2800C3C7A1 /* JSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; };
 		13F887581E2971D400C3C7A1 /* Demangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887521E2971C500C3C7A1 /* Demangle.cpp */; };
 		13F887591E2971D400C3C7A1 /* StringBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887531E2971C500C3C7A1 /* StringBase.cpp */; };
 		13F8875A1E2971D400C3C7A1 /* Unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887541E2971C500C3C7A1 /* Unicode.cpp */; };
 		13F8876E1E29726200C3C7A1 /* CxxNativeModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0A81E03699D0018521A /* CxxNativeModule.cpp */; };
 		13F887701E29726200C3C7A1 /* Instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0AE1E03699D0018521A /* Instance.cpp */; };
 		13F887711E29726200C3C7A1 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; };
-		13F887721E29726200C3C7A1 /* JSCExecutor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0B21E03699D0018521A /* JSCExecutor.cpp */; };
-		13F887741E29726200C3C7A1 /* JSCLegacyTracing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0B61E03699D0018521A /* JSCLegacyTracing.cpp */; };
-		13F887751E29726200C3C7A1 /* JSCMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0B81E03699D0018521A /* JSCMemory.cpp */; };
-		13F887761E29726200C3C7A1 /* JSCNativeModules.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0BA1E03699D0018521A /* JSCNativeModules.cpp */; };
-		13F887771E29726200C3C7A1 /* JSCPerfStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0BC1E03699D0018521A /* JSCPerfStats.cpp */; };
-		13F887781E29726200C3C7A1 /* JSCSamplingProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0BE1E03699D0018521A /* JSCSamplingProfiler.cpp */; };
-		13F887791E29726200C3C7A1 /* JSCUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0C21E03699D0018521A /* JSCUtils.cpp */; };
 		13F8877B1E29726200C3C7A1 /* JSIndexedRAMBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0C61E03699D0018521A /* JSIndexedRAMBundle.cpp */; };
 		13F8877C1E29726200C3C7A1 /* MethodCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0CA1E03699D0018521A /* MethodCall.cpp */; };
 		13F8877D1E29726200C3C7A1 /* ModuleRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0CC1E03699D0018521A /* ModuleRegistry.cpp */; };
 		13F8877E1E29726200C3C7A1 /* NativeToJsBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0CF1E03699D0018521A /* NativeToJsBridge.cpp */; };
-		13F8877F1E29726200C3C7A1 /* Platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0D11E03699D0018521A /* Platform.cpp */; };
 		13F887801E29726200C3C7A1 /* SampleCxxModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0D31E03699D0018521A /* SampleCxxModule.cpp */; };
 		13F887821E29726300C3C7A1 /* CxxNativeModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0A81E03699D0018521A /* CxxNativeModule.cpp */; };
 		13F887841E29726300C3C7A1 /* Instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0AE1E03699D0018521A /* Instance.cpp */; };
-		13F887851E29726300C3C7A1 /* JSCExecutor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0B21E03699D0018521A /* JSCExecutor.cpp */; };
-		13F887871E29726300C3C7A1 /* JSCLegacyTracing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0B61E03699D0018521A /* JSCLegacyTracing.cpp */; };
-		13F887881E29726300C3C7A1 /* JSCMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0B81E03699D0018521A /* JSCMemory.cpp */; };
-		13F887891E29726300C3C7A1 /* JSCNativeModules.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0BA1E03699D0018521A /* JSCNativeModules.cpp */; };
-		13F8878A1E29726300C3C7A1 /* JSCPerfStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0BC1E03699D0018521A /* JSCPerfStats.cpp */; };
-		13F8878B1E29726300C3C7A1 /* JSCSamplingProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0BE1E03699D0018521A /* JSCSamplingProfiler.cpp */; };
-		13F8878C1E29726300C3C7A1 /* JSCUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0C21E03699D0018521A /* JSCUtils.cpp */; };
 		13F8878E1E29726300C3C7A1 /* JSIndexedRAMBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0C61E03699D0018521A /* JSIndexedRAMBundle.cpp */; };
 		13F8878F1E29726300C3C7A1 /* MethodCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0CA1E03699D0018521A /* MethodCall.cpp */; };
 		13F887901E29726300C3C7A1 /* ModuleRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0CC1E03699D0018521A /* ModuleRegistry.cpp */; };
 		13F887911E29726300C3C7A1 /* NativeToJsBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0CF1E03699D0018521A /* NativeToJsBridge.cpp */; };
-		13F887921E29726300C3C7A1 /* Platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0D11E03699D0018521A /* Platform.cpp */; };
 		13F887931E29726300C3C7A1 /* SampleCxxModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0D31E03699D0018521A /* SampleCxxModule.cpp */; };
 		13F8879F1E29741900C3C7A1 /* BitsFunctexcept.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F8879C1E29740700C3C7A1 /* BitsFunctexcept.cpp */; };
 		13F887A21E2977FF00C3C7A1 /* MallocImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887A01E2977D800C3C7A1 /* MallocImpl.cpp */; };
@@ -213,30 +170,18 @@
 		19F61C011E8495CD00571D81 /* ieee.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E471E25C5A300323FB7 /* ieee.h */; };
 		19F61C021E8495CD00571D81 /* strtod.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E491E25C5A300323FB7 /* strtod.h */; };
 		19F61C031E8495CD00571D81 /* utils.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E4A1E25C5A300323FB7 /* utils.h */; };
-		19F61C041E8495FF00571D81 /* JSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1081E0369AD0018521A /* JSCHelpers.h */; };
-		19F61C051E8495FF00571D81 /* noncopyable.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1091E0369AD0018521A /* noncopyable.h */; };
-		19F61C061E8495FF00571D81 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; };
-		19F61C071E8495FF00571D81 /* Value.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; };
 		27595AA41E575C7800CCE2B1 /* CxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; };
 		27595AA51E575C7800CCE2B1 /* CxxNativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A91E03699D0018521A /* CxxNativeModule.h */; };
 		27595AA61E575C7800CCE2B1 /* JSExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0AB1E03699D0018521A /* JSExecutor.h */; };
 		27595AA91E575C7800CCE2B1 /* Instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0AF1E03699D0018521A /* Instance.h */; };
 		27595AAA1E575C7800CCE2B1 /* JsArgumentHelpers-inl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B01E03699D0018521A /* JsArgumentHelpers-inl.h */; };
 		27595AAB1E575C7800CCE2B1 /* JsArgumentHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B11E03699D0018521A /* JsArgumentHelpers.h */; };
-		27595AAC1E575C7800CCE2B1 /* JSCExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B31E03699D0018521A /* JSCExecutor.h */; };
-		27595AAE1E575C7800CCE2B1 /* JSCLegacyTracing.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B71E03699D0018521A /* JSCLegacyTracing.h */; };
-		27595AAF1E575C7800CCE2B1 /* JSCMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B91E03699D0018521A /* JSCMemory.h */; };
-		27595AB01E575C7800CCE2B1 /* JSCNativeModules.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BB1E03699D0018521A /* JSCNativeModules.h */; };
-		27595AB11E575C7800CCE2B1 /* JSCPerfStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BD1E03699D0018521A /* JSCPerfStats.h */; };
-		27595AB21E575C7800CCE2B1 /* JSCSamplingProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BF1E03699D0018521A /* JSCSamplingProfiler.h */; };
-		27595AB31E575C7800CCE2B1 /* JSCUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C31E03699D0018521A /* JSCUtils.h */; };
 		27595AB51E575C7800CCE2B1 /* JSIndexedRAMBundle.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C71E03699D0018521A /* JSIndexedRAMBundle.h */; };
 		27595AB61E575C7800CCE2B1 /* MessageQueueThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C91E03699D0018521A /* MessageQueueThread.h */; };
 		27595AB71E575C7800CCE2B1 /* MethodCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0CB1E03699D0018521A /* MethodCall.h */; };
 		27595AB81E575C7800CCE2B1 /* ModuleRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0CD1E03699D0018521A /* ModuleRegistry.h */; };
 		27595AB91E575C7800CCE2B1 /* NativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0CE1E03699D0018521A /* NativeModule.h */; };
 		27595ABA1E575C7800CCE2B1 /* NativeToJsBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D01E03699D0018521A /* NativeToJsBridge.h */; };
-		27595ABB1E575C7800CCE2B1 /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D21E03699D0018521A /* Platform.h */; };
 		27595ABC1E575C7800CCE2B1 /* SampleCxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D41E03699D0018521A /* SampleCxxModule.h */; };
 		27595ABD1E575C7800CCE2B1 /* SystraceSection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D51E03699D0018521A /* SystraceSection.h */; };
 		27595ABF1E575C7800CCE2B1 /* CxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; };
@@ -245,25 +190,16 @@
 		27595AC41E575C7800CCE2B1 /* Instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0AF1E03699D0018521A /* Instance.h */; };
 		27595AC51E575C7800CCE2B1 /* JsArgumentHelpers-inl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B01E03699D0018521A /* JsArgumentHelpers-inl.h */; };
 		27595AC61E575C7800CCE2B1 /* JsArgumentHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B11E03699D0018521A /* JsArgumentHelpers.h */; };
-		27595AC71E575C7800CCE2B1 /* JSCExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B31E03699D0018521A /* JSCExecutor.h */; };
-		27595AC91E575C7800CCE2B1 /* JSCLegacyTracing.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B71E03699D0018521A /* JSCLegacyTracing.h */; };
-		27595ACA1E575C7800CCE2B1 /* JSCMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B91E03699D0018521A /* JSCMemory.h */; };
-		27595ACB1E575C7800CCE2B1 /* JSCNativeModules.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BB1E03699D0018521A /* JSCNativeModules.h */; };
-		27595ACC1E575C7800CCE2B1 /* JSCPerfStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BD1E03699D0018521A /* JSCPerfStats.h */; };
-		27595ACD1E575C7800CCE2B1 /* JSCSamplingProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BF1E03699D0018521A /* JSCSamplingProfiler.h */; };
-		27595ACE1E575C7800CCE2B1 /* JSCUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C31E03699D0018521A /* JSCUtils.h */; };
 		27595AD01E575C7800CCE2B1 /* JSIndexedRAMBundle.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C71E03699D0018521A /* JSIndexedRAMBundle.h */; };
 		27595AD11E575C7800CCE2B1 /* MessageQueueThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C91E03699D0018521A /* MessageQueueThread.h */; };
 		27595AD21E575C7800CCE2B1 /* MethodCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0CB1E03699D0018521A /* MethodCall.h */; };
 		27595AD31E575C7800CCE2B1 /* ModuleRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0CD1E03699D0018521A /* ModuleRegistry.h */; };
 		27595AD41E575C7800CCE2B1 /* NativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0CE1E03699D0018521A /* NativeModule.h */; };
 		27595AD51E575C7800CCE2B1 /* NativeToJsBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D01E03699D0018521A /* NativeToJsBridge.h */; };
-		27595AD61E575C7800CCE2B1 /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D21E03699D0018521A /* Platform.h */; };
 		27595AD71E575C7800CCE2B1 /* SampleCxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D41E03699D0018521A /* SampleCxxModule.h */; };
 		27595AD81E575C7800CCE2B1 /* SystraceSection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D51E03699D0018521A /* SystraceSection.h */; };
 		2D0EB9F32021067800CAF88A /* RCTUIUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = F1EFDA4E201F660F00EE6E4C /* RCTUIUtils.m */; };
 		2D16E68E1FA4FD3900B85C8A /* RCTTVNavigationEventEmitter.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */; };
-		2D1D83CD1F74E2CE00615550 /* libprivatedata-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9936F32F1F5F2E5B0010BF04 /* libprivatedata-tvOS.a */; };
 		2D1D83CE1F74E2DA00615550 /* libdouble-conversion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D383D621EBD27B9005632C8 /* libdouble-conversion.a */; };
 		2D3B5E931D9B087300451313 /* RCTErrorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */; };
 		2D3B5E941D9B087900451313 /* RCTBundleURLProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 68EFE4ED1CF6EB3900A1DE13 /* RCTBundleURLProvider.m */; };
@@ -315,10 +251,6 @@
 		2D3B5ED41D9B097D00451313 /* RCTModalHostView.m in Sources */ = {isa = PBXBuildFile; fileRef = 83A1FE8B1B62640A00BE0E65 /* RCTModalHostView.m */; };
 		2D3B5ED51D9B098000451313 /* RCTModalHostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83392EB21B6634E10013B15F /* RCTModalHostViewController.m */; };
 		2D3B5ED61D9B098400451313 /* RCTModalHostViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 83A1FE8E1B62643A00BE0E65 /* RCTModalHostViewManager.m */; };
-		2D3B5ED71D9B098700451313 /* RCTNavigator.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B0800D1A69489C00A75B9A /* RCTNavigator.m */; };
-		2D3B5ED81D9B098A00451313 /* RCTNavigatorManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B0800F1A69489C00A75B9A /* RCTNavigatorManager.m */; };
-		2D3B5ED91D9B098E00451313 /* RCTNavItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B080111A69489C00A75B9A /* RCTNavItem.m */; };
-		2D3B5EDA1D9B099100451313 /* RCTNavItemManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B080131A69489C00A75B9A /* RCTNavItemManager.m */; };
 		2D3B5EDD1D9B09A300451313 /* RCTProgressViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13513F3B1B1F43F400FCE529 /* RCTProgressViewManager.m */; };
 		2D3B5EE01D9B09AD00451313 /* RCTRootShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BCE8081C99CB9D00DD7AAD /* RCTRootShadowView.m */; };
 		2D3B5EE31D9B09B700451313 /* RCTSegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 131B6AF11AF1093D00FFC3E0 /* RCTSegmentedControl.m */; };
@@ -335,7 +267,6 @@
 		2D8C2E331DA40441000EE098 /* RCTMultipartStreamReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 001BFCCF1D8381DE008E587E /* RCTMultipartStreamReader.m */; };
 		2DD0EFE11DA84F2800B0C975 /* RCTStatusBarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13723B4F1A82FD3C00F88898 /* RCTStatusBarManager.m */; };
 		352DCFF01D19F4C20056D623 /* RCTI18nUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 352DCFEF1D19F4C20056D623 /* RCTI18nUtil.m */; };
-		369123E11DDC75850095B341 /* RCTJSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */; };
 		391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; };
 		39C50FF92046EACF00CEE534 /* RCTVersion.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 199B8A6E1F44DB16005DEF67 /* RCTVersion.h */; };
 		39C50FFB2046EE3500CEE534 /* RCTVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 39C50FFA2046EE3500CEE534 /* RCTVersion.m */; };
@@ -353,14 +284,10 @@
 		3D0B842F1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */; };
 		3D0B84301EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D0B842E1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m */; };
 		3D0E378A1F1CC40000DCAC9F /* RCTWebSocketModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
-		3D0E378C1F1CC58C00DCAC9F /* RCTWebSocketObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0E378B1F1CC58C00DCAC9F /* RCTWebSocketObserver.h */; };
-		3D0E378D1F1CC58F00DCAC9F /* RCTWebSocketObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0E378B1F1CC58C00DCAC9F /* RCTWebSocketObserver.h */; };
 		3D0E378E1F1CC59100DCAC9F /* RCTWebSocketModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
 		3D0E378F1F1CC5CF00DCAC9F /* RCTWebSocketModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
 		3D0E37901F1CC5E100DCAC9F /* RCTWebSocketModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
 		3D1E68DB1CABD13900DD7465 /* RCTDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */; };
-		3D302F1E1DF8265A00D6DDAE /* JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; };
-		3D302F1F1DF8265A00D6DDAE /* JSCWrapper.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; };
 		3D302F241DF828F800D6DDAE /* RCTImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0831DE4F3A000E03CC6 /* RCTImageLoader.h */; };
 		3D302F251DF828F800D6DDAE /* RCTImageStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0841DE4F3A000E03CC6 /* RCTImageStoreManager.h */; };
 		3D302F261DF828F800D6DDAE /* RCTResizeMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0851DE4F3A000E03CC6 /* RCTResizeMode.h */; };
@@ -405,7 +332,6 @@
 		3D302F4D1DF828F800D6DDAE /* RCTURLRequestDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83A1B265A0E00583190 /* RCTURLRequestDelegate.h */; };
 		3D302F4E1DF828F800D6DDAE /* RCTURLRequestHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3D302F4F1DF828F800D6DDAE /* RCTUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
-		3D302F541DF828F800D6DDAE /* RCTJSCSamplingProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* RCTJSCSamplingProfiler.h */; };
 		3D302F551DF828F800D6DDAE /* RCTAccessibilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
 		3D302F561DF828F800D6DDAE /* RCTAlertManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE71A69327A00A75B9A /* RCTAlertManager.h */; };
 		3D302F571DF828F800D6DDAE /* RCTAppState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1372B7081AB030C200659ED6 /* RCTAppState.h */; };
@@ -439,10 +365,6 @@
 		3D302F7B1DF828F800D6DDAE /* RCTModalHostView.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */; };
 		3D302F7C1DF828F800D6DDAE /* RCTModalHostViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 83392EB11B6634E10013B15F /* RCTModalHostViewController.h */; };
 		3D302F7D1DF828F800D6DDAE /* RCTModalHostViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8D1B62643A00BE0E65 /* RCTModalHostViewManager.h */; };
-		3D302F7E1DF828F800D6DDAE /* RCTNavigator.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B0800C1A69489C00A75B9A /* RCTNavigator.h */; };
-		3D302F7F1DF828F800D6DDAE /* RCTNavigatorManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B0800E1A69489C00A75B9A /* RCTNavigatorManager.h */; };
-		3D302F801DF828F800D6DDAE /* RCTNavItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080101A69489C00A75B9A /* RCTNavItem.h */; };
-		3D302F811DF828F800D6DDAE /* RCTNavItemManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080121A69489C00A75B9A /* RCTNavItemManager.h */; };
 		3D302F841DF828F800D6DDAE /* RCTPointerEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 13442BF31AA90E0B0037E5B0 /* RCTPointerEvents.h */; };
 		3D302F851DF828F800D6DDAE /* RCTProgressViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13513F3A1B1F43F400FCE529 /* RCTProgressViewManager.h */; };
 		3D302F861DF828F800D6DDAE /* RCTRefreshControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 191E3EBF1C29DC3800C180A6 /* RCTRefreshControl.h */; };
@@ -465,8 +387,6 @@
 		3D302F9D1DF828F800D6DDAE /* RCTWrapperViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080231A694A8400A75B9A /* RCTWrapperViewController.h */; };
 		3D302F9F1DF828F800D6DDAE /* UIView+React.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E067531A70F44B002CDEE1 /* UIView+React.h */; };
 		3D3030221DF8294C00D6DDAE /* JSBundleType.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CD8F51DE5FB2300167DC4 /* JSBundleType.h */; };
-		3D3030251DF8295E00D6DDAE /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; };
-		3D3030261DF8295E00D6DDAE /* JSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; };
 		3D37B5821D522B190042D5B5 /* RCTFont.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D37B5811D522B190042D5B5 /* RCTFont.mm */; };
 		3D383D1F1EBD27A8005632C8 /* RCTBridge+Private.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */; };
 		3D383D201EBD27AF005632C8 /* RCTBridge+Private.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */; };
@@ -515,12 +435,8 @@
 		3D383D5D1EBD27B9005632C8 /* strtod.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E491E25C5A300323FB7 /* strtod.h */; };
 		3D383D5E1EBD27B9005632C8 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E4A1E25C5A300323FB7 /* utils.h */; };
 		3D383D6D1EBD2940005632C8 /* libdouble-conversion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139D7E881E25C6D100323FB7 /* libdouble-conversion.a */; };
-		3D383D6E1EBD2940005632C8 /* libjschelpers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3CD90B1DE5FBD600167DC4 /* libjschelpers.a */; };
 		3D383D6F1EBD2940005632C8 /* libthird-party.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139D7ECE1E25DB7D00323FB7 /* libthird-party.a */; };
-		3D383D711EBD2949005632C8 /* libjschelpers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3CD9181DE5FBD800167DC4 /* libjschelpers.a */; };
 		3D383D721EBD2949005632C8 /* libthird-party.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D383D3C1EBD27B6005632C8 /* libthird-party.a */; };
-		3D3CD93D1DE5FC1400167DC4 /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; };
-		3D3CD93E1DE5FC1400167DC4 /* JSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; };
 		3D3CD9411DE5FC5300167DC4 /* libcxxreact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3CD9251DE5FBEC00167DC4 /* libcxxreact.a */; };
 		3D3CD9451DE5FC7100167DC4 /* JSBundleType.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CD8F51DE5FB2300167DC4 /* JSBundleType.h */; };
 		3D74547C1E54758900E74ADD /* JSBigString.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7454781E54757500E74ADD /* JSBigString.h */; };
@@ -593,7 +509,6 @@
 		3D80D9481DF6FA890028D040 /* RCTURLRequestDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1345A83A1B265A0E00583190 /* RCTURLRequestDelegate.h */; };
 		3D80D9491DF6FA890028D040 /* RCTURLRequestHandler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3D80D94A1DF6FA890028D040 /* RCTUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
-		3D80D94F1DF6FA890028D040 /* RCTJSCSamplingProfiler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* RCTJSCSamplingProfiler.h */; };
 		3D80D9501DF6FA890028D040 /* RCTAccessibilityManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
 		3D80D9511DF6FA890028D040 /* RCTAlertManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE71A69327A00A75B9A /* RCTAlertManager.h */; };
 		3D80D9521DF6FA890028D040 /* RCTAppState.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1372B7081AB030C200659ED6 /* RCTAppState.h */; };
@@ -627,10 +542,6 @@
 		3D80D9761DF6FA890028D040 /* RCTModalHostView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */; };
 		3D80D9771DF6FA890028D040 /* RCTModalHostViewController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83392EB11B6634E10013B15F /* RCTModalHostViewController.h */; };
 		3D80D9781DF6FA890028D040 /* RCTModalHostViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8D1B62643A00BE0E65 /* RCTModalHostViewManager.h */; };
-		3D80D9791DF6FA890028D040 /* RCTNavigator.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B0800C1A69489C00A75B9A /* RCTNavigator.h */; };
-		3D80D97A1DF6FA890028D040 /* RCTNavigatorManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B0800E1A69489C00A75B9A /* RCTNavigatorManager.h */; };
-		3D80D97B1DF6FA890028D040 /* RCTNavItem.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B080101A69489C00A75B9A /* RCTNavItem.h */; };
-		3D80D97C1DF6FA890028D040 /* RCTNavItemManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B080121A69489C00A75B9A /* RCTNavItemManager.h */; };
 		3D80D97D1DF6FA890028D040 /* RCTPicker.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 58114A121AAE854800E7D092 /* RCTPicker.h */; };
 		3D80D97E1DF6FA890028D040 /* RCTPickerManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 58114A141AAE854800E7D092 /* RCTPickerManager.h */; };
 		3D80D97F1DF6FA890028D040 /* RCTPointerEvents.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13442BF31AA90E0B0037E5B0 /* RCTPointerEvents.h */; };
@@ -700,7 +611,6 @@
 		3D80DA421DF820620028D040 /* RCTURLRequestDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83A1B265A0E00583190 /* RCTURLRequestDelegate.h */; };
 		3D80DA431DF820620028D040 /* RCTURLRequestHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3D80DA441DF820620028D040 /* RCTUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
-		3D80DA491DF820620028D040 /* RCTJSCSamplingProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* RCTJSCSamplingProfiler.h */; };
 		3D80DA4A1DF820620028D040 /* RCTAccessibilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
 		3D80DA4B1DF820620028D040 /* RCTAlertManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE71A69327A00A75B9A /* RCTAlertManager.h */; };
 		3D80DA4C1DF820620028D040 /* RCTAppState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1372B7081AB030C200659ED6 /* RCTAppState.h */; };
@@ -734,10 +644,6 @@
 		3D80DA701DF820620028D040 /* RCTModalHostView.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */; };
 		3D80DA711DF820620028D040 /* RCTModalHostViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 83392EB11B6634E10013B15F /* RCTModalHostViewController.h */; };
 		3D80DA721DF820620028D040 /* RCTModalHostViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8D1B62643A00BE0E65 /* RCTModalHostViewManager.h */; };
-		3D80DA731DF820620028D040 /* RCTNavigator.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B0800C1A69489C00A75B9A /* RCTNavigator.h */; };
-		3D80DA741DF820620028D040 /* RCTNavigatorManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B0800E1A69489C00A75B9A /* RCTNavigatorManager.h */; };
-		3D80DA751DF820620028D040 /* RCTNavItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080101A69489C00A75B9A /* RCTNavItem.h */; };
-		3D80DA761DF820620028D040 /* RCTNavItemManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080121A69489C00A75B9A /* RCTNavItemManager.h */; };
 		3D80DA771DF820620028D040 /* RCTPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 58114A121AAE854800E7D092 /* RCTPicker.h */; };
 		3D80DA781DF820620028D040 /* RCTPickerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 58114A141AAE854800E7D092 /* RCTPickerManager.h */; };
 		3D80DA791DF820620028D040 /* RCTPointerEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 13442BF31AA90E0B0037E5B0 /* RCTPointerEvents.h */; };
@@ -765,7 +671,6 @@
 		3D80DA931DF820620028D040 /* UIView+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F15A171B7CC46900F10295 /* UIView+Private.h */; };
 		3D80DA941DF820620028D040 /* UIView+React.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E067531A70F44B002CDEE1 /* UIView+React.h */; };
 		3D8ED92C1E5B120100D83D20 /* libcxxreact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3CD9321DE5FBEE00167DC4 /* libcxxreact.a */; };
-		3D8ED92D1E5B120100D83D20 /* libyoga.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3C06751DE3340C00C268FA /* libyoga.a */; };
 		3DA9819E1E5B0DBB004F2374 /* NSDataBigString.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7454B31E54786200E74ADD /* NSDataBigString.h */; };
 		3DA981A01E5B0E34004F2374 /* CxxModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; };
 		3DA981A11E5B0E34004F2374 /* CxxNativeModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A91E03699D0018521A /* CxxNativeModule.h */; };
@@ -775,13 +680,6 @@
 		3DA981A71E5B0E34004F2374 /* JsArgumentHelpers.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B11E03699D0018521A /* JsArgumentHelpers.h */; };
 		3DA981A81E5B0E34004F2374 /* JSBigString.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7454781E54757500E74ADD /* JSBigString.h */; };
 		3DA981A91E5B0E34004F2374 /* JSBundleType.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D3CD8F51DE5FB2300167DC4 /* JSBundleType.h */; };
-		3DA981AA1E5B0E34004F2374 /* JSCExecutor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B31E03699D0018521A /* JSCExecutor.h */; };
-		3DA981AC1E5B0E34004F2374 /* JSCLegacyTracing.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B71E03699D0018521A /* JSCLegacyTracing.h */; };
-		3DA981AD1E5B0E34004F2374 /* JSCMemory.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B91E03699D0018521A /* JSCMemory.h */; };
-		3DA981AE1E5B0E34004F2374 /* JSCNativeModules.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BB1E03699D0018521A /* JSCNativeModules.h */; };
-		3DA981AF1E5B0E34004F2374 /* JSCPerfStats.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BD1E03699D0018521A /* JSCPerfStats.h */; };
-		3DA981B01E5B0E34004F2374 /* JSCSamplingProfiler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BF1E03699D0018521A /* JSCSamplingProfiler.h */; };
-		3DA981B11E5B0E34004F2374 /* JSCUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C31E03699D0018521A /* JSCUtils.h */; };
 		3DA981B31E5B0E34004F2374 /* JSIndexedRAMBundle.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C71E03699D0018521A /* JSIndexedRAMBundle.h */; };
 		3DA981B41E5B0E34004F2374 /* JSModulesUnbundle.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C81E03699D0018521A /* JSModulesUnbundle.h */; };
 		3DA981B51E5B0E34004F2374 /* MessageQueueThread.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C91E03699D0018521A /* MessageQueueThread.h */; };
@@ -789,7 +687,6 @@
 		3DA981B71E5B0E34004F2374 /* ModuleRegistry.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0CD1E03699D0018521A /* ModuleRegistry.h */; };
 		3DA981B81E5B0E34004F2374 /* NativeModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0CE1E03699D0018521A /* NativeModule.h */; };
 		3DA981B91E5B0E34004F2374 /* NativeToJsBridge.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D01E03699D0018521A /* NativeToJsBridge.h */; };
-		3DA981BB1E5B0E34004F2374 /* Platform.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D21E03699D0018521A /* Platform.h */; };
 		3DA981BC1E5B0E34004F2374 /* RecoverableError.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7454791E54757500E74ADD /* RecoverableError.h */; };
 		3DA981BD1E5B0E34004F2374 /* SampleCxxModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D41E03699D0018521A /* SampleCxxModule.h */; };
 		3DA981BE1E5B0E34004F2374 /* SystraceSection.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D51E03699D0018521A /* SystraceSection.h */; };
@@ -830,7 +727,6 @@
 		3DA981E31E5B0F29004F2374 /* RCTURLRequestDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1345A83A1B265A0E00583190 /* RCTURLRequestDelegate.h */; };
 		3DA981E41E5B0F29004F2374 /* RCTURLRequestHandler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3DA981E51E5B0F29004F2374 /* RCTUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
-		3DA981E91E5B0F7F004F2374 /* RCTJSCSamplingProfiler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* RCTJSCSamplingProfiler.h */; };
 		3DA981EA1E5B0F7F004F2374 /* RCTAccessibilityManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
 		3DA981EB1E5B0F7F004F2374 /* RCTAlertManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE71A69327A00A75B9A /* RCTAlertManager.h */; };
 		3DA981EC1E5B0F7F004F2374 /* RCTAppState.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1372B7081AB030C200659ED6 /* RCTAppState.h */; };
@@ -864,10 +760,6 @@
 		3DA982111E5B0F7F004F2374 /* RCTModalHostView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */; };
 		3DA982121E5B0F7F004F2374 /* RCTModalHostViewController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83392EB11B6634E10013B15F /* RCTModalHostViewController.h */; };
 		3DA982131E5B0F7F004F2374 /* RCTModalHostViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8D1B62643A00BE0E65 /* RCTModalHostViewManager.h */; };
-		3DA982141E5B0F7F004F2374 /* RCTNavigator.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B0800C1A69489C00A75B9A /* RCTNavigator.h */; };
-		3DA982151E5B0F7F004F2374 /* RCTNavigatorManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B0800E1A69489C00A75B9A /* RCTNavigatorManager.h */; };
-		3DA982161E5B0F7F004F2374 /* RCTNavItem.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B080101A69489C00A75B9A /* RCTNavItem.h */; };
-		3DA982171E5B0F7F004F2374 /* RCTNavItemManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B080121A69489C00A75B9A /* RCTNavItemManager.h */; };
 		3DA982181E5B0F7F004F2374 /* RCTPicker.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 58114A121AAE854800E7D092 /* RCTPicker.h */; };
 		3DA982191E5B0F7F004F2374 /* RCTPickerManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 58114A141AAE854800E7D092 /* RCTPickerManager.h */; };
 		3DA9821A1E5B0F7F004F2374 /* RCTPointerEvents.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13442BF31AA90E0B0037E5B0 /* RCTPointerEvents.h */; };
@@ -903,13 +795,6 @@
 		3DA982421E5B1053004F2374 /* JsArgumentHelpers.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B11E03699D0018521A /* JsArgumentHelpers.h */; };
 		3DA982431E5B1053004F2374 /* JSBigString.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7454781E54757500E74ADD /* JSBigString.h */; };
 		3DA982441E5B1053004F2374 /* JSBundleType.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D3CD8F51DE5FB2300167DC4 /* JSBundleType.h */; };
-		3DA982451E5B1053004F2374 /* JSCExecutor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B31E03699D0018521A /* JSCExecutor.h */; };
-		3DA982471E5B1053004F2374 /* JSCLegacyTracing.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B71E03699D0018521A /* JSCLegacyTracing.h */; };
-		3DA982481E5B1053004F2374 /* JSCMemory.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0B91E03699D0018521A /* JSCMemory.h */; };
-		3DA982491E5B1053004F2374 /* JSCNativeModules.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BB1E03699D0018521A /* JSCNativeModules.h */; };
-		3DA9824A1E5B1053004F2374 /* JSCPerfStats.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BD1E03699D0018521A /* JSCPerfStats.h */; };
-		3DA9824B1E5B1053004F2374 /* JSCSamplingProfiler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0BF1E03699D0018521A /* JSCSamplingProfiler.h */; };
-		3DA9824C1E5B1053004F2374 /* JSCUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C31E03699D0018521A /* JSCUtils.h */; };
 		3DA9824E1E5B1053004F2374 /* JSIndexedRAMBundle.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C71E03699D0018521A /* JSIndexedRAMBundle.h */; };
 		3DA9824F1E5B1053004F2374 /* JSModulesUnbundle.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C81E03699D0018521A /* JSModulesUnbundle.h */; };
 		3DA982501E5B1053004F2374 /* MessageQueueThread.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0C91E03699D0018521A /* MessageQueueThread.h */; };
@@ -917,20 +802,9 @@
 		3DA982521E5B1053004F2374 /* ModuleRegistry.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0CD1E03699D0018521A /* ModuleRegistry.h */; };
 		3DA982531E5B1053004F2374 /* NativeModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0CE1E03699D0018521A /* NativeModule.h */; };
 		3DA982541E5B1053004F2374 /* NativeToJsBridge.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D01E03699D0018521A /* NativeToJsBridge.h */; };
-		3DA982561E5B1053004F2374 /* Platform.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D21E03699D0018521A /* Platform.h */; };
 		3DA982571E5B1053004F2374 /* RecoverableError.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7454791E54757500E74ADD /* RecoverableError.h */; };
 		3DA982581E5B1053004F2374 /* SampleCxxModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D41E03699D0018521A /* SampleCxxModule.h */; };
 		3DA982591E5B1053004F2374 /* SystraceSection.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D51E03699D0018521A /* SystraceSection.h */; };
-		3DA9825A1E5B1079004F2374 /* JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; };
-		3DA9825B1E5B1079004F2374 /* JSCHelpers.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1081E0369AD0018521A /* JSCHelpers.h */; };
-		3DA9825C1E5B1079004F2374 /* JSCWrapper.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; };
-		3DA9825D1E5B1079004F2374 /* noncopyable.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1091E0369AD0018521A /* noncopyable.h */; };
-		3DA9825E1E5B1079004F2374 /* Unicode.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; };
-		3DA9825F1E5B1079004F2374 /* Value.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; };
-		3DA982601E5B1089004F2374 /* JSCHelpers.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1081E0369AD0018521A /* JSCHelpers.h */; };
-		3DA982611E5B1089004F2374 /* noncopyable.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1091E0369AD0018521A /* noncopyable.h */; };
-		3DA982621E5B1089004F2374 /* Unicode.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; };
-		3DA982631E5B1089004F2374 /* Value.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; };
 		3DC159E41E83E1AE007B1282 /* RCTRootContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59A7B9FC1E577DBF0068EDBF /* RCTRootContentView.m */; };
 		3DC159E51E83E1E9007B1282 /* JSBigString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27B958731E57587D0096647A /* JSBigString.cpp */; };
 		3DC159E61E83E1FA007B1282 /* JSBigString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27B958731E57587D0096647A /* JSBigString.cpp */; };
@@ -942,14 +816,9 @@
 		3DCE53291FEAB23100613583 /* RCTDatePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 133CAE8D1B8E5CFD00F6AD92 /* RCTDatePicker.m */; };
 		3DCE532A1FEAB23100613583 /* RCTDatePickerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 58C571C01AA56C1900CDF9C8 /* RCTDatePickerManager.h */; };
 		3DCE532B1FEAB23100613583 /* RCTDatePickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58C571BF1AA56C1900CDF9C8 /* RCTDatePickerManager.m */; };
-		3DDEC1521DDCE0CA0020BBDF /* RCTJSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */; };
 		3DE4F8681DF85D8E00B9E5A0 /* YGEnums.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77031DF767AF001F9587 /* YGEnums.h */; };
 		3DE4F8691DF85D8E00B9E5A0 /* YGMacros.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77041DF767AF001F9587 /* YGMacros.h */; };
 		3DE4F86A1DF85D8E00B9E5A0 /* Yoga.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77081DF767AF001F9587 /* Yoga.h */; };
-		3DF1BE821F26576400068F1A /* JSCTracing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF1BE801F26576400068F1A /* JSCTracing.cpp */; };
-		3DF1BE831F26576400068F1A /* JSCTracing.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF1BE811F26576400068F1A /* JSCTracing.h */; };
-		3DF1BE841F26577000068F1A /* JSCTracing.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF1BE811F26576400068F1A /* JSCTracing.h */; };
-		3DF1BE851F26577300068F1A /* JSCTracing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF1BE801F26576400068F1A /* JSCTracing.cpp */; };
 		3DFE0D161DF8574D00459392 /* YGEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 130A77031DF767AF001F9587 /* YGEnums.h */; };
 		3DFE0D171DF8574D00459392 /* YGMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 130A77041DF767AF001F9587 /* YGMacros.h */; };
 		3DFE0D191DF8574D00459392 /* Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = 130A77081DF767AF001F9587 /* Yoga.h */; };
@@ -957,6 +826,10 @@
 		3DFE0D1B1DF8575800459392 /* YGMacros.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77041DF767AF001F9587 /* YGMacros.h */; };
 		3DFE0D1C1DF8575800459392 /* Yoga.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77081DF767AF001F9587 /* Yoga.h */; };
 		3EDCA8A51D3591E700450C31 /* RCTErrorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */; };
+		50E98FEA21460B0D00CD9289 /* RCTWKWebViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 50E98FE621460B0D00CD9289 /* RCTWKWebViewManager.m */; };
+		50E98FEB21460B0D00CD9289 /* RCTWKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E98FE721460B0D00CD9289 /* RCTWKWebView.h */; };
+		50E98FEC21460B0D00CD9289 /* RCTWKWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 50E98FE821460B0D00CD9289 /* RCTWKWebView.m */; };
+		50E98FED21460B0D00CD9289 /* RCTWKWebViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E98FE921460B0D00CD9289 /* RCTWKWebViewManager.h */; };
 		5335D5411FE81A4700883D58 /* RCTShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5335D5401FE81A4700883D58 /* RCTShadowView.m */; };
 		53438962203905BB008E0CB3 /* YGLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5343895E203905B6008E0CB3 /* YGLayout.cpp */; };
 		53438963203905BC008E0CB3 /* YGLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5343895E203905B6008E0CB3 /* YGLayout.cpp */; };
@@ -1053,8 +926,6 @@
 		597633381F4E021D005BE8A4 /* RCTShadowView+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 597633351F4E021D005BE8A4 /* RCTShadowView+Internal.h */; };
 		597633391F4E021D005BE8A4 /* RCTShadowView+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 597633351F4E021D005BE8A4 /* RCTShadowView+Internal.h */; };
 		598FD1921F816A2A006C54CB /* RAMBundleRegistry.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = C6D380181F71D75B00621378 /* RAMBundleRegistry.h */; };
-		598FD1931F817284006C54CB /* PrivateDataBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9936F3351F5F2F480010BF04 /* PrivateDataBase.cpp */; };
-		598FD1941F8172A9006C54CB /* PrivateDataBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 9936F3361F5F2F480010BF04 /* PrivateDataBase.h */; };
 		598FD1951F817335006C54CB /* RCTModalManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 91076A881F743AB00081B4FA /* RCTModalManager.h */; };
 		598FD1961F817335006C54CB /* RCTModalManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 91076A871F743AB00081B4FA /* RCTModalManager.m */; };
 		598FD1971F817336006C54CB /* RCTModalManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 91076A881F743AB00081B4FA /* RCTModalManager.h */; };
@@ -1119,7 +990,6 @@
 		59EDBCA71FDF4E0C003573DE /* RCTScrollableProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EDBC9C1FDF4E0C003573DE /* RCTScrollableProtocol.h */; };
 		59EDBCA81FDF4E0C003573DE /* RCTScrollableProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EDBC9C1FDF4E0C003573DE /* RCTScrollableProtocol.h */; };
 		59EDBCA91FDF4E0C003573DE /* (null) in Headers */ = {isa = PBXBuildFile; };
-		59EDBCAA1FDF4E0C003573DE /* (null) in Headers */ = {isa = PBXBuildFile; };
 		59EDBCAB1FDF4E0C003573DE /* (null) in Sources */ = {isa = PBXBuildFile; };
 		59EDBCAC1FDF4E0C003573DE /* (null) in Sources */ = {isa = PBXBuildFile; };
 		59EDBCAD1FDF4E0C003573DE /* RCTScrollContentView.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EDBC9F1FDF4E0C003573DE /* RCTScrollContentView.h */; };
@@ -1127,7 +997,6 @@
 		59EDBCAF1FDF4E0C003573DE /* RCTScrollContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EDBCA01FDF4E0C003573DE /* RCTScrollContentView.m */; };
 		59EDBCB01FDF4E0C003573DE /* RCTScrollContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EDBCA01FDF4E0C003573DE /* RCTScrollContentView.m */; };
 		59EDBCB11FDF4E0C003573DE /* (null) in Headers */ = {isa = PBXBuildFile; };
-		59EDBCB21FDF4E0C003573DE /* (null) in Headers */ = {isa = PBXBuildFile; };
 		59EDBCB31FDF4E0C003573DE /* (null) in Sources */ = {isa = PBXBuildFile; };
 		59EDBCB41FDF4E0C003573DE /* (null) in Sources */ = {isa = PBXBuildFile; };
 		59EDBCB51FDF4E0C003573DE /* RCTScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EDBCA31FDF4E0C003573DE /* RCTScrollView.h */; };
@@ -1185,20 +1054,16 @@
 		83CBBA981A6020BB00E9B192 /* RCTTouchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBA971A6020BB00E9B192 /* RCTTouchHandler.m */; };
 		83CBBACC1A6023D300E9B192 /* RCTConvert.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBACB1A6023D300E9B192 /* RCTConvert.m */; };
 		916F9C2D1F743F57002E5920 /* RCTModalManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 91076A871F743AB00081B4FA /* RCTModalManager.m */; };
-		9936F3371F5F2F480010BF04 /* PrivateDataBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9936F3351F5F2F480010BF04 /* PrivateDataBase.cpp */; };
-		9936F3381F5F2F480010BF04 /* PrivateDataBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 9936F3361F5F2F480010BF04 /* PrivateDataBase.h */; };
-		9936F3391F5F2F5C0010BF04 /* PrivateDataBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 9936F3361F5F2F480010BF04 /* PrivateDataBase.h */; };
-		9936F33A1F5F2F7C0010BF04 /* PrivateDataBase.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 9936F3361F5F2F480010BF04 /* PrivateDataBase.h */; };
-		9936F33B1F5F2F9D0010BF04 /* PrivateDataBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9936F3351F5F2F480010BF04 /* PrivateDataBase.cpp */; };
-		9936F33C1F5F2FE70010BF04 /* PrivateDataBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 9936F3361F5F2F480010BF04 /* PrivateDataBase.h */; };
-		9936F33D1F5F2FF40010BF04 /* PrivateDataBase.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 9936F3361F5F2F480010BF04 /* PrivateDataBase.h */; };
-		9936F33E1F5F2FFC0010BF04 /* PrivateDataBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9936F3351F5F2F480010BF04 /* PrivateDataBase.cpp */; };
 		A2440AA21DF8D854006E7BFC /* RCTReloadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */; };
 		A2440AA31DF8D854006E7BFC /* RCTReloadCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */; };
 		A2440AA41DF8D865006E7BFC /* RCTReloadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */; };
 		AC70D2E91DE489E4002E6351 /* RCTJavaScriptLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */; };
 		B233E6EA1D2D845D00BC68BA /* RCTI18nManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B233E6E91D2D845D00BC68BA /* RCTI18nManager.m */; };
 		B95154321D1B34B200FE7B80 /* RCTActivityIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = B95154311D1B34B200FE7B80 /* RCTActivityIndicatorView.m */; };
+		BA0501AD2109DCF200A6BBC4 /* ReactMarker.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13DA8A2F2097A90A00276ED4 /* ReactMarker.h */; };
+		BA0501AE2109DD0600A6BBC4 /* JSExecutor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E223624320875A8000108244 /* JSExecutor.cpp */; };
+		BA0501B02109DD1800A6BBC4 /* YGConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CE2080020772F7C009A43B3 /* YGConfig.cpp */; };
+		BA0501B12109DD1C00A6BBC4 /* YGConfig.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5CE2080120772F7C009A43B3 /* YGConfig.h */; };
 		C60128AB1F3D1258009DF9FF /* RCTCxxConvert.h in Headers */ = {isa = PBXBuildFile; fileRef = C60128A91F3D1258009DF9FF /* RCTCxxConvert.h */; };
 		C60128AC1F3D1258009DF9FF /* RCTCxxConvert.h in Headers */ = {isa = PBXBuildFile; fileRef = C60128A91F3D1258009DF9FF /* RCTCxxConvert.h */; };
 		C60128AD1F3D1258009DF9FF /* RCTCxxConvert.m in Sources */ = {isa = PBXBuildFile; fileRef = C60128AA1F3D1258009DF9FF /* RCTCxxConvert.m */; };
@@ -1228,19 +1093,68 @@
 		EBF21BFE1FC499840052F4D5 /* InspectorInterfaces.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EBF21BBA1FC498270052F4D5 /* InspectorInterfaces.h */; };
 		EBF21BFF1FC4998E0052F4D5 /* InspectorInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBF21BBB1FC498270052F4D5 /* InspectorInterfaces.cpp */; };
 		EBF21C001FC499A80052F4D5 /* InspectorInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBF21BBB1FC498270052F4D5 /* InspectorInterfaces.cpp */; };
+		ED296F82214C973700B7C4FE /* libjsinspector-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EBF21BFA1FC4989A0052F4D5 /* libjsinspector-tvOS.a */; };
+		ED296F83214C974A00B7C4FE /* libyoga.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3C06751DE3340C00C268FA /* libyoga.a */; };
+		ED296FB7214C9A9A00B7C4FE /* JSIDynamic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDEBC6DA214B3F6800DD5AC8 /* JSIDynamic.cpp */; };
+		ED296FB8214C9A9A00B7C4FE /* jsi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDEBC6DB214B3F6800DD5AC8 /* jsi.cpp */; };
+		ED296FB9214C9AC200B7C4FE /* JSCRuntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDEBC6DD214B3F6800DD5AC8 /* JSCRuntime.cpp */; };
+		ED296FBC214C9B0400B7C4FE /* jsi-inl.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6D9214B3F6800DD5AC8 /* jsi-inl.h */; };
+		ED296FBF214C9B0400B7C4FE /* JSIDynamic.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DC214B3F6800DD5AC8 /* JSIDynamic.h */; };
+		ED296FC1214C9B0400B7C4FE /* JSCRuntime.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DE214B3F6800DD5AC8 /* JSCRuntime.h */; };
+		ED296FC3214C9B0400B7C4FE /* instrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E0214B3F6800DD5AC8 /* instrumentation.h */; };
+		ED296FC4214C9B0400B7C4FE /* jsi.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E1214B3F6800DD5AC8 /* jsi.h */; };
+		ED296FC5214C9B3E00B7C4FE /* jsi-inl.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6D9214B3F6800DD5AC8 /* jsi-inl.h */; };
+		ED296FC6214C9B4400B7C4FE /* JSIDynamic.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DC214B3F6800DD5AC8 /* JSIDynamic.h */; };
+		ED296FC7214C9B4B00B7C4FE /* instrumentation.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E0214B3F6800DD5AC8 /* instrumentation.h */; };
+		ED296FC8214C9B5200B7C4FE /* jsi.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E1214B3F6800DD5AC8 /* jsi.h */; };
+		ED296FCB214C9B6C00B7C4FE /* libjsi-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED296FB6214C9A0900B7C4FE /* libjsi-tvOS.a */; };
+		ED29703E2150126E00B7C4FE /* AtomicIntrusiveLinkedList.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D849C1E273B5600323FB7 /* AtomicIntrusiveLinkedList.h */; };
+		ED2970402150126E00B7C4FE /* Bits.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D849E1E273B5600323FB7 /* Bits.h */; };
+		ED2970422150126E00B7C4FE /* Conv.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D84A01E273B5600323FB7 /* Conv.h */; };
+		ED2970432150126E00B7C4FE /* dynamic-inl.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D84A11E273B5600323FB7 /* dynamic-inl.h */; };
+		ED2970452150126E00B7C4FE /* dynamic.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D84A31E273B5600323FB7 /* dynamic.h */; };
+		ED2970462150126E00B7C4FE /* Exception.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D84A41E273B5600323FB7 /* Exception.h */; };
+		ED2970482150126E00B7C4FE /* json.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D84A81E273B5600323FB7 /* json.h */; };
+		ED2970492150126E00B7C4FE /* Memory.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D84A91E273B5600323FB7 /* Memory.h */; };
+		ED29704A2150126E00B7C4FE /* MoveWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D84AA1E273B5600323FB7 /* MoveWrapper.h */; };
+		ED29704B2150126E00B7C4FE /* Optional.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D84AB1E273B5600323FB7 /* Optional.h */; };
+		ED29704C2150126E00B7C4FE /* ScopeGuard.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D84AC1E273B5600323FB7 /* ScopeGuard.h */; };
+		ED29704F2150199F00B7C4FE /* JSCRuntime.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DE214B3F6800DD5AC8 /* JSCRuntime.h */; };
+		ED297050215019B400B7C4FE /* instrumentation.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E0214B3F6800DD5AC8 /* instrumentation.h */; };
+		ED297067215023D800B7C4FE /* libjsiexecutor-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED296FEE214C9CF800B7C4FE /* libjsiexecutor-tvOS.a */; };
+		ED6189692155BBF70000C9A7 /* JSIExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = ED6189672155BBF70000C9A7 /* JSIExecutor.h */; };
+		ED61896A2155BBF70000C9A7 /* JSIExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = ED6189672155BBF70000C9A7 /* JSIExecutor.h */; };
+		ED61896B2155BBF70000C9A7 /* JSINativeModules.h in Headers */ = {isa = PBXBuildFile; fileRef = ED6189682155BBF70000C9A7 /* JSINativeModules.h */; };
+		ED61896C2155BBF70000C9A7 /* JSINativeModules.h in Headers */ = {isa = PBXBuildFile; fileRef = ED6189682155BBF70000C9A7 /* JSINativeModules.h */; };
+		ED7286BC2155C62000C26ABF /* JSIExecutor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = ED6189672155BBF70000C9A7 /* JSIExecutor.h */; };
+		ED7286BD2155C62000C26ABF /* JSINativeModules.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = ED6189682155BBF70000C9A7 /* JSINativeModules.h */; };
+		ED7286BE2155C62B00C26ABF /* JSIExecutor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = ED6189672155BBF70000C9A7 /* JSIExecutor.h */; };
+		ED7286BF2155C62B00C26ABF /* JSINativeModules.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = ED6189682155BBF70000C9A7 /* JSINativeModules.h */; };
+		EDDA711D2164285A00B2D070 /* JSINativeModules.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDDA711B2164285A00B2D070 /* JSINativeModules.cpp */; };
+		EDDA711E2164285A00B2D070 /* JSINativeModules.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDDA711B2164285A00B2D070 /* JSINativeModules.cpp */; };
+		EDDA711F2164285A00B2D070 /* JSIExecutor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDDA711C2164285A00B2D070 /* JSIExecutor.cpp */; };
+		EDDA71202164285A00B2D070 /* JSIExecutor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDDA711C2164285A00B2D070 /* JSIExecutor.cpp */; };
+		EDEBC6E2214B3F6800DD5AC8 /* jsi-inl.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6D9214B3F6800DD5AC8 /* jsi-inl.h */; };
+		EDEBC6E3214B3F6800DD5AC8 /* JSIDynamic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDEBC6DA214B3F6800DD5AC8 /* JSIDynamic.cpp */; };
+		EDEBC6E4214B3F6800DD5AC8 /* jsi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDEBC6DB214B3F6800DD5AC8 /* jsi.cpp */; };
+		EDEBC6E5214B3F6800DD5AC8 /* JSIDynamic.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DC214B3F6800DD5AC8 /* JSIDynamic.h */; };
+		EDEBC6E6214B3F6800DD5AC8 /* JSCRuntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDEBC6DD214B3F6800DD5AC8 /* JSCRuntime.cpp */; };
+		EDEBC6E7214B3F6800DD5AC8 /* JSCRuntime.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DE214B3F6800DD5AC8 /* JSCRuntime.h */; };
+		EDEBC6E8214B3F6800DD5AC8 /* instrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E0214B3F6800DD5AC8 /* instrumentation.h */; };
+		EDEBC6E9214B3F6800DD5AC8 /* jsi.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E1214B3F6800DD5AC8 /* jsi.h */; };
+		EDEBC71A214B40A300DD5AC8 /* libjsi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EDEBC6D6214B3E7000DD5AC8 /* libjsi.a */; };
+		EDEBC71C214B40F900DD5AC8 /* jsi-inl.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6D9214B3F6800DD5AC8 /* jsi-inl.h */; };
+		EDEBC71D214B40F900DD5AC8 /* JSIDynamic.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DC214B3F6800DD5AC8 /* JSIDynamic.h */; };
+		EDEBC71E214B40F900DD5AC8 /* JSCRuntime.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DE214B3F6800DD5AC8 /* JSCRuntime.h */; };
+		EDEBC71F214B40F900DD5AC8 /* jsi.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E1214B3F6800DD5AC8 /* jsi.h */; };
+		EDEBC7DF214C705700DD5AC8 /* libjsiexecutor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EDEBC73B214B45A300DD5AC8 /* libjsiexecutor.a */; };
+		EDEBC7E0214C709200DD5AC8 /* libjsinspector.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EBF21BDC1FC498900052F4D5 /* libjsinspector.a */; };
 		F1EFDA50201F661000EE6E4C /* RCTUIUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = F1EFDA4E201F660F00EE6E4C /* RCTUIUtils.m */; };
 		FEFAAC9E1FDB89B50057BBE0 /* RCTRedBoxExtraDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FEFAAC9C1FDB89B40057BBE0 /* RCTRedBoxExtraDataViewController.m */; };
 		FEFAAC9F1FDB89B50057BBE0 /* RCTRedBoxExtraDataViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = FEFAAC9D1FDB89B40057BBE0 /* RCTRedBoxExtraDataViewController.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		1320081A1E283DC300F0C457 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 139D7ECD1E25DB7D00323FB7;
-			remoteInfo = "third-party";
-		};
 		1320081C1E283DCB00F0C457 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
@@ -1262,13 +1176,6 @@
 			remoteGlobalIDString = 3D3CD9261DE5FBEE00167DC4;
 			remoteInfo = "cxxreact-tvOS";
 		};
-		3D383D631EBD27CE005632C8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 3D383D211EBD27B6005632C8;
-			remoteInfo = "third-party-tvOS";
-		};
 		3D383D651EBD27DB005632C8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
@@ -1283,68 +1190,124 @@
 			remoteGlobalIDString = 3D3CD9191DE5FBEC00167DC4;
 			remoteInfo = cxxreact;
 		};
-		3D3CD94F1DE5FDB900167DC4 /* PBXContainerItemProxy */ = {
+		53D123981FBF1E0C001B8A10 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 3D3CD8FF1DE5FBD600167DC4;
-			remoteInfo = jschelpers;
+			remoteGlobalIDString = 3D3C04B91DE3340900C268FA;
+			remoteInfo = yoga;
 		};
-		3DC159E71E83E2A0007B1282 /* PBXContainerItemProxy */ = {
+		ED296F7D214C957300B7C4FE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 3D3CD90C1DE5FBD800167DC4;
-			remoteInfo = "jschelpers-tvOS";
+			remoteGlobalIDString = EDEBC6BA214B3E7000DD5AC8;
+			remoteInfo = jsi;
 		};
-		53D123981FBF1E0C001B8A10 /* PBXContainerItemProxy */ = {
+		ED296F80214C971800B7C4FE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 3D3C04B91DE3340900C268FA;
-			remoteInfo = yoga;
+			remoteGlobalIDString = EBF21BDD1FC4989A0052F4D5;
+			remoteInfo = "jsinspector-tvOS";
 		};
-		9936F33F1F5F305D0010BF04 /* PBXContainerItemProxy */ = {
+		ED296F96214C996500B7C4FE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 9936F2F81F5F2E4B0010BF04;
-			remoteInfo = privatedata;
+			remoteGlobalIDString = 3D383D3D1EBD27B9005632C8;
+			remoteInfo = "double-conversion-tvOS";
 		};
-		9936F3411F5F30640010BF04 /* PBXContainerItemProxy */ = {
+		ED296FC9214C9B6200B7C4FE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 9936F3141F5F2E5B0010BF04;
-			remoteInfo = "privatedata-tvOS";
+			remoteGlobalIDString = ED296F98214C9A0900B7C4FE;
+			remoteInfo = "jsi-tvOS";
 		};
-		9936F3431F5F30780010BF04 /* PBXContainerItemProxy */ = {
+		ED296FF7214C9EAA00B7C4FE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 9936F2F81F5F2E4B0010BF04;
-			remoteInfo = privatedata;
+			remoteGlobalIDString = 3D383D211EBD27B6005632C8;
+			remoteInfo = "third-party-tvOS";
 		};
-		9936F3451F5F30830010BF04 /* PBXContainerItemProxy */ = {
+		ED296FFB214C9EC000B7C4FE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 9936F3141F5F2E5B0010BF04;
-			remoteInfo = "privatedata-tvOS";
+			remoteGlobalIDString = 3D3CD9261DE5FBEE00167DC4;
+			remoteInfo = "cxxreact-tvOS";
 		};
-		EBF21C011FC499D10052F4D5 /* PBXContainerItemProxy */ = {
+		ED296FFD214C9EC600B7C4FE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = EBF21BBF1FC498900052F4D5;
-			remoteInfo = jsinspector;
+			remoteGlobalIDString = ED296F98214C9A0900B7C4FE;
+			remoteInfo = "jsi-tvOS";
 		};
-		EBF21C031FC499D80052F4D5 /* PBXContainerItemProxy */ = {
+		ED29704D215012C700B7C4FE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = EBF21BDD1FC4989A0052F4D5;
-			remoteInfo = "jsinspector-tvOS";
+			remoteGlobalIDString = 3D383D3D1EBD27B9005632C8;
+			remoteInfo = "double-conversion-tvOS";
+		};
+		ED2970652150237300B7C4FE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = ED296FD0214C9CF800B7C4FE;
+			remoteInfo = "jsiexecutor-tvOS";
+		};
+		EDEBC74A214B46A700DD5AC8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EDEBC724214B45A300DD5AC8;
+			remoteInfo = jsiexecutor;
+		};
+		EDEBC74E214B477400DD5AC8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EDEBC6BA214B3E7000DD5AC8;
+			remoteInfo = jsi;
+		};
+		EDEBC7CB214C516800DD5AC8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 139D7E871E25C6D100323FB7;
+			remoteInfo = "double-conversion";
+		};
+		EDEBC7CD214C523F00DD5AC8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 3D3CD9191DE5FBEC00167DC4;
+			remoteInfo = cxxreact;
+		};
+		EDEBC7D2214C528C00DD5AC8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 139D7ECD1E25DB7D00323FB7;
+			remoteInfo = "third-party";
+		};
+		EDEBC7D6214C52FD00DD5AC8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 139D7E871E25C6D100323FB7;
+			remoteInfo = "double-conversion";
+		};
+		EDEBC7D8214C628300DD5AC8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EBF21BBF1FC498900052F4D5;
+			remoteInfo = jsinspector;
 		};
 /* End PBXContainerItemProxy section */
 
@@ -1406,7 +1369,6 @@
 				3D383D201EBD27AF005632C8 /* RCTBridge+Private.h in Copy Headers */,
 				3D7BFD351EA8E43F008DFB7A /* RCTDevSettings.h in Copy Headers */,
 				3D7BFD331EA8E433008DFB7A /* RCTPackagerClient.h in Copy Headers */,
-				3DA981E91E5B0F7F004F2374 /* RCTJSCSamplingProfiler.h in Copy Headers */,
 				3DA981EA1E5B0F7F004F2374 /* RCTAccessibilityManager.h in Copy Headers */,
 				3DA981EB1E5B0F7F004F2374 /* RCTAlertManager.h in Copy Headers */,
 				3DA981EC1E5B0F7F004F2374 /* RCTAppState.h in Copy Headers */,
@@ -1440,10 +1402,6 @@
 				3DA982111E5B0F7F004F2374 /* RCTModalHostView.h in Copy Headers */,
 				3DA982121E5B0F7F004F2374 /* RCTModalHostViewController.h in Copy Headers */,
 				3DA982131E5B0F7F004F2374 /* RCTModalHostViewManager.h in Copy Headers */,
-				3DA982141E5B0F7F004F2374 /* RCTNavigator.h in Copy Headers */,
-				3DA982151E5B0F7F004F2374 /* RCTNavigatorManager.h in Copy Headers */,
-				3DA982161E5B0F7F004F2374 /* RCTNavItem.h in Copy Headers */,
-				3DA982171E5B0F7F004F2374 /* RCTNavItemManager.h in Copy Headers */,
 				3DA982181E5B0F7F004F2374 /* RCTPicker.h in Copy Headers */,
 				3DA982191E5B0F7F004F2374 /* RCTPickerManager.h in Copy Headers */,
 				3DA9821A1E5B0F7F004F2374 /* RCTPointerEvents.h in Copy Headers */,
@@ -1517,6 +1475,7 @@
 			dstPath = include/yoga;
 			dstSubfolderSpec = 16;
 			files = (
+				BA0501B12109DD1C00A6BBC4 /* YGConfig.h in Copy Headers */,
 				3DFE0D1A1DF8575800459392 /* YGEnums.h in Copy Headers */,
 				3DFE0D1B1DF8575800459392 /* YGMacros.h in Copy Headers */,
 				3DFE0D1C1DF8575800459392 /* Yoga.h in Copy Headers */,
@@ -1530,6 +1489,7 @@
 			dstPath = include/cxxreact;
 			dstSubfolderSpec = 16;
 			files = (
+				BA0501AD2109DCF200A6BBC4 /* ReactMarker.h in Copy Headers */,
 				598FD1921F816A2A006C54CB /* RAMBundleRegistry.h in Copy Headers */,
 				3DA9823B1E5B1053004F2374 /* CxxModule.h in Copy Headers */,
 				3DA9823C1E5B1053004F2374 /* CxxNativeModule.h in Copy Headers */,
@@ -1539,13 +1499,6 @@
 				3DA982421E5B1053004F2374 /* JsArgumentHelpers.h in Copy Headers */,
 				3DA982431E5B1053004F2374 /* JSBigString.h in Copy Headers */,
 				3DA982441E5B1053004F2374 /* JSBundleType.h in Copy Headers */,
-				3DA982451E5B1053004F2374 /* JSCExecutor.h in Copy Headers */,
-				3DA982471E5B1053004F2374 /* JSCLegacyTracing.h in Copy Headers */,
-				3DA982481E5B1053004F2374 /* JSCMemory.h in Copy Headers */,
-				3DA982491E5B1053004F2374 /* JSCNativeModules.h in Copy Headers */,
-				3DA9824A1E5B1053004F2374 /* JSCPerfStats.h in Copy Headers */,
-				3DA9824B1E5B1053004F2374 /* JSCSamplingProfiler.h in Copy Headers */,
-				3DA9824C1E5B1053004F2374 /* JSCUtils.h in Copy Headers */,
 				3DA9824E1E5B1053004F2374 /* JSIndexedRAMBundle.h in Copy Headers */,
 				3DA9824F1E5B1053004F2374 /* JSModulesUnbundle.h in Copy Headers */,
 				3DA982501E5B1053004F2374 /* MessageQueueThread.h in Copy Headers */,
@@ -1553,7 +1506,6 @@
 				3DA982521E5B1053004F2374 /* ModuleRegistry.h in Copy Headers */,
 				3DA982531E5B1053004F2374 /* NativeModule.h in Copy Headers */,
 				3DA982541E5B1053004F2374 /* NativeToJsBridge.h in Copy Headers */,
-				3DA982561E5B1053004F2374 /* Platform.h in Copy Headers */,
 				3DA982571E5B1053004F2374 /* RecoverableError.h in Copy Headers */,
 				3DA982581E5B1053004F2374 /* SampleCxxModule.h in Copy Headers */,
 				3DA982591E5B1053004F2374 /* SystraceSection.h in Copy Headers */,
@@ -1561,22 +1513,6 @@
 			name = "Copy Headers";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		3D302F1D1DF8264A00D6DDAE /* Copy Headers */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = include/jschelpers;
-			dstSubfolderSpec = 16;
-			files = (
-				3DA982601E5B1089004F2374 /* JSCHelpers.h in Copy Headers */,
-				3DA982611E5B1089004F2374 /* noncopyable.h in Copy Headers */,
-				3DA982621E5B1089004F2374 /* Unicode.h in Copy Headers */,
-				3DA982631E5B1089004F2374 /* Value.h in Copy Headers */,
-				3D302F1E1DF8265A00D6DDAE /* JavaScriptCore.h in Copy Headers */,
-				3D302F1F1DF8265A00D6DDAE /* JSCWrapper.h in Copy Headers */,
-			);
-			name = "Copy Headers";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		3D383D491EBD27B9005632C8 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1670,7 +1606,6 @@
 				3D80D9481DF6FA890028D040 /* RCTURLRequestDelegate.h in Copy Headers */,
 				3D80D9491DF6FA890028D040 /* RCTURLRequestHandler.h in Copy Headers */,
 				3D80D94A1DF6FA890028D040 /* RCTUtils.h in Copy Headers */,
-				3D80D94F1DF6FA890028D040 /* RCTJSCSamplingProfiler.h in Copy Headers */,
 				3D80D9501DF6FA890028D040 /* RCTAccessibilityManager.h in Copy Headers */,
 				3D80D9511DF6FA890028D040 /* RCTAlertManager.h in Copy Headers */,
 				3D80D9521DF6FA890028D040 /* RCTAppState.h in Copy Headers */,
@@ -1704,10 +1639,6 @@
 				3D80D9761DF6FA890028D040 /* RCTModalHostView.h in Copy Headers */,
 				3D80D9771DF6FA890028D040 /* RCTModalHostViewController.h in Copy Headers */,
 				3D80D9781DF6FA890028D040 /* RCTModalHostViewManager.h in Copy Headers */,
-				3D80D9791DF6FA890028D040 /* RCTNavigator.h in Copy Headers */,
-				3D80D97A1DF6FA890028D040 /* RCTNavigatorManager.h in Copy Headers */,
-				3D80D97B1DF6FA890028D040 /* RCTNavItem.h in Copy Headers */,
-				3D80D97C1DF6FA890028D040 /* RCTNavItemManager.h in Copy Headers */,
 				3D80D97D1DF6FA890028D040 /* RCTPicker.h in Copy Headers */,
 				3D80D97E1DF6FA890028D040 /* RCTPickerManager.h in Copy Headers */,
 				3D80D97F1DF6FA890028D040 /* RCTPointerEvents.h in Copy Headers */,
@@ -1766,13 +1697,6 @@
 				3DA981A71E5B0E34004F2374 /* JsArgumentHelpers.h in Copy Headers */,
 				3DA981A81E5B0E34004F2374 /* JSBigString.h in Copy Headers */,
 				3DA981A91E5B0E34004F2374 /* JSBundleType.h in Copy Headers */,
-				3DA981AA1E5B0E34004F2374 /* JSCExecutor.h in Copy Headers */,
-				3DA981AC1E5B0E34004F2374 /* JSCLegacyTracing.h in Copy Headers */,
-				3DA981AD1E5B0E34004F2374 /* JSCMemory.h in Copy Headers */,
-				3DA981AE1E5B0E34004F2374 /* JSCNativeModules.h in Copy Headers */,
-				3DA981AF1E5B0E34004F2374 /* JSCPerfStats.h in Copy Headers */,
-				3DA981B01E5B0E34004F2374 /* JSCSamplingProfiler.h in Copy Headers */,
-				3DA981B11E5B0E34004F2374 /* JSCUtils.h in Copy Headers */,
 				3DA981B31E5B0E34004F2374 /* JSIndexedRAMBundle.h in Copy Headers */,
 				3DA981B41E5B0E34004F2374 /* JSModulesUnbundle.h in Copy Headers */,
 				3DA981B51E5B0E34004F2374 /* MessageQueueThread.h in Copy Headers */,
@@ -1780,7 +1704,6 @@
 				3DA981B71E5B0E34004F2374 /* ModuleRegistry.h in Copy Headers */,
 				3DA981B81E5B0E34004F2374 /* NativeModule.h in Copy Headers */,
 				3DA981B91E5B0E34004F2374 /* NativeToJsBridge.h in Copy Headers */,
-				3DA981BB1E5B0E34004F2374 /* Platform.h in Copy Headers */,
 				3DA981BC1E5B0E34004F2374 /* RecoverableError.h in Copy Headers */,
 				3DA981BD1E5B0E34004F2374 /* SampleCxxModule.h in Copy Headers */,
 				3DA981BE1E5B0E34004F2374 /* SystraceSection.h in Copy Headers */,
@@ -1788,62 +1711,78 @@
 			name = "Copy Headers";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		3D80DABB1DF8218B0028D040 /* Copy Headers */ = {
+		EBF21BCB1FC498900052F4D5 /* Copy Headers */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
-			dstPath = include/jschelpers;
+			dstPath = include/jsinspector;
 			dstSubfolderSpec = 16;
 			files = (
-				3DA9825A1E5B1079004F2374 /* JavaScriptCore.h in Copy Headers */,
-				3DA9825B1E5B1079004F2374 /* JSCHelpers.h in Copy Headers */,
-				3DA9825C1E5B1079004F2374 /* JSCWrapper.h in Copy Headers */,
-				3DA9825D1E5B1079004F2374 /* noncopyable.h in Copy Headers */,
-				3DA9825E1E5B1079004F2374 /* Unicode.h in Copy Headers */,
-				3DA9825F1E5B1079004F2374 /* Value.h in Copy Headers */,
+				EBF21BFB1FC498FC0052F4D5 /* InspectorInterfaces.h in Copy Headers */,
 			);
 			name = "Copy Headers";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		9936F3021F5F2E4B0010BF04 /* Copy Headers */ = {
+		EBF21BE91FC4989A0052F4D5 /* Copy Headers */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
-			dstPath = include/privatedata;
+			dstPath = include/jsinspector;
 			dstSubfolderSpec = 16;
 			files = (
-				9936F33D1F5F2FF40010BF04 /* PrivateDataBase.h in Copy Headers */,
+				EBF21BFE1FC499840052F4D5 /* InspectorInterfaces.h in Copy Headers */,
 			);
 			name = "Copy Headers";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		9936F31E1F5F2E5B0010BF04 /* Copy Headers */ = {
+		ED296FA4214C9A0900B7C4FE /* Copy Headers */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
-			dstPath = include/privatedata;
+			dstPath = include/jsi;
 			dstSubfolderSpec = 16;
 			files = (
-				9936F33A1F5F2F7C0010BF04 /* PrivateDataBase.h in Copy Headers */,
+				ED29704F2150199F00B7C4FE /* JSCRuntime.h in Copy Headers */,
+				ED296FC8214C9B5200B7C4FE /* jsi.h in Copy Headers */,
+				ED296FC7214C9B4B00B7C4FE /* instrumentation.h in Copy Headers */,
+				ED296FC6214C9B4400B7C4FE /* JSIDynamic.h in Copy Headers */,
+				ED296FC5214C9B3E00B7C4FE /* jsi-inl.h in Copy Headers */,
 			);
 			name = "Copy Headers";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		EBF21BCB1FC498900052F4D5 /* Copy Headers */ = {
+		ED296FDC214C9CF800B7C4FE /* Copy Headers */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
-			dstPath = include/jsinspector;
+			dstPath = include/jsireact;
 			dstSubfolderSpec = 16;
 			files = (
-				EBF21BFB1FC498FC0052F4D5 /* InspectorInterfaces.h in Copy Headers */,
+				ED7286BE2155C62B00C26ABF /* JSIExecutor.h in Copy Headers */,
+				ED7286BF2155C62B00C26ABF /* JSINativeModules.h in Copy Headers */,
 			);
 			name = "Copy Headers";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		EBF21BE91FC4989A0052F4D5 /* Copy Headers */ = {
+		EDEBC6C6214B3E7000DD5AC8 /* Copy Headers */ = {
 			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = include/jsinspector;
+			buildActionMask = 12;
+			dstPath = include/jsi;
 			dstSubfolderSpec = 16;
 			files = (
-				EBF21BFE1FC499840052F4D5 /* InspectorInterfaces.h in Copy Headers */,
+				ED297050215019B400B7C4FE /* instrumentation.h in Copy Headers */,
+				EDEBC71C214B40F900DD5AC8 /* jsi-inl.h in Copy Headers */,
+				EDEBC71D214B40F900DD5AC8 /* JSIDynamic.h in Copy Headers */,
+				EDEBC71E214B40F900DD5AC8 /* JSCRuntime.h in Copy Headers */,
+				EDEBC71F214B40F900DD5AC8 /* jsi.h in Copy Headers */,
+			);
+			name = "Copy Headers";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EDEBC72F214B45A300DD5AC8 /* Copy Headers */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 12;
+			dstPath = include/jsireact;
+			dstSubfolderSpec = 16;
+			files = (
+				ED7286BC2155C62000C26ABF /* JSIExecutor.h in Copy Headers */,
+				ED7286BD2155C62000C26ABF /* JSINativeModules.h in Copy Headers */,
 			);
 			name = "Copy Headers";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1896,10 +1835,6 @@
 		134D63C21F1FEC4B008872B5 /* RCTCxxBridgeDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTCxxBridgeDelegate.h; sourceTree = "<group>"; };
 		13513F3A1B1F43F400FCE529 /* RCTProgressViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTProgressViewManager.h; sourceTree = "<group>"; };
 		13513F3B1B1F43F400FCE529 /* RCTProgressViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTProgressViewManager.m; sourceTree = "<group>"; };
-		135A9BF91E7B0EAE00587AEB /* RCTJSCErrorHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCErrorHandling.h; sourceTree = "<group>"; };
-		135A9BFA1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJSCErrorHandling.mm; sourceTree = "<group>"; };
-		135A9BFD1E7B0EE600587AEB /* RCTJSCHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCHelpers.h; sourceTree = "<group>"; };
-		135A9BFE1E7B0EE600587AEB /* RCTJSCHelpers.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJSCHelpers.mm; sourceTree = "<group>"; };
 		13723B4E1A82FD3C00F88898 /* RCTStatusBarManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTStatusBarManager.h; sourceTree = "<group>"; };
 		13723B4F1A82FD3C00F88898 /* RCTStatusBarManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTStatusBarManager.m; sourceTree = "<group>"; };
 		1372B7081AB030C200659ED6 /* RCTAppState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAppState.h; sourceTree = "<group>"; };
@@ -1914,58 +1849,58 @@
 		137327E61AA5CF210034F82E /* RCTTabBarManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTabBarManager.m; sourceTree = "<group>"; };
 		1384E2061E806D4E00545659 /* RCTNativeModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNativeModule.h; sourceTree = "<group>"; };
 		1384E2071E806D4E00545659 /* RCTNativeModule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTNativeModule.mm; sourceTree = "<group>"; };
-		139D7E391E25C5A300323FB7 /* bignum-dtoa.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "bignum-dtoa.cc"; path = "double-conversion-1.1.5/src/bignum-dtoa.cc"; sourceTree = "<group>"; };
-		139D7E3A1E25C5A300323FB7 /* bignum-dtoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "bignum-dtoa.h"; path = "double-conversion-1.1.5/src/bignum-dtoa.h"; sourceTree = "<group>"; };
-		139D7E3B1E25C5A300323FB7 /* bignum.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bignum.cc; path = "double-conversion-1.1.5/src/bignum.cc"; sourceTree = "<group>"; };
-		139D7E3C1E25C5A300323FB7 /* bignum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bignum.h; path = "double-conversion-1.1.5/src/bignum.h"; sourceTree = "<group>"; };
-		139D7E3D1E25C5A300323FB7 /* cached-powers.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "cached-powers.cc"; path = "double-conversion-1.1.5/src/cached-powers.cc"; sourceTree = "<group>"; };
-		139D7E3E1E25C5A300323FB7 /* cached-powers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "cached-powers.h"; path = "double-conversion-1.1.5/src/cached-powers.h"; sourceTree = "<group>"; };
-		139D7E3F1E25C5A300323FB7 /* diy-fp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "diy-fp.cc"; path = "double-conversion-1.1.5/src/diy-fp.cc"; sourceTree = "<group>"; };
-		139D7E401E25C5A300323FB7 /* diy-fp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "diy-fp.h"; path = "double-conversion-1.1.5/src/diy-fp.h"; sourceTree = "<group>"; };
-		139D7E411E25C5A300323FB7 /* double-conversion.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "double-conversion.cc"; path = "double-conversion-1.1.5/src/double-conversion.cc"; sourceTree = "<group>"; };
-		139D7E421E25C5A300323FB7 /* double-conversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "double-conversion.h"; path = "double-conversion-1.1.5/src/double-conversion.h"; sourceTree = "<group>"; };
-		139D7E431E25C5A300323FB7 /* fast-dtoa.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "fast-dtoa.cc"; path = "double-conversion-1.1.5/src/fast-dtoa.cc"; sourceTree = "<group>"; };
-		139D7E441E25C5A300323FB7 /* fast-dtoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "fast-dtoa.h"; path = "double-conversion-1.1.5/src/fast-dtoa.h"; sourceTree = "<group>"; };
-		139D7E451E25C5A300323FB7 /* fixed-dtoa.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "fixed-dtoa.cc"; path = "double-conversion-1.1.5/src/fixed-dtoa.cc"; sourceTree = "<group>"; };
-		139D7E461E25C5A300323FB7 /* fixed-dtoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "fixed-dtoa.h"; path = "double-conversion-1.1.5/src/fixed-dtoa.h"; sourceTree = "<group>"; };
-		139D7E471E25C5A300323FB7 /* ieee.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ieee.h; path = "double-conversion-1.1.5/src/ieee.h"; sourceTree = "<group>"; };
-		139D7E481E25C5A300323FB7 /* strtod.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = strtod.cc; path = "double-conversion-1.1.5/src/strtod.cc"; sourceTree = "<group>"; };
-		139D7E491E25C5A300323FB7 /* strtod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strtod.h; path = "double-conversion-1.1.5/src/strtod.h"; sourceTree = "<group>"; };
-		139D7E4A1E25C5A300323FB7 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utils.h; path = "double-conversion-1.1.5/src/utils.h"; sourceTree = "<group>"; };
+		139D7E391E25C5A300323FB7 /* bignum-dtoa.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "bignum-dtoa.cc"; path = "../third-party/double-conversion-1.1.6/src/bignum-dtoa.cc"; sourceTree = SOURCE_ROOT; };
+		139D7E3A1E25C5A300323FB7 /* bignum-dtoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "bignum-dtoa.h"; path = "../third-party/double-conversion-1.1.6/src/bignum-dtoa.h"; sourceTree = SOURCE_ROOT; };
+		139D7E3B1E25C5A300323FB7 /* bignum.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bignum.cc; path = "../third-party/double-conversion-1.1.6/src/bignum.cc"; sourceTree = SOURCE_ROOT; };
+		139D7E3C1E25C5A300323FB7 /* bignum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bignum.h; path = "../third-party/double-conversion-1.1.6/src/bignum.h"; sourceTree = SOURCE_ROOT; };
+		139D7E3D1E25C5A300323FB7 /* cached-powers.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "cached-powers.cc"; path = "../third-party/double-conversion-1.1.6/src/cached-powers.cc"; sourceTree = SOURCE_ROOT; };
+		139D7E3E1E25C5A300323FB7 /* cached-powers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "cached-powers.h"; path = "../third-party/double-conversion-1.1.6/src/cached-powers.h"; sourceTree = SOURCE_ROOT; };
+		139D7E3F1E25C5A300323FB7 /* diy-fp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "diy-fp.cc"; path = "../third-party/double-conversion-1.1.6/src/diy-fp.cc"; sourceTree = SOURCE_ROOT; };
+		139D7E401E25C5A300323FB7 /* diy-fp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "diy-fp.h"; path = "../third-party/double-conversion-1.1.6/src/diy-fp.h"; sourceTree = SOURCE_ROOT; };
+		139D7E411E25C5A300323FB7 /* double-conversion.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "double-conversion.cc"; path = "../third-party/double-conversion-1.1.6/src/double-conversion.cc"; sourceTree = SOURCE_ROOT; };
+		139D7E421E25C5A300323FB7 /* double-conversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "double-conversion.h"; path = "../third-party/double-conversion-1.1.6/src/double-conversion.h"; sourceTree = SOURCE_ROOT; };
+		139D7E431E25C5A300323FB7 /* fast-dtoa.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "fast-dtoa.cc"; path = "../third-party/double-conversion-1.1.6/src/fast-dtoa.cc"; sourceTree = SOURCE_ROOT; };
+		139D7E441E25C5A300323FB7 /* fast-dtoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "fast-dtoa.h"; path = "../third-party/double-conversion-1.1.6/src/fast-dtoa.h"; sourceTree = SOURCE_ROOT; };
+		139D7E451E25C5A300323FB7 /* fixed-dtoa.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "fixed-dtoa.cc"; path = "../third-party/double-conversion-1.1.6/src/fixed-dtoa.cc"; sourceTree = SOURCE_ROOT; };
+		139D7E461E25C5A300323FB7 /* fixed-dtoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "fixed-dtoa.h"; path = "../third-party/double-conversion-1.1.6/src/fixed-dtoa.h"; sourceTree = SOURCE_ROOT; };
+		139D7E471E25C5A300323FB7 /* ieee.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ieee.h; path = "../third-party/double-conversion-1.1.6/src/ieee.h"; sourceTree = SOURCE_ROOT; };
+		139D7E481E25C5A300323FB7 /* strtod.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = strtod.cc; path = "../third-party/double-conversion-1.1.6/src/strtod.cc"; sourceTree = SOURCE_ROOT; };
+		139D7E491E25C5A300323FB7 /* strtod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strtod.h; path = "../third-party/double-conversion-1.1.6/src/strtod.h"; sourceTree = SOURCE_ROOT; };
+		139D7E4A1E25C5A300323FB7 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utils.h; path = "../third-party/double-conversion-1.1.6/src/utils.h"; sourceTree = SOURCE_ROOT; };
 		139D7E881E25C6D100323FB7 /* libdouble-conversion.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libdouble-conversion.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		139D7ECE1E25DB7D00323FB7 /* libthird-party.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libthird-party.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		139D7ED81E25DBDC00323FB7 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "glog-0.3.4/src/config.h"; sourceTree = "<group>"; };
-		139D7ED91E25DBDC00323FB7 /* demangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = demangle.h; path = "glog-0.3.4/src/demangle.h"; sourceTree = "<group>"; };
-		139D7EDA1E25DBDC00323FB7 /* logging.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = logging.cc; path = "glog-0.3.4/src/logging.cc"; sourceTree = "<group>"; };
-		139D7EDB1E25DBDC00323FB7 /* raw_logging.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = raw_logging.cc; path = "glog-0.3.4/src/raw_logging.cc"; sourceTree = "<group>"; };
-		139D7EDC1E25DBDC00323FB7 /* signalhandler.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = signalhandler.cc; path = "glog-0.3.4/src/signalhandler.cc"; sourceTree = "<group>"; };
-		139D7EDD1E25DBDC00323FB7 /* stacktrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stacktrace.h; path = "glog-0.3.4/src/stacktrace.h"; sourceTree = "<group>"; };
-		139D7EDE1E25DBDC00323FB7 /* symbolize.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = symbolize.cc; path = "glog-0.3.4/src/symbolize.cc"; sourceTree = "<group>"; };
-		139D7EDF1E25DBDC00323FB7 /* symbolize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = symbolize.h; path = "glog-0.3.4/src/symbolize.h"; sourceTree = "<group>"; };
-		139D7EE01E25DBDC00323FB7 /* utilities.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = utilities.cc; path = "glog-0.3.4/src/utilities.cc"; sourceTree = "<group>"; };
-		139D7EE11E25DBDC00323FB7 /* utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utilities.h; path = "glog-0.3.4/src/utilities.h"; sourceTree = "<group>"; };
-		139D7EE21E25DBDC00323FB7 /* vlog_is_on.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vlog_is_on.cc; path = "glog-0.3.4/src/vlog_is_on.cc"; sourceTree = "<group>"; };
-		139D7F081E25DE3700323FB7 /* demangle.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = demangle.cc; path = "glog-0.3.4/src/demangle.cc"; sourceTree = "<group>"; };
-		139D7F111E25DEC900323FB7 /* log_severity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log_severity.h; sourceTree = "<group>"; };
-		139D7F121E25DEC900323FB7 /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logging.h; sourceTree = "<group>"; };
-		139D7F141E25DEC900323FB7 /* raw_logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = raw_logging.h; sourceTree = "<group>"; };
-		139D7F161E25DEC900323FB7 /* stl_logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stl_logging.h; sourceTree = "<group>"; };
-		139D7F181E25DEC900323FB7 /* vlog_is_on.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vlog_is_on.h; sourceTree = "<group>"; };
-		139D849C1E273B5600323FB7 /* AtomicIntrusiveLinkedList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomicIntrusiveLinkedList.h; path = "folly-2016.10.31.00/folly/AtomicIntrusiveLinkedList.h"; sourceTree = "<group>"; };
-		139D849D1E273B5600323FB7 /* Bits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Bits.cpp; path = "folly-2016.10.31.00/folly/Bits.cpp"; sourceTree = "<group>"; };
-		139D849E1E273B5600323FB7 /* Bits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Bits.h; path = "folly-2016.10.31.00/folly/Bits.h"; sourceTree = "<group>"; };
-		139D849F1E273B5600323FB7 /* Conv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Conv.cpp; path = "folly-2016.10.31.00/folly/Conv.cpp"; sourceTree = "<group>"; };
-		139D84A01E273B5600323FB7 /* Conv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Conv.h; path = "folly-2016.10.31.00/folly/Conv.h"; sourceTree = "<group>"; };
-		139D84A11E273B5600323FB7 /* dynamic-inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "dynamic-inl.h"; path = "folly-2016.10.31.00/folly/dynamic-inl.h"; sourceTree = "<group>"; };
-		139D84A21E273B5600323FB7 /* dynamic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dynamic.cpp; path = "folly-2016.10.31.00/folly/dynamic.cpp"; sourceTree = "<group>"; };
-		139D84A31E273B5600323FB7 /* dynamic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic.h; path = "folly-2016.10.31.00/folly/dynamic.h"; sourceTree = "<group>"; };
-		139D84A41E273B5600323FB7 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Exception.h; path = "folly-2016.10.31.00/folly/Exception.h"; sourceTree = "<group>"; };
-		139D84A71E273B5600323FB7 /* json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json.cpp; path = "folly-2016.10.31.00/folly/json.cpp"; sourceTree = "<group>"; };
-		139D84A81E273B5600323FB7 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json.h; path = "folly-2016.10.31.00/folly/json.h"; sourceTree = "<group>"; };
-		139D84A91E273B5600323FB7 /* Memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Memory.h; path = "folly-2016.10.31.00/folly/Memory.h"; sourceTree = "<group>"; };
-		139D84AA1E273B5600323FB7 /* MoveWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MoveWrapper.h; path = "folly-2016.10.31.00/folly/MoveWrapper.h"; sourceTree = "<group>"; };
-		139D84AB1E273B5600323FB7 /* Optional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Optional.h; path = "folly-2016.10.31.00/folly/Optional.h"; sourceTree = "<group>"; };
-		139D84AC1E273B5600323FB7 /* ScopeGuard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScopeGuard.h; path = "folly-2016.10.31.00/folly/ScopeGuard.h"; sourceTree = "<group>"; };
+		139D7ED81E25DBDC00323FB7 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../third-party/glog-0.3.5/src/config.h"; sourceTree = SOURCE_ROOT; };
+		139D7ED91E25DBDC00323FB7 /* demangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = demangle.h; path = "../third-party/glog-0.3.5/src/demangle.h"; sourceTree = SOURCE_ROOT; };
+		139D7EDA1E25DBDC00323FB7 /* logging.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = logging.cc; path = "../third-party/glog-0.3.5/src/logging.cc"; sourceTree = SOURCE_ROOT; };
+		139D7EDB1E25DBDC00323FB7 /* raw_logging.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = raw_logging.cc; path = "../third-party/glog-0.3.5/src/raw_logging.cc"; sourceTree = SOURCE_ROOT; };
+		139D7EDC1E25DBDC00323FB7 /* signalhandler.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = signalhandler.cc; path = "../third-party/glog-0.3.5/src/signalhandler.cc"; sourceTree = SOURCE_ROOT; };
+		139D7EDD1E25DBDC00323FB7 /* stacktrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stacktrace.h; path = "../third-party/glog-0.3.5/src/stacktrace.h"; sourceTree = SOURCE_ROOT; };
+		139D7EDE1E25DBDC00323FB7 /* symbolize.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = symbolize.cc; path = "../third-party/glog-0.3.5/src/symbolize.cc"; sourceTree = SOURCE_ROOT; };
+		139D7EDF1E25DBDC00323FB7 /* symbolize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = symbolize.h; path = "../third-party/glog-0.3.5/src/symbolize.h"; sourceTree = SOURCE_ROOT; };
+		139D7EE01E25DBDC00323FB7 /* utilities.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = utilities.cc; path = "../third-party/glog-0.3.5/src/utilities.cc"; sourceTree = SOURCE_ROOT; };
+		139D7EE11E25DBDC00323FB7 /* utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utilities.h; path = "../third-party/glog-0.3.5/src/utilities.h"; sourceTree = SOURCE_ROOT; };
+		139D7EE21E25DBDC00323FB7 /* vlog_is_on.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vlog_is_on.cc; path = "../third-party/glog-0.3.5/src/vlog_is_on.cc"; sourceTree = SOURCE_ROOT; };
+		139D7F081E25DE3700323FB7 /* demangle.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = demangle.cc; path = "../third-party/glog-0.3.5/src/demangle.cc"; sourceTree = SOURCE_ROOT; };
+		139D7F111E25DEC900323FB7 /* log_severity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = log_severity.h; path = "../third-party/glog-0.3.5/src/glog/log_severity.h"; sourceTree = SOURCE_ROOT; };
+		139D7F121E25DEC900323FB7 /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = logging.h; path = "../third-party/glog-0.3.5/src/glog/logging.h"; sourceTree = SOURCE_ROOT; };
+		139D7F141E25DEC900323FB7 /* raw_logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = raw_logging.h; path = "../third-party/glog-0.3.5/src/glog/raw_logging.h"; sourceTree = SOURCE_ROOT; };
+		139D7F161E25DEC900323FB7 /* stl_logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stl_logging.h; path = "../third-party/glog-0.3.5/src/glog/stl_logging.h"; sourceTree = SOURCE_ROOT; };
+		139D7F181E25DEC900323FB7 /* vlog_is_on.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vlog_is_on.h; path = "../third-party/glog-0.3.5/src/glog/vlog_is_on.h"; sourceTree = SOURCE_ROOT; };
+		139D849C1E273B5600323FB7 /* AtomicIntrusiveLinkedList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomicIntrusiveLinkedList.h; path = "../third-party/folly-2016.10.31.00/folly/AtomicIntrusiveLinkedList.h"; sourceTree = SOURCE_ROOT; };
+		139D849D1E273B5600323FB7 /* Bits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Bits.cpp; path = "../third-party/folly-2016.10.31.00/folly/Bits.cpp"; sourceTree = SOURCE_ROOT; };
+		139D849E1E273B5600323FB7 /* Bits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Bits.h; path = "../third-party/folly-2016.10.31.00/folly/Bits.h"; sourceTree = SOURCE_ROOT; };
+		139D849F1E273B5600323FB7 /* Conv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Conv.cpp; path = "../third-party/folly-2016.10.31.00/folly/Conv.cpp"; sourceTree = SOURCE_ROOT; };
+		139D84A01E273B5600323FB7 /* Conv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Conv.h; path = "../third-party/folly-2016.10.31.00/folly/Conv.h"; sourceTree = SOURCE_ROOT; };
+		139D84A11E273B5600323FB7 /* dynamic-inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "dynamic-inl.h"; path = "../third-party/folly-2016.10.31.00/folly/dynamic-inl.h"; sourceTree = SOURCE_ROOT; };
+		139D84A21E273B5600323FB7 /* dynamic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dynamic.cpp; path = "../third-party/folly-2016.10.31.00/folly/dynamic.cpp"; sourceTree = SOURCE_ROOT; };
+		139D84A31E273B5600323FB7 /* dynamic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic.h; path = "../third-party/folly-2016.10.31.00/folly/dynamic.h"; sourceTree = SOURCE_ROOT; };
+		139D84A41E273B5600323FB7 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Exception.h; path = "../third-party/folly-2016.10.31.00/folly/Exception.h"; sourceTree = SOURCE_ROOT; };
+		139D84A71E273B5600323FB7 /* json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json.cpp; path = "../third-party/folly-2016.10.31.00/folly/json.cpp"; sourceTree = SOURCE_ROOT; };
+		139D84A81E273B5600323FB7 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json.h; path = "../third-party/folly-2016.10.31.00/folly/json.h"; sourceTree = SOURCE_ROOT; };
+		139D84A91E273B5600323FB7 /* Memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Memory.h; path = "../third-party/folly-2016.10.31.00/folly/Memory.h"; sourceTree = SOURCE_ROOT; };
+		139D84AA1E273B5600323FB7 /* MoveWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MoveWrapper.h; path = "../third-party/folly-2016.10.31.00/folly/MoveWrapper.h"; sourceTree = SOURCE_ROOT; };
+		139D84AB1E273B5600323FB7 /* Optional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Optional.h; path = "../third-party/folly-2016.10.31.00/folly/Optional.h"; sourceTree = SOURCE_ROOT; };
+		139D84AC1E273B5600323FB7 /* ScopeGuard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScopeGuard.h; path = "../third-party/folly-2016.10.31.00/folly/ScopeGuard.h"; sourceTree = SOURCE_ROOT; };
 		13A0C2851B74F71200B29F6F /* RCTDevLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDevLoadingView.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		13A0C2861B74F71200B29F6F /* RCTDevLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDevLoadingView.m; sourceTree = "<group>"; };
 		13A0C2871B74F71200B29F6F /* RCTDevMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDevMenu.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -1988,14 +1923,6 @@
 		13B07FEA1A69327A00A75B9A /* RCTExceptionsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTExceptionsManager.m; sourceTree = "<group>"; };
 		13B07FED1A69327A00A75B9A /* RCTTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTiming.h; sourceTree = "<group>"; };
 		13B07FEE1A69327A00A75B9A /* RCTTiming.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTiming.m; sourceTree = "<group>"; };
-		13B0800C1A69489C00A75B9A /* RCTNavigator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNavigator.h; sourceTree = "<group>"; };
-		13B0800D1A69489C00A75B9A /* RCTNavigator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTNavigator.m; sourceTree = "<group>"; };
-		13B0800E1A69489C00A75B9A /* RCTNavigatorManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNavigatorManager.h; sourceTree = "<group>"; };
-		13B0800F1A69489C00A75B9A /* RCTNavigatorManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTNavigatorManager.m; sourceTree = "<group>"; };
-		13B080101A69489C00A75B9A /* RCTNavItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNavItem.h; sourceTree = "<group>"; };
-		13B080111A69489C00A75B9A /* RCTNavItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTNavItem.m; sourceTree = "<group>"; };
-		13B080121A69489C00A75B9A /* RCTNavItemManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNavItemManager.h; sourceTree = "<group>"; };
-		13B080131A69489C00A75B9A /* RCTNavItemManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTNavItemManager.m; sourceTree = "<group>"; };
 		13B080181A69489C00A75B9A /* RCTActivityIndicatorViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTActivityIndicatorViewManager.h; sourceTree = "<group>"; };
 		13B080191A69489C00A75B9A /* RCTActivityIndicatorViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTActivityIndicatorViewManager.m; sourceTree = "<group>"; };
 		13B080231A694A8400A75B9A /* RCTWrapperViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWrapperViewController.h; sourceTree = "<group>"; };
@@ -2031,11 +1958,11 @@
 		13E067541A70F44B002CDEE1 /* UIView+React.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+React.m"; sourceTree = "<group>"; };
 		13F17A831B8493E5007D4C75 /* RCTRedBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRedBox.h; sourceTree = "<group>"; };
 		13F17A841B8493E5007D4C75 /* RCTRedBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRedBox.m; sourceTree = "<group>"; };
-		13F887521E2971C500C3C7A1 /* Demangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Demangle.cpp; path = "folly-2016.10.31.00/folly/Demangle.cpp"; sourceTree = "<group>"; };
-		13F887531E2971C500C3C7A1 /* StringBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringBase.cpp; path = "folly-2016.10.31.00/folly/StringBase.cpp"; sourceTree = "<group>"; };
-		13F887541E2971C500C3C7A1 /* Unicode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unicode.cpp; path = "folly-2016.10.31.00/folly/Unicode.cpp"; sourceTree = "<group>"; };
-		13F8879C1E29740700C3C7A1 /* BitsFunctexcept.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BitsFunctexcept.cpp; path = "folly-2016.10.31.00/folly/portability/BitsFunctexcept.cpp"; sourceTree = "<group>"; };
-		13F887A01E2977D800C3C7A1 /* MallocImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MallocImpl.cpp; path = "folly-2016.10.31.00/folly/detail/MallocImpl.cpp"; sourceTree = "<group>"; };
+		13F887521E2971C500C3C7A1 /* Demangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Demangle.cpp; path = "../third-party/folly-2016.10.31.00/folly/Demangle.cpp"; sourceTree = SOURCE_ROOT; };
+		13F887531E2971C500C3C7A1 /* StringBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringBase.cpp; path = "../third-party/folly-2016.10.31.00/folly/StringBase.cpp"; sourceTree = SOURCE_ROOT; };
+		13F887541E2971C500C3C7A1 /* Unicode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unicode.cpp; path = "../third-party/folly-2016.10.31.00/folly/Unicode.cpp"; sourceTree = SOURCE_ROOT; };
+		13F8879C1E29740700C3C7A1 /* BitsFunctexcept.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BitsFunctexcept.cpp; path = "../third-party/folly-2016.10.31.00/folly/portability/BitsFunctexcept.cpp"; sourceTree = SOURCE_ROOT; };
+		13F887A01E2977D800C3C7A1 /* MallocImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MallocImpl.cpp; path = "../third-party/folly-2016.10.31.00/folly/detail/MallocImpl.cpp"; sourceTree = SOURCE_ROOT; };
 		14200DA81AC179B3008EE6BA /* RCTJavaScriptLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJavaScriptLoader.h; sourceTree = "<group>"; };
 		142014171B32094000CC17BA /* RCTPerformanceLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPerformanceLogger.m; sourceTree = "<group>"; };
 		142014181B32094000CC17BA /* RCTPerformanceLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPerformanceLogger.h; sourceTree = "<group>"; };
@@ -2067,13 +1994,10 @@
 		191E3EBF1C29DC3800C180A6 /* RCTRefreshControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRefreshControl.h; sourceTree = "<group>"; };
 		191E3EC01C29DC3800C180A6 /* RCTRefreshControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRefreshControl.m; sourceTree = "<group>"; };
 		199B8A6E1F44DB16005DEF67 /* RCTVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTVersion.h; sourceTree = "<group>"; };
-		19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = systemJSCWrapper.cpp; sourceTree = "<group>"; };
 		27B958731E57587D0096647A /* JSBigString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBigString.cpp; sourceTree = "<group>"; };
 		2D2A28131D9B038B00D4039D /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		352DCFEE1D19F4C20056D623 /* RCTI18nUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTI18nUtil.h; sourceTree = "<group>"; };
 		352DCFEF1D19F4C20056D623 /* RCTI18nUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTI18nUtil.m; sourceTree = "<group>"; };
-		369123DF1DDC75850095B341 /* RCTJSCSamplingProfiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCSamplingProfiler.h; sourceTree = "<group>"; };
-		369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJSCSamplingProfiler.m; sourceTree = "<group>"; };
 		391E86A21C623EC800009732 /* RCTTouchEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTouchEvent.m; sourceTree = "<group>"; };
 		391E86A31C623EC800009732 /* RCTTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTouchEvent.h; sourceTree = "<group>"; };
 		39C50FFA2046EE3500CEE534 /* RCTVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTVersion.m; sourceTree = "<group>"; };
@@ -2082,7 +2006,6 @@
 		3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVNavigationEventEmitter.h; sourceTree = "<group>"; };
 		3D0B842E1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTVNavigationEventEmitter.m; sourceTree = "<group>"; };
 		3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTWebSocketModule.h; path = WebSocket/RCTWebSocketModule.h; sourceTree = "<group>"; };
-		3D0E378B1F1CC58C00DCAC9F /* RCTWebSocketObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTWebSocketObserver.h; path = WebSocket/RCTWebSocketObserver.h; sourceTree = "<group>"; };
 		3D1E68D81CABD13900DD7465 /* RCTDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDisplayLink.h; sourceTree = "<group>"; };
 		3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDisplayLink.m; sourceTree = "<group>"; };
 		3D1FA07A1DE4F2EA00E03CC6 /* RCTNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNetworking.h; sourceTree = "<group>"; };
@@ -2099,8 +2022,6 @@
 		3D3C059A1DE3340900C268FA /* libyoga.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libyoga.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D3C06751DE3340C00C268FA /* libyoga.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libyoga.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D3CD8F51DE5FB2300167DC4 /* JSBundleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBundleType.h; sourceTree = "<group>"; };
-		3D3CD90B1DE5FBD600167DC4 /* libjschelpers.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjschelpers.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		3D3CD9181DE5FBD800167DC4 /* libjschelpers.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjschelpers.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D3CD9251DE5FBEC00167DC4 /* libcxxreact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcxxreact.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D3CD9321DE5FBEE00167DC4 /* libcxxreact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcxxreact.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D7454781E54757500E74ADD /* JSBigString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBigString.h; sourceTree = "<group>"; };
@@ -2109,9 +2030,6 @@
 		3D7749421DC1065C007EC8D8 /* RCTPlatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPlatform.h; sourceTree = "<group>"; };
 		3D7749431DC1065C007EC8D8 /* RCTPlatform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPlatform.m; sourceTree = "<group>"; };
 		3D788F841EBD2D240063D616 /* third-party.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "third-party.xcconfig"; sourceTree = "<group>"; };
-		3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptCore.h; sourceTree = "<group>"; };
-		3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCWrapper.cpp; sourceTree = "<group>"; };
-		3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCWrapper.h; sourceTree = "<group>"; };
 		3D7AA9C31E548CD5001955CF /* NSDataBigString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NSDataBigString.mm; sourceTree = "<group>"; };
 		3D7BFD0B1EA8E351008DFB7A /* RCTPackagerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPackagerClient.h; sourceTree = "<group>"; };
 		3D7BFD0C1EA8E351008DFB7A /* RCTPackagerClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPackagerClient.m; sourceTree = "<group>"; };
@@ -2127,20 +2045,6 @@
 		3D92B0AF1E03699D0018521A /* Instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Instance.h; sourceTree = "<group>"; };
 		3D92B0B01E03699D0018521A /* JsArgumentHelpers-inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JsArgumentHelpers-inl.h"; sourceTree = "<group>"; };
 		3D92B0B11E03699D0018521A /* JsArgumentHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JsArgumentHelpers.h; sourceTree = "<group>"; };
-		3D92B0B21E03699D0018521A /* JSCExecutor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCExecutor.cpp; sourceTree = "<group>"; };
-		3D92B0B31E03699D0018521A /* JSCExecutor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCExecutor.h; sourceTree = "<group>"; };
-		3D92B0B61E03699D0018521A /* JSCLegacyTracing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCLegacyTracing.cpp; sourceTree = "<group>"; };
-		3D92B0B71E03699D0018521A /* JSCLegacyTracing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCLegacyTracing.h; sourceTree = "<group>"; };
-		3D92B0B81E03699D0018521A /* JSCMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCMemory.cpp; sourceTree = "<group>"; };
-		3D92B0B91E03699D0018521A /* JSCMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCMemory.h; sourceTree = "<group>"; };
-		3D92B0BA1E03699D0018521A /* JSCNativeModules.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCNativeModules.cpp; sourceTree = "<group>"; };
-		3D92B0BB1E03699D0018521A /* JSCNativeModules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCNativeModules.h; sourceTree = "<group>"; };
-		3D92B0BC1E03699D0018521A /* JSCPerfStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCPerfStats.cpp; sourceTree = "<group>"; };
-		3D92B0BD1E03699D0018521A /* JSCPerfStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCPerfStats.h; sourceTree = "<group>"; };
-		3D92B0BE1E03699D0018521A /* JSCSamplingProfiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSamplingProfiler.cpp; sourceTree = "<group>"; };
-		3D92B0BF1E03699D0018521A /* JSCSamplingProfiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSamplingProfiler.h; sourceTree = "<group>"; };
-		3D92B0C21E03699D0018521A /* JSCUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCUtils.cpp; sourceTree = "<group>"; };
-		3D92B0C31E03699D0018521A /* JSCUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCUtils.h; sourceTree = "<group>"; };
 		3D92B0C61E03699D0018521A /* JSIndexedRAMBundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIndexedRAMBundle.cpp; sourceTree = "<group>"; };
 		3D92B0C71E03699D0018521A /* JSIndexedRAMBundle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIndexedRAMBundle.h; sourceTree = "<group>"; };
 		3D92B0C81E03699D0018521A /* JSModulesUnbundle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSModulesUnbundle.h; sourceTree = "<group>"; };
@@ -2152,23 +2056,16 @@
 		3D92B0CE1E03699D0018521A /* NativeModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeModule.h; sourceTree = "<group>"; };
 		3D92B0CF1E03699D0018521A /* NativeToJsBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NativeToJsBridge.cpp; sourceTree = "<group>"; };
 		3D92B0D01E03699D0018521A /* NativeToJsBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeToJsBridge.h; sourceTree = "<group>"; };
-		3D92B0D11E03699D0018521A /* Platform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.cpp; sourceTree = "<group>"; };
-		3D92B0D21E03699D0018521A /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Platform.h; sourceTree = "<group>"; };
 		3D92B0D31E03699D0018521A /* SampleCxxModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SampleCxxModule.cpp; sourceTree = "<group>"; };
 		3D92B0D41E03699D0018521A /* SampleCxxModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SampleCxxModule.h; sourceTree = "<group>"; };
 		3D92B0D51E03699D0018521A /* SystraceSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystraceSection.h; sourceTree = "<group>"; };
-		3D92B1071E0369AD0018521A /* JSCHelpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCHelpers.cpp; sourceTree = "<group>"; };
-		3D92B1081E0369AD0018521A /* JSCHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCHelpers.h; sourceTree = "<group>"; };
-		3D92B1091E0369AD0018521A /* noncopyable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = noncopyable.h; sourceTree = "<group>"; };
-		3D92B10A1E0369AD0018521A /* Unicode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Unicode.cpp; sourceTree = "<group>"; };
-		3D92B10B1E0369AD0018521A /* Unicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Unicode.h; sourceTree = "<group>"; };
-		3D92B10C1E0369AD0018521A /* Value.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Value.cpp; sourceTree = "<group>"; };
-		3D92B10D1E0369AD0018521A /* Value.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Value.h; sourceTree = "<group>"; };
-		3DF1BE801F26576400068F1A /* JSCTracing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCTracing.cpp; sourceTree = "<group>"; };
-		3DF1BE811F26576400068F1A /* JSCTracing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCTracing.h; sourceTree = "<group>"; };
 		3EDCA8A21D3591E700450C31 /* RCTErrorCustomizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorCustomizer.h; sourceTree = "<group>"; };
 		3EDCA8A31D3591E700450C31 /* RCTErrorInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorInfo.h; sourceTree = "<group>"; };
 		3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTErrorInfo.m; sourceTree = "<group>"; };
+		50E98FE621460B0D00CD9289 /* RCTWKWebViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWKWebViewManager.m; sourceTree = "<group>"; };
+		50E98FE721460B0D00CD9289 /* RCTWKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWKWebView.h; sourceTree = "<group>"; };
+		50E98FE821460B0D00CD9289 /* RCTWKWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWKWebView.m; sourceTree = "<group>"; };
+		50E98FE921460B0D00CD9289 /* RCTWKWebViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWKWebViewManager.h; sourceTree = "<group>"; };
 		5335D5401FE81A4700883D58 /* RCTShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowView.m; sourceTree = "<group>"; };
 		5343895E203905B6008E0CB3 /* YGLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YGLayout.cpp; sourceTree = "<group>"; };
 		5343895F203905B6008E0CB3 /* YGLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGLayout.h; sourceTree = "<group>"; };
@@ -2290,10 +2187,6 @@
 		83F15A171B7CC46900F10295 /* UIView+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+Private.h"; sourceTree = "<group>"; };
 		91076A871F743AB00081B4FA /* RCTModalManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTModalManager.m; sourceTree = "<group>"; };
 		91076A881F743AB00081B4FA /* RCTModalManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTModalManager.h; sourceTree = "<group>"; };
-		9936F3131F5F2E4B0010BF04 /* libprivatedata.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libprivatedata.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		9936F32F1F5F2E5B0010BF04 /* libprivatedata-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libprivatedata-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		9936F3351F5F2F480010BF04 /* PrivateDataBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PrivateDataBase.cpp; path = privatedata/PrivateDataBase.cpp; sourceTree = "<group>"; };
-		9936F3361F5F2F480010BF04 /* PrivateDataBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrivateDataBase.h; path = privatedata/PrivateDataBase.h; sourceTree = "<group>"; };
 		A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTReloadCommand.h; sourceTree = "<group>"; };
 		A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTReloadCommand.m; sourceTree = "<group>"; };
 		AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJavaScriptLoader.mm; sourceTree = "<group>"; };
@@ -2320,6 +2213,28 @@
 		EBF21BBB1FC498270052F4D5 /* InspectorInterfaces.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorInterfaces.cpp; sourceTree = "<group>"; };
 		EBF21BDC1FC498900052F4D5 /* libjsinspector.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjsinspector.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		EBF21BFA1FC4989A0052F4D5 /* libjsinspector-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjsinspector-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		ED296FB6214C9A0900B7C4FE /* libjsi-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjsi-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		ED296FEE214C9CF800B7C4FE /* libjsiexecutor-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjsiexecutor-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		ED6189672155BBF70000C9A7 /* JSIExecutor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSIExecutor.h; path = jsireact/JSIExecutor.h; sourceTree = "<group>"; };
+		ED6189682155BBF70000C9A7 /* JSINativeModules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSINativeModules.h; path = jsireact/JSINativeModules.h; sourceTree = "<group>"; };
+		EDDA711B2164285A00B2D070 /* JSINativeModules.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSINativeModules.cpp; path = jsireact/JSINativeModules.cpp; sourceTree = "<group>"; };
+		EDDA711C2164285A00B2D070 /* JSIExecutor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSIExecutor.cpp; path = jsireact/JSIExecutor.cpp; sourceTree = "<group>"; };
+		EDEBC6D6214B3E7000DD5AC8 /* libjsi.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjsi.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		EDEBC6D9214B3F6800DD5AC8 /* jsi-inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "jsi-inl.h"; sourceTree = "<group>"; };
+		EDEBC6DA214B3F6800DD5AC8 /* JSIDynamic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDynamic.cpp; sourceTree = "<group>"; };
+		EDEBC6DB214B3F6800DD5AC8 /* jsi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jsi.cpp; sourceTree = "<group>"; };
+		EDEBC6DC214B3F6800DD5AC8 /* JSIDynamic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDynamic.h; sourceTree = "<group>"; };
+		EDEBC6DD214B3F6800DD5AC8 /* JSCRuntime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCRuntime.cpp; sourceTree = "<group>"; };
+		EDEBC6DE214B3F6800DD5AC8 /* JSCRuntime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCRuntime.h; sourceTree = "<group>"; };
+		EDEBC6DF214B3F6800DD5AC8 /* BUCK */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BUCK; sourceTree = "<group>"; };
+		EDEBC6E0214B3F6800DD5AC8 /* instrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = instrumentation.h; sourceTree = "<group>"; };
+		EDEBC6E1214B3F6800DD5AC8 /* jsi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jsi.h; sourceTree = "<group>"; };
+		EDEBC73B214B45A300DD5AC8 /* libjsiexecutor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjsiexecutor.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		EDEBC740214B463000DD5AC8 /* BUCK */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BUCK; sourceTree = "<group>"; };
+		EDEBC750214B47E100DD5AC8 /* JSDeltaBundleClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeltaBundleClient.cpp; sourceTree = "<group>"; };
+		EDEBC751214B47E100DD5AC8 /* JSDeltaBundleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDeltaBundleClient.h; sourceTree = "<group>"; };
+		EDEBC752214B47E100DD5AC8 /* SharedProxyCxxModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedProxyCxxModule.h; sourceTree = "<group>"; };
+		EDEBC757214C284000DD5AC8 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		F1EFDA4E201F660F00EE6E4C /* RCTUIUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUIUtils.m; sourceTree = "<group>"; };
 		F1EFDA4F201F660F00EE6E4C /* RCTUIUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTUIUtils.h; sourceTree = "<group>"; };
 		FEFAAC9C1FDB89B40057BBE0 /* RCTRedBoxExtraDataViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRedBoxExtraDataViewController.m; sourceTree = "<group>"; };
@@ -2331,11 +2246,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				EDEBC7E0214C709200DD5AC8 /* libjsinspector.a in Frameworks */,
+				3D3CD9411DE5FC5300167DC4 /* libcxxreact.a in Frameworks */,
+				EDEBC71A214B40A300DD5AC8 /* libjsi.a in Frameworks */,
+				EDEBC7DF214C705700DD5AC8 /* libjsiexecutor.a in Frameworks */,
 				53D123971FBF1DF5001B8A10 /* libyoga.a in Frameworks */,
 				3D383D6D1EBD2940005632C8 /* libdouble-conversion.a in Frameworks */,
-				3D383D6E1EBD2940005632C8 /* libjschelpers.a in Frameworks */,
 				3D383D6F1EBD2940005632C8 /* libthird-party.a in Frameworks */,
-				3D3CD9411DE5FC5300167DC4 /* libcxxreact.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2343,12 +2260,41 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ED297067215023D800B7C4FE /* libjsiexecutor-tvOS.a in Frameworks */,
+				ED296FCB214C9B6C00B7C4FE /* libjsi-tvOS.a in Frameworks */,
+				ED296F83214C974A00B7C4FE /* libyoga.a in Frameworks */,
+				ED296F82214C973700B7C4FE /* libjsinspector-tvOS.a in Frameworks */,
 				2D1D83CE1F74E2DA00615550 /* libdouble-conversion.a in Frameworks */,
-				2D1D83CD1F74E2CE00615550 /* libprivatedata-tvOS.a in Frameworks */,
-				3D383D711EBD2949005632C8 /* libjschelpers.a in Frameworks */,
 				3D383D721EBD2949005632C8 /* libthird-party.a in Frameworks */,
 				3D8ED92C1E5B120100D83D20 /* libcxxreact.a in Frameworks */,
-				3D8ED92D1E5B120100D83D20 /* libyoga.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		ED296FCE214C9CB400B7C4FE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		ED296FF5214C9E7C00B7C4FE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EDEBC756214C283300DD5AC8 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EDEBC79A214C2A7000DD5AC8 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2399,8 +2345,6 @@
 				3D7454B31E54786200E74ADD /* NSDataBigString.h */,
 				3D7AA9C31E548CD5001955CF /* NSDataBigString.mm */,
 				13134C741E296B2A00B9F3CB /* RCTCxxBridge.mm */,
-				135A9BFD1E7B0EE600587AEB /* RCTJSCHelpers.h */,
-				135A9BFE1E7B0EE600587AEB /* RCTJSCHelpers.mm */,
 				13134C771E296B2A00B9F3CB /* RCTMessageThread.h */,
 				13134C781E296B2A00B9F3CB /* RCTMessageThread.mm */,
 				13134C7B1E296B2A00B9F3CB /* RCTObjcExecutor.h */,
@@ -2447,6 +2391,7 @@
 				139D7E4A1E25C5A300323FB7 /* utils.h */,
 			);
 			name = "double-conversion";
+			path = "../third-party/double-conversion-1.1.6";
 			sourceTree = "<group>";
 		};
 		139D7ED71E25DB9200323FB7 /* glog */ = {
@@ -2479,7 +2424,7 @@
 				139D7F181E25DEC900323FB7 /* vlog_is_on.h */,
 			);
 			name = glog;
-			path = "glog-0.3.4/src/glog";
+			path = "../third-party/glog-0.3.5/src/glog";
 			sourceTree = "<group>";
 		};
 		139D849B1E2739EC00323FB7 /* folly */ = {
@@ -2507,6 +2452,7 @@
 				139D84AC1E273B5600323FB7 /* ScopeGuard.h */,
 			);
 			name = folly;
+			path = "../third-party/folly-2016.10.31.00";
 			sourceTree = "<group>";
 		};
 		13B07FE01A69315300A75B9A /* Modules */ = {
@@ -2534,8 +2480,6 @@
 				B233E6E91D2D845D00BC68BA /* RCTI18nManager.m */,
 				352DCFEE1D19F4C20056D623 /* RCTI18nUtil.h */,
 				352DCFEF1D19F4C20056D623 /* RCTI18nUtil.m */,
-				369123DF1DDC75850095B341 /* RCTJSCSamplingProfiler.h */,
-				369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */,
 				13D9FEEC1CDCD93000158BD7 /* RCTKeyboardObserver.h */,
 				13D9FEED1CDCD93000158BD7 /* RCTKeyboardObserver.m */,
 				5960C1B11F0804A00066FD5B /* RCTLayoutAnimation.h */,
@@ -2567,6 +2511,10 @@
 		13B07FF31A6947C200A75B9A /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				50E98FE721460B0D00CD9289 /* RCTWKWebView.h */,
+				50E98FE821460B0D00CD9289 /* RCTWKWebView.m */,
+				50E98FE921460B0D00CD9289 /* RCTWKWebViewManager.h */,
+				50E98FE621460B0D00CD9289 /* RCTWKWebViewManager.m */,
 				B95154301D1B34B200FE7B80 /* RCTActivityIndicatorView.h */,
 				B95154311D1B34B200FE7B80 /* RCTActivityIndicatorView.m */,
 				13B080181A69489C00A75B9A /* RCTActivityIndicatorViewManager.h */,
@@ -2603,14 +2551,6 @@
 				83A1FE8E1B62643A00BE0E65 /* RCTModalHostViewManager.m */,
 				91076A881F743AB00081B4FA /* RCTModalManager.h */,
 				91076A871F743AB00081B4FA /* RCTModalManager.m */,
-				13B0800C1A69489C00A75B9A /* RCTNavigator.h */,
-				13B0800D1A69489C00A75B9A /* RCTNavigator.m */,
-				13B0800E1A69489C00A75B9A /* RCTNavigatorManager.h */,
-				13B0800F1A69489C00A75B9A /* RCTNavigatorManager.m */,
-				13B080101A69489C00A75B9A /* RCTNavItem.h */,
-				13B080111A69489C00A75B9A /* RCTNavItem.m */,
-				13B080121A69489C00A75B9A /* RCTNavItemManager.h */,
-				13B080131A69489C00A75B9A /* RCTNavItemManager.m */,
 				58114A121AAE854800E7D092 /* RCTPicker.h */,
 				58114A131AAE854800E7D092 /* RCTPicker.m */,
 				58114A141AAE854800E7D092 /* RCTPickerManager.h */,
@@ -2692,10 +2632,10 @@
 		3D10A3C71DDF3CED004A0F9D /* ReactCommon */ = {
 			isa = PBXGroup;
 			children = (
-				9936F3341F5F2F360010BF04 /* privatedata */,
+				EDEBC73C214B463000DD5AC8 /* jsiexecutor */,
+				EDEBC6D8214B3F6800DD5AC8 /* jsi */,
 				130A77021DF767AF001F9587 /* yoga */,
 				AC70D2EA1DE489FC002E6351 /* cxxreact */,
-				3D4A621D1DDD3985001F41B4 /* jschelpers */,
 				EBF21BB91FC497DA0052F4D5 /* jsinspector */,
 			);
 			name = ReactCommon;
@@ -2750,24 +2690,6 @@
 			name = PushNotificationIOS;
 			sourceTree = "<group>";
 		};
-		3D4A621D1DDD3985001F41B4 /* jschelpers */ = {
-			isa = PBXGroup;
-			children = (
-				19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */,
-				3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */,
-				3D92B1071E0369AD0018521A /* JSCHelpers.cpp */,
-				3D92B1081E0369AD0018521A /* JSCHelpers.h */,
-				3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */,
-				3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */,
-				3D92B1091E0369AD0018521A /* noncopyable.h */,
-				3D92B10A1E0369AD0018521A /* Unicode.cpp */,
-				3D92B10B1E0369AD0018521A /* Unicode.h */,
-				3D92B10C1E0369AD0018521A /* Value.cpp */,
-				3D92B10D1E0369AD0018521A /* Value.h */,
-			);
-			path = jschelpers;
-			sourceTree = "<group>";
-		};
 		3D7BFD0A1EA8E2D1008DFB7A /* DevSupport */ = {
 			isa = PBXGroup;
 			children = (
@@ -2788,7 +2710,6 @@
 		3D7BFD2A1EA8E3D3008DFB7A /* WebSocket */ = {
 			isa = PBXGroup;
 			children = (
-				3D0E378B1F1CC58C00DCAC9F /* RCTWebSocketObserver.h */,
 				3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */,
 				3D7BFD2B1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h */,
 				3D7BFD2C1EA8E3FA008DFB7A /* RCTSRWebSocket.h */,
@@ -2804,12 +2725,12 @@
 				139D7E381E25C55B00323FB7 /* double-conversion */,
 			);
 			name = ThirdParty;
-			path = "../third-party";
 			sourceTree = "<group>";
 		};
 		53D123821FBF1D49001B8A10 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				EDEBC757214C284000DD5AC8 /* JavaScriptCore.framework */,
 				53D123831FBF1D49001B8A10 /* libyoga.a */,
 			);
 			name = Frameworks;
@@ -2914,18 +2835,18 @@
 				2D2A28131D9B038B00D4039D /* libReact.a */,
 				3D3C059A1DE3340900C268FA /* libyoga.a */,
 				3D3C06751DE3340C00C268FA /* libyoga.a */,
-				3D3CD90B1DE5FBD600167DC4 /* libjschelpers.a */,
-				3D3CD9181DE5FBD800167DC4 /* libjschelpers.a */,
 				3D3CD9251DE5FBEC00167DC4 /* libcxxreact.a */,
 				3D3CD9321DE5FBEE00167DC4 /* libcxxreact.a */,
 				139D7E881E25C6D100323FB7 /* libdouble-conversion.a */,
 				139D7ECE1E25DB7D00323FB7 /* libthird-party.a */,
 				3D383D3C1EBD27B6005632C8 /* libthird-party.a */,
 				3D383D621EBD27B9005632C8 /* libdouble-conversion.a */,
-				9936F3131F5F2E4B0010BF04 /* libprivatedata.a */,
-				9936F32F1F5F2E5B0010BF04 /* libprivatedata-tvOS.a */,
 				EBF21BDC1FC498900052F4D5 /* libjsinspector.a */,
 				EBF21BFA1FC4989A0052F4D5 /* libjsinspector-tvOS.a */,
+				EDEBC6D6214B3E7000DD5AC8 /* libjsi.a */,
+				EDEBC73B214B45A300DD5AC8 /* libjsiexecutor.a */,
+				ED296FB6214C9A0900B7C4FE /* libjsi-tvOS.a */,
+				ED296FEE214C9CF800B7C4FE /* libjsiexecutor-tvOS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -2980,8 +2901,6 @@
 				83CBBA631A601ECA00E9B192 /* RCTJavaScriptExecutor.h */,
 				14200DA81AC179B3008EE6BA /* RCTJavaScriptLoader.h */,
 				AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */,
-				135A9BF91E7B0EAE00587AEB /* RCTJSCErrorHandling.h */,
-				135A9BFA1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm */,
 				008341F51D1DB34400876D9A /* RCTJSStackFrame.h */,
 				008341F41D1DB34400876D9A /* RCTJSStackFrame.m */,
 				13A1F71C1A75392D00D3D453 /* RCTKeyCommands.h */,
@@ -3030,18 +2949,12 @@
 			path = Base;
 			sourceTree = "<group>";
 		};
-		9936F3341F5F2F360010BF04 /* privatedata */ = {
-			isa = PBXGroup;
-			children = (
-				9936F3351F5F2F480010BF04 /* PrivateDataBase.cpp */,
-				9936F3361F5F2F480010BF04 /* PrivateDataBase.h */,
-			);
-			name = privatedata;
-			sourceTree = "<group>";
-		};
 		AC70D2EA1DE489FC002E6351 /* cxxreact */ = {
 			isa = PBXGroup;
 			children = (
+				EDEBC750214B47E100DD5AC8 /* JSDeltaBundleClient.cpp */,
+				EDEBC751214B47E100DD5AC8 /* JSDeltaBundleClient.h */,
+				EDEBC752214B47E100DD5AC8 /* SharedProxyCxxModule.h */,
 				13DA8A302097A90B00276ED4 /* ReactMarker.cpp */,
 				13DA8A2F2097A90A00276ED4 /* ReactMarker.h */,
 				E223624320875A8000108244 /* JSExecutor.cpp */,
@@ -3056,22 +2969,6 @@
 				3D7454781E54757500E74ADD /* JSBigString.h */,
 				AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */,
 				3D3CD8F51DE5FB2300167DC4 /* JSBundleType.h */,
-				3D92B0B21E03699D0018521A /* JSCExecutor.cpp */,
-				3D92B0B31E03699D0018521A /* JSCExecutor.h */,
-				3D92B0B61E03699D0018521A /* JSCLegacyTracing.cpp */,
-				3D92B0B71E03699D0018521A /* JSCLegacyTracing.h */,
-				3D92B0B81E03699D0018521A /* JSCMemory.cpp */,
-				3D92B0B91E03699D0018521A /* JSCMemory.h */,
-				3D92B0BA1E03699D0018521A /* JSCNativeModules.cpp */,
-				3D92B0BB1E03699D0018521A /* JSCNativeModules.h */,
-				3D92B0BC1E03699D0018521A /* JSCPerfStats.cpp */,
-				3D92B0BD1E03699D0018521A /* JSCPerfStats.h */,
-				3D92B0BE1E03699D0018521A /* JSCSamplingProfiler.cpp */,
-				3D92B0BF1E03699D0018521A /* JSCSamplingProfiler.h */,
-				3DF1BE801F26576400068F1A /* JSCTracing.cpp */,
-				3DF1BE811F26576400068F1A /* JSCTracing.h */,
-				3D92B0C21E03699D0018521A /* JSCUtils.cpp */,
-				3D92B0C31E03699D0018521A /* JSCUtils.h */,
 				3D92B0AB1E03699D0018521A /* JSExecutor.h */,
 				3D92B0C61E03699D0018521A /* JSIndexedRAMBundle.cpp */,
 				3D92B0C71E03699D0018521A /* JSIndexedRAMBundle.h */,
@@ -3084,8 +2981,6 @@
 				3D92B0CE1E03699D0018521A /* NativeModule.h */,
 				3D92B0CF1E03699D0018521A /* NativeToJsBridge.cpp */,
 				3D92B0D01E03699D0018521A /* NativeToJsBridge.h */,
-				3D92B0D11E03699D0018521A /* Platform.cpp */,
-				3D92B0D21E03699D0018521A /* Platform.h */,
 				C6D380191F71D75B00621378 /* RAMBundleRegistry.cpp */,
 				C6D380181F71D75B00621378 /* RAMBundleRegistry.h */,
 				3D7454791E54757500E74ADD /* RecoverableError.h */,
@@ -3105,6 +3000,42 @@
 			path = jsinspector;
 			sourceTree = "<group>";
 		};
+		ED6189662155BBDD0000C9A7 /* jsireact */ = {
+			isa = PBXGroup;
+			children = (
+				EDDA711C2164285A00B2D070 /* JSIExecutor.cpp */,
+				EDDA711B2164285A00B2D070 /* JSINativeModules.cpp */,
+				ED6189672155BBF70000C9A7 /* JSIExecutor.h */,
+				ED6189682155BBF70000C9A7 /* JSINativeModules.h */,
+			);
+			name = jsireact;
+			sourceTree = "<group>";
+		};
+		EDEBC6D8214B3F6800DD5AC8 /* jsi */ = {
+			isa = PBXGroup;
+			children = (
+				EDEBC6D9214B3F6800DD5AC8 /* jsi-inl.h */,
+				EDEBC6DA214B3F6800DD5AC8 /* JSIDynamic.cpp */,
+				EDEBC6DB214B3F6800DD5AC8 /* jsi.cpp */,
+				EDEBC6DC214B3F6800DD5AC8 /* JSIDynamic.h */,
+				EDEBC6DD214B3F6800DD5AC8 /* JSCRuntime.cpp */,
+				EDEBC6DE214B3F6800DD5AC8 /* JSCRuntime.h */,
+				EDEBC6DF214B3F6800DD5AC8 /* BUCK */,
+				EDEBC6E0214B3F6800DD5AC8 /* instrumentation.h */,
+				EDEBC6E1214B3F6800DD5AC8 /* jsi.h */,
+			);
+			path = jsi;
+			sourceTree = "<group>";
+		};
+		EDEBC73C214B463000DD5AC8 /* jsiexecutor */ = {
+			isa = PBXGroup;
+			children = (
+				ED6189662155BBDD0000C9A7 /* jsireact */,
+				EDEBC740214B463000DD5AC8 /* BUCK */,
+			);
+			path = jsiexecutor;
+			sourceTree = "<group>";
+		};
 		F1EFDA4D201F660F00EE6E4C /* UIUtils */ = {
 			isa = PBXGroup;
 			children = (
@@ -3141,11 +3072,9 @@
 				3DA982391E5B0F8A004F2374 /* UIView+Private.h in Headers */,
 				13134C8D1E296B2A00B9F3CB /* RCTMessageThread.h in Headers */,
 				130443DE1E401B0D00D93A67 /* RCTTVView.h in Headers */,
-				598FD1941F8172A9006C54CB /* PrivateDataBase.h in Headers */,
 				3D7AA9C51E548CDB001955CF /* NSDataBigString.h in Headers */,
 				5960C1BA1F0804A00066FD5B /* RCTLayoutAnimationGroup.h in Headers */,
 				13134C991E296B2A00B9F3CB /* RCTCxxMethod.h in Headers */,
-				3D0E378D1F1CC58F00DCAC9F /* RCTWebSocketObserver.h in Headers */,
 				3D302F471DF828F800D6DDAE /* RCTPlatform.h in Headers */,
 				13134C951E296B2A00B9F3CB /* RCTObjcExecutor.h in Headers */,
 				590D7BFE1EBD458B00D8A370 /* RCTShadowView+Layout.h in Headers */,
@@ -3179,7 +3108,6 @@
 				3D302F351DF828F800D6DDAE /* RCTErrorCustomizer.h in Headers */,
 				3D302F361DF828F800D6DDAE /* RCTErrorInfo.h in Headers */,
 				3D302F371DF828F800D6DDAE /* RCTEventDispatcher.h in Headers */,
-				59EDBCAA1FDF4E0C003573DE /* (null) in Headers */,
 				594F0A371FD23228007FBE96 /* RCTSurfaceSizeMeasureMode.h in Headers */,
 				3D302F381DF828F800D6DDAE /* RCTFrameUpdate.h in Headers */,
 				3D302F391DF828F800D6DDAE /* RCTImageSource.h in Headers */,
@@ -3192,7 +3120,6 @@
 				599FAA491FB274980058CCF6 /* RCTSurfaceView+Internal.h in Headers */,
 				59EDBCB61FDF4E0C003573DE /* RCTScrollView.h in Headers */,
 				3D302F3E1DF828F800D6DDAE /* RCTKeyCommands.h in Headers */,
-				135A9C031E7B0F6100587AEB /* RCTJSCErrorHandling.h in Headers */,
 				599FAA411FB274980058CCF6 /* RCTSurfaceRootShadowViewDelegate.h in Headers */,
 				3D302F3F1DF828F800D6DDAE /* RCTLog.h in Headers */,
 				599FAA431FB274980058CCF6 /* RCTSurfaceRootView.h in Headers */,
@@ -3208,7 +3135,6 @@
 				3D302F481DF828F800D6DDAE /* RCTRootView.h in Headers */,
 				3D302F491DF828F800D6DDAE /* RCTRootViewDelegate.h in Headers */,
 				3D302F4A1DF828F800D6DDAE /* RCTRootViewInternal.h in Headers */,
-				59EDBCB21FDF4E0C003573DE /* (null) in Headers */,
 				3D302F4B1DF828F800D6DDAE /* RCTTouchEvent.h in Headers */,
 				591F78DD202ADB22004A668C /* RCTLayout.h in Headers */,
 				59D031F21F8353D3008361F0 /* RCTSafeAreaView.h in Headers */,
@@ -3218,7 +3144,6 @@
 				59500D441F71C63F00B122B7 /* RCTUIManagerUtils.h in Headers */,
 				3D302F4F1DF828F800D6DDAE /* RCTUtils.h in Headers */,
 				59D031FA1F8353D3008361F0 /* RCTSafeAreaViewManager.h in Headers */,
-				3D302F541DF828F800D6DDAE /* RCTJSCSamplingProfiler.h in Headers */,
 				3D302F551DF828F800D6DDAE /* RCTAccessibilityManager.h in Headers */,
 				3D302F561DF828F800D6DDAE /* RCTAlertManager.h in Headers */,
 				3D302F571DF828F800D6DDAE /* RCTAppState.h in Headers */,
@@ -3247,7 +3172,6 @@
 				3D302F661DF828F800D6DDAE /* RCTFPSGraph.h in Headers */,
 				3D302F681DF828F800D6DDAE /* RCTMacros.h in Headers */,
 				3D302F691DF828F800D6DDAE /* RCTProfile.h in Headers */,
-				3DF1BE841F26577000068F1A /* JSCTracing.h in Headers */,
 				3D302F6A1DF828F800D6DDAE /* RCTActivityIndicatorView.h in Headers */,
 				3D302F6B1DF828F800D6DDAE /* RCTActivityIndicatorViewManager.h in Headers */,
 				3D7BFD301EA8E3FA008DFB7A /* RCTSRWebSocket.h in Headers */,
@@ -3267,13 +3191,8 @@
 				3D302F7C1DF828F800D6DDAE /* RCTModalHostViewController.h in Headers */,
 				3D302F7D1DF828F800D6DDAE /* RCTModalHostViewManager.h in Headers */,
 				594F0A331FD23228007FBE96 /* RCTSurfaceHostingView.h in Headers */,
-				3D302F7E1DF828F800D6DDAE /* RCTNavigator.h in Headers */,
-				3D302F7F1DF828F800D6DDAE /* RCTNavigatorManager.h in Headers */,
 				130443DD1E401AF500D93A67 /* RCTConvert+Transform.h in Headers */,
 				134D63C41F1FEC65008872B5 /* RCTCxxBridgeDelegate.h in Headers */,
-				3D302F801DF828F800D6DDAE /* RCTNavItem.h in Headers */,
-				3D302F811DF828F800D6DDAE /* RCTNavItemManager.h in Headers */,
-				135A9C061E7B0F7800587AEB /* RCTJSCHelpers.h in Headers */,
 				3D302F841DF828F800D6DDAE /* RCTPointerEvents.h in Headers */,
 				59EB6DBC1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h in Headers */,
 				657734941EE8356100A0E9EA /* RCTInspectorPackagerConnection.h in Headers */,
@@ -3338,44 +3257,23 @@
 				27595AD51E575C7800CCE2B1 /* NativeToJsBridge.h in Headers */,
 				27595AC41E575C7800CCE2B1 /* Instance.h in Headers */,
 				27595AD11E575C7800CCE2B1 /* MessageQueueThread.h in Headers */,
-				27595ACE1E575C7800CCE2B1 /* JSCUtils.h in Headers */,
 				3D7454811E5475AF00E74ADD /* RecoverableError.h in Headers */,
 				27595AC51E575C7800CCE2B1 /* JsArgumentHelpers-inl.h in Headers */,
-				27595AC91E575C7800CCE2B1 /* JSCLegacyTracing.h in Headers */,
-				27595AD61E575C7800CCE2B1 /* Platform.h in Headers */,
 				27595AD81E575C7800CCE2B1 /* SystraceSection.h in Headers */,
 				27595AC61E575C7800CCE2B1 /* JsArgumentHelpers.h in Headers */,
 				27595AD71E575C7800CCE2B1 /* SampleCxxModule.h in Headers */,
 				27595AD21E575C7800CCE2B1 /* MethodCall.h in Headers */,
 				3D3030221DF8294C00D6DDAE /* JSBundleType.h in Headers */,
-				27595ACA1E575C7800CCE2B1 /* JSCMemory.h in Headers */,
 				3D74547D1E54758900E74ADD /* JSBigString.h in Headers */,
-				27595AC71E575C7800CCE2B1 /* JSCExecutor.h in Headers */,
-				27595ACD1E575C7800CCE2B1 /* JSCSamplingProfiler.h in Headers */,
 				27595ABF1E575C7800CCE2B1 /* CxxModule.h in Headers */,
 				27595AD41E575C7800CCE2B1 /* NativeModule.h in Headers */,
-				27595ACB1E575C7800CCE2B1 /* JSCNativeModules.h in Headers */,
 				27595AC01E575C7800CCE2B1 /* CxxNativeModule.h in Headers */,
 				27595AD01E575C7800CCE2B1 /* JSIndexedRAMBundle.h in Headers */,
 				27595AD31E575C7800CCE2B1 /* ModuleRegistry.h in Headers */,
-				27595ACC1E575C7800CCE2B1 /* JSCPerfStats.h in Headers */,
 				27595AC11E575C7800CCE2B1 /* JSExecutor.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		3D3030241DF8295800D6DDAE /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				19F61C041E8495FF00571D81 /* JSCHelpers.h in Headers */,
-				19F61C051E8495FF00571D81 /* noncopyable.h in Headers */,
-				19F61C061E8495FF00571D81 /* Unicode.h in Headers */,
-				19F61C071E8495FF00571D81 /* Value.h in Headers */,
-				3D3030251DF8295E00D6DDAE /* JavaScriptCore.h in Headers */,
-				3D3030261DF8295E00D6DDAE /* JSCWrapper.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		3D383D541EBD27B9005632C8 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -3410,19 +3308,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		3D3CD9001DE5FBD600167DC4 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				13EBC6821E28733C00880AC5 /* Value.h in Headers */,
-				13EBC6811E28733C00880AC5 /* Unicode.h in Headers */,
-				13EBC6801E28733C00880AC5 /* noncopyable.h in Headers */,
-				13EBC67E1E28726000880AC5 /* JSCHelpers.h in Headers */,
-				3D3CD93D1DE5FC1400167DC4 /* JavaScriptCore.h in Headers */,
-				3D3CD93E1DE5FC1400167DC4 /* JSCWrapper.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		3D3CD91A1DE5FBEC00167DC4 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -3433,27 +3318,19 @@
 				27595ABA1E575C7800CCE2B1 /* NativeToJsBridge.h in Headers */,
 				27595AA91E575C7800CCE2B1 /* Instance.h in Headers */,
 				27595AB61E575C7800CCE2B1 /* MessageQueueThread.h in Headers */,
-				27595AB31E575C7800CCE2B1 /* JSCUtils.h in Headers */,
 				3D7454801E5475AF00E74ADD /* RecoverableError.h in Headers */,
 				27595AAA1E575C7800CCE2B1 /* JsArgumentHelpers-inl.h in Headers */,
-				27595AAE1E575C7800CCE2B1 /* JSCLegacyTracing.h in Headers */,
-				27595ABB1E575C7800CCE2B1 /* Platform.h in Headers */,
 				27595ABD1E575C7800CCE2B1 /* SystraceSection.h in Headers */,
 				27595AAB1E575C7800CCE2B1 /* JsArgumentHelpers.h in Headers */,
 				27595ABC1E575C7800CCE2B1 /* SampleCxxModule.h in Headers */,
 				27595AB71E575C7800CCE2B1 /* MethodCall.h in Headers */,
-				27595AAF1E575C7800CCE2B1 /* JSCMemory.h in Headers */,
 				3D74547C1E54758900E74ADD /* JSBigString.h in Headers */,
-				27595AAC1E575C7800CCE2B1 /* JSCExecutor.h in Headers */,
-				27595AB21E575C7800CCE2B1 /* JSCSamplingProfiler.h in Headers */,
 				27595AA41E575C7800CCE2B1 /* CxxModule.h in Headers */,
 				27595AB91E575C7800CCE2B1 /* NativeModule.h in Headers */,
-				27595AB01E575C7800CCE2B1 /* JSCNativeModules.h in Headers */,
 				3D3CD9451DE5FC7100167DC4 /* JSBundleType.h in Headers */,
 				27595AA51E575C7800CCE2B1 /* CxxNativeModule.h in Headers */,
 				27595AB51E575C7800CCE2B1 /* JSIndexedRAMBundle.h in Headers */,
 				27595AB81E575C7800CCE2B1 /* ModuleRegistry.h in Headers */,
-				27595AB11E575C7800CCE2B1 /* JSCPerfStats.h in Headers */,
 				27595AA61E575C7800CCE2B1 /* JSExecutor.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3476,7 +3353,6 @@
 				3D80DA1F1DF820620028D040 /* RCTPushNotificationManager.h in Headers */,
 				3D80DA201DF820620028D040 /* RCTAssert.h in Headers */,
 				3D80DA211DF820620028D040 /* RCTBridge.h in Headers */,
-				13F880381E296D2800C3C7A1 /* JSCWrapper.h in Headers */,
 				3D80DA221DF820620028D040 /* RCTBridge+Private.h in Headers */,
 				599FAA461FB274980058CCF6 /* RCTSurfaceStage.h in Headers */,
 				599FAA361FB274980058CCF6 /* RCTSurface.h in Headers */,
@@ -3494,6 +3370,7 @@
 				3D80DA2A1DF820620028D040 /* RCTErrorCustomizer.h in Headers */,
 				3D80DA2B1DF820620028D040 /* RCTErrorInfo.h in Headers */,
 				1384E2081E806D4E00545659 /* RCTNativeModule.h in Headers */,
+				50E98FED21460B0D00CD9289 /* RCTWKWebViewManager.h in Headers */,
 				3D7BFD2D1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h in Headers */,
 				3D80DA2C1DF820620028D040 /* RCTEventDispatcher.h in Headers */,
 				3D80DA2D1DF820620028D040 /* RCTFrameUpdate.h in Headers */,
@@ -3502,10 +3379,9 @@
 				3D80DA2F1DF820620028D040 /* RCTInvalidating.h in Headers */,
 				598FD1971F817336006C54CB /* RCTModalManager.h in Headers */,
 				599FAA3A1FB274980058CCF6 /* RCTSurfaceDelegate.h in Headers */,
-				9936F3381F5F2F480010BF04 /* PrivateDataBase.h in Headers */,
 				3D80DA301DF820620028D040 /* RCTJavaScriptExecutor.h in Headers */,
 				3DCE53281FEAB23100613583 /* RCTDatePicker.h in Headers */,
-				135A9BFF1E7B0EE600587AEB /* RCTJSCHelpers.h in Headers */,
+				50E98FEB21460B0D00CD9289 /* RCTWKWebView.h in Headers */,
 				3D80DA311DF820620028D040 /* RCTJavaScriptLoader.h in Headers */,
 				130E3D881E6A082100ACE484 /* RCTDevSettings.h in Headers */,
 				3D80DA321DF820620028D040 /* RCTJSStackFrame.h in Headers */,
@@ -3528,7 +3404,6 @@
 				3D80DA3D1DF820620028D040 /* RCTRootView.h in Headers */,
 				59EDBCB91FDF4E0C003573DE /* RCTScrollViewManager.h in Headers */,
 				59EDBCB51FDF4E0C003573DE /* RCTScrollView.h in Headers */,
-				135A9BFB1E7B0EAE00587AEB /* RCTJSCErrorHandling.h in Headers */,
 				3D80DA3E1DF820620028D040 /* RCTRootViewDelegate.h in Headers */,
 				3D80DA3F1DF820620028D040 /* RCTRootViewInternal.h in Headers */,
 				3D80DA401DF820620028D040 /* RCTTouchEvent.h in Headers */,
@@ -3540,11 +3415,9 @@
 				3D80DA431DF820620028D040 /* RCTURLRequestHandler.h in Headers */,
 				3D80DA441DF820620028D040 /* RCTUtils.h in Headers */,
 				13134C981E296B2A00B9F3CB /* RCTCxxMethod.h in Headers */,
-				3D80DA491DF820620028D040 /* RCTJSCSamplingProfiler.h in Headers */,
 				3D80DA4A1DF820620028D040 /* RCTAccessibilityManager.h in Headers */,
 				3D80DA4B1DF820620028D040 /* RCTAlertManager.h in Headers */,
 				3D80DA4C1DF820620028D040 /* RCTAppState.h in Headers */,
-				3D0E378C1F1CC58C00DCAC9F /* RCTWebSocketObserver.h in Headers */,
 				3D80DA4D1DF820620028D040 /* RCTAsyncLocalStorage.h in Headers */,
 				3D80DA4E1DF820620028D040 /* RCTClipboard.h in Headers */,
 				3D80DA4F1DF820620028D040 /* RCTDevLoadingView.h in Headers */,
@@ -3592,14 +3465,9 @@
 				3D80DA6B1DF820620028D040 /* RCTFont.h in Headers */,
 				3D80DA701DF820620028D040 /* RCTModalHostView.h in Headers */,
 				3D80DA711DF820620028D040 /* RCTModalHostViewController.h in Headers */,
-				3DF1BE831F26576400068F1A /* JSCTracing.h in Headers */,
 				3D80DA721DF820620028D040 /* RCTModalHostViewManager.h in Headers */,
 				13134C9C1E296B2A00B9F3CB /* RCTCxxModule.h in Headers */,
-				3D80DA731DF820620028D040 /* RCTNavigator.h in Headers */,
-				3D80DA741DF820620028D040 /* RCTNavigatorManager.h in Headers */,
 				594F0A321FD23228007FBE96 /* RCTSurfaceHostingView.h in Headers */,
-				3D80DA751DF820620028D040 /* RCTNavItem.h in Headers */,
-				3D80DA761DF820620028D040 /* RCTNavItemManager.h in Headers */,
 				3D80DA771DF820620028D040 /* RCTPicker.h in Headers */,
 				3D80DA781DF820620028D040 /* RCTPickerManager.h in Headers */,
 				3D80DA791DF820620028D040 /* RCTPointerEvents.h in Headers */,
@@ -3641,33 +3509,77 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		9936F2FB1F5F2E4B0010BF04 /* Headers */ = {
+		EBF21BC41FC498900052F4D5 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9936F33C1F5F2FE70010BF04 /* PrivateDataBase.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		9936F3171F5F2E5B0010BF04 /* Headers */ = {
+		EBF21BE21FC4989A0052F4D5 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9936F3391F5F2F5C0010BF04 /* PrivateDataBase.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		EBF21BC41FC498900052F4D5 /* Headers */ = {
+		ED296F99214C9A0900B7C4FE /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ED296FBC214C9B0400B7C4FE /* jsi-inl.h in Headers */,
+				ED296FBF214C9B0400B7C4FE /* JSIDynamic.h in Headers */,
+				ED296FC1214C9B0400B7C4FE /* JSCRuntime.h in Headers */,
+				ED296FC3214C9B0400B7C4FE /* instrumentation.h in Headers */,
+				ED296FC4214C9B0400B7C4FE /* jsi.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		EBF21BE21FC4989A0052F4D5 /* Headers */ = {
+		ED296FD1214C9CF800B7C4FE /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				ED61896C2155BBF70000C9A7 /* JSINativeModules.h in Headers */,
+				ED61896A2155BBF70000C9A7 /* JSIExecutor.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		ED2970382150123E00B7C4FE /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				ED29703E2150126E00B7C4FE /* AtomicIntrusiveLinkedList.h in Headers */,
+				ED2970402150126E00B7C4FE /* Bits.h in Headers */,
+				ED2970422150126E00B7C4FE /* Conv.h in Headers */,
+				ED2970432150126E00B7C4FE /* dynamic-inl.h in Headers */,
+				ED2970452150126E00B7C4FE /* dynamic.h in Headers */,
+				ED2970462150126E00B7C4FE /* Exception.h in Headers */,
+				ED2970482150126E00B7C4FE /* json.h in Headers */,
+				ED2970492150126E00B7C4FE /* Memory.h in Headers */,
+				ED29704A2150126E00B7C4FE /* MoveWrapper.h in Headers */,
+				ED29704B2150126E00B7C4FE /* Optional.h in Headers */,
+				ED29704C2150126E00B7C4FE /* ScopeGuard.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EDEBC6BB214B3E7000DD5AC8 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EDEBC6E9214B3F6800DD5AC8 /* jsi.h in Headers */,
+				EDEBC6E7214B3F6800DD5AC8 /* JSCRuntime.h in Headers */,
+				EDEBC6E5214B3F6800DD5AC8 /* JSIDynamic.h in Headers */,
+				EDEBC6E2214B3F6800DD5AC8 /* jsi-inl.h in Headers */,
+				EDEBC6E8214B3F6800DD5AC8 /* instrumentation.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EDEBC729214B45A300DD5AC8 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ED61896B2155BBF70000C9A7 /* JSINativeModules.h in Headers */,
+				ED6189692155BBF70000C9A7 /* JSIExecutor.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3722,6 +3634,9 @@
 			buildRules = (
 			);
 			dependencies = (
+				ED2970662150237300B7C4FE /* PBXTargetDependency */,
+				ED296FCA214C9B6200B7C4FE /* PBXTargetDependency */,
+				ED296F81214C971800B7C4FE /* PBXTargetDependency */,
 				3D0574551DE5FF9600184BB4 /* PBXTargetDependency */,
 				3D0574571DE5FF9600184BB4 /* PBXTargetDependency */,
 			);
@@ -3735,6 +3650,7 @@
 			buildConfigurationList = 3D383D391EBD27B6005632C8 /* Build configuration list for PBXNativeTarget "third-party-tvOS" */;
 			buildPhases = (
 				3D383D241EBD27B6005632C8 /* Sources */,
+				ED2970382150123E00B7C4FE /* Headers */,
 			);
 			buildRules = (
 			);
@@ -3798,44 +3714,6 @@
 			productReference = 3D3C06751DE3340C00C268FA /* libyoga.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		3D3CD8FF1DE5FBD600167DC4 /* jschelpers */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 3D3CD9081DE5FBD600167DC4 /* Build configuration list for PBXNativeTarget "jschelpers" */;
-			buildPhases = (
-				3D3CD9001DE5FBD600167DC4 /* Headers */,
-				3D80DABB1DF8218B0028D040 /* Copy Headers */,
-				3D3CD9051DE5FBD600167DC4 /* Sources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				9936F3441F5F30780010BF04 /* PBXTargetDependency */,
-				1320081B1E283DC300F0C457 /* PBXTargetDependency */,
-			);
-			name = jschelpers;
-			productName = React;
-			productReference = 3D3CD90B1DE5FBD600167DC4 /* libjschelpers.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		3D3CD90C1DE5FBD800167DC4 /* jschelpers-tvOS */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 3D3CD9151DE5FBD800167DC4 /* Build configuration list for PBXNativeTarget "jschelpers-tvOS" */;
-			buildPhases = (
-				3D3030241DF8295800D6DDAE /* Headers */,
-				3D302F1D1DF8264A00D6DDAE /* Copy Headers */,
-				3D3CD9121DE5FBD800167DC4 /* Sources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				9936F3461F5F30830010BF04 /* PBXTargetDependency */,
-				3D383D641EBD27CE005632C8 /* PBXTargetDependency */,
-			);
-			name = "jschelpers-tvOS";
-			productName = "React-tvOS";
-			productReference = 3D3CD9181DE5FBD800167DC4 /* libjschelpers.a */;
-			productType = "com.apple.product-type.library.static";
-		};
 		3D3CD9191DE5FBEC00167DC4 /* cxxreact */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3D3CD9221DE5FBEC00167DC4 /* Build configuration list for PBXNativeTarget "cxxreact" */;
@@ -3847,9 +3725,7 @@
 			buildRules = (
 			);
 			dependencies = (
-				EBF21C021FC499D10052F4D5 /* PBXTargetDependency */,
-				9936F3401F5F305D0010BF04 /* PBXTargetDependency */,
-				3D3CD9501DE5FDB900167DC4 /* PBXTargetDependency */,
+				EDEBC7D7214C52FD00DD5AC8 /* PBXTargetDependency */,
 			);
 			name = cxxreact;
 			productName = React;
@@ -3867,9 +3743,7 @@
 			buildRules = (
 			);
 			dependencies = (
-				EBF21C041FC499D80052F4D5 /* PBXTargetDependency */,
-				9936F3421F5F30640010BF04 /* PBXTargetDependency */,
-				3DC159E81E83E2A0007B1282 /* PBXTargetDependency */,
+				ED296F97214C996500B7C4FE /* PBXTargetDependency */,
 			);
 			name = "cxxreact-tvOS";
 			productName = "React-tvOS";
@@ -3890,6 +3764,9 @@
 			buildRules = (
 			);
 			dependencies = (
+				EDEBC74F214B477400DD5AC8 /* PBXTargetDependency */,
+				EDEBC7D9214C628300DD5AC8 /* PBXTargetDependency */,
+				EDEBC74B214B46A700DD5AC8 /* PBXTargetDependency */,
 				53D123991FBF1E0C001B8A10 /* PBXTargetDependency */,
 				3D3CD94C1DE5FCE700167DC4 /* PBXTargetDependency */,
 			);
@@ -3898,102 +3775,137 @@
 			productReference = 83CBBA2E1A601D0E00E9B192 /* libReact.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		9936F2F81F5F2E4B0010BF04 /* privatedata */ = {
+		EBF21BBF1FC498900052F4D5 /* jsinspector */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 9936F3101F5F2E4B0010BF04 /* Build configuration list for PBXNativeTarget "privatedata" */;
+			buildConfigurationList = EBF21BD91FC498900052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector" */;
 			buildPhases = (
-				9936F2FB1F5F2E4B0010BF04 /* Headers */,
-				9936F3021F5F2E4B0010BF04 /* Copy Headers */,
-				9936F30A1F5F2E4B0010BF04 /* Sources */,
+				EBF21BC41FC498900052F4D5 /* Headers */,
+				EBF21BCB1FC498900052F4D5 /* Copy Headers */,
+				EBF21BD31FC498900052F4D5 /* Sources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
-			name = privatedata;
+			name = jsinspector;
 			productName = React;
-			productReference = 9936F3131F5F2E4B0010BF04 /* libprivatedata.a */;
+			productReference = EBF21BDC1FC498900052F4D5 /* libjsinspector.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		9936F3141F5F2E5B0010BF04 /* privatedata-tvOS */ = {
+		EBF21BDD1FC4989A0052F4D5 /* jsinspector-tvOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 9936F32C1F5F2E5B0010BF04 /* Build configuration list for PBXNativeTarget "privatedata-tvOS" */;
+			buildConfigurationList = EBF21BF71FC4989A0052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector-tvOS" */;
 			buildPhases = (
-				9936F3171F5F2E5B0010BF04 /* Headers */,
-				9936F31E1F5F2E5B0010BF04 /* Copy Headers */,
-				9936F3261F5F2E5B0010BF04 /* Sources */,
+				EBF21BE21FC4989A0052F4D5 /* Headers */,
+				EBF21BE91FC4989A0052F4D5 /* Copy Headers */,
+				EBF21BF11FC4989A0052F4D5 /* Sources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
-			name = "privatedata-tvOS";
+			name = "jsinspector-tvOS";
 			productName = "React-tvOS";
-			productReference = 9936F32F1F5F2E5B0010BF04 /* libprivatedata-tvOS.a */;
+			productReference = EBF21BFA1FC4989A0052F4D5 /* libjsinspector-tvOS.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		EBF21BBF1FC498900052F4D5 /* jsinspector */ = {
+		ED296F98214C9A0900B7C4FE /* jsi-tvOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = EBF21BD91FC498900052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector" */;
+			buildConfigurationList = ED296FB3214C9A0900B7C4FE /* Build configuration list for PBXNativeTarget "jsi-tvOS" */;
 			buildPhases = (
-				EBF21BC41FC498900052F4D5 /* Headers */,
-				EBF21BCB1FC498900052F4D5 /* Copy Headers */,
-				EBF21BD31FC498900052F4D5 /* Sources */,
+				ED296F99214C9A0900B7C4FE /* Headers */,
+				ED296FA4214C9A0900B7C4FE /* Copy Headers */,
+				ED296FA9214C9A0900B7C4FE /* Sources */,
+				ED296FCE214C9CB400B7C4FE /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				ED29704E215012C700B7C4FE /* PBXTargetDependency */,
 			);
-			name = jsinspector;
-			productName = React;
-			productReference = EBF21BDC1FC498900052F4D5 /* libjsinspector.a */;
+			name = "jsi-tvOS";
+			productName = "React-tvOS";
+			productReference = ED296FB6214C9A0900B7C4FE /* libjsi-tvOS.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		EBF21BDD1FC4989A0052F4D5 /* jsinspector-tvOS */ = {
+		ED296FD0214C9CF800B7C4FE /* jsiexecutor-tvOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = EBF21BF71FC4989A0052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector-tvOS" */;
+			buildConfigurationList = ED296FEB214C9CF800B7C4FE /* Build configuration list for PBXNativeTarget "jsiexecutor-tvOS" */;
 			buildPhases = (
-				EBF21BE21FC4989A0052F4D5 /* Headers */,
-				EBF21BE91FC4989A0052F4D5 /* Copy Headers */,
-				EBF21BF11FC4989A0052F4D5 /* Sources */,
+				ED296FD1214C9CF800B7C4FE /* Headers */,
+				ED296FDC214C9CF800B7C4FE /* Copy Headers */,
+				ED296FE1214C9CF800B7C4FE /* Sources */,
+				ED296FF5214C9E7C00B7C4FE /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				ED296FFE214C9EC600B7C4FE /* PBXTargetDependency */,
+				ED296FFC214C9EC000B7C4FE /* PBXTargetDependency */,
+				ED296FF8214C9EAA00B7C4FE /* PBXTargetDependency */,
 			);
-			name = "jsinspector-tvOS";
+			name = "jsiexecutor-tvOS";
 			productName = "React-tvOS";
-			productReference = EBF21BFA1FC4989A0052F4D5 /* libjsinspector-tvOS.a */;
+			productReference = ED296FEE214C9CF800B7C4FE /* libjsiexecutor-tvOS.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		83CBB9F71A601CBA00E9B192 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0940;
-				ORGANIZATIONNAME = Facebook;
-				TargetAttributes = {
-					139D7E871E25C6D100323FB7 = {
-						CreatedOnToolsVersion = 8.1;
-						DevelopmentTeam = V9WTTPBFK9;
-						ProvisioningStyle = Automatic;
-					};
-					139D7ECD1E25DB7D00323FB7 = {
-						CreatedOnToolsVersion = 8.1;
-						DevelopmentTeam = V9WTTPBFK9;
-						ProvisioningStyle = Automatic;
-					};
-					2D2A28121D9B038B00D4039D = {
-						CreatedOnToolsVersion = 8.0;
-						ProvisioningStyle = Automatic;
-					};
-					3D383D211EBD27B6005632C8 = {
-						DevelopmentTeam = V9WTTPBFK9;
-					};
-					3D383D3D1EBD27B9005632C8 = {
-						DevelopmentTeam = V9WTTPBFK9;
+		EDEBC6BA214B3E7000DD5AC8 /* jsi */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = EDEBC6D3214B3E7000DD5AC8 /* Build configuration list for PBXNativeTarget "jsi" */;
+			buildPhases = (
+				EDEBC6BB214B3E7000DD5AC8 /* Headers */,
+				EDEBC6C6214B3E7000DD5AC8 /* Copy Headers */,
+				EDEBC6CA214B3E7000DD5AC8 /* Sources */,
+				EDEBC756214C283300DD5AC8 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				EDEBC7CC214C516800DD5AC8 /* PBXTargetDependency */,
+			);
+			name = jsi;
+			productName = React;
+			productReference = EDEBC6D6214B3E7000DD5AC8 /* libjsi.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		EDEBC724214B45A300DD5AC8 /* jsiexecutor */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = EDEBC738214B45A300DD5AC8 /* Build configuration list for PBXNativeTarget "jsiexecutor" */;
+			buildPhases = (
+				EDEBC729214B45A300DD5AC8 /* Headers */,
+				EDEBC72F214B45A300DD5AC8 /* Copy Headers */,
+				EDEBC734214B45A300DD5AC8 /* Sources */,
+				EDEBC79A214C2A7000DD5AC8 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				ED296F7E214C957300B7C4FE /* PBXTargetDependency */,
+				EDEBC7D3214C528C00DD5AC8 /* PBXTargetDependency */,
+				EDEBC7CE214C523F00DD5AC8 /* PBXTargetDependency */,
+			);
+			name = jsiexecutor;
+			productName = React;
+			productReference = EDEBC73B214B45A300DD5AC8 /* libjsiexecutor.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		83CBB9F71A601CBA00E9B192 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0940;
+				ORGANIZATIONNAME = Facebook;
+				TargetAttributes = {
+					139D7E871E25C6D100323FB7 = {
+						CreatedOnToolsVersion = 8.1;
+					};
+					139D7ECD1E25DB7D00323FB7 = {
+						CreatedOnToolsVersion = 8.1;
+					};
+					2D2A28121D9B038B00D4039D = {
+						CreatedOnToolsVersion = 8.0;
 					};
 					83CBBA2D1A601D0E00E9B192 = {
 						CreatedOnToolsVersion = 6.1.1;
@@ -4019,16 +3931,16 @@
 				3D3C059B1DE3340C00C268FA /* yoga-tvOS */,
 				3D3CD9191DE5FBEC00167DC4 /* cxxreact */,
 				3D3CD9261DE5FBEE00167DC4 /* cxxreact-tvOS */,
-				3D3CD8FF1DE5FBD600167DC4 /* jschelpers */,
-				3D3CD90C1DE5FBD800167DC4 /* jschelpers-tvOS */,
 				EBF21BBF1FC498900052F4D5 /* jsinspector */,
 				EBF21BDD1FC4989A0052F4D5 /* jsinspector-tvOS */,
 				139D7ECD1E25DB7D00323FB7 /* third-party */,
 				3D383D211EBD27B6005632C8 /* third-party-tvOS */,
 				139D7E871E25C6D100323FB7 /* double-conversion */,
 				3D383D3D1EBD27B9005632C8 /* double-conversion-tvOS */,
-				9936F2F81F5F2E4B0010BF04 /* privatedata */,
-				9936F3141F5F2E5B0010BF04 /* privatedata-tvOS */,
+				EDEBC6BA214B3E7000DD5AC8 /* jsi */,
+				EDEBC724214B45A300DD5AC8 /* jsiexecutor */,
+				ED296F98214C9A0900B7C4FE /* jsi-tvOS */,
+				ED296FD0214C9CF800B7C4FE /* jsiexecutor-tvOS */,
 			);
 		};
 /* End PBXProject section */
@@ -4046,7 +3958,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi";
+			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		142C4F7F1B582EA6001F0B58 /* Include RCTJSCProfiler */ = {
@@ -4061,7 +3973,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [[ \"$CONFIGURATION\" == \"Debug\" ]] && [[ -d \"/tmp/RCTJSCProfiler\" ]]; then\n   find \"${CONFIGURATION_BUILD_DIR}\" -name '*.app' | xargs -I{} sh -c 'cp -r /tmp/RCTJSCProfiler \"$1\"' -- {}\nfi";
+			shellScript = "if [[ \"$CONFIGURATION\" == \"Debug\" ]] && [[ -d \"/tmp/RCTJSCProfiler\" ]]; then\n   find \"${CONFIGURATION_BUILD_DIR}\" -name '*.app' | xargs -I{} sh -c 'cp -r /tmp/RCTJSCProfiler \"$1\"' -- {}\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		190EE32F1E6A43DE00A8543A /* Install Third Party */ = {
@@ -4070,13 +3982,69 @@
 			files = (
 			);
 			inputPaths = (
+				"../scripts/ios-install-third-party.sh",
 			);
 			name = "Install Third Party";
 			outputPaths = (
+				"../third-party/glog-0.3.5/src/config.h",
+				"../third-party/glog-0.3.5/src/demangle.cc",
+				"../third-party/glog-0.3.5/src/demangle.h",
+				"../third-party/glog-0.3.5/src/logging.cc",
+				"../third-party/glog-0.3.5/src/raw_logging.cc",
+				"../third-party/glog-0.3.5/src/signalhandler.cc",
+				"../third-party/glog-0.3.5/src/stacktrace.h",
+				"../third-party/glog-0.3.5/src/symbolize.cc",
+				"../third-party/glog-0.3.5/src/symbolize.h",
+				"../third-party/glog-0.3.5/src/utilities.cc",
+				"../third-party/glog-0.3.5/src/utilities.h",
+				"../third-party/glog-0.3.5/src/vlog_is_on.cc",
+				"../third-party/glog-0.3.5/src/glog/log_severity.h",
+				"../third-party/glog-0.3.5/src/glog/logging.h",
+				"../third-party/glog-0.3.5/src/glog/raw_logging.h",
+				"../third-party/glog-0.3.5/src/glog/stl_logging.h",
+				"../third-party/glog-0.3.5/src/glog/vlog_is_on.h",
+				"../third-party/folly-2016.10.31.00/folly/detail/MallocImpl.cpp",
+				"../third-party/folly-2016.10.31.00/folly/portability/BitsFunctexcept.cpp",
+				"../third-party/folly-2016.10.31.00/folly/Demangle.cpp",
+				"../third-party/folly-2016.10.31.00/folly/StringBase.cpp",
+				"../third-party/folly-2016.10.31.00/folly/Unicode.cpp",
+				"../third-party/folly-2016.10.31.00/folly/AtomicIntrusiveLinkedList.h",
+				"../third-party/folly-2016.10.31.00/folly/Bits.cpp",
+				"../third-party/folly-2016.10.31.00/folly/Bits.h",
+				"../third-party/folly-2016.10.31.00/folly/Conv.cpp",
+				"../third-party/folly-2016.10.31.00/folly/Conv.h",
+				"../third-party/folly-2016.10.31.00/folly/dynamic-inl.h",
+				"../third-party/folly-2016.10.31.00/folly/dynamic.cpp",
+				"../third-party/folly-2016.10.31.00/folly/dynamic.h",
+				"../third-party/folly-2016.10.31.00/folly/Exception.h",
+				"../third-party/folly-2016.10.31.00/folly/json.cpp",
+				"../third-party/folly-2016.10.31.00/folly/json.h",
+				"../third-party/folly-2016.10.31.00/folly/Memory.h",
+				"../third-party/folly-2016.10.31.00/folly/MoveWrapper.h",
+				"../third-party/folly-2016.10.31.00/folly/Optional.h",
+				"../third-party/folly-2016.10.31.00/folly/ScopeGuard.h",
+				"../third-party/double-conversion-1.1.6/src/bignum-dtoa.cc",
+				"../third-party/double-conversion-1.1.6/src/bignum-dtoa.h",
+				"../third-party/double-conversion-1.1.6/src/bignum.cc",
+				"../third-party/double-conversion-1.1.6/src/bignum.h",
+				"../third-party/double-conversion-1.1.6/src/cached-powers.cc",
+				"../third-party/double-conversion-1.1.6/src/cached-powers.h",
+				"../third-party/double-conversion-1.1.6/src/diy-fp.cc",
+				"../third-party/double-conversion-1.1.6/src/diy-fp.h",
+				"../third-party/double-conversion-1.1.6/src/double-conversion.cc",
+				"../third-party/double-conversion-1.1.6/src/double-conversion.h",
+				"../third-party/double-conversion-1.1.6/src/fast-dtoa.cc",
+				"../third-party/double-conversion-1.1.6/src/fast-dtoa.h",
+				"../third-party/double-conversion-1.1.6/src/fixed-dtoa.cc",
+				"../third-party/double-conversion-1.1.6/src/fixed-dtoa.h",
+				"../third-party/double-conversion-1.1.6/src/ieee.h",
+				"../third-party/double-conversion-1.1.6/src/strtod.cc",
+				"../third-party/double-conversion-1.1.6/src/strtod.h",
+				"../third-party/double-conversion-1.1.6/src/utils.h",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"$SRCROOT/..\"\nexec ./scripts/ios-install-third-party.sh";
+			shellScript = "cd \"$SRCROOT/..\"\nexec ./scripts/ios-install-third-party.sh\n";
 		};
 		2D6948201DA3042200B3FA97 /* Include RCTJSCProfiler */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -4105,7 +4073,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\nif nc -w 5 -z localhost 8081 ; then\nif ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\necho \"Port 8081 already in use, packager is either not running or not running correctly\"\nexit 2\nfi\nelse\nopen \"$SRCROOT/../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\nfi\nfi";
+			shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\nif nc -w 5 -z localhost 8081 ; then\nif ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\necho \"Port 8081 already in use, packager is either not running or not running correctly\"\nexit 2\nfi\nelse\nopen \"$SRCROOT/../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\nfi\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		3D383D3E1EBD27B9005632C8 /* Install Third Party */ = {
@@ -4167,7 +4135,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				598FD1931F817284006C54CB /* PrivateDataBase.cpp in Sources */,
 				3DC159E41E83E1AE007B1282 /* RCTRootContentView.m in Sources */,
 				3D80D91B1DF6F8200028D040 /* RCTPlatform.m in Sources */,
 				2D0EB9F32021067800CAF88A /* RCTUIUtils.m in Sources */,
@@ -4219,10 +4186,8 @@
 				13134C971E296B2A00B9F3CB /* RCTObjcExecutor.mm in Sources */,
 				594F0A351FD23228007FBE96 /* RCTSurfaceHostingView.mm in Sources */,
 				130E3D8B1E6A083900ACE484 /* RCTDevSettings.mm in Sources */,
-				2D3B5ED81D9B098A00451313 /* RCTNavigatorManager.m in Sources */,
 				2D3B5E951D9B087C00451313 /* RCTAssert.m in Sources */,
 				59D031F81F8353D3008361F0 /* RCTSafeAreaViewLocalData.m in Sources */,
-				3DF1BE851F26577300068F1A /* JSCTracing.cpp in Sources */,
 				2D3B5EB61D9B091400451313 /* RCTExceptionsManager.m in Sources */,
 				2D3B5EEB1D9B09D000451313 /* RCTTabBarItem.m in Sources */,
 				2D3B5ED41D9B097D00451313 /* RCTModalHostView.m in Sources */,
@@ -4258,7 +4223,6 @@
 				2D3B5EB51D9B091100451313 /* RCTDevMenu.m in Sources */,
 				59EDBCAC1FDF4E0C003573DE /* (null) in Sources */,
 				2D3B5EBD1D9B092A00451313 /* RCTTiming.m in Sources */,
-				135A9C041E7B0F6400587AEB /* RCTJSCErrorHandling.mm in Sources */,
 				2D3B5EA81D9B08D300451313 /* RCTUtils.m in Sources */,
 				599FAA451FB274980058CCF6 /* RCTSurfaceRootView.mm in Sources */,
 				2D3B5EC81D9B095800451313 /* RCTActivityIndicatorViewManager.m in Sources */,
@@ -4276,11 +4240,9 @@
 				2D3B5EB01D9B08FE00451313 /* RCTAlertManager.m in Sources */,
 				13134C9B1E296B2A00B9F3CB /* RCTCxxMethod.mm in Sources */,
 				2D3B5E9C1D9B08A300451313 /* RCTImageSource.m in Sources */,
-				3DDEC1521DDCE0CA0020BBDF /* RCTJSCSamplingProfiler.m in Sources */,
 				2D3B5EC31D9B094800451313 /* RCTProfileTrampoline-arm.S in Sources */,
 				3D0B842B1EC0B49400B2BD8E /* RCTTVRemoteHandler.m in Sources */,
 				657734861EE834D900A0E9EA /* RCTInspectorDevServerHelper.mm in Sources */,
-				2D3B5ED91D9B098E00451313 /* RCTNavItem.m in Sources */,
 				66CD94B41F1045E700CB3C7C /* RCTMaskedView.m in Sources */,
 				2D74EAFA1DAE9590003B751B /* RCTMultipartDataTask.m in Sources */,
 				2D3B5EC51D9B094D00451313 /* RCTProfileTrampoline-i386.S in Sources */,
@@ -4291,12 +4253,9 @@
 				2D3B5EBE1D9B092D00451313 /* RCTUIManager.m in Sources */,
 				C60128AE1F3D1258009DF9FF /* RCTCxxConvert.m in Sources */,
 				2D3B5EDD1D9B09A300451313 /* RCTProgressViewManager.m in Sources */,
-				2D3B5ED71D9B098700451313 /* RCTNavigator.m in Sources */,
-				2D3B5EDA1D9B099100451313 /* RCTNavItemManager.m in Sources */,
 				2D3B5EC11D9B093900451313 /* RCTFPSGraph.m in Sources */,
 				2D3B5E9A1D9B089D00451313 /* RCTEventDispatcher.m in Sources */,
 				2D3B5ED61D9B098400451313 /* RCTModalHostViewManager.m in Sources */,
-				135A9C051E7B0F7500587AEB /* RCTJSCHelpers.mm in Sources */,
 				2D3B5EC71D9B095600451313 /* RCTActivityIndicatorView.m in Sources */,
 				2D3B5EB21D9B090300451313 /* RCTAsyncLocalStorage.m in Sources */,
 				59D031FC1F8353D3008361F0 /* RCTSafeAreaViewManager.m in Sources */,
@@ -4361,6 +4320,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BA0501B02109DD1800A6BBC4 /* YGConfig.cpp in Sources */,
 				53DEF6EB205AE5A1006A3890 /* YGFloatOptional.cpp in Sources */,
 				53D123A11FBF1EFF001B8A10 /* Yoga.cpp in Sources */,
 				5352C5762038FF9700A3B97E /* YGStyle.cpp in Sources */,
@@ -4372,30 +4332,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		3D3CD9051DE5FBD600167DC4 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				13EBC6711E2870DE00880AC5 /* JSCWrapper.cpp in Sources */,
-				13EBC6731E2870DE00880AC5 /* Value.cpp in Sources */,
-				13EBC67D1E28725900880AC5 /* JSCHelpers.cpp in Sources */,
-				135A9C021E7B0F4800587AEB /* systemJSCWrapper.cpp in Sources */,
-				13EBC67B1E28723000880AC5 /* Unicode.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3D3CD9121DE5FBD800167DC4 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				13EBC6791E2870E400880AC5 /* Unicode.cpp in Sources */,
-				13EBC6781E2870E400880AC5 /* JSCWrapper.cpp in Sources */,
-				13EBC6771E2870E400880AC5 /* JSCHelpers.cpp in Sources */,
-				135A9C011E7B0F4700587AEB /* systemJSCWrapper.cpp in Sources */,
-				13EBC67A1E2870E400880AC5 /* Value.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		3D3CD91F1DE5FBEC00167DC4 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -4405,19 +4341,11 @@
 				13F8877D1E29726200C3C7A1 /* ModuleRegistry.cpp in Sources */,
 				C6D3801C1F71D76700621378 /* RAMBundleRegistry.cpp in Sources */,
 				13F8876E1E29726200C3C7A1 /* CxxNativeModule.cpp in Sources */,
-				13F887721E29726200C3C7A1 /* JSCExecutor.cpp in Sources */,
-				13F887741E29726200C3C7A1 /* JSCLegacyTracing.cpp in Sources */,
 				13DA8A332097A90B00276ED4 /* ReactMarker.cpp in Sources */,
-				13F887771E29726200C3C7A1 /* JSCPerfStats.cpp in Sources */,
 				13F887711E29726200C3C7A1 /* JSBundleType.cpp in Sources */,
-				13F887791E29726200C3C7A1 /* JSCUtils.cpp in Sources */,
-				13F887781E29726200C3C7A1 /* JSCSamplingProfiler.cpp in Sources */,
-				13F887751E29726200C3C7A1 /* JSCMemory.cpp in Sources */,
 				13F8877C1E29726200C3C7A1 /* MethodCall.cpp in Sources */,
-				13F8877F1E29726200C3C7A1 /* Platform.cpp in Sources */,
 				13F887701E29726200C3C7A1 /* Instance.cpp in Sources */,
 				13F8877E1E29726200C3C7A1 /* NativeToJsBridge.cpp in Sources */,
-				13F887761E29726200C3C7A1 /* JSCNativeModules.cpp in Sources */,
 				13F887801E29726200C3C7A1 /* SampleCxxModule.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4426,24 +4354,17 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BA0501AE2109DD0600A6BBC4 /* JSExecutor.cpp in Sources */,
 				3DC159E61E83E1FA007B1282 /* JSBigString.cpp in Sources */,
 				13F8878E1E29726300C3C7A1 /* JSIndexedRAMBundle.cpp in Sources */,
 				13F887901E29726300C3C7A1 /* ModuleRegistry.cpp in Sources */,
 				C6D3801D1F71D76800621378 /* RAMBundleRegistry.cpp in Sources */,
-				13F887851E29726300C3C7A1 /* JSCExecutor.cpp in Sources */,
-				13F887871E29726300C3C7A1 /* JSCLegacyTracing.cpp in Sources */,
-				13F8878A1E29726300C3C7A1 /* JSCPerfStats.cpp in Sources */,
 				13DA8A342097A90B00276ED4 /* ReactMarker.cpp in Sources */,
 				13F887841E29726300C3C7A1 /* Instance.cpp in Sources */,
-				13F8878C1E29726300C3C7A1 /* JSCUtils.cpp in Sources */,
-				13F8878B1E29726300C3C7A1 /* JSCSamplingProfiler.cpp in Sources */,
-				13F887881E29726300C3C7A1 /* JSCMemory.cpp in Sources */,
 				3D80D9181DF6F7A80028D040 /* JSBundleType.cpp in Sources */,
 				13F8878F1E29726300C3C7A1 /* MethodCall.cpp in Sources */,
-				13F887921E29726300C3C7A1 /* Platform.cpp in Sources */,
 				13F887911E29726300C3C7A1 /* NativeToJsBridge.cpp in Sources */,
 				13F887821E29726300C3C7A1 /* CxxNativeModule.cpp in Sources */,
-				13F887891E29726300C3C7A1 /* JSCNativeModules.cpp in Sources */,
 				13F887931E29726300C3C7A1 /* SampleCxxModule.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4480,6 +4401,7 @@
 				13CC8A821B17642100940AE7 /* RCTBorderDrawing.m in Sources */,
 				C60128AD1F3D1258009DF9FF /* RCTCxxConvert.m in Sources */,
 				3DCE53291FEAB23100613583 /* RCTDatePicker.m in Sources */,
+				50E98FEA21460B0D00CD9289 /* RCTWKWebViewManager.m in Sources */,
 				83CBBA511A601E3B00E9B192 /* RCTAssert.m in Sources */,
 				59EB6DBD1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.mm in Sources */,
 				59E604A21FE9CCE300BD90C5 /* RCTScrollContentViewManager.m in Sources */,
@@ -4519,12 +4441,10 @@
 				59EDBCB71FDF4E0C003573DE /* RCTScrollView.m in Sources */,
 				59EDBCAB1FDF4E0C003573DE /* (null) in Sources */,
 				59EDBCBB1FDF4E0C003573DE /* RCTScrollViewManager.m in Sources */,
-				369123E11DDC75850095B341 /* RCTJSCSamplingProfiler.m in Sources */,
 				599FAA441FB274980058CCF6 /* RCTSurfaceRootView.mm in Sources */,
 				C60669361F3CCF1B00E67165 /* RCTManagedPointer.mm in Sources */,
 				13B080261A694A8400A75B9A /* RCTWrapperViewController.m in Sources */,
 				A2440AA31DF8D854006E7BFC /* RCTReloadCommand.m in Sources */,
-				3DF1BE821F26576400068F1A /* JSCTracing.cpp in Sources */,
 				6577348F1EE8354A00A0E9EA /* RCTInspector.mm in Sources */,
 				E9B20B7B1B500126007A2DA7 /* RCTAccessibilityManager.m in Sources */,
 				13A0C2891B74F71200B29F6F /* RCTDevLoadingView.m in Sources */,
@@ -4543,7 +4463,6 @@
 				83CBBA981A6020BB00E9B192 /* RCTTouchHandler.m in Sources */,
 				3EDCA8A51D3591E700450C31 /* RCTErrorInfo.m in Sources */,
 				83CBBA521A601E3B00E9B192 /* RCTLog.mm in Sources */,
-				13B0801D1A69489C00A75B9A /* RCTNavItemManager.m in Sources */,
 				13A6E20E1C19AA0C00845B82 /* RCTParserUtils.m in Sources */,
 				59D031F71F8353D3008361F0 /* RCTSafeAreaViewLocalData.m in Sources */,
 				13E067571A70F44B002CDEE1 /* RCTView.m in Sources */,
@@ -4551,7 +4470,6 @@
 				EBF21BBD1FC498270052F4D5 /* InspectorInterfaces.cpp in Sources */,
 				59EDBCAF1FDF4E0C003573DE /* RCTScrollContentView.m in Sources */,
 				13D9FEEE1CDCD93000158BD7 /* RCTKeyboardObserver.m in Sources */,
-				135A9C001E7B0EE600587AEB /* RCTJSCHelpers.mm in Sources */,
 				B233E6EA1D2D845D00BC68BA /* RCTI18nManager.m in Sources */,
 				3D7BFD1F1EA8E351008DFB7A /* RCTPackagerConnection.mm in Sources */,
 				13456E931ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m in Sources */,
@@ -4564,6 +4482,7 @@
 				3DCE532B1FEAB23100613583 /* RCTDatePickerManager.m in Sources */,
 				13C156051AB1A2840079392D /* RCTWebView.m in Sources */,
 				83CBBA601A601EAA00E9B192 /* RCTBridge.m in Sources */,
+				50E98FEC21460B0D00CD9289 /* RCTWKWebView.m in Sources */,
 				590D7BFF1EBD458B00D8A370 /* RCTShadowView+Layout.m in Sources */,
 				5335D5411FE81A4700883D58 /* RCTShadowView.m in Sources */,
 				66CD94B31F1045E700CB3C7C /* RCTMaskedView.m in Sources */,
@@ -4572,7 +4491,6 @@
 				137327E81AA5CF210034F82E /* RCTTabBarItem.m in Sources */,
 				83A1FE8C1B62640A00BE0E65 /* RCTModalHostView.m in Sources */,
 				5925356A20084D0600DD584B /* RCTSurfaceSizeMeasureMode.mm in Sources */,
-				9936F3371F5F2F480010BF04 /* PrivateDataBase.cpp in Sources */,
 				1450FF871BCFF28A00208362 /* RCTProfileTrampoline-arm.S in Sources */,
 				131B6AF51AF1093D00FFC3E0 /* RCTSegmentedControlManager.m in Sources */,
 				58114A171AAE854800E7D092 /* RCTPickerManager.m in Sources */,
@@ -4581,13 +4499,10 @@
 				68EFE4EE1CF6EB3900A1DE13 /* RCTBundleURLProvider.m in Sources */,
 				B95154321D1B34B200FE7B80 /* RCTActivityIndicatorView.m in Sources */,
 				5960C1BB1F0804A00066FD5B /* RCTLayoutAnimationGroup.m in Sources */,
-				13B0801A1A69489C00A75B9A /* RCTNavigator.m in Sources */,
 				137327E71AA5CF210034F82E /* RCTTabBar.m in Sources */,
 				13F17A851B8493E5007D4C75 /* RCTRedBox.m in Sources */,
-				135A9BFC1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm in Sources */,
 				59D031F31F8353D3008361F0 /* RCTSafeAreaView.m in Sources */,
 				83392EB31B6634E10013B15F /* RCTModalHostViewController.m in Sources */,
-				13B0801C1A69489C00A75B9A /* RCTNavItem.m in Sources */,
 				83CBBA691A601EF300E9B192 /* RCTEventDispatcher.m in Sources */,
 				83A1FE8F1B62643A00BE0E65 /* RCTModalHostViewManager.m in Sources */,
 				13E0674A1A70F434002CDEE1 /* RCTUIManager.m in Sources */,
@@ -4595,52 +4510,68 @@
 				391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */,
 				1450FF861BCFF28A00208362 /* RCTProfile.m in Sources */,
 				13AB90C11B6FA36700713B4F /* RCTComponentData.m in Sources */,
-				13B0801B1A69489C00A75B9A /* RCTNavigatorManager.m in Sources */,
 				916F9C2D1F743F57002E5920 /* RCTModalManager.m in Sources */,
 				F1EFDA50201F661000EE6E4C /* RCTUIUtils.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		9936F30A1F5F2E4B0010BF04 /* Sources */ = {
+		EBF21BD31FC498900052F4D5 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9936F33E1F5F2FFC0010BF04 /* PrivateDataBase.cpp in Sources */,
+				EBF21BFC1FC4990B0052F4D5 /* InspectorInterfaces.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		9936F3261F5F2E5B0010BF04 /* Sources */ = {
+		EBF21BF11FC4989A0052F4D5 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9936F33B1F5F2F9D0010BF04 /* PrivateDataBase.cpp in Sources */,
+				EBF21BFF1FC4998E0052F4D5 /* InspectorInterfaces.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		EBF21BD31FC498900052F4D5 /* Sources */ = {
+		ED296FA9214C9A0900B7C4FE /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EBF21BFC1FC4990B0052F4D5 /* InspectorInterfaces.cpp in Sources */,
+				ED296FB9214C9AC200B7C4FE /* JSCRuntime.cpp in Sources */,
+				ED296FB7214C9A9A00B7C4FE /* JSIDynamic.cpp in Sources */,
+				ED296FB8214C9A9A00B7C4FE /* jsi.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		EBF21BF11FC4989A0052F4D5 /* Sources */ = {
+		ED296FE1214C9CF800B7C4FE /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EBF21BFF1FC4998E0052F4D5 /* InspectorInterfaces.cpp in Sources */,
+				EDDA711E2164285A00B2D070 /* JSINativeModules.cpp in Sources */,
+				EDDA71202164285A00B2D070 /* JSIExecutor.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EDEBC6CA214B3E7000DD5AC8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EDEBC6E6214B3F6800DD5AC8 /* JSCRuntime.cpp in Sources */,
+				EDEBC6E4214B3F6800DD5AC8 /* jsi.cpp in Sources */,
+				EDEBC6E3214B3F6800DD5AC8 /* JSIDynamic.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EDEBC734214B45A300DD5AC8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EDDA711D2164285A00B2D070 /* JSINativeModules.cpp in Sources */,
+				EDDA711F2164285A00B2D070 /* JSIExecutor.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		1320081B1E283DC300F0C457 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 139D7ECD1E25DB7D00323FB7 /* third-party */;
-			targetProxy = 1320081A1E283DC300F0C457 /* PBXContainerItemProxy */;
-		};
 		1320081D1E283DCB00F0C457 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 139D7E871E25C6D100323FB7 /* double-conversion */;
@@ -4656,11 +4587,6 @@
 			target = 3D3CD9261DE5FBEE00167DC4 /* cxxreact-tvOS */;
 			targetProxy = 3D0574561DE5FF9600184BB4 /* PBXContainerItemProxy */;
 		};
-		3D383D641EBD27CE005632C8 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 3D383D211EBD27B6005632C8 /* third-party-tvOS */;
-			targetProxy = 3D383D631EBD27CE005632C8 /* PBXContainerItemProxy */;
-		};
 		3D383D661EBD27DB005632C8 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 3D383D3D1EBD27B9005632C8 /* double-conversion-tvOS */;
@@ -4671,50 +4597,90 @@
 			target = 3D3CD9191DE5FBEC00167DC4 /* cxxreact */;
 			targetProxy = 3D3CD94B1DE5FCE700167DC4 /* PBXContainerItemProxy */;
 		};
-		3D3CD9501DE5FDB900167DC4 /* PBXTargetDependency */ = {
+		53D123991FBF1E0C001B8A10 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 3D3C04B91DE3340900C268FA /* yoga */;
+			targetProxy = 53D123981FBF1E0C001B8A10 /* PBXContainerItemProxy */;
+		};
+		ED296F7E214C957300B7C4FE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 3D3CD8FF1DE5FBD600167DC4 /* jschelpers */;
-			targetProxy = 3D3CD94F1DE5FDB900167DC4 /* PBXContainerItemProxy */;
+			target = EDEBC6BA214B3E7000DD5AC8 /* jsi */;
+			targetProxy = ED296F7D214C957300B7C4FE /* PBXContainerItemProxy */;
 		};
-		3DC159E81E83E2A0007B1282 /* PBXTargetDependency */ = {
+		ED296F81214C971800B7C4FE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 3D3CD90C1DE5FBD800167DC4 /* jschelpers-tvOS */;
-			targetProxy = 3DC159E71E83E2A0007B1282 /* PBXContainerItemProxy */;
+			target = EBF21BDD1FC4989A0052F4D5 /* jsinspector-tvOS */;
+			targetProxy = ED296F80214C971800B7C4FE /* PBXContainerItemProxy */;
 		};
-		53D123991FBF1E0C001B8A10 /* PBXTargetDependency */ = {
+		ED296F97214C996500B7C4FE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 3D3C04B91DE3340900C268FA /* yoga */;
-			targetProxy = 53D123981FBF1E0C001B8A10 /* PBXContainerItemProxy */;
+			target = 3D383D3D1EBD27B9005632C8 /* double-conversion-tvOS */;
+			targetProxy = ED296F96214C996500B7C4FE /* PBXContainerItemProxy */;
+		};
+		ED296FCA214C9B6200B7C4FE /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = ED296F98214C9A0900B7C4FE /* jsi-tvOS */;
+			targetProxy = ED296FC9214C9B6200B7C4FE /* PBXContainerItemProxy */;
 		};
-		9936F3401F5F305D0010BF04 /* PBXTargetDependency */ = {
+		ED296FF8214C9EAA00B7C4FE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 9936F2F81F5F2E4B0010BF04 /* privatedata */;
-			targetProxy = 9936F33F1F5F305D0010BF04 /* PBXContainerItemProxy */;
+			target = 3D383D211EBD27B6005632C8 /* third-party-tvOS */;
+			targetProxy = ED296FF7214C9EAA00B7C4FE /* PBXContainerItemProxy */;
 		};
-		9936F3421F5F30640010BF04 /* PBXTargetDependency */ = {
+		ED296FFC214C9EC000B7C4FE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 9936F3141F5F2E5B0010BF04 /* privatedata-tvOS */;
-			targetProxy = 9936F3411F5F30640010BF04 /* PBXContainerItemProxy */;
+			target = 3D3CD9261DE5FBEE00167DC4 /* cxxreact-tvOS */;
+			targetProxy = ED296FFB214C9EC000B7C4FE /* PBXContainerItemProxy */;
 		};
-		9936F3441F5F30780010BF04 /* PBXTargetDependency */ = {
+		ED296FFE214C9EC600B7C4FE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 9936F2F81F5F2E4B0010BF04 /* privatedata */;
-			targetProxy = 9936F3431F5F30780010BF04 /* PBXContainerItemProxy */;
+			target = ED296F98214C9A0900B7C4FE /* jsi-tvOS */;
+			targetProxy = ED296FFD214C9EC600B7C4FE /* PBXContainerItemProxy */;
 		};
-		9936F3461F5F30830010BF04 /* PBXTargetDependency */ = {
+		ED29704E215012C700B7C4FE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 9936F3141F5F2E5B0010BF04 /* privatedata-tvOS */;
-			targetProxy = 9936F3451F5F30830010BF04 /* PBXContainerItemProxy */;
+			target = 3D383D3D1EBD27B9005632C8 /* double-conversion-tvOS */;
+			targetProxy = ED29704D215012C700B7C4FE /* PBXContainerItemProxy */;
 		};
-		EBF21C021FC499D10052F4D5 /* PBXTargetDependency */ = {
+		ED2970662150237300B7C4FE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = EBF21BBF1FC498900052F4D5 /* jsinspector */;
-			targetProxy = EBF21C011FC499D10052F4D5 /* PBXContainerItemProxy */;
+			target = ED296FD0214C9CF800B7C4FE /* jsiexecutor-tvOS */;
+			targetProxy = ED2970652150237300B7C4FE /* PBXContainerItemProxy */;
 		};
-		EBF21C041FC499D80052F4D5 /* PBXTargetDependency */ = {
+		EDEBC74B214B46A700DD5AC8 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = EBF21BDD1FC4989A0052F4D5 /* jsinspector-tvOS */;
-			targetProxy = EBF21C031FC499D80052F4D5 /* PBXContainerItemProxy */;
+			target = EDEBC724214B45A300DD5AC8 /* jsiexecutor */;
+			targetProxy = EDEBC74A214B46A700DD5AC8 /* PBXContainerItemProxy */;
+		};
+		EDEBC74F214B477400DD5AC8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EDEBC6BA214B3E7000DD5AC8 /* jsi */;
+			targetProxy = EDEBC74E214B477400DD5AC8 /* PBXContainerItemProxy */;
+		};
+		EDEBC7CC214C516800DD5AC8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 139D7E871E25C6D100323FB7 /* double-conversion */;
+			targetProxy = EDEBC7CB214C516800DD5AC8 /* PBXContainerItemProxy */;
+		};
+		EDEBC7CE214C523F00DD5AC8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 3D3CD9191DE5FBEC00167DC4 /* cxxreact */;
+			targetProxy = EDEBC7CD214C523F00DD5AC8 /* PBXContainerItemProxy */;
+		};
+		EDEBC7D3214C528C00DD5AC8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 139D7ECD1E25DB7D00323FB7 /* third-party */;
+			targetProxy = EDEBC7D2214C528C00DD5AC8 /* PBXContainerItemProxy */;
+		};
+		EDEBC7D7214C52FD00DD5AC8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 139D7E871E25C6D100323FB7 /* double-conversion */;
+			targetProxy = EDEBC7D6214C52FD00DD5AC8 /* PBXContainerItemProxy */;
+		};
+		EDEBC7D9214C628300DD5AC8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EBF21BBF1FC498900052F4D5 /* jsinspector */;
+			targetProxy = EDEBC7D8214C628300DD5AC8 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -4727,7 +4693,6 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = V9WTTPBFK9;
 				OTHER_LDFLAGS = "-ObjC";
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/double-conversion";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4744,7 +4709,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = V9WTTPBFK9;
 				OTHER_LDFLAGS = "-ObjC";
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/double-conversion";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4761,7 +4725,6 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = V9WTTPBFK9;
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4780,7 +4743,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = V9WTTPBFK9;
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4836,7 +4798,6 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = V9WTTPBFK9;
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "third-party";
@@ -4856,7 +4817,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = V9WTTPBFK9;
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "third-party";
@@ -4874,7 +4834,6 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = V9WTTPBFK9;
 				OTHER_LDFLAGS = "-ObjC";
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/double-conversion";
 				PRODUCT_NAME = "double-conversion";
@@ -4892,7 +4851,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = V9WTTPBFK9;
 				OTHER_LDFLAGS = "-ObjC";
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/double-conversion";
 				PRODUCT_NAME = "double-conversion";
@@ -4964,73 +4922,6 @@
 			};
 			name = Release;
 		};
-		3D3CD9091DE5FBD600167DC4 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
-			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jschelpers;
-				RUN_CLANG_STATIC_ANALYZER = YES;
-			};
-			name = Debug;
-		};
-		3D3CD90A1DE5FBD600167DC4 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
-			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jschelpers;
-				RUN_CLANG_STATIC_ANALYZER = NO;
-			};
-			name = Release;
-		};
-		3D3CD9161DE5FBD800167DC4 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
-			buildSettings = {
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_SUSPICIOUS_MOVES = YES;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_TESTABILITY = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = jschelpers;
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jschelpers;
-				SDKROOT = appletvos;
-			};
-			name = Debug;
-		};
-		3D3CD9171DE5FBD800167DC4 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
-			buildSettings = {
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_SUSPICIOUS_MOVES = YES;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_NO_COMMON_BLOCKS = YES;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = jschelpers;
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jschelpers;
-				SDKROOT = appletvos;
-			};
-			name = Release;
-		};
 		3D3CD9231DE5FBEC00167DC4 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
@@ -5232,7 +5123,11 @@
 					"RCT_METRO_PORT=${RCT_METRO_PORT}",
 				);
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-weak_framework",
+					WebKit,
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/React;
 				RUN_CLANG_STATIC_ANALYZER = YES;
@@ -5250,14 +5145,18 @@
 					"RCT_METRO_PORT=${RCT_METRO_PORT}",
 				);
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-weak_framework",
+					WebKit,
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/React;
 				RUN_CLANG_STATIC_ANALYZER = NO;
 			};
 			name = Release;
 		};
-		9936F3111F5F2E4B0010BF04 /* Debug */ = {
+		EBF21BDA1FC498900052F4D5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
 			buildSettings = {
@@ -5266,12 +5165,12 @@
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/privatedata;
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
 				RUN_CLANG_STATIC_ANALYZER = YES;
 			};
 			name = Debug;
 		};
-		9936F3121F5F2E4B0010BF04 /* Release */ = {
+		EBF21BDB1FC498900052F4D5 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
 			buildSettings = {
@@ -5281,12 +5180,12 @@
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/privatedata;
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
 				RUN_CLANG_STATIC_ANALYZER = NO;
 			};
 			name = Release;
 		};
-		9936F32D1F5F2E5B0010BF04 /* Debug */ = {
+		EBF21BF81FC4989A0052F4D5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
 			buildSettings = {
@@ -5300,12 +5199,12 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/privatedata;
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
 				SDKROOT = appletvos;
 			};
 			name = Debug;
 		};
-		9936F32E1F5F2E5B0010BF04 /* Release */ = {
+		EBF21BF91FC4989A0052F4D5 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
 			buildSettings = {
@@ -5319,43 +5218,69 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/privatedata;
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
 				SDKROOT = appletvos;
 			};
 			name = Release;
 		};
-		EBF21BDA1FC498900052F4D5 /* Debug */ = {
+		ED296FB4214C9A0900B7C4FE /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
 			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_TESTABILITY = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../third-party/boost_1_63_0",
+					"$(SRCROOT)/../third-party/folly-2016.10.31.00",
+					"$(SRCROOT)/../third-party/glog-0.3.5/src",
+				);
+				OTHER_CFLAGS = (
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
-				RUN_CLANG_STATIC_ANALYZER = YES;
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsi;
+				SDKROOT = appletvos;
 			};
 			name = Debug;
 		};
-		EBF21BDB1FC498900052F4D5 /* Release */ = {
+		ED296FB5214C9A0900B7C4FE /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
 			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_NO_COMMON_BLOCKS = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../third-party/boost_1_63_0",
+					"$(SRCROOT)/../third-party/folly-2016.10.31.00",
+					"$(SRCROOT)/../third-party/glog-0.3.5/src",
+				);
+				OTHER_CFLAGS = (
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
-				RUN_CLANG_STATIC_ANALYZER = NO;
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsi;
+				SDKROOT = appletvos;
 			};
 			name = Release;
 		};
-		EBF21BF81FC4989A0052F4D5 /* Debug */ = {
+		ED296FEC214C9CF800B7C4FE /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
@@ -5365,16 +5290,25 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../third-party/boost_1_63_0",
+					"$(SRCROOT)/../third-party/folly-2016.10.31.00",
+					"$(SRCROOT)/../third-party/glog-0.3.5/src",
+				);
+				OTHER_CFLAGS = (
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsireact;
 				SDKROOT = appletvos;
 			};
 			name = Debug;
 		};
-		EBF21BF91FC4989A0052F4D5 /* Release */ = {
+		ED296FED214C9CF800B7C4FE /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
@@ -5384,13 +5318,81 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_NO_COMMON_BLOCKS = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../third-party/boost_1_63_0",
+					"$(SRCROOT)/../third-party/folly-2016.10.31.00",
+					"$(SRCROOT)/../third-party/glog-0.3.5/src",
+				);
+				OTHER_CFLAGS = (
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsireact;
 				SDKROOT = appletvos;
 			};
 			name = Release;
 		};
+		EDEBC6D4214B3E7000DD5AC8 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+				CLANG_STATIC_ANALYZER_MODE = deep;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsi;
+				RUN_CLANG_STATIC_ANALYZER = YES;
+			};
+			name = Debug;
+		};
+		EDEBC6D5214B3E7000DD5AC8 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+				CLANG_STATIC_ANALYZER_MODE = deep;
+				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsi;
+				RUN_CLANG_STATIC_ANALYZER = NO;
+			};
+			name = Release;
+		};
+		EDEBC739214B45A300DD5AC8 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+				CLANG_STATIC_ANALYZER_MODE = deep;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsireact;
+				RUN_CLANG_STATIC_ANALYZER = YES;
+			};
+			name = Debug;
+		};
+		EDEBC73A214B45A300DD5AC8 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+				CLANG_STATIC_ANALYZER_MODE = deep;
+				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsireact;
+				RUN_CLANG_STATIC_ANALYZER = NO;
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -5457,24 +5459,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		3D3CD9081DE5FBD600167DC4 /* Build configuration list for PBXNativeTarget "jschelpers" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3D3CD9091DE5FBD600167DC4 /* Debug */,
-				3D3CD90A1DE5FBD600167DC4 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		3D3CD9151DE5FBD800167DC4 /* Build configuration list for PBXNativeTarget "jschelpers-tvOS" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3D3CD9161DE5FBD800167DC4 /* Debug */,
-				3D3CD9171DE5FBD800167DC4 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		3D3CD9221DE5FBEC00167DC4 /* Build configuration list for PBXNativeTarget "cxxreact" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -5511,38 +5495,56 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		9936F3101F5F2E4B0010BF04 /* Build configuration list for PBXNativeTarget "privatedata" */ = {
+		EBF21BD91FC498900052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				EBF21BDA1FC498900052F4D5 /* Debug */,
+				EBF21BDB1FC498900052F4D5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		EBF21BF71FC4989A0052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector-tvOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				9936F3111F5F2E4B0010BF04 /* Debug */,
-				9936F3121F5F2E4B0010BF04 /* Release */,
+				EBF21BF81FC4989A0052F4D5 /* Debug */,
+				EBF21BF91FC4989A0052F4D5 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		9936F32C1F5F2E5B0010BF04 /* Build configuration list for PBXNativeTarget "privatedata-tvOS" */ = {
+		ED296FB3214C9A0900B7C4FE /* Build configuration list for PBXNativeTarget "jsi-tvOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				9936F32D1F5F2E5B0010BF04 /* Debug */,
-				9936F32E1F5F2E5B0010BF04 /* Release */,
+				ED296FB4214C9A0900B7C4FE /* Debug */,
+				ED296FB5214C9A0900B7C4FE /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		EBF21BD91FC498900052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector" */ = {
+		ED296FEB214C9CF800B7C4FE /* Build configuration list for PBXNativeTarget "jsiexecutor-tvOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				EBF21BDA1FC498900052F4D5 /* Debug */,
-				EBF21BDB1FC498900052F4D5 /* Release */,
+				ED296FEC214C9CF800B7C4FE /* Debug */,
+				ED296FED214C9CF800B7C4FE /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		EBF21BF71FC4989A0052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector-tvOS" */ = {
+		EDEBC6D3214B3E7000DD5AC8 /* Build configuration list for PBXNativeTarget "jsi" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				EBF21BF81FC4989A0052F4D5 /* Debug */,
-				EBF21BF91FC4989A0052F4D5 /* Release */,
+				EDEBC6D4214B3E7000DD5AC8 /* Debug */,
+				EDEBC6D5214B3E7000DD5AC8 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		EDEBC738214B45A300DD5AC8 /* Build configuration list for PBXNativeTarget "jsiexecutor" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				EDEBC739214B45A300DD5AC8 /* Debug */,
+				EDEBC73A214B45A300DD5AC8 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/React/UIUtils/RCTUIUtils.h b/React/UIUtils/RCTUIUtils.h
index 02e57abaf023b6..ad99d867d0bfee 100644
--- a/React/UIUtils/RCTUIUtils.h
+++ b/React/UIUtils/RCTUIUtils.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/UIUtils/RCTUIUtils.m b/React/UIUtils/RCTUIUtils.m
index 17d8a8567278cb..dcc3353ccf6f60 100644
--- a/React/UIUtils/RCTUIUtils.m
+++ b/React/UIUtils/RCTUIUtils.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTActivityIndicatorView.h b/React/Views/RCTActivityIndicatorView.h
index 580ae77816dc27..55026efa7b90b0 100644
--- a/React/Views/RCTActivityIndicatorView.h
+++ b/React/Views/RCTActivityIndicatorView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTActivityIndicatorView.m b/React/Views/RCTActivityIndicatorView.m
index 1fa29d15111b5b..e5d9fda47268ec 100644
--- a/React/Views/RCTActivityIndicatorView.m
+++ b/React/Views/RCTActivityIndicatorView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTActivityIndicatorViewManager.h b/React/Views/RCTActivityIndicatorViewManager.h
index 9871a9d7d67be4..be5d278e76d8d2 100644
--- a/React/Views/RCTActivityIndicatorViewManager.h
+++ b/React/Views/RCTActivityIndicatorViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTActivityIndicatorViewManager.m b/React/Views/RCTActivityIndicatorViewManager.m
index 2ba37a2288e8a7..5de5643a3b9b1b 100644
--- a/React/Views/RCTActivityIndicatorViewManager.m
+++ b/React/Views/RCTActivityIndicatorViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTAnimationType.h b/React/Views/RCTAnimationType.h
index fb3ddc3c83c8d0..9b03cf23c0eb82 100644
--- a/React/Views/RCTAnimationType.h
+++ b/React/Views/RCTAnimationType.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTAutoInsetsProtocol.h b/React/Views/RCTAutoInsetsProtocol.h
index 934f4702ae8ced..a35f99f7f3063e 100644
--- a/React/Views/RCTAutoInsetsProtocol.h
+++ b/React/Views/RCTAutoInsetsProtocol.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTBorderDrawing.h b/React/Views/RCTBorderDrawing.h
index 089f92fa01ca23..6798dd90766802 100644
--- a/React/Views/RCTBorderDrawing.h
+++ b/React/Views/RCTBorderDrawing.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,6 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTBorderStyle.h>
+#import <React/RCTDefines.h>
 
 typedef struct {
   CGFloat topLeft;
@@ -33,24 +34,24 @@ typedef struct {
 /**
  * Determine if the border widths, colors and radii are all equal.
  */
-BOOL RCTBorderInsetsAreEqual(UIEdgeInsets borderInsets);
-BOOL RCTCornerRadiiAreEqual(RCTCornerRadii cornerRadii);
-BOOL RCTBorderColorsAreEqual(RCTBorderColors borderColors);
+RCT_EXTERN BOOL RCTBorderInsetsAreEqual(UIEdgeInsets borderInsets);
+RCT_EXTERN BOOL RCTCornerRadiiAreEqual(RCTCornerRadii cornerRadii);
+RCT_EXTERN BOOL RCTBorderColorsAreEqual(RCTBorderColors borderColors);
 
 /**
  * Convert RCTCornerRadii to RCTCornerInsets by applying border insets.
  * Effectively, returns radius - inset, with a lower bound of 0.0.
  */
-RCTCornerInsets RCTGetCornerInsets(RCTCornerRadii cornerRadii,
-                                   UIEdgeInsets borderInsets);
+RCT_EXTERN RCTCornerInsets RCTGetCornerInsets(RCTCornerRadii cornerRadii,
+                                              UIEdgeInsets borderInsets);
 
 /**
  * Create a CGPath representing a rounded rectangle with the specified bounds
  * and corner insets. Note that the CGPathRef must be released by the caller.
  */
-CGPathRef RCTPathCreateWithRoundedRect(CGRect bounds,
-                                       RCTCornerInsets cornerInsets,
-                                       const CGAffineTransform *transform);
+RCT_EXTERN CGPathRef RCTPathCreateWithRoundedRect(CGRect bounds,
+                                                  RCTCornerInsets cornerInsets,
+                                                  const CGAffineTransform *transform);
 
 /**
  * Draw a CSS-compliant border as an image. You can determine if it's scalable
@@ -58,10 +59,10 @@ CGPathRef RCTPathCreateWithRoundedRect(CGRect bounds,
  *
  * `borderInsets` defines the border widths for each edge.
  */
-UIImage *RCTGetBorderImage(RCTBorderStyle borderStyle,
-                           CGSize viewSize,
-                           RCTCornerRadii cornerRadii,
-                           UIEdgeInsets borderInsets,
-                           RCTBorderColors borderColors,
-                           CGColorRef backgroundColor,
-                           BOOL drawToEdge);
+RCT_EXTERN UIImage *RCTGetBorderImage(RCTBorderStyle borderStyle,
+                                      CGSize viewSize,
+                                      RCTCornerRadii cornerRadii,
+                                      UIEdgeInsets borderInsets,
+                                      RCTBorderColors borderColors,
+                                      CGColorRef backgroundColor,
+                                      BOOL drawToEdge);
diff --git a/React/Views/RCTBorderDrawing.m b/React/Views/RCTBorderDrawing.m
index 7674f1d154f8ef..2a8d105471aa2a 100644
--- a/React/Views/RCTBorderDrawing.m
+++ b/React/Views/RCTBorderDrawing.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -217,13 +217,21 @@ static CGContextRef RCTUIGraphicsBeginImageContext(CGSize size, CGColorRef backg
   (borderInsets.top + cornerInsets.topRight.height +
    borderInsets.bottom + cornerInsets.bottomLeft.height <= viewSize.height);
 
-  const UIEdgeInsets edgeInsets = (UIEdgeInsets){
+  UIEdgeInsets edgeInsets = (UIEdgeInsets){
     borderInsets.top + MAX(cornerInsets.topLeft.height, cornerInsets.topRight.height),
     borderInsets.left + MAX(cornerInsets.topLeft.width, cornerInsets.bottomLeft.width),
     borderInsets.bottom + MAX(cornerInsets.bottomLeft.height, cornerInsets.bottomRight.height),
     borderInsets.right + MAX(cornerInsets.bottomRight.width, cornerInsets.topRight.width)
   };
 
+  // Asymmetrical edgeInsets cause strange artifacting on iOS 10 and earlier.
+  edgeInsets = (UIEdgeInsets){
+    MAX(edgeInsets.top, edgeInsets.bottom),
+    MAX(edgeInsets.left, edgeInsets.right),
+    MAX(edgeInsets.top, edgeInsets.bottom),
+    MAX(edgeInsets.left, edgeInsets.right),
+  };
+
   const CGSize size = makeStretchable ? (CGSize){
     // 1pt for the middle stretchable area along each axis
     edgeInsets.left + 1 + edgeInsets.right,
diff --git a/React/Views/RCTBorderStyle.h b/React/Views/RCTBorderStyle.h
index c3d7acdfbe4cea..2bc79b4e421e80 100644
--- a/React/Views/RCTBorderStyle.h
+++ b/React/Views/RCTBorderStyle.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTComponent.h b/React/Views/RCTComponent.h
index 639c220dca0534..ac54b75cace1cc 100644
--- a/React/Views/RCTComponent.h
+++ b/React/Views/RCTComponent.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTComponentData.h b/React/Views/RCTComponentData.h
index f2080992bc4a6e..7b1cf485c916d6 100644
--- a/React/Views/RCTComponentData.h
+++ b/React/Views/RCTComponentData.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTComponentData.m b/React/Views/RCTComponentData.m
index 06bfdbaf2c2501..170b2e5d192cd6 100644
--- a/React/Views/RCTComponentData.m
+++ b/React/Views/RCTComponentData.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -167,6 +167,12 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
     if (json) {
       freeValueOnCompletion = YES;
       value = malloc(typeSignature.methodReturnLength);
+      if (!value) {
+        // CWE - 391 : Unchecked error condition
+        // https://www.cvedetails.com/cwe-details/391/Unchecked-Error-Condition.html
+        // https://eli.thegreenplace.net/2009/10/30/handling-out-of-memory-conditions-in-c
+        abort();
+      }
       [typeInvocation setArgument:&json atIndex:2];
       [typeInvocation invoke];
       [typeInvocation getReturnValue:value];
diff --git a/React/Views/RCTConvert+CoreLocation.h b/React/Views/RCTConvert+CoreLocation.h
index bfe61029ebc723..c021bb45e12638 100644
--- a/React/Views/RCTConvert+CoreLocation.h
+++ b/React/Views/RCTConvert+CoreLocation.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTConvert+CoreLocation.m b/React/Views/RCTConvert+CoreLocation.m
index 67607b1520db94..d7afdca79b0780 100644
--- a/React/Views/RCTConvert+CoreLocation.m
+++ b/React/Views/RCTConvert+CoreLocation.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTConvert+Transform.h b/React/Views/RCTConvert+Transform.h
index c07fac3c159970..c5161b4782f8e5 100644
--- a/React/Views/RCTConvert+Transform.h
+++ b/React/Views/RCTConvert+Transform.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTConvert+Transform.m b/React/Views/RCTConvert+Transform.m
index bd5b144905206d..f6c7d0091c7de2 100644
--- a/React/Views/RCTConvert+Transform.m
+++ b/React/Views/RCTConvert+Transform.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTDatePicker.h b/React/Views/RCTDatePicker.h
index 2b2759575a3322..9494bce34d2ea0 100644
--- a/React/Views/RCTDatePicker.h
+++ b/React/Views/RCTDatePicker.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTDatePicker.m b/React/Views/RCTDatePicker.m
index 664d15b202e86b..0bc1676d8b840c 100644
--- a/React/Views/RCTDatePicker.m
+++ b/React/Views/RCTDatePicker.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTDatePickerManager.h b/React/Views/RCTDatePickerManager.h
index 0693b34afe8044..619be407d5a8ab 100644
--- a/React/Views/RCTDatePickerManager.h
+++ b/React/Views/RCTDatePickerManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTDatePickerManager.m b/React/Views/RCTDatePickerManager.m
index cd1138626596e2..da94b21053629c 100644
--- a/React/Views/RCTDatePickerManager.m
+++ b/React/Views/RCTDatePickerManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTFont.h b/React/Views/RCTFont.h
index a8f347a7d52f48..909f8676cfff19 100644
--- a/React/Views/RCTFont.h
+++ b/React/Views/RCTFont.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTFont.mm b/React/Views/RCTFont.mm
index 9cd63ce6ffe188..e26fcd89bc810b 100644
--- a/React/Views/RCTFont.mm
+++ b/React/Views/RCTFont.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTLayout.h b/React/Views/RCTLayout.h
index 4c000136d8990c..57047b39d43edd 100644
--- a/React/Views/RCTLayout.h
+++ b/React/Views/RCTLayout.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTLayout.m b/React/Views/RCTLayout.m
index 8b0f6a2b6e75af..321199f8f47f1c 100644
--- a/React/Views/RCTLayout.m
+++ b/React/Views/RCTLayout.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTMaskedView.h b/React/Views/RCTMaskedView.h
index 2406d6ce8ab541..e6992651081a9d 100644
--- a/React/Views/RCTMaskedView.h
+++ b/React/Views/RCTMaskedView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTMaskedView.m b/React/Views/RCTMaskedView.m
index 5a1a4218127df7..e9411c29ad1497 100644
--- a/React/Views/RCTMaskedView.m
+++ b/React/Views/RCTMaskedView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTMaskedViewManager.h b/React/Views/RCTMaskedViewManager.h
index 42e03124363886..09adc28829744d 100644
--- a/React/Views/RCTMaskedViewManager.h
+++ b/React/Views/RCTMaskedViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTMaskedViewManager.m b/React/Views/RCTMaskedViewManager.m
index d6bd575948ab29..651b25bd63861e 100644
--- a/React/Views/RCTMaskedViewManager.m
+++ b/React/Views/RCTMaskedViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTModalHostView.h b/React/Views/RCTModalHostView.h
index 08506545acd983..e421e597f806dd 100644
--- a/React/Views/RCTModalHostView.h
+++ b/React/Views/RCTModalHostView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTModalHostView.m b/React/Views/RCTModalHostView.m
index 102ccde8fd98b7..f586e4ad0eadb5 100644
--- a/React/Views/RCTModalHostView.m
+++ b/React/Views/RCTModalHostView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTModalHostViewController.h b/React/Views/RCTModalHostViewController.h
index f7b27351214721..c5af5ffca6ac0d 100644
--- a/React/Views/RCTModalHostViewController.h
+++ b/React/Views/RCTModalHostViewController.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTModalHostViewController.m b/React/Views/RCTModalHostViewController.m
index 4b5c5281dce7ee..abd5369dce7afe 100644
--- a/React/Views/RCTModalHostViewController.m
+++ b/React/Views/RCTModalHostViewController.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTModalHostViewManager.h b/React/Views/RCTModalHostViewManager.h
index b325a9c6604d38..f42cecc27dfc06 100644
--- a/React/Views/RCTModalHostViewManager.h
+++ b/React/Views/RCTModalHostViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTModalHostViewManager.m b/React/Views/RCTModalHostViewManager.m
index bb235dc625b755..6377683d2dc748 100644
--- a/React/Views/RCTModalHostViewManager.m
+++ b/React/Views/RCTModalHostViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTModalManager.h b/React/Views/RCTModalManager.h
index 62c1743d7fb2e5..8ce1a29d7f52d3 100644
--- a/React/Views/RCTModalManager.h
+++ b/React/Views/RCTModalManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTModalManager.m b/React/Views/RCTModalManager.m
index 0920ad66528e4a..5303866d1b17c3 100644
--- a/React/Views/RCTModalManager.m
+++ b/React/Views/RCTModalManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTNavItem.h b/React/Views/RCTNavItem.h
deleted file mode 100644
index 9cabdf2e600a6a..00000000000000
--- a/React/Views/RCTNavItem.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <UIKit/UIKit.h>
-
-#import <React/RCTComponent.h>
-
-@interface RCTNavItem : UIView
-
-@property (nonatomic, copy) NSString *title;
-@property (nonatomic, strong) UIImage *titleImage;
-@property (nonatomic, strong) UIImage *leftButtonIcon;
-@property (nonatomic, copy) NSString *leftButtonTitle;
-@property (nonatomic, assign) UIBarButtonSystemItem leftButtonSystemIcon;
-@property (nonatomic, strong) UIImage *rightButtonIcon;
-@property (nonatomic, copy) NSString *rightButtonTitle;
-@property (nonatomic, assign) UIBarButtonSystemItem rightButtonSystemIcon;
-@property (nonatomic, strong) UIImage *backButtonIcon;
-@property (nonatomic, copy) NSString *backButtonTitle;
-@property (nonatomic, assign) BOOL navigationBarHidden;
-@property (nonatomic, assign) BOOL shadowHidden;
-@property (nonatomic, strong) UIColor *tintColor;
-@property (nonatomic, strong) UIColor *barTintColor;
-@property (nonatomic, strong) UIColor *titleTextColor;
-@property (nonatomic, assign) BOOL translucent;
-#if !TARGET_OS_TV
-@property (nonatomic, assign) UIBarStyle barStyle;
-#endif
-
-@property (nonatomic, readonly) UIImageView *titleImageView;
-@property (nonatomic, readonly) UIBarButtonItem *backButtonItem;
-@property (nonatomic, readonly) UIBarButtonItem *leftButtonItem;
-@property (nonatomic, readonly) UIBarButtonItem *rightButtonItem;
-
-@property (nonatomic, copy) RCTBubblingEventBlock onLeftButtonPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onRightButtonPress;
-
-@end
diff --git a/React/Views/RCTNavItem.m b/React/Views/RCTNavItem.m
deleted file mode 100644
index 58923e2450a917..00000000000000
--- a/React/Views/RCTNavItem.m
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTNavItem.h"
-
-@implementation RCTNavItem
-
-@synthesize backButtonItem = _backButtonItem;
-@synthesize leftButtonItem = _leftButtonItem;
-@synthesize rightButtonItem = _rightButtonItem;
-
-- (UIImageView *)titleImageView
-{
-  if (_titleImage) {
-    return [[UIImageView alloc] initWithImage:_titleImage];
-  } else {
-    return nil;
-  }
-}
-
--(instancetype)init
-{
-  if (self = [super init]) {
-    _leftButtonSystemIcon = NSNotFound;
-    _rightButtonSystemIcon = NSNotFound;
-  }
-  return self;
-}
-
-- (void)setBackButtonTitle:(NSString *)backButtonTitle
-{
-  _backButtonTitle = backButtonTitle;
-  _backButtonItem = nil;
-}
-
-- (void)setBackButtonIcon:(UIImage *)backButtonIcon
-{
-  _backButtonIcon = backButtonIcon;
-  _backButtonItem = nil;
-}
-
-- (UIBarButtonItem *)backButtonItem
-{
-  if (!_backButtonItem) {
-    if (_backButtonIcon) {
-      _backButtonItem = [[UIBarButtonItem alloc] initWithImage:_backButtonIcon
-                                                         style:UIBarButtonItemStylePlain
-                                                        target:nil
-                                                        action:nil];
-    } else if (_backButtonTitle.length) {
-      _backButtonItem = [[UIBarButtonItem alloc] initWithTitle:_backButtonTitle
-                                                         style:UIBarButtonItemStylePlain
-                                                        target:nil
-                                                        action:nil];
-    } else {
-      _backButtonItem = nil;
-    }
-  }
-  return _backButtonItem;
-}
-
-- (void)setLeftButtonTitle:(NSString *)leftButtonTitle
-{
-  _leftButtonTitle = leftButtonTitle;
-  _leftButtonItem = nil;
-}
-
-- (void)setLeftButtonIcon:(UIImage *)leftButtonIcon
-{
-  _leftButtonIcon = leftButtonIcon;
-  _leftButtonItem = nil;
-}
-
-- (void)setLeftButtonSystemIcon:(UIBarButtonSystemItem)leftButtonSystemIcon
-{
-  _leftButtonSystemIcon = leftButtonSystemIcon;
-  _leftButtonItem = nil;
-}
-
-- (UIBarButtonItem *)leftButtonItem
-{
-  if (!_leftButtonItem) {
-    if (_leftButtonIcon) {
-      _leftButtonItem =
-      [[UIBarButtonItem alloc] initWithImage:_leftButtonIcon
-                                       style:UIBarButtonItemStylePlain
-                                      target:self
-                                      action:@selector(handleLeftButtonPress)];
-
-    } else if (_leftButtonTitle.length) {
-      _leftButtonItem =
-      [[UIBarButtonItem alloc] initWithTitle:_leftButtonTitle
-                                       style:UIBarButtonItemStylePlain
-                                      target:self
-                                      action:@selector(handleLeftButtonPress)];
-
-    } else if (_leftButtonSystemIcon != NSNotFound) {
-      _leftButtonItem =
-      [[UIBarButtonItem alloc] initWithBarButtonSystemItem:_leftButtonSystemIcon
-                                                    target:self
-                                                    action:@selector(handleLeftButtonPress)];
-    } else {
-      _leftButtonItem = nil;
-    }
-  }
-  return _leftButtonItem;
-}
-
-- (void)handleLeftButtonPress
-{
-  if (_onLeftButtonPress) {
-    _onLeftButtonPress(nil);
-  }
-}
-
-- (void)setRightButtonTitle:(NSString *)rightButtonTitle
-{
-  _rightButtonTitle = rightButtonTitle;
-  _rightButtonItem = nil;
-}
-
-- (void)setRightButtonIcon:(UIImage *)rightButtonIcon
-{
-  _rightButtonIcon = rightButtonIcon;
-  _rightButtonItem = nil;
-}
-
-- (void)setRightButtonSystemIcon:(UIBarButtonSystemItem)rightButtonSystemIcon
-{
-  _rightButtonSystemIcon = rightButtonSystemIcon;
-  _rightButtonItem = nil;
-}
-
-- (UIBarButtonItem *)rightButtonItem
-{
-  if (!_rightButtonItem) {
-    if (_rightButtonIcon) {
-      _rightButtonItem =
-      [[UIBarButtonItem alloc] initWithImage:_rightButtonIcon
-                                       style:UIBarButtonItemStylePlain
-                                      target:self
-                                      action:@selector(handleRightButtonPress)];
-
-    } else if (_rightButtonTitle.length) {
-      _rightButtonItem =
-      [[UIBarButtonItem alloc] initWithTitle:_rightButtonTitle
-                                       style:UIBarButtonItemStylePlain
-                                      target:self
-                                      action:@selector(handleRightButtonPress)];
-
-    } else if (_rightButtonSystemIcon != NSNotFound) {
-      _rightButtonItem =
-      [[UIBarButtonItem alloc] initWithBarButtonSystemItem:_rightButtonSystemIcon
-                                      target:self
-                                      action:@selector(handleRightButtonPress)];
-    } else {
-      _rightButtonItem = nil;
-    }
-  }
-  return _rightButtonItem;
-}
-
-- (void)handleRightButtonPress
-{
-  if (_onRightButtonPress) {
-    _onRightButtonPress(nil);
-  }
-}
-
-@end
diff --git a/React/Views/RCTNavItemManager.h b/React/Views/RCTNavItemManager.h
deleted file mode 100644
index 8fcb61c3690457..00000000000000
--- a/React/Views/RCTNavItemManager.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <React/RCTConvert.h>
-#import <React/RCTViewManager.h>
-
-@interface RCTConvert (BarButtonSystemItem)
-
-+ (UIBarButtonSystemItem)UIBarButtonSystemItem:(id)json;
-
-@end
-
-@interface RCTNavItemManager : RCTViewManager
-
-@end
diff --git a/React/Views/RCTNavItemManager.m b/React/Views/RCTNavItemManager.m
deleted file mode 100644
index d9d349c5ad531c..00000000000000
--- a/React/Views/RCTNavItemManager.m
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTNavItemManager.h"
-
-#import "RCTConvert.h"
-#import "RCTNavItem.h"
-
-@implementation RCTConvert (BarButtonSystemItem)
-
-RCT_ENUM_CONVERTER(UIBarButtonSystemItem, (@{
-  @"done": @(UIBarButtonSystemItemDone),
-  @"cancel": @(UIBarButtonSystemItemCancel),
-  @"edit": @(UIBarButtonSystemItemEdit),
-  @"save": @(UIBarButtonSystemItemSave),
-  @"add": @(UIBarButtonSystemItemAdd),
-  @"flexible-space": @(UIBarButtonSystemItemFlexibleSpace),
-  @"fixed-space": @(UIBarButtonSystemItemFixedSpace),
-  @"compose": @(UIBarButtonSystemItemCompose),
-  @"reply": @(UIBarButtonSystemItemReply),
-  @"action": @(UIBarButtonSystemItemAction),
-  @"organize": @(UIBarButtonSystemItemOrganize),
-  @"bookmarks": @(UIBarButtonSystemItemBookmarks),
-  @"search": @(UIBarButtonSystemItemSearch),
-  @"refresh": @(UIBarButtonSystemItemRefresh),
-  @"stop": @(UIBarButtonSystemItemStop),
-  @"camera": @(UIBarButtonSystemItemCamera),
-  @"trash": @(UIBarButtonSystemItemTrash),
-  @"play": @(UIBarButtonSystemItemPlay),
-  @"pause": @(UIBarButtonSystemItemPause),
-  @"rewind": @(UIBarButtonSystemItemRewind),
-  @"fast-forward": @(UIBarButtonSystemItemFastForward),
-  @"undo": @(UIBarButtonSystemItemUndo),
-  @"redo": @(UIBarButtonSystemItemRedo),
-  @"page-curl": @(UIBarButtonSystemItemPageCurl)
-}), NSNotFound, integerValue);
-
-@end
-
-@implementation RCTNavItemManager
-
-RCT_EXPORT_MODULE()
-
-- (UIView *)view
-{
-  return [RCTNavItem new];
-}
-
-RCT_EXPORT_VIEW_PROPERTY(navigationBarHidden, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(shadowHidden, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(barTintColor, UIColor)
-#if !TARGET_OS_TV
-RCT_EXPORT_VIEW_PROPERTY(barStyle, UIBarStyle)
-#endif
-RCT_EXPORT_VIEW_PROPERTY(translucent, BOOL)
-
-RCT_EXPORT_VIEW_PROPERTY(title, NSString)
-RCT_EXPORT_VIEW_PROPERTY(titleTextColor, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(titleImage, UIImage)
-
-RCT_EXPORT_VIEW_PROPERTY(backButtonIcon, UIImage)
-RCT_EXPORT_VIEW_PROPERTY(backButtonTitle, NSString)
-
-RCT_EXPORT_VIEW_PROPERTY(leftButtonTitle, NSString)
-RCT_EXPORT_VIEW_PROPERTY(leftButtonIcon, UIImage)
-RCT_EXPORT_VIEW_PROPERTY(leftButtonSystemIcon, UIBarButtonSystemItem)
-
-RCT_EXPORT_VIEW_PROPERTY(rightButtonIcon, UIImage)
-RCT_EXPORT_VIEW_PROPERTY(rightButtonTitle, NSString)
-RCT_EXPORT_VIEW_PROPERTY(rightButtonSystemIcon, UIBarButtonSystemItem)
-
-RCT_EXPORT_VIEW_PROPERTY(onLeftButtonPress, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onRightButtonPress, RCTBubblingEventBlock)
-
-@end
diff --git a/React/Views/RCTNavigator.h b/React/Views/RCTNavigator.h
deleted file mode 100644
index b8ad30141c872d..00000000000000
--- a/React/Views/RCTNavigator.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <UIKit/UIKit.h>
-
-#import <React/RCTFrameUpdate.h>
-
-@class RCTBridge;
-
-@interface RCTNavigator : UIView <RCTFrameUpdateObserver>
-
-@property (nonatomic, strong) UIView *reactNavSuperviewLink;
-@property (nonatomic, assign) NSInteger requestedTopOfStack;
-@property (nonatomic, assign) BOOL interactivePopGestureEnabled;
-
-- (instancetype)initWithBridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER;
-
-/**
- * Schedules a JavaScript navigation and prevents `UIKit` from navigating until
- * JavaScript has sent its scheduled navigation.
- *
- * @returns Whether or not a JavaScript driven navigation could be
- * scheduled/reserved. If returning `NO`, JavaScript should usually just do
- * nothing at all.
- */
-- (BOOL)requestSchedulingJavaScriptNavigation;
-
-- (void)uiManagerDidPerformMounting;
-
-@end
diff --git a/React/Views/RCTNavigator.m b/React/Views/RCTNavigator.m
deleted file mode 100644
index 0a0bfe61cf15e2..00000000000000
--- a/React/Views/RCTNavigator.m
+++ /dev/null
@@ -1,630 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTNavigator.h"
-
-#import "RCTAssert.h"
-#import "RCTBridge.h"
-#import "RCTConvert.h"
-#import "RCTEventDispatcher.h"
-#import "RCTLog.h"
-#import "RCTNavItem.h"
-#import "RCTScrollView.h"
-#import "RCTUtils.h"
-#import "RCTView.h"
-#import "RCTWrapperViewController.h"
-#import "UIView+React.h"
-
-typedef NS_ENUM(NSUInteger, RCTNavigationLock) {
-  RCTNavigationLockNone,
-  RCTNavigationLockNative,
-  RCTNavigationLockJavaScript
-};
-
-// By default the interactive pop gesture will be enabled when the navigation bar is displayed
-// and disabled when hidden
-// RCTPopGestureStateDefault maps to the default behavior (mentioned above). Once popGestureState
-// leaves this value, it can never be returned back to it. This is because, due to a limitation in
-// the iOS APIs, once we override the default behavior of the gesture recognizer, we cannot return
-// back to it.
-// RCTPopGestureStateEnabled will enable the gesture independent of nav bar visibility
-// RCTPopGestureStateDisabled will disable the gesture independent of nav bar visibility
-typedef NS_ENUM(NSUInteger, RCTPopGestureState) {
-  RCTPopGestureStateDefault = 0,
-  RCTPopGestureStateEnabled,
-  RCTPopGestureStateDisabled
-};
-
-NSInteger kNeverRequested = -1;
-NSInteger kNeverProgressed = -10000;
-
-
-@interface UINavigationController ()
-
-// need to declare this since `UINavigationController` doesn't publicly declare the fact that it implements
-// UINavigationBarDelegate :(
-- (BOOL)navigationBar:(UINavigationBar *)navigationBar shouldPopItem:(UINavigationItem *)item;
-
-@end
-
-// http://stackoverflow.com/questions/5115135/uinavigationcontroller-how-to-cancel-the-back-button-event
-// There's no other way to do this unfortunately :(
-@interface RCTNavigationController : UINavigationController <UINavigationBarDelegate>
-{
-  dispatch_block_t _scrollCallback;
-}
-
-@property (nonatomic, assign) RCTNavigationLock navigationLock;
-
-@end
-
-/**
- * In general, `RCTNavigator` examines `_currentViews` (which are React child
- * views), and compares them to `_navigationController.viewControllers` (which
- * are controlled by UIKit).
- *
- * It is possible for JavaScript (`_currentViews`) to "get ahead" of native
- * (`navigationController.viewControllers`) and vice versa. JavaScript gets
- * ahead by adding/removing React subviews. Native gets ahead by swiping back,
- * or tapping the back button. In both cases, the other system is initially
- * unaware. And in both cases, `RCTNavigator` helps the other side "catch up".
- *
- * If `RCTNavigator` sees the number of React children have changed, it
- * pushes/pops accordingly. If `RCTNavigator` sees a `UIKit` driven push/pop, it
- * notifies JavaScript that this has happened, and expects that JavaScript will
- * eventually render more children to match `UIKit`. There's no rush for
- * JavaScript to catch up. But if it does render anything, it must catch up to
- * UIKit. It cannot deviate.
- *
- * To implement this, we need a lock, which we store on the native thread. This
- * lock allows one of the systems to push/pop views. Whoever wishes to
- * "get ahead" must obtain the lock. Whoever wishes to "catch up" must obtain
- * the lock. One thread may not "get ahead" or "catch up" when the other has
- * the lock. Once a thread has the lock, it can only do the following:
- *
- * 1. If it is behind, it may only catch up.
- * 2. If it is caught up or ahead, it may push or pop.
- *
- *
- * ========= Acquiring The Lock ==========
- *
- * JavaScript asynchronously acquires the lock using a native hook. It might be
- * rejected and receive the return value `false`.
- *
- * We acquire the native lock in `shouldPopItem`, which is called right before
- * native tries to push/pop, but only if JavaScript doesn't already have the
- * lock.
- *
- * ========  While JavaScript Has Lock ====
- *
- * When JavaScript has the lock, we have to block all `UIKit` driven pops:
- *
- * 1. Block back button navigation:
- *   - Back button will invoke `shouldPopItem`, from which we return `NO` if
- *   JavaScript has the lock.
- *   - Back button will respect the return value `NO` and not permit
- *   navigation.
- *
- * 2. Block swipe-to-go-back navigation:
- *   - Swipe will trigger `shouldPopItem`, but swipe won't respect our `NO`
- *   return value so we must disable the gesture recognizer while JavaScript
- *   has the lock.
- *
- * ========  While Native Has Lock =======
- *
- * We simply deny JavaScript the right to acquire the lock.
- *
- *
- * ======== Releasing The Lock ===========
- *
- * Recall that the lock represents who has the right to either push/pop (or
- * catch up). As soon as we recognize that the side that has locked has carried
- * out what it scheduled to do, we can release the lock, but only after any
- * possible animations are completed.
- *
- * *IF* a scheduled operation results in a push/pop (not all do), then we can
- * only release the lock after the push/pop animation is complete because
- * UIKit. `didMoveToNavigationController` is invoked when the view is done
- * pushing/popping/animating. Native swipe-to-go-back interactions can be
- * aborted, however, and you'll never see that method invoked. So just to cover
- * that case, we also put an animation complete hook in
- * `animateAlongsideTransition` to make sure we free the lock, in case the
- * scheduled native push/pop never actually happened.
- *
- * For JavaScript:
- * - When we see that JavaScript has "caught up" to `UIKit`, and no pushes/pops
- * were needed, we can release the lock.
- * - When we see that JavaScript requires *some* push/pop, it's not yet done
- * carrying out what it scheduled to do. Just like with `UIKit` push/pops, we
- * still have to wait for it to be done animating
- * (`didMoveToNavigationController` is a suitable hook).
- *
- */
-@implementation RCTNavigationController
-
-/**
- * @param callback Callback that is invoked when a "scroll" interaction begins
- * so that `RCTNavigator` can notify `JavaScript`.
- */
-- (instancetype)initWithScrollCallback:(dispatch_block_t)callback
-{
-  if ((self = [super initWithNibName:nil bundle:nil])) {
-    _scrollCallback = callback;
-  }
-  return self;
-}
-
-/**
- * Invoked when either a navigation item has been popped off, or when a
- * swipe-back gesture has began. The swipe-back gesture doesn't respect the
- * return value of this method. The back button does. That's why we have to
- * completely disable the gesture recognizer for swipe-back while JS has the
- * lock.
- */
-- (BOOL)navigationBar:(UINavigationBar *)navigationBar shouldPopItem:(UINavigationItem *)item
-{
-#if !TARGET_OS_TV
-  if (self.interactivePopGestureRecognizer.state == UIGestureRecognizerStateBegan) {
-    if (self.navigationLock == RCTNavigationLockNone) {
-      self.navigationLock = RCTNavigationLockNative;
-      if (_scrollCallback) {
-        _scrollCallback();
-      }
-    } else if (self.navigationLock == RCTNavigationLockJavaScript) {
-      // This should never happen because we disable/enable the gesture
-      // recognizer when we lock the navigation.
-      RCTAssert(NO, @"Should never receive gesture start while JS locks navigator");
-    }
-  } else
-#endif //TARGET_OS_TV
-  {
-    if (self.navigationLock == RCTNavigationLockNone) {
-      // Must be coming from native interaction, lock it - it will be unlocked
-      // in `didMoveToNavigationController`
-      self.navigationLock = RCTNavigationLockNative;
-      if (_scrollCallback) {
-        _scrollCallback();
-      }
-    } else if (self.navigationLock == RCTNavigationLockJavaScript) {
-      // This should only occur when JS has the lock, and
-      // - JS is driving the pop
-      // - Or the back button was pressed
-      // TODO: We actually want to disable the backbutton while JS has the
-      // lock, but it's not so easy. Even returning `NO` wont' work because it
-      // will also block JS driven pops. We simply need to disallow a standard
-      // back button, and instead use a custom one that tells JS to pop to
-      // length (`currentReactCount` - 1).
-      return [super navigationBar:navigationBar shouldPopItem:item];
-    }
-  }
-  return [super navigationBar:navigationBar shouldPopItem:item];
-}
-
-@end
-
-@interface RCTNavigator() <RCTWrapperViewControllerNavigationListener, UINavigationControllerDelegate, UIGestureRecognizerDelegate>
-
-@property (nonatomic, copy) RCTDirectEventBlock onNavigationProgress;
-@property (nonatomic, copy) RCTBubblingEventBlock onNavigationComplete;
-
-@property (nonatomic, assign) NSInteger previousRequestedTopOfStack;
-
-@property (nonatomic, assign) RCTPopGestureState popGestureState;
-
-// Previous views are only mainted in order to detect incorrect
-// addition/removal of views below the `requestedTopOfStack`
-@property (nonatomic, copy, readwrite) NSArray<RCTNavItem *> *previousViews;
-@property (nonatomic, readwrite, strong) RCTNavigationController *navigationController;
-/**
- * Display link is used to get high frequency sample rate during
- * interaction/animation of view controller push/pop.
- *
- * - The run loop retains the displayLink.
- * - `displayLink` retains its target.
- * - We use `invalidate` to remove the `RCTNavigator`'s reference to the
- * `displayLink` and remove the `displayLink` from the run loop.
- *
- *
- * `displayLink`:
- * --------------
- *
- * - Even though we could implement the `displayLink` cleanup without the
- * `invalidate` hook by adding and removing it from the run loop at the
- * right times (begin/end animation), we need to account for the possibility
- * that the view itself is destroyed mid-interaction. So we always keep it
- * added to the run loop, but start/stop it with interactions/animations. We
- * remove it from the run loop when the view will be destroyed by React.
- *
- * +----------+              +--------------+
- * | run loop o----strong--->|  displayLink |
- * +----------+              +--o-----------+
- *                              |        ^
- *                              |        |
- *                            strong   strong
- *                              |        |
- *                              v        |
- *                             +---------o---+
- *                             | RCTNavigator |
- *                             +-------------+
- *
- * `dummyView`:
- * ------------
- * There's no easy way to get a callback that fires when the position of a
- * navigation item changes. The actual layers that are moved around during the
- * navigation transition are private. Our only hope is to use
- * `animateAlongsideTransition`, to set a dummy view's position to transition
- * anywhere from -1.0 to 1.0. We later set up a `CADisplayLink` to poll the
- * `presentationLayer` of that dummy view and report the value as a "progress"
- * percentage.
- *
- * It was critical that we added the dummy view as a subview of the
- * transitionCoordinator's `containerView`, otherwise the animations would not
- * work correctly when reversing the gesture direction etc. This seems to be
- * undocumented behavior/requirement.
- *
- */
-@property (nonatomic, readonly, assign) CGFloat mostRecentProgress;
-@property (nonatomic, readonly, strong) NSTimer *runTimer;
-@property (nonatomic, readonly, assign) NSInteger currentlyTransitioningFrom;
-@property (nonatomic, readonly, assign) NSInteger currentlyTransitioningTo;
-
-// Dummy view that we make animate with the same curve/interaction as the
-// navigation animation/interaction.
-@property (nonatomic, readonly, strong) UIView *dummyView;
-
-@end
-
-@implementation RCTNavigator
-{
-  __weak RCTBridge *_bridge;
-  NSInteger _numberOfViewControllerMovesToIgnore;
-}
-
-@synthesize paused = _paused;
-@synthesize pauseCallback = _pauseCallback;
-
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-{
-  RCTAssertParam(bridge);
-
-  if ((self = [super initWithFrame:CGRectZero])) {
-    _paused = YES;
-
-    _bridge = bridge;
-    _mostRecentProgress = kNeverProgressed;
-    _dummyView = [[UIView alloc] initWithFrame:CGRectZero];
-    _previousRequestedTopOfStack = kNeverRequested; // So that we initialize with a push.
-    _previousViews = @[];
-    __weak RCTNavigator *weakSelf = self;
-    _navigationController = [[RCTNavigationController alloc] initWithScrollCallback:^{
-      [weakSelf dispatchFakeScrollEvent];
-    }];
-    _navigationController.delegate = self;
-    RCTAssert([self requestSchedulingJavaScriptNavigation], @"Could not acquire JS navigation lock on init");
-
-    [self addSubview:_navigationController.view];
-    [_navigationController.view addSubview:_dummyView];
-  }
-  return self;
-}
-
-RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
-RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
-
-- (void)didUpdateFrame:(__unused RCTFrameUpdate *)update
-{
-  if (_currentlyTransitioningFrom != _currentlyTransitioningTo) {
-    UIView *topView = _dummyView;
-    id presentationLayer = [topView.layer presentationLayer];
-    CGRect frame = [presentationLayer frame];
-    CGFloat nextProgress = ABS(frame.origin.x);
-    // Don't want to spam the bridge, when the user holds their finger still mid-navigation.
-    if (nextProgress == _mostRecentProgress) {
-      return;
-    }
-    _mostRecentProgress = nextProgress;
-    if (_onNavigationProgress) {
-      _onNavigationProgress(@{
-        @"fromIndex": @(_currentlyTransitioningFrom),
-        @"toIndex": @(_currentlyTransitioningTo),
-        @"progress": @(nextProgress),
-      });
-    }
-  }
-}
-
-- (void)setPaused:(BOOL)paused
-{
-  if (_paused != paused) {
-    _paused = paused;
-    if (_pauseCallback) {
-      _pauseCallback();
-    }
-  }
-}
-
-- (void)setInteractivePopGestureEnabled:(BOOL)interactivePopGestureEnabled
-{
-#if !TARGET_OS_TV
-  _interactivePopGestureEnabled = interactivePopGestureEnabled;
-
-  _navigationController.interactivePopGestureRecognizer.delegate = self;
-  _navigationController.interactivePopGestureRecognizer.enabled = interactivePopGestureEnabled;
-
-  _popGestureState = interactivePopGestureEnabled ? RCTPopGestureStateEnabled : RCTPopGestureStateDisabled;
-#endif
-}
-
-- (void)dealloc
-{
-#if !TARGET_OS_TV
-  if (_navigationController.interactivePopGestureRecognizer.delegate == self) {
-    _navigationController.interactivePopGestureRecognizer.delegate = nil;
-  }
-#endif
-  _navigationController.delegate = nil;
-  [_navigationController removeFromParentViewController];
-}
-
-- (UIViewController *)reactViewController
-{
-  return _navigationController;
-}
-
-- (BOOL)gestureRecognizerShouldBegin:(__unused UIGestureRecognizer *)gestureRecognizer
-{
-  return _navigationController.viewControllers.count > 1;
-}
-
-/**
- * See documentation about lock lifecycle. This is only here to clean up
- * swipe-back abort interaction, which leaves us *no* other way to clean up
- * locks aside from the animation complete hook.
- */
-- (void)navigationController:(UINavigationController *)navigationController
-      willShowViewController:(__unused UIViewController *)viewController
-                    animated:(__unused BOOL)animated
-{
-  id<UIViewControllerTransitionCoordinator> tc =
-    navigationController.topViewController.transitionCoordinator;
-  __weak RCTNavigator *weakSelf = self;
-  [tc.containerView addSubview: _dummyView];
-  [tc animateAlongsideTransition: ^(id<UIViewControllerTransitionCoordinatorContext> context) {
-    RCTWrapperViewController *fromController =
-      (RCTWrapperViewController *)[context viewControllerForKey:UITransitionContextFromViewControllerKey];
-    RCTWrapperViewController *toController =
-      (RCTWrapperViewController *)[context viewControllerForKey:UITransitionContextToViewControllerKey];
-
-    // This may be triggered by a navigation controller unrelated to me: if so, ignore.
-    if (fromController.navigationController != self->_navigationController ||
-        toController.navigationController != self->_navigationController) {
-      return;
-    }
-
-    NSUInteger indexOfFrom = [self.reactSubviews indexOfObject:fromController.navItem];
-    NSUInteger indexOfTo = [self.reactSubviews indexOfObject:toController.navItem];
-    CGFloat destination = indexOfFrom < indexOfTo ? 1.0 : -1.0;
-    self->_dummyView.frame = (CGRect){{destination, 0}, CGSizeZero};
-    self->_currentlyTransitioningFrom = indexOfFrom;
-    self->_currentlyTransitioningTo = indexOfTo;
-    self.paused = NO;
-  }
-  completion:^(__unused id<UIViewControllerTransitionCoordinatorContext> context) {
-    [weakSelf freeLock];
-    self->_currentlyTransitioningFrom = 0;
-    self->_currentlyTransitioningTo = 0;
-    self->_dummyView.frame = CGRectZero;
-    self.paused = YES;
-    // Reset the parallel position tracker
-  }];
-}
-
-- (BOOL)requestSchedulingJavaScriptNavigation
-{
-  if (_navigationController.navigationLock == RCTNavigationLockNone) {
-    _navigationController.navigationLock = RCTNavigationLockJavaScript;
-#if !TARGET_OS_TV
-    _navigationController.interactivePopGestureRecognizer.enabled = NO;
-#endif
-    return YES;
-  }
-  return NO;
-}
-
-- (void)freeLock
-{
-  _navigationController.navigationLock = RCTNavigationLockNone;
-
-  // Unless the pop gesture has been explicitly disabled (RCTPopGestureStateDisabled),
-  // Set interactivePopGestureRecognizer.enabled to YES
-  // If the popGestureState is RCTPopGestureStateDefault the default behavior will be maintained
-#if !TARGET_OS_TV
-  _navigationController.interactivePopGestureRecognizer.enabled = self.popGestureState != RCTPopGestureStateDisabled;
-#endif
-}
-
-/**
- * A React subview can be inserted/removed at any time, however if the
- * `requestedTopOfStack` changes, there had better be enough subviews present
- * to satisfy the push/pop.
- */
-- (void)insertReactSubview:(RCTNavItem *)view atIndex:(NSInteger)atIndex
-{
-  RCTAssert([view isKindOfClass:[RCTNavItem class]], @"RCTNavigator only accepts RCTNavItem subviews");
-  RCTAssert(
-    _navigationController.navigationLock == RCTNavigationLockJavaScript,
-    @"Cannot change subviews from JS without first locking."
-  );
-  [super insertReactSubview:view atIndex:atIndex];
-}
-
-- (void)didUpdateReactSubviews
-{
-  // Do nothing, as subviews are managed by `uiManagerDidPerformMounting`
-}
-
-- (void)layoutSubviews
-{
-  [super layoutSubviews];
-  [self reactAddControllerToClosestParent:_navigationController];
-  _navigationController.view.frame = self.bounds;
-}
-
-- (void)removeReactSubview:(RCTNavItem *)subview
-{
-  if (self.reactSubviews.count <= 0 || subview == self.reactSubviews[0]) {
-    RCTLogError(@"Attempting to remove invalid RCT subview of RCTNavigator");
-    return;
-  }
-  [super removeReactSubview:subview];
-}
-
-- (void)handleTopOfStackChanged
-{
-  if (_onNavigationComplete) {
-    _onNavigationComplete(@{
-      @"stackLength":@(_navigationController.viewControllers.count)
-    });
-  }
-}
-
-- (void)dispatchFakeScrollEvent
-{
-  [_bridge.eventDispatcher sendFakeScrollEvent:self.reactTag];
-}
-
-/**
- * Must be overridden because UIKit removes the view's superview when used
- * as a navigator - it's considered outside the view hierarchy.
- */
-- (UIView *)reactSuperview
-{
-  RCTAssert(!_bridge.isValid || self.superview != nil, @"put reactNavSuperviewLink back");
-  UIView *superview = [super reactSuperview];
-  return superview ?: self.reactNavSuperviewLink;
-}
-
-- (void)uiManagerDidPerformMounting
-{
-  // we can't hook up the VC hierarchy in 'init' because the subviews aren't
-  // hooked up yet, so we do it on demand here
-  [self reactAddControllerToClosestParent:_navigationController];
-
-  NSUInteger viewControllerCount = _navigationController.viewControllers.count;
-  // The "react count" is the count of views that are visible on the navigation
-  // stack.  There may be more beyond this - that aren't visible, and may be
-  // deleted/purged soon.
-  NSUInteger previousReactCount =
-    _previousRequestedTopOfStack == kNeverRequested ? 0 : _previousRequestedTopOfStack + 1;
-  NSUInteger currentReactCount = _requestedTopOfStack + 1;
-
-  BOOL jsGettingAhead =
-    //    ----- previously caught up ------          ------ no longer caught up -------
-    viewControllerCount == previousReactCount && currentReactCount != viewControllerCount;
-  BOOL jsCatchingUp =
-    //    --- previously not caught up ----          --------- now caught up ----------
-    viewControllerCount != previousReactCount && currentReactCount == viewControllerCount;
-  BOOL jsMakingNoProgressButNeedsToCatchUp =
-    //    --- previously not caught up ----          ------- still the same -----------
-    viewControllerCount != previousReactCount && currentReactCount == previousReactCount;
-  BOOL jsMakingNoProgressAndDoesntNeedTo =
-    //    --- previously caught up --------          ------- still caught up ----------
-    viewControllerCount == previousReactCount && currentReactCount == previousReactCount;
-
-BOOL jsGettingtooSlow =
-  //    --- previously not caught up --------          ------- no longer caught up ----------
-  viewControllerCount < previousReactCount && currentReactCount < previousReactCount;
-
-  BOOL reactPushOne = jsGettingAhead && currentReactCount == previousReactCount + 1;
-  BOOL reactPopN = jsGettingAhead && currentReactCount < previousReactCount;
-
-  // We can actually recover from this situation, but it would be nice to know
-  // when this error happens. This simply means that JS hasn't caught up to a
-  // back navigation before progressing. It's likely a bug in the JS code that
-  // catches up/schedules navigations.
-  if (!(jsGettingAhead ||
-        jsCatchingUp ||
-        jsMakingNoProgressButNeedsToCatchUp ||
-        jsMakingNoProgressAndDoesntNeedTo ||
-        jsGettingtooSlow)) {
-    RCTLogError(@"JS has only made partial progress to catch up to UIKit");
-  }
-  if (currentReactCount > self.reactSubviews.count) {
-    RCTLogError(@"Cannot adjust current top of stack beyond available views");
-  }
-
-  // Views before the previous React count must not have changed. Views greater than previousReactCount
-  // up to currentReactCount may have changed.
-  for (NSUInteger i = 0; i < MIN(self.reactSubviews.count, MIN(_previousViews.count, previousReactCount)); i++) {
-    if (self.reactSubviews[i] != _previousViews[i]) {
-      RCTLogError(@"current view should equal previous view");
-    }
-  }
-  if (currentReactCount < 1) {
-    RCTLogError(@"should be at least one current view");
-  }
-  if (jsGettingAhead) {
-    if (reactPushOne) {
-      UIView *lastView = self.reactSubviews.lastObject;
-      RCTWrapperViewController *vc = [[RCTWrapperViewController alloc] initWithNavItem:(RCTNavItem *)lastView];
-      vc.navigationListener = self;
-      _numberOfViewControllerMovesToIgnore = 1;
-      [_navigationController pushViewController:vc animated:(currentReactCount > 1)];
-    } else if (reactPopN) {
-      UIViewController *viewControllerToPopTo = _navigationController.viewControllers[(currentReactCount - 1)];
-      _numberOfViewControllerMovesToIgnore = viewControllerCount - currentReactCount;
-      [_navigationController popToViewController:viewControllerToPopTo animated:YES];
-    } else {
-      RCTLogError(@"Pushing or popping more than one view at a time from JS");
-    }
-  } else if (jsCatchingUp) {
-    [self freeLock]; // Nothing to push/pop
-  } else {
-    // Else, JS making no progress, could have been unrelated to anything nav.
-    return;
-  }
-
-  // Only make a copy of the subviews whose validity we expect to be able to check (in the loop, above),
-  // otherwise we would unnecessarily retain a reference to view(s) no longer on the React navigation stack:
-  NSUInteger expectedCount = MIN(currentReactCount, self.reactSubviews.count);
-  _previousViews = [[self.reactSubviews subarrayWithRange: NSMakeRange(0, expectedCount)] copy];
-  _previousRequestedTopOfStack = _requestedTopOfStack;
-}
-
-// TODO: This will likely fail when performing multiple pushes/pops. We must
-// free the lock only after the *last* push/pop.
-- (void)wrapperViewController:(RCTWrapperViewController *)wrapperViewController
-didMoveToNavigationController:(UINavigationController *)navigationController
-{
-  if (self.superview == nil) {
-    // If superview is nil, then a JS reload (Cmd+R) happened
-    // while a push/pop is in progress.
-    return;
-  }
-
-  RCTAssert(
-    (navigationController == nil || [_navigationController.viewControllers containsObject:wrapperViewController]),
-    @"if navigation controller is not nil, it should contain the wrapper view controller"
-  );
-  RCTAssert(_navigationController.navigationLock == RCTNavigationLockJavaScript ||
-           _numberOfViewControllerMovesToIgnore == 0,
-           @"If JS doesn't have the lock there should never be any pending transitions");
-  /**
-   * When JS has the lock we want to keep track of when the request completes
-   * the pending transition count hitting 0 signifies this, and should always
-   * remain at 0 when JS does not have the lock
-   */
-  if (_numberOfViewControllerMovesToIgnore > 0) {
-    _numberOfViewControllerMovesToIgnore -= 1;
-  }
-  if (_numberOfViewControllerMovesToIgnore == 0) {
-    [self handleTopOfStackChanged];
-    [self freeLock];
-  }
-}
-
-@end
diff --git a/React/Views/RCTNavigatorManager.m b/React/Views/RCTNavigatorManager.m
deleted file mode 100644
index 99a03cbb364439..00000000000000
--- a/React/Views/RCTNavigatorManager.m
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTNavigatorManager.h"
-
-#import "RCTBridge.h"
-#import "RCTConvert.h"
-#import "RCTNavigator.h"
-#import "RCTUIManager.h"
-#import "RCTUIManagerObserverCoordinator.h"
-#import "UIView+React.h"
-
-@interface RCTNavigatorManager () <RCTUIManagerObserver>
-
-@end
-
-@implementation RCTNavigatorManager
-{
-  // The main thread only.
-  NSHashTable<RCTNavigator *> *_viewRegistry;
-}
-
-- (void)setBridge:(RCTBridge *)bridge
-{
-  [super setBridge:bridge];
-
-  [self.bridge.uiManager.observerCoordinator addObserver:self];
-}
-
-- (void)invalidate
-{
-  [self.bridge.uiManager.observerCoordinator removeObserver:self];
-}
-
-RCT_EXPORT_MODULE()
-
-- (UIView *)view
-{
-  if (!_viewRegistry) {
-    _viewRegistry = [NSHashTable hashTableWithOptions:NSPointerFunctionsWeakMemory];
-  }
-
-  RCTNavigator *view = [[RCTNavigator alloc] initWithBridge:self.bridge];
-  [_viewRegistry addObject:view];
-  return view;
-}
-
-RCT_EXPORT_VIEW_PROPERTY(requestedTopOfStack, NSInteger)
-RCT_EXPORT_VIEW_PROPERTY(onNavigationProgress, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onNavigationComplete, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(interactivePopGestureEnabled, BOOL)
-
-RCT_EXPORT_METHOD(requestSchedulingJavaScriptNavigation:(nonnull NSNumber *)reactTag
-                  callback:(RCTResponseSenderBlock)callback)
-{
-  [self.bridge.uiManager addUIBlock:
-   ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTNavigator *> *viewRegistry){
-    RCTNavigator *navigator = viewRegistry[reactTag];
-    if ([navigator isKindOfClass:[RCTNavigator class]]) {
-      BOOL wasAcquired = [navigator requestSchedulingJavaScriptNavigation];
-      callback(@[@(wasAcquired)]);
-    } else {
-      RCTLogError(@"Cannot set lock: %@ (tag #%@) is not an RCTNavigator", navigator, reactTag);
-    }
-  }];
-}
-
-#pragma mark - RCTUIManagerObserver
-
-- (void)uiManagerDidPerformMounting:(__unused RCTUIManager *)manager
-{
-  RCTExecuteOnMainQueue(^{
-    for (RCTNavigator *view in self->_viewRegistry) {
-      [view uiManagerDidPerformMounting];
-    }
-  });
-}
-
-@end
diff --git a/React/Views/RCTPicker.h b/React/Views/RCTPicker.h
index 3424f58f32d5b7..2bb0b4893ceced 100644
--- a/React/Views/RCTPicker.h
+++ b/React/Views/RCTPicker.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTPicker.m b/React/Views/RCTPicker.m
index 3193417bdfdd8c..cc13578051d1e3 100644
--- a/React/Views/RCTPicker.m
+++ b/React/Views/RCTPicker.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -23,6 +23,7 @@ - (instancetype)initWithFrame:(CGRect)frame
     _selectedIndex = NSNotFound;
     _textAlign = NSTextAlignmentCenter;
     self.delegate = self;
+    [self selectRow:0 inComponent:0 animated:YES]; // Workaround for missing selection indicator lines (see https://stackoverflow.com/questions/39564660/uipickerview-selection-indicator-not-visible-in-ios10)
   }
   return self;
 }
diff --git a/React/Views/RCTPickerManager.h b/React/Views/RCTPickerManager.h
index a24de5c6eb56df..79de2ee4a73cc8 100644
--- a/React/Views/RCTPickerManager.h
+++ b/React/Views/RCTPickerManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTPickerManager.m b/React/Views/RCTPickerManager.m
index 32947d0001c42d..4838710940dee0 100644
--- a/React/Views/RCTPickerManager.m
+++ b/React/Views/RCTPickerManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTPointerEvents.h b/React/Views/RCTPointerEvents.h
index b8a34fcf79e0c8..86dda22d75df5a 100644
--- a/React/Views/RCTPointerEvents.h
+++ b/React/Views/RCTPointerEvents.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTProgressViewManager.h b/React/Views/RCTProgressViewManager.h
index 6528d8ea861ca8..67a4f0df9e9909 100644
--- a/React/Views/RCTProgressViewManager.h
+++ b/React/Views/RCTProgressViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTProgressViewManager.m b/React/Views/RCTProgressViewManager.m
index d9381c100a57ce..c4a1907566d79d 100644
--- a/React/Views/RCTProgressViewManager.m
+++ b/React/Views/RCTProgressViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTRefreshControl.h b/React/Views/RCTRefreshControl.h
index fa0a1b49473c4d..64fda72c064fa0 100644
--- a/React/Views/RCTRefreshControl.h
+++ b/React/Views/RCTRefreshControl.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,8 +8,9 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTComponent.h>
+#import <React/RCTScrollableProtocol.h>
 
-@interface RCTRefreshControl : UIRefreshControl
+@interface RCTRefreshControl : UIRefreshControl <RCTCustomRefreshContolProtocol>
 
 @property (nonatomic, copy) NSString *title;
 @property (nonatomic, copy) RCTDirectEventBlock onRefresh;
diff --git a/React/Views/RCTRefreshControl.m b/React/Views/RCTRefreshControl.m
index 6bce70938592e7..b26bb03371ed56 100644
--- a/React/Views/RCTRefreshControl.m
+++ b/React/Views/RCTRefreshControl.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTRefreshControlManager.h b/React/Views/RCTRefreshControlManager.h
index ca9fec0739bc69..9d26851104179c 100644
--- a/React/Views/RCTRefreshControlManager.h
+++ b/React/Views/RCTRefreshControlManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTRefreshControlManager.m b/React/Views/RCTRefreshControlManager.m
index 355d35073ae37d..5bfef4af842b42 100644
--- a/React/Views/RCTRefreshControlManager.m
+++ b/React/Views/RCTRefreshControlManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTRootShadowView.h b/React/Views/RCTRootShadowView.h
index 38a65d0fb87a90..775274fd253833 100644
--- a/React/Views/RCTRootShadowView.h
+++ b/React/Views/RCTRootShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTRootShadowView.m b/React/Views/RCTRootShadowView.m
index a1353a4ed0a00f..3e7ed812c80979 100644
--- a/React/Views/RCTRootShadowView.m
+++ b/React/Views/RCTRootShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSegmentedControl.h b/React/Views/RCTSegmentedControl.h
index d29774a2b26376..8e50659f2db248 100644
--- a/React/Views/RCTSegmentedControl.h
+++ b/React/Views/RCTSegmentedControl.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSegmentedControl.m b/React/Views/RCTSegmentedControl.m
index 4b3650c9c8bf47..adbde608e23b00 100644
--- a/React/Views/RCTSegmentedControl.m
+++ b/React/Views/RCTSegmentedControl.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSegmentedControlManager.h b/React/Views/RCTSegmentedControlManager.h
index ad642a6dbf011f..42cbd8025d0c61 100644
--- a/React/Views/RCTSegmentedControlManager.h
+++ b/React/Views/RCTSegmentedControlManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSegmentedControlManager.m b/React/Views/RCTSegmentedControlManager.m
index 8805917deaa327..2994065de206a9 100644
--- a/React/Views/RCTSegmentedControlManager.m
+++ b/React/Views/RCTSegmentedControlManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTShadowView+Internal.h b/React/Views/RCTShadowView+Internal.h
index a5518410a7fc8a..e213335166dcef 100644
--- a/React/Views/RCTShadowView+Internal.h
+++ b/React/Views/RCTShadowView+Internal.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTShadowView+Internal.m b/React/Views/RCTShadowView+Internal.m
index 2a10f2d623e3f2..0f482817244765 100644
--- a/React/Views/RCTShadowView+Internal.m
+++ b/React/Views/RCTShadowView+Internal.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTShadowView+Layout.h b/React/Views/RCTShadowView+Layout.h
index c7d0f16c5f772a..e99d60da647372 100644
--- a/React/Views/RCTShadowView+Layout.h
+++ b/React/Views/RCTShadowView+Layout.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTShadowView+Layout.m b/React/Views/RCTShadowView+Layout.m
index af2987c1fa1ee1..a4c39f208b7c8b 100644
--- a/React/Views/RCTShadowView+Layout.m
+++ b/React/Views/RCTShadowView+Layout.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
index ccf0d80cf28d32..07161f9cfdb1e3 100644
--- a/React/Views/RCTShadowView.h
+++ b/React/Views/RCTShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m
index fce31af6534a60..40c0cdaf8d84f0 100644
--- a/React/Views/RCTShadowView.m
+++ b/React/Views/RCTShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSlider.h b/React/Views/RCTSlider.h
index 139d5dfa6f92d8..749225ccb7f119 100644
--- a/React/Views/RCTSlider.h
+++ b/React/Views/RCTSlider.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSlider.m b/React/Views/RCTSlider.m
index 50407057a6d05c..11898a82fa426b 100644
--- a/React/Views/RCTSlider.m
+++ b/React/Views/RCTSlider.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSliderManager.h b/React/Views/RCTSliderManager.h
index a500a16963d80d..ffdf5209ff8541 100644
--- a/React/Views/RCTSliderManager.h
+++ b/React/Views/RCTSliderManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSliderManager.m b/React/Views/RCTSliderManager.m
index a8a5d24a9165f2..ff3ee403f66d36 100644
--- a/React/Views/RCTSliderManager.m
+++ b/React/Views/RCTSliderManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSwitch.h b/React/Views/RCTSwitch.h
index 2bd430707b4070..13c6b4861f244b 100644
--- a/React/Views/RCTSwitch.h
+++ b/React/Views/RCTSwitch.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSwitch.m b/React/Views/RCTSwitch.m
index 23e07bfc641101..e0a8902f3999ab 100644
--- a/React/Views/RCTSwitch.m
+++ b/React/Views/RCTSwitch.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSwitchManager.h b/React/Views/RCTSwitchManager.h
index b37b1ee86a8e29..57242079c6f5b6 100644
--- a/React/Views/RCTSwitchManager.h
+++ b/React/Views/RCTSwitchManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTSwitchManager.m b/React/Views/RCTSwitchManager.m
index 6642623e7919ee..8edcea2a26fb86 100644
--- a/React/Views/RCTSwitchManager.m
+++ b/React/Views/RCTSwitchManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTTVView.h b/React/Views/RCTTVView.h
index 4f8b2f79c62b9f..8329b085065a7f 100644
--- a/React/Views/RCTTVView.h
+++ b/React/Views/RCTTVView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTTVView.m b/React/Views/RCTTVView.m
index 4351978629a807..427fcde0eea059 100644
--- a/React/Views/RCTTVView.m
+++ b/React/Views/RCTTVView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTTabBar.h b/React/Views/RCTTabBar.h
index 249aa9baaba073..a2a7e62eb8af49 100644
--- a/React/Views/RCTTabBar.h
+++ b/React/Views/RCTTabBar.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTTabBar.m b/React/Views/RCTTabBar.m
index 0d02bb5a8ad4d7..f1f8f4de009755 100644
--- a/React/Views/RCTTabBar.m
+++ b/React/Views/RCTTabBar.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTTabBarItem.h b/React/Views/RCTTabBarItem.h
index 25e36de62da252..431108066a3913 100644
--- a/React/Views/RCTTabBarItem.h
+++ b/React/Views/RCTTabBarItem.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTTabBarItem.m b/React/Views/RCTTabBarItem.m
index 57ffe57c931d4d..b7bdfc7f8f5efc 100644
--- a/React/Views/RCTTabBarItem.m
+++ b/React/Views/RCTTabBarItem.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTTabBarItemManager.h b/React/Views/RCTTabBarItemManager.h
index fd72e35b123d0a..d738ecb6baad81 100644
--- a/React/Views/RCTTabBarItemManager.h
+++ b/React/Views/RCTTabBarItemManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTTabBarItemManager.m b/React/Views/RCTTabBarItemManager.m
index b51952b4e073cb..130aef44cc7043 100644
--- a/React/Views/RCTTabBarItemManager.m
+++ b/React/Views/RCTTabBarItemManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTTabBarManager.h b/React/Views/RCTTabBarManager.h
index b41f52b89a2854..7e0b49d3435821 100644
--- a/React/Views/RCTTabBarManager.h
+++ b/React/Views/RCTTabBarManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTTabBarManager.m b/React/Views/RCTTabBarManager.m
index 6813ffb5d436c7..0f9d3b3439808e 100644
--- a/React/Views/RCTTabBarManager.m
+++ b/React/Views/RCTTabBarManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTTextDecorationLineType.h b/React/Views/RCTTextDecorationLineType.h
index 21152baea4fb49..968333fa588b78 100644
--- a/React/Views/RCTTextDecorationLineType.h
+++ b/React/Views/RCTTextDecorationLineType.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTView.h b/React/Views/RCTView.h
index 68cf22ef20ff1e..65ba3bfd643fd4 100644
--- a/React/Views/RCTView.h
+++ b/React/Views/RCTView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTView.m b/React/Views/RCTView.m
index d8888cbdc681b5..f8091b906ec579 100644
--- a/React/Views/RCTView.m
+++ b/React/Views/RCTView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -655,8 +655,8 @@ - (void)displayLayer:(CALayer *)layer
     CGRectMake(
       insets.left / size.width,
       insets.top / size.height,
-      1.0 / size.width,
-      1.0 / size.height
+      (CGFloat)1.0 / size.width,
+      (CGFloat)1.0 / size.height
     );
   });
 
diff --git a/React/Views/RCTViewManager.h b/React/Views/RCTViewManager.h
index 2edadcc775e117..38a6dbd6e1bea9 100644
--- a/React/Views/RCTViewManager.h
+++ b/React/Views/RCTViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m
index 602dd280d512e7..154e9b0a244501 100644
--- a/React/Views/RCTViewManager.m
+++ b/React/Views/RCTViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -33,6 +33,7 @@ @implementation RCTConvert(UIAccessibilityTraits)
   @"header": @(UIAccessibilityTraitHeader),
   @"search": @(UIAccessibilityTraitSearchField),
   @"image": @(UIAccessibilityTraitImage),
+  @"imagebutton": @(UIAccessibilityTraitImage | UIAccessibilityTraitButton),
   @"selected": @(UIAccessibilityTraitSelected),
   @"plays": @(UIAccessibilityTraitPlaysSound),
   @"key": @(UIAccessibilityTraitKeyboardKey),
@@ -110,8 +111,8 @@ - (RCTShadowView *)shadowView
 RCT_REMAP_VIEW_PROPERTY(accessible, reactAccessibilityElement.isAccessibilityElement, BOOL)
 RCT_REMAP_VIEW_PROPERTY(accessibilityActions, reactAccessibilityElement.accessibilityActions, NSString)
 RCT_REMAP_VIEW_PROPERTY(accessibilityLabel, reactAccessibilityElement.accessibilityLabel, NSString)
+RCT_REMAP_VIEW_PROPERTY(accessibilityHint, reactAccessibilityElement.accessibilityHint, NSString)
 RCT_REMAP_VIEW_PROPERTY(accessibilityTraits, reactAccessibilityElement.accessibilityTraits, UIAccessibilityTraits)
-RCT_REMAP_VIEW_PROPERTY(accessibilityRole, reactAccessibilityElement.accessibilityTraits, UIAccessibilityTraits)
 RCT_REMAP_VIEW_PROPERTY(accessibilityViewIsModal, reactAccessibilityElement.accessibilityViewIsModal, BOOL)
 RCT_REMAP_VIEW_PROPERTY(accessibilityElementsHidden, reactAccessibilityElement.accessibilityElementsHidden, BOOL)
 RCT_REMAP_VIEW_PROPERTY(accessibilityIgnoresInvertColors, reactAccessibilityElement.shouldAccessibilityIgnoresInvertColors, BOOL)
@@ -148,6 +149,26 @@ - (RCTShadowView *)shadowView
   view.layer.allowsEdgeAntialiasing = !CATransform3DIsIdentity(view.layer.transform);
 }
 
+RCT_CUSTOM_VIEW_PROPERTY(accessibilityRole, UIAccessibilityTraits, RCTView)
+{
+  // This mask must be kept in sync with the AccessibilityRoles enum defined in ViewAccessibility.js and DeprecatedViewAccessibility.js
+  const UIAccessibilityTraits AccessibilityRolesMask = UIAccessibilityTraitNone | UIAccessibilityTraitButton | UIAccessibilityTraitLink | UIAccessibilityTraitSearchField | UIAccessibilityTraitImage | UIAccessibilityTraitKeyboardKey | UIAccessibilityTraitStaticText | UIAccessibilityTraitAdjustable | UIAccessibilityTraitHeader | UIAccessibilityTraitSummaryElement;
+
+  UIAccessibilityTraits newTraits = json ? [RCTConvert UIAccessibilityTraits:json] : defaultView.accessibilityTraits;
+  UIAccessibilityTraits maskedTraits = newTraits & AccessibilityRolesMask;
+  view.reactAccessibilityElement.accessibilityTraits = (view.reactAccessibilityElement.accessibilityTraits & ~AccessibilityRolesMask) | maskedTraits;
+}
+
+RCT_CUSTOM_VIEW_PROPERTY(accessibilityStates, UIAccessibilityTraits, RCTView)
+{
+  // This mask must be kept in sync with the AccessibilityStates enum defined in ViewAccessibility.js and DeprecatedViewAccessibility.js
+  const UIAccessibilityTraits AccessibilityStatesMask = UIAccessibilityTraitNotEnabled | UIAccessibilityTraitSelected;
+
+  UIAccessibilityTraits newTraits = json ? [RCTConvert UIAccessibilityTraits:json] : defaultView.accessibilityTraits;
+  UIAccessibilityTraits maskedTraits = newTraits & AccessibilityStatesMask;
+  view.reactAccessibilityElement.accessibilityTraits = (view.reactAccessibilityElement.accessibilityTraits & ~AccessibilityStatesMask) | maskedTraits;
+}
+
 RCT_CUSTOM_VIEW_PROPERTY(pointerEvents, RCTPointerEvents, RCTView)
 {
   if ([view respondsToSelector:@selector(setPointerEvents:)]) {
diff --git a/React/Views/RCTWKWebView.h b/React/Views/RCTWKWebView.h
new file mode 100644
index 00000000000000..13f98aff542979
--- /dev/null
+++ b/React/Views/RCTWKWebView.h
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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/RCTView.h>
+#import <React/RCTDefines.h>
+#import <WebKit/WebKit.h>
+
+@class RCTWKWebView;
+
+@protocol RCTWKWebViewDelegate <NSObject>
+
+- (BOOL)webView:(RCTWKWebView *)webView
+shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
+   withCallback:(RCTDirectEventBlock)callback;
+
+@end
+
+@interface RCTWKWebView : RCTView
+
+@property (nonatomic, weak) id<RCTWKWebViewDelegate> delegate;
+@property (nonatomic, copy) NSDictionary *source;
+@property (nonatomic, assign) BOOL messagingEnabled;
+@property (nonatomic, copy) NSString *injectedJavaScript;
+@property (nonatomic, assign) BOOL scrollEnabled;
+@property (nonatomic, assign) CGFloat decelerationRate;
+@property (nonatomic, assign) BOOL allowsInlineMediaPlayback;
+@property (nonatomic, assign) BOOL bounces;
+@property (nonatomic, assign) BOOL mediaPlaybackRequiresUserAction;
+#if WEBKIT_IOS_10_APIS_AVAILABLE
+@property (nonatomic, assign) WKDataDetectorTypes dataDetectorTypes;
+#endif
+@property (nonatomic, assign) UIEdgeInsets contentInset;
+@property (nonatomic, assign) BOOL automaticallyAdjustContentInsets;
+
+- (void)postMessage:(NSString *)message;
+- (void)injectJavaScript:(NSString *)script;
+- (void)goForward;
+- (void)goBack;
+- (void)reload;
+- (void)stopLoading;
+
+@end
diff --git a/React/Views/RCTWKWebView.m b/React/Views/RCTWKWebView.m
new file mode 100644
index 00000000000000..9f8e3443ec2bec
--- /dev/null
+++ b/React/Views/RCTWKWebView.m
@@ -0,0 +1,412 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTWKWebView.h"
+#import <React/RCTConvert.h>
+#import "RCTAutoInsetsProtocol.h"
+
+static NSString *const MessageHanderName = @"ReactNative";
+
+@interface RCTWKWebView () <WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler, UIScrollViewDelegate, RCTAutoInsetsProtocol>
+@property (nonatomic, copy) RCTDirectEventBlock onLoadingStart;
+@property (nonatomic, copy) RCTDirectEventBlock onLoadingFinish;
+@property (nonatomic, copy) RCTDirectEventBlock onLoadingError;
+@property (nonatomic, copy) RCTDirectEventBlock onShouldStartLoadWithRequest;
+@property (nonatomic, copy) RCTDirectEventBlock onMessage;
+@property (nonatomic, copy) WKWebView *webView;
+@end
+
+@implementation RCTWKWebView
+{
+  UIColor * _savedBackgroundColor;
+}
+
+- (void)dealloc
+{
+
+}
+
+/**
+ * See https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/DisplayWebContent/Tasks/WebKitAvail.html.
+ */
++ (BOOL)dynamicallyLoadWebKitIfAvailable
+{
+  static BOOL _webkitAvailable=NO;
+  static dispatch_once_t onceToken;
+
+  dispatch_once(&onceToken, ^{
+    NSBundle *webKitBundle = [NSBundle bundleWithPath:@"/System/Library/Frameworks/WebKit.framework"];
+    if (webKitBundle) {
+      _webkitAvailable = [webKitBundle load];
+    }
+  });
+
+  return _webkitAvailable;
+}
+
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if ((self = [super initWithFrame:frame])) {
+    super.backgroundColor = [UIColor clearColor];
+    _bounces = YES;
+    _scrollEnabled = YES;
+    _automaticallyAdjustContentInsets = YES;
+    _contentInset = UIEdgeInsetsZero;
+  }
+  return self;
+}
+
+- (void)didMoveToWindow
+{
+  if (self.window != nil) {
+    if (![[self class] dynamicallyLoadWebKitIfAvailable]) {
+      return;
+    };
+
+    WKWebViewConfiguration *wkWebViewConfig = [WKWebViewConfiguration new];
+    wkWebViewConfig.userContentController = [WKUserContentController new];
+    [wkWebViewConfig.userContentController addScriptMessageHandler: self name: MessageHanderName];
+    wkWebViewConfig.allowsInlineMediaPlayback = _allowsInlineMediaPlayback;
+#if WEBKIT_IOS_10_APIS_AVAILABLE
+    wkWebViewConfig.mediaTypesRequiringUserActionForPlayback = _mediaPlaybackRequiresUserAction
+      ? WKAudiovisualMediaTypeAll
+      : WKAudiovisualMediaTypeNone;
+   wkWebViewConfig.dataDetectorTypes = _dataDetectorTypes;
+#endif
+
+    _webView = [[WKWebView alloc] initWithFrame:self.bounds configuration: wkWebViewConfig];
+    _webView.scrollView.delegate = self;
+    _webView.UIDelegate = self;
+    _webView.navigationDelegate = self;
+    _webView.scrollView.scrollEnabled = _scrollEnabled;
+    _webView.scrollView.bounces = _bounces;
+
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
+    if ([_webView.scrollView respondsToSelector:@selector(setContentInsetAdjustmentBehavior:)]) {
+      _webView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    }
+#endif
+
+    [self addSubview:_webView];
+
+    [self visitSource];
+  }
+}
+
+- (void)setBackgroundColor:(UIColor *)backgroundColor
+{
+  _savedBackgroundColor = backgroundColor;
+  if (_webView == nil) {
+    return;
+  }
+
+  CGFloat alpha = CGColorGetAlpha(backgroundColor.CGColor);
+  self.opaque = _webView.opaque = (alpha == 1.0);
+  _webView.scrollView.backgroundColor = backgroundColor;
+  _webView.backgroundColor = backgroundColor;
+}
+
+/**
+ * This method is called whenever JavaScript running within the web view calls:
+ *   - window.webkit.messageHandlers.[MessageHanderName].postMessage
+ */
+- (void)userContentController:(WKUserContentController *)userContentController
+       didReceiveScriptMessage:(WKScriptMessage *)message
+{
+  if (_onMessage != nil) {
+    NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+    [event addEntriesFromDictionary: @{@"data": message.body}];
+    _onMessage(event);
+  }
+}
+
+- (void)setSource:(NSDictionary *)source
+{
+  if (![_source isEqualToDictionary:source]) {
+    _source = [source copy];
+
+    if (_webView != nil) {
+      [self visitSource];
+    }
+  }
+}
+
+- (void)setContentInset:(UIEdgeInsets)contentInset
+{
+  _contentInset = contentInset;
+  [RCTView autoAdjustInsetsForView:self
+                    withScrollView:_webView.scrollView
+                      updateOffset:NO];
+}
+
+- (void)refreshContentInset
+{
+  [RCTView autoAdjustInsetsForView:self
+                    withScrollView:_webView.scrollView
+                      updateOffset:YES];
+}
+
+- (void)visitSource
+{
+  // Check for a static html source first
+  NSString *html = [RCTConvert NSString:_source[@"html"]];
+  if (html) {
+    NSURL *baseURL = [RCTConvert NSURL:_source[@"baseUrl"]];
+    if (!baseURL) {
+      baseURL = [NSURL URLWithString:@"about:blank"];
+    }
+    [_webView loadHTMLString:html baseURL:baseURL];
+    return;
+  }
+
+  NSURLRequest *request = [RCTConvert NSURLRequest:_source];
+  // Because of the way React works, as pages redirect, we actually end up
+  // passing the redirect urls back here, so we ignore them if trying to load
+  // the same url. We'll expose a call to 'reload' to allow a user to load
+  // the existing page.
+  if ([request.URL isEqual:_webView.URL]) {
+    return;
+  }
+  if (!request.URL) {
+    // Clear the webview
+    [_webView loadHTMLString:@"" baseURL:nil];
+    return;
+  }
+  [_webView loadRequest:request];
+}
+
+
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
+{
+  scrollView.decelerationRate = _decelerationRate;
+}
+
+- (void)setScrollEnabled:(BOOL)scrollEnabled
+{
+  _scrollEnabled = scrollEnabled;
+  _webView.scrollView.scrollEnabled = scrollEnabled;
+}
+
+- (void)postMessage:(NSString *)message
+{
+  NSDictionary *eventInitDict = @{@"data": message};
+  NSString *source = [NSString
+    stringWithFormat:@"document.dispatchEvent(new MessageEvent('message', %@));",
+    RCTJSONStringify(eventInitDict, NULL)
+  ];
+  [self evaluateJS: source thenCall: nil];
+}
+
+- (void)layoutSubviews
+{
+  [super layoutSubviews];
+
+  // Ensure webview takes the position and dimensions of RCTWKWebView
+  _webView.frame = self.bounds;
+}
+
+- (NSMutableDictionary<NSString *, id> *)baseEvent
+{
+  NSDictionary *event = @{
+    @"url": _webView.URL.absoluteString ?: @"",
+    @"title": _webView.title,
+    @"loading" : @(_webView.loading),
+    @"canGoBack": @(_webView.canGoBack),
+    @"canGoForward" : @(_webView.canGoForward)
+  };
+  return [[NSMutableDictionary alloc] initWithDictionary: event];
+}
+
+#pragma mark - WKNavigationDelegate methods
+
+/**
+ * Decides whether to allow or cancel a navigation.
+ * @see https://fburl.com/42r9fxob
+ */
+- (void)                  webView:(WKWebView *)webView
+  decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
+                  decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
+{
+  static NSDictionary<NSNumber *, NSString *> *navigationTypes;
+  static dispatch_once_t onceToken;
+
+  dispatch_once(&onceToken, ^{
+    navigationTypes = @{
+      @(WKNavigationTypeLinkActivated): @"click",
+      @(WKNavigationTypeFormSubmitted): @"formsubmit",
+      @(WKNavigationTypeBackForward): @"backforward",
+      @(WKNavigationTypeReload): @"reload",
+      @(WKNavigationTypeFormResubmitted): @"formresubmit",
+      @(WKNavigationTypeOther): @"other",
+    };
+  });
+
+  WKNavigationType navigationType = navigationAction.navigationType;
+  NSURLRequest *request = navigationAction.request;
+
+  if (_onShouldStartLoadWithRequest) {
+    NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+    [event addEntriesFromDictionary: @{
+      @"url": (request.URL).absoluteString,
+      @"navigationType": navigationTypes[@(navigationType)]
+    }];
+    if (![self.delegate webView:self
+      shouldStartLoadForRequest:event
+                   withCallback:_onShouldStartLoadWithRequest]) {
+      decisionHandler(WKNavigationResponsePolicyCancel);
+      return;
+    }
+  }
+
+  if (_onLoadingStart) {
+    // We have this check to filter out iframe requests and whatnot
+    BOOL isTopFrame = [request.URL isEqual:request.mainDocumentURL];
+    if (isTopFrame) {
+      NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+      [event addEntriesFromDictionary: @{
+        @"url": (request.URL).absoluteString,
+        @"navigationType": navigationTypes[@(navigationType)]
+      }];
+      _onLoadingStart(event);
+    }
+  }
+
+  // Allow all navigation by default
+  decisionHandler(WKNavigationResponsePolicyAllow);
+}
+
+/**
+ * Called when an error occurs while the web view is loading content.
+ * @see https://fburl.com/km6vqenw
+ */
+- (void)               webView:(WKWebView *)webView
+  didFailProvisionalNavigation:(WKNavigation *)navigation
+                     withError:(NSError *)error
+{
+  if (_onLoadingError) {
+    if ([error.domain isEqualToString:NSURLErrorDomain] && error.code == NSURLErrorCancelled) {
+      // NSURLErrorCancelled is reported when a page has a redirect OR if you load
+      // a new URL in the WebView before the previous one came back. We can just
+      // ignore these since they aren't real errors.
+      // http://stackoverflow.com/questions/1024748/how-do-i-fix-nsurlerrordomain-error-999-in-iphone-3-0-os
+      return;
+    }
+
+    NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+    [event addEntriesFromDictionary:@{
+      @"didFailProvisionalNavigation": @YES,
+      @"domain": error.domain,
+      @"code": @(error.code),
+      @"description": error.localizedDescription,
+    }];
+    _onLoadingError(event);
+  }
+
+  [self setBackgroundColor: _savedBackgroundColor];
+}
+
+- (void)evaluateJS:(NSString *)js
+          thenCall: (void (^)(NSString*)) callback
+{
+  [self.webView evaluateJavaScript: js completionHandler: ^(id result, NSError *error) {
+    if (error == nil && callback != nil) {
+      callback([NSString stringWithFormat:@"%@", result]);
+    }
+  }];
+}
+
+
+/**
+ * Called when the navigation is complete.
+ * @see https://fburl.com/rtys6jlb
+ */
+- (void)      webView:(WKWebView *)webView
+  didFinishNavigation:(WKNavigation *)navigation
+{
+  if (_messagingEnabled) {
+    #if RCT_DEV
+
+    // Implementation inspired by Lodash.isNative.
+    NSString *isPostMessageNative = @"String(String(window.postMessage) === String(Object.hasOwnProperty).replace('hasOwnProperty', 'postMessage'))";
+    [self evaluateJS: isPostMessageNative thenCall: ^(NSString *result) {
+      if (! [result isEqualToString:@"true"]) {
+        RCTLogError(@"Setting onMessage on a WebView overrides existing values of window.postMessage, but a previous value was defined");
+      }
+    }];
+    #endif
+
+    NSString *source = [NSString stringWithFormat:
+      @"(function() {"
+        "window.originalPostMessage = window.postMessage;"
+
+        "window.postMessage = function(data) {"
+          "window.webkit.messageHandlers.%@.postMessage(String(data));"
+        "};"
+      "})();",
+      MessageHanderName
+    ];
+    [self evaluateJS: source thenCall: nil];
+  }
+
+  if (_injectedJavaScript) {
+    [self evaluateJS: _injectedJavaScript thenCall: ^(NSString *jsEvaluationValue) {
+      NSMutableDictionary *event = [self baseEvent];
+      event[@"jsEvaluationValue"] = jsEvaluationValue;
+      if (self.onLoadingFinish) {
+        self.onLoadingFinish(event);
+      }
+    }];
+  } else if (_onLoadingFinish) {
+    _onLoadingFinish([self baseEvent]);
+  }
+
+  [self setBackgroundColor: _savedBackgroundColor];
+}
+
+- (void)injectJavaScript:(NSString *)script
+{
+  [self evaluateJS: script thenCall: nil];
+}
+
+- (void)goForward
+{
+  [_webView goForward];
+}
+
+- (void)goBack
+{
+  [_webView goBack];
+}
+
+- (void)reload
+{
+  /**
+   * When the initial load fails due to network connectivity issues,
+   * [_webView reload] doesn't reload the webpage. Therefore, we must
+   * manually call [_webView loadRequest:request].
+   */
+  NSURLRequest *request = [RCTConvert NSURLRequest:self.source];
+  if (request.URL && !_webView.URL.absoluteString.length) {
+    [_webView loadRequest:request];
+  }
+  else {
+    [_webView reload];
+  }
+}
+
+- (void)stopLoading
+{
+  [_webView stopLoading];
+}
+
+- (void)setBounces:(BOOL)bounces
+{
+  _bounces = bounces;
+  _webView.scrollView.bounces = bounces;
+}
+@end
diff --git a/React/Views/RCTNavigatorManager.h b/React/Views/RCTWKWebViewManager.h
similarity index 63%
rename from React/Views/RCTNavigatorManager.h
rename to React/Views/RCTWKWebViewManager.h
index 58c40c94e7f1f7..cf44faf240cbd0 100644
--- a/React/Views/RCTNavigatorManager.h
+++ b/React/Views/RCTWKWebViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,5 @@
 
 #import <React/RCTViewManager.h>
 
-@interface RCTNavigatorManager : RCTViewManager
-
+@interface RCTWKWebViewManager : RCTViewManager
 @end
diff --git a/React/Views/RCTWKWebViewManager.m b/React/Views/RCTWKWebViewManager.m
new file mode 100644
index 00000000000000..9d329472b965c1
--- /dev/null
+++ b/React/Views/RCTWKWebViewManager.m
@@ -0,0 +1,170 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTWKWebViewManager.h"
+
+#import "RCTUIManager.h"
+#import "RCTWKWebView.h"
+#import <React/RCTDefines.h>
+
+@interface RCTWKWebViewManager () <RCTWKWebViewDelegate>
+@end
+
+@implementation RCTWKWebViewManager
+{
+  NSConditionLock *_shouldStartLoadLock;
+  BOOL _shouldStartLoad;
+}
+
+RCT_EXPORT_MODULE()
+
+- (UIView *)view
+{
+  RCTWKWebView *webView = [RCTWKWebView new];
+  webView.delegate = self;
+  return webView;
+}
+
+RCT_EXPORT_VIEW_PROPERTY(source, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(onLoadingStart, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onLoadingFinish, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onLoadingError, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onShouldStartLoadWithRequest, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(injectedJavaScript, NSString)
+RCT_EXPORT_VIEW_PROPERTY(allowsInlineMediaPlayback, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(mediaPlaybackRequiresUserAction, BOOL)
+#if WEBKIT_IOS_10_APIS_AVAILABLE
+RCT_EXPORT_VIEW_PROPERTY(dataDetectorTypes, WKDataDetectorTypes)
+#endif
+RCT_EXPORT_VIEW_PROPERTY(contentInset, UIEdgeInsets)
+RCT_EXPORT_VIEW_PROPERTY(automaticallyAdjustContentInsets, BOOL)
+
+/**
+ * Expose methods to enable messaging the webview.
+ */
+RCT_EXPORT_VIEW_PROPERTY(messagingEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(onMessage, RCTDirectEventBlock)
+
+RCT_EXPORT_METHOD(postMessage:(nonnull NSNumber *)reactTag message:(NSString *)message)
+{
+  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWKWebView *> *viewRegistry) {
+    RCTWKWebView *view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[RCTWKWebView class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
+    } else {
+      [view postMessage:message];
+    }
+  }];
+}
+
+RCT_CUSTOM_VIEW_PROPERTY(bounces, BOOL, RCTWKWebView) {
+  view.bounces = json == nil ? true : [RCTConvert BOOL: json];
+}
+
+RCT_CUSTOM_VIEW_PROPERTY(scrollEnabled, BOOL, RCTWKWebView) {
+  view.scrollEnabled = json == nil ? true : [RCTConvert BOOL: json];
+}
+
+RCT_CUSTOM_VIEW_PROPERTY(decelerationRate, CGFloat, RCTWKWebView) {
+  view.decelerationRate = json == nil ? UIScrollViewDecelerationRateNormal : [RCTConvert CGFloat: json];
+}
+
+RCT_EXPORT_METHOD(injectJavaScript:(nonnull NSNumber *)reactTag script:(NSString *)script)
+{
+  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWKWebView *> *viewRegistry) {
+    RCTWKWebView *view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[RCTWKWebView class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
+    } else {
+      [view injectJavaScript:script];
+    }
+  }];
+}
+
+RCT_EXPORT_METHOD(goBack:(nonnull NSNumber *)reactTag)
+{
+  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWKWebView *> *viewRegistry) {
+    RCTWKWebView *view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[RCTWKWebView class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
+    } else {
+      [view goBack];
+    }
+  }];
+}
+
+RCT_EXPORT_METHOD(goForward:(nonnull NSNumber *)reactTag)
+{
+  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWKWebView *> *viewRegistry) {
+    RCTWKWebView *view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[RCTWKWebView class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
+    } else {
+      [view goForward];
+    }
+  }];
+}
+
+RCT_EXPORT_METHOD(reload:(nonnull NSNumber *)reactTag)
+{
+  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWKWebView *> *viewRegistry) {
+    RCTWKWebView *view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[RCTWKWebView class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
+    } else {
+      [view reload];
+    }
+  }];
+}
+
+RCT_EXPORT_METHOD(stopLoading:(nonnull NSNumber *)reactTag)
+{
+  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWKWebView *> *viewRegistry) {
+    RCTWKWebView *view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[RCTWKWebView class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
+    } else {
+      [view stopLoading];
+    }
+  }];
+}
+
+#pragma mark - Exported synchronous methods
+
+- (BOOL)          webView:(RCTWKWebView *)webView
+shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
+             withCallback:(RCTDirectEventBlock)callback
+{
+  _shouldStartLoadLock = [[NSConditionLock alloc] initWithCondition:arc4random()];
+  _shouldStartLoad = YES;
+  request[@"lockIdentifier"] = @(_shouldStartLoadLock.condition);
+  callback(request);
+
+  // Block the main thread for a maximum of 250ms until the JS thread returns
+  if ([_shouldStartLoadLock lockWhenCondition:0 beforeDate:[NSDate dateWithTimeIntervalSinceNow:.25]]) {
+    BOOL returnValue = _shouldStartLoad;
+    [_shouldStartLoadLock unlock];
+    _shouldStartLoadLock = nil;
+    return returnValue;
+  } else {
+    RCTLogWarn(@"Did not receive response to shouldStartLoad in time, defaulting to YES");
+    return YES;
+  }
+}
+
+RCT_EXPORT_METHOD(startLoadWithResult:(BOOL)result lockIdentifier:(NSInteger)lockIdentifier)
+{
+  if ([_shouldStartLoadLock tryLockWhenCondition:lockIdentifier]) {
+    _shouldStartLoad = result;
+    [_shouldStartLoadLock unlockWithCondition:0];
+  } else {
+    RCTLogWarn(@"startLoadWithResult invoked with invalid lockIdentifier: "
+               "got %lld, expected %lld", (long long)lockIdentifier, (long long)_shouldStartLoadLock.condition);
+  }
+}
+
+@end
diff --git a/React/Views/RCTWebView.h b/React/Views/RCTWebView.h
index eccb5b94c6daa3..4fa9d62d8a831d 100644
--- a/React/Views/RCTWebView.h
+++ b/React/Views/RCTWebView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTWebView.m b/React/Views/RCTWebView.m
index 61042b221f79ef..a634efc3daf9a1 100644
--- a/React/Views/RCTWebView.m
+++ b/React/Views/RCTWebView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTWebViewManager.h b/React/Views/RCTWebViewManager.h
index 2c83b2f64169fc..d06ea1b806e470 100644
--- a/React/Views/RCTWebViewManager.h
+++ b/React/Views/RCTWebViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/RCTWebViewManager.m b/React/Views/RCTWebViewManager.m
index 8f4ef9b0f4f793..fc39f7cb1382a2 100644
--- a/React/Views/RCTWebViewManager.m
+++ b/React/Views/RCTWebViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -63,8 +63,8 @@ - (UIView *)view
 
 RCT_EXPORT_METHOD(goForward:(nonnull NSNumber *)reactTag)
 {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
+  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWebView *> *viewRegistry) {
+    RCTWebView *view = viewRegistry[reactTag];
     if (![view isKindOfClass:[RCTWebView class]]) {
       RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
     } else {
diff --git a/React/Views/RCTWrapperViewController.h b/React/Views/RCTWrapperViewController.h
index 7baa0c08c533ed..623b37bf15e0a3 100644
--- a/React/Views/RCTWrapperViewController.h
+++ b/React/Views/RCTWrapperViewController.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,22 +7,10 @@
 
 #import <UIKit/UIKit.h>
 
-@class RCTNavItem;
 @class RCTWrapperViewController;
 
-@protocol RCTWrapperViewControllerNavigationListener <NSObject>
-
-- (void)wrapperViewController:(RCTWrapperViewController *)wrapperViewController
-didMoveToNavigationController:(UINavigationController *)navigationController;
-
-@end
-
 @interface RCTWrapperViewController : UIViewController
 
 - (instancetype)initWithContentView:(UIView *)contentView NS_DESIGNATED_INITIALIZER;
-- (instancetype)initWithNavItem:(RCTNavItem *)navItem;
-
-@property (nonatomic, weak) id<RCTWrapperViewControllerNavigationListener> navigationListener;
-@property (nonatomic, strong) RCTNavItem *navItem;
 
 @end
diff --git a/React/Views/RCTWrapperViewController.m b/React/Views/RCTWrapperViewController.m
index 30103019eef4f2..e32425e41e4e55 100644
--- a/React/Views/RCTWrapperViewController.m
+++ b/React/Views/RCTWrapperViewController.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,6 @@
 #import <UIKit/UIScrollView.h>
 
 #import "RCTEventDispatcher.h"
-#import "RCTNavItem.h"
 #import "RCTUtils.h"
 #import "UIView+React.h"
 #import "RCTAutoInsetsProtocol.h"
@@ -38,14 +37,6 @@ - (instancetype)initWithContentView:(UIView *)contentView
   return self;
 }
 
-- (instancetype)initWithNavItem:(RCTNavItem *)navItem
-{
-  if ((self = [self initWithContentView:navItem])) {
-    _navItem = navItem;
-  }
-  return self;
-}
-
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithNibName:(NSString *)nn bundle:(NSBundle *)nb)
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
 
@@ -83,55 +74,6 @@ - (void)viewDidLayoutSubviews
   }
 }
 
-static UIView *RCTFindNavBarShadowViewInView(UIView *view)
-{
-  if ([view isKindOfClass:[UIImageView class]] && view.bounds.size.height <= 1) {
-    return view;
-  }
-  for (UIView *subview in view.subviews) {
-    UIView *shadowView = RCTFindNavBarShadowViewInView(subview);
-    if (shadowView) {
-      return shadowView;
-    }
-  }
-  return nil;
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-  [super viewWillAppear:animated];
-
-  // TODO: find a way to make this less-tightly coupled to navigation controller
-  if ([self.parentViewController isKindOfClass:[UINavigationController class]])
-  {
-    [self.navigationController
-     setNavigationBarHidden:_navItem.navigationBarHidden
-     animated:animated];
-
-    UINavigationBar *bar = self.navigationController.navigationBar;
-    bar.barTintColor = _navItem.barTintColor;
-    bar.tintColor = _navItem.tintColor;
-    bar.translucent = _navItem.translucent;
-#if !TARGET_OS_TV
-    bar.barStyle = _navItem.barStyle;
-#endif
-    bar.titleTextAttributes = _navItem.titleTextColor ? @{
-      NSForegroundColorAttributeName: _navItem.titleTextColor
-    } : nil;
-
-    RCTFindNavBarShadowViewInView(bar).hidden = _navItem.shadowHidden;
-
-    UINavigationItem *item = self.navigationItem;
-    item.title = _navItem.title;
-    item.titleView = _navItem.titleImageView;
-#if !TARGET_OS_TV
-    item.backBarButtonItem = _navItem.backButtonItem;
-#endif //TARGET_OS_TV
-    item.leftBarButtonItem = _navItem.leftButtonItem;
-    item.rightBarButtonItem = _navItem.rightButtonItem;
-  }
-}
-
 - (void)loadView
 {
   // Add a wrapper so that the wrapper view managed by the
@@ -142,16 +84,4 @@ - (void)loadView
   self.view = _wrapperView;
 }
 
-- (void)didMoveToParentViewController:(UIViewController *)parent
-{
-  // There's no clear setter for navigation controllers, but did move to parent
-  // view controller provides the desired effect. This is called after a pop
-  // finishes, be it a swipe to go back or a standard tap on the back button
-  [super didMoveToParentViewController:parent];
-  if (parent == nil || [parent isKindOfClass:[UINavigationController class]]) {
-    [self.navigationListener wrapperViewController:self
-                     didMoveToNavigationController:(UINavigationController *)parent];
-  }
-}
-
 @end
diff --git a/React/Views/SafeAreaView/RCTSafeAreaShadowView.h b/React/Views/SafeAreaView/RCTSafeAreaShadowView.h
index 8ce55759f86ec3..bb00017950d24a 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaShadowView.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
index 333c0da7fbe43f..9c66d6be245655 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/SafeAreaView/RCTSafeAreaView.h b/React/Views/SafeAreaView/RCTSafeAreaView.h
index 1964b0b65f9f6f..9a8c2efc64d5bf 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaView.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,6 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 
+@property (nonatomic, assign) BOOL emulateUnlessSupported;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/React/Views/SafeAreaView/RCTSafeAreaView.m b/React/Views/SafeAreaView/RCTSafeAreaView.m
index e4fe4b6d17146a..7e3c8562e04a5f 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaView.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -21,6 +21,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
 {
   if (self = [super initWithFrame:CGRectZero]) {
     _bridge = bridge;
+    _emulateUnlessSupported = YES; // The default.
   }
 
   return self;
@@ -29,7 +30,45 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)decoder)
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 
+- (BOOL)isSupportedByOS
+{
+  return [self respondsToSelector:@selector(safeAreaInsets)];
+}
+
+- (UIEdgeInsets)safeAreaInsetsIfSupportedAndEnabled
+{
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
+  if (self.isSupportedByOS) {
+    return self.safeAreaInsets;
+  }
+#endif
+  return self.emulateUnlessSupported ? self.emulatedSafeAreaInsets : UIEdgeInsetsZero;
+}
+
+- (UIEdgeInsets)emulatedSafeAreaInsets
+{
+  UIViewController* vc = self.reactViewController;
+
+  if (!vc) {
+    return UIEdgeInsetsZero;
+  }
+
+  CGFloat topLayoutOffset = vc.topLayoutGuide.length;
+  CGFloat bottomLayoutOffset = vc.bottomLayoutGuide.length;
+  CGRect safeArea = vc.view.bounds;
+  safeArea.origin.y += topLayoutOffset;
+  safeArea.size.height -= topLayoutOffset + bottomLayoutOffset;
+  CGRect localSafeArea = [vc.view convertRect:safeArea toView:self];
+  UIEdgeInsets safeAreaInsets = UIEdgeInsetsMake(0, 0, 0, 0);
+  if (CGRectGetMinY(localSafeArea) > CGRectGetMinY(self.bounds)) {
+    safeAreaInsets.top = CGRectGetMinY(localSafeArea) - CGRectGetMinY(self.bounds);
+  }
+  if (CGRectGetMaxY(localSafeArea) < CGRectGetMaxY(self.bounds)) {
+    safeAreaInsets.bottom = CGRectGetMaxY(self.bounds) - CGRectGetMaxY(localSafeArea);
+  }
+
+  return safeAreaInsets;
+}
 
 static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIEdgeInsets insets2, CGFloat threshold) {
   return
@@ -41,23 +80,44 @@ static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIE
 
 - (void)safeAreaInsetsDidChange
 {
-  if (![self respondsToSelector:@selector(safeAreaInsets)]) {
-    return;
-  }
+  [self invalidateSafeAreaInsets];
+}
+
+- (void)invalidateSafeAreaInsets
+{
+  [self setSafeAreaInsets:self.safeAreaInsetsIfSupportedAndEnabled];
+}
 
-  UIEdgeInsets safeAreaInsets = self.safeAreaInsets;
+- (void)layoutSubviews
+{
+  [super layoutSubviews];
+
+  if (!self.isSupportedByOS && self.emulateUnlessSupported) {
+    [self invalidateSafeAreaInsets];
+  }
+}
 
+- (void)setSafeAreaInsets:(UIEdgeInsets)safeAreaInsets
+{
   if (UIEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, 1.0 / RCTScreenScale())) {
     return;
   }
 
   _currentSafeAreaInsets = safeAreaInsets;
 
-  RCTSafeAreaViewLocalData *localData =
-    [[RCTSafeAreaViewLocalData alloc] initWithInsets:safeAreaInsets];
+  RCTSafeAreaViewLocalData *localData = [[RCTSafeAreaViewLocalData alloc] initWithInsets:safeAreaInsets];
   [_bridge.uiManager setLocalData:localData forView:self];
 }
 
-#endif
+- (void)setEmulateUnlessSupported:(BOOL)emulateUnlessSupported
+{
+  if (_emulateUnlessSupported == emulateUnlessSupported) {
+    return;
+  }
+
+  _emulateUnlessSupported = emulateUnlessSupported;
+
+  [self invalidateSafeAreaInsets];
+}
 
 @end
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h
index a644890c6abefc..e72c1127be64ad 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m
index 0c38d89344755a..ca108bf3967d8b 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewManager.h b/React/Views/SafeAreaView/RCTSafeAreaViewManager.h
index aeaf69a73deba8..5dcfb038438551 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewManager.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewManager.m b/React/Views/SafeAreaView/RCTSafeAreaViewManager.m
index 6bc64562358ccc..6baf0c1b55baba 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewManager.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -15,6 +15,8 @@ @implementation RCTSafeAreaViewManager
 
 RCT_EXPORT_MODULE()
 
+RCT_EXPORT_VIEW_PROPERTY(emulateUnlessSupported, BOOL)
+
 - (UIView *)view
 {
   return [[RCTSafeAreaView alloc] initWithBridge:self.bridge];
diff --git a/React/Views/ScrollView/RCTScrollContentShadowView.h b/React/Views/ScrollView/RCTScrollContentShadowView.h
index e10573cca94ae1..2e1bd897c0ca2c 100644
--- a/React/Views/ScrollView/RCTScrollContentShadowView.h
+++ b/React/Views/ScrollView/RCTScrollContentShadowView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/ScrollView/RCTScrollContentShadowView.m b/React/Views/ScrollView/RCTScrollContentShadowView.m
index 3988ee381e7e66..7d4e2f78f81f33 100644
--- a/React/Views/ScrollView/RCTScrollContentShadowView.m
+++ b/React/Views/ScrollView/RCTScrollContentShadowView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/ScrollView/RCTScrollContentView.h b/React/Views/ScrollView/RCTScrollContentView.h
index 5271bf250b1591..8d93a2a678c9b9 100644
--- a/React/Views/ScrollView/RCTScrollContentView.h
+++ b/React/Views/ScrollView/RCTScrollContentView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/ScrollView/RCTScrollContentView.m b/React/Views/ScrollView/RCTScrollContentView.m
index a6426dec89a954..99689d5686a2ca 100644
--- a/React/Views/ScrollView/RCTScrollContentView.m
+++ b/React/Views/ScrollView/RCTScrollContentView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/ScrollView/RCTScrollContentViewManager.h b/React/Views/ScrollView/RCTScrollContentViewManager.h
index bf5c250a5fb0da..21db0a1ef826cb 100644
--- a/React/Views/ScrollView/RCTScrollContentViewManager.h
+++ b/React/Views/ScrollView/RCTScrollContentViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/ScrollView/RCTScrollContentViewManager.m b/React/Views/ScrollView/RCTScrollContentViewManager.m
index 732f976556f610..2f345a8c390a2a 100644
--- a/React/Views/ScrollView/RCTScrollContentViewManager.m
+++ b/React/Views/ScrollView/RCTScrollContentViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/ScrollView/RCTScrollView.h b/React/Views/ScrollView/RCTScrollView.h
index e1853e5d9d3558..3404422c7b00da 100644
--- a/React/Views/ScrollView/RCTScrollView.h
+++ b/React/Views/ScrollView/RCTScrollView.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -45,6 +45,9 @@
 @property (nonatomic, assign) BOOL centerContent;
 @property (nonatomic, copy) NSDictionary *maintainVisibleContentPosition;
 @property (nonatomic, assign) int snapToInterval;
+@property (nonatomic, copy) NSArray<NSNumber *> *snapToOffsets;
+@property (nonatomic, assign) BOOL snapToStart;
+@property (nonatomic, assign) BOOL snapToEnd;
 @property (nonatomic, copy) NSString *snapToAlignment;
 
 // NOTE: currently these event props are only declared so we can export the
@@ -52,6 +55,7 @@
 // need to be coalesced before sending, for performance reasons.
 @property (nonatomic, copy) RCTDirectEventBlock onScrollBeginDrag;
 @property (nonatomic, copy) RCTDirectEventBlock onScroll;
+@property (nonatomic, copy) RCTDirectEventBlock onScrollToTop;
 @property (nonatomic, copy) RCTDirectEventBlock onScrollEndDrag;
 @property (nonatomic, copy) RCTDirectEventBlock onMomentumScrollBegin;
 @property (nonatomic, copy) RCTDirectEventBlock onMomentumScrollEnd;
diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
index 58661fa78488a5..52507300612f8a 100644
--- a/React/Views/ScrollView/RCTScrollView.m
+++ b/React/Views/ScrollView/RCTScrollView.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -155,7 +155,7 @@ @interface RCTCustomScrollView : UIScrollView<UIGestureRecognizerDelegate>
 
 @property (nonatomic, assign) BOOL centerContent;
 #if !TARGET_OS_TV
-@property (nonatomic, strong) RCTRefreshControl *rctRefreshControl;
+@property (nonatomic, strong) UIView<RCTCustomRefreshContolProtocol> *customRefreshControl;
 @property (nonatomic, assign) BOOL pinchGestureEnabled;
 #endif
 
@@ -329,13 +329,13 @@ - (void)setFrame:(CGRect)frame
 }
 
 #if !TARGET_OS_TV
-- (void)setRctRefreshControl:(RCTRefreshControl *)refreshControl
+- (void)setCustomRefreshControl:(UIView<RCTCustomRefreshContolProtocol> *)refreshControl
 {
-  if (_rctRefreshControl) {
-    [_rctRefreshControl removeFromSuperview];
+  if (_customRefreshControl) {
+    [_customRefreshControl removeFromSuperview];
   }
-  _rctRefreshControl = refreshControl;
-  [self addSubview:_rctRefreshControl];
+  _customRefreshControl = refreshControl;
+  [self addSubview:_customRefreshControl];
 }
 
 - (void)setPinchGestureEnabled:(BOOL)pinchGestureEnabled
@@ -443,13 +443,12 @@ - (void)insertReactSubview:(UIView *)view atIndex:(NSInteger)atIndex
 {
   [super insertReactSubview:view atIndex:atIndex];
 #if !TARGET_OS_TV
-  if ([view isKindOfClass:[RCTRefreshControl class]]) {
-    [_scrollView setRctRefreshControl:(RCTRefreshControl *)view];
-  }
-  else if ([view conformsToProtocol:@protocol(UIScrollViewDelegate)]) {
-    [self addScrollListener:(UIView<UIScrollViewDelegate> *)view];
-    [_scrollView addSubview:view];
-    [_scrollView sendSubviewToBack:view];
+  if ([view conformsToProtocol:@protocol(RCTCustomRefreshContolProtocol)]) {
+    [_scrollView setCustomRefreshControl:(UIView<RCTCustomRefreshContolProtocol> *)view];
+    if (![view isKindOfClass:[UIRefreshControl class]]
+        && [view conformsToProtocol:@protocol(UIScrollViewDelegate)]) {
+      [self addScrollListener:(UIView<UIScrollViewDelegate> *)view];
+    }
   } else
 #endif
   {
@@ -464,11 +463,12 @@ - (void)removeReactSubview:(UIView *)subview
 {
   [super removeReactSubview:subview];
 #if !TARGET_OS_TV
-  if ([subview isKindOfClass:[RCTRefreshControl class]]) {
-    [_scrollView setRctRefreshControl:nil];
-  } else if ([subview conformsToProtocol:@protocol(UIScrollViewDelegate)]) {
-    [self removeScrollListener:(UIView<UIScrollViewDelegate> *)subview];
-    [subview removeFromSuperview];
+  if ([subview conformsToProtocol:@protocol(RCTCustomRefreshContolProtocol)]) {
+    [_scrollView setCustomRefreshControl:nil];
+    if (![subview isKindOfClass:[UIRefreshControl class]]
+        && [subview conformsToProtocol:@protocol(UIScrollViewDelegate)]) {
+      [self removeScrollListener:(UIView<UIScrollViewDelegate> *)subview];
+    }
   } else
 #endif
   {
@@ -519,8 +519,8 @@ - (void)layoutSubviews
 
 #if !TARGET_OS_TV
   // Adjust the refresh control frame if the scrollview layout changes.
-  RCTRefreshControl *refreshControl = _scrollView.rctRefreshControl;
-  if (refreshControl && refreshControl.refreshing) {
+  UIView<RCTCustomRefreshContolProtocol> *refreshControl = _scrollView.customRefreshControl;
+  if (refreshControl && refreshControl.isRefreshing) {
     refreshControl.frame = (CGRect){_scrollView.contentOffset, {_scrollView.frame.size.width, refreshControl.frame.size.height}};
   }
 #endif
@@ -648,6 +648,7 @@ - (void)delegateMethod:(UIScrollView *)scrollView           \
 
 RCT_SCROLL_EVENT_HANDLER(scrollViewWillBeginDecelerating, onMomentumScrollBegin)
 RCT_SCROLL_EVENT_HANDLER(scrollViewDidZoom, onScroll)
+RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
 
 - (void)addScrollListener:(NSObject<UIScrollViewDelegate> *)scrollListener
 {
@@ -727,12 +728,91 @@ - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
 
 - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
 {
-  // snapToInterval
-  // An alternative to enablePaging which allows setting custom stopping intervals,
-  // smaller than a full page size. Often seen in apps which feature horizonally
-  // scrolling items. snapToInterval does not enforce scrolling one interval at a time
-  // but guarantees that the scroll will stop at an interval point.
-  if (self.snapToInterval) {
+  if (self.snapToOffsets) {
+    // An alternative to enablePaging and snapToInterval which allows setting custom
+    // stopping points that don't have to be the same distance apart. Often seen in
+    // apps which feature horizonally scrolling items. snapToInterval does not enforce
+    // scrolling one interval at a time but guarantees that the scroll will stop at
+    // a snap offset point.
+
+    // Find which axis to snap
+    BOOL isHorizontal = [self isHorizontal:scrollView];
+    CGFloat velocityAlongAxis = isHorizontal ? velocity.x : velocity.y;
+    CGFloat offsetAlongAxis = isHorizontal ? _scrollView.contentOffset.x : _scrollView.contentOffset.y;
+
+    // Calculate maximum content offset
+    CGSize viewportSize = [self _calculateViewportSize];
+    CGFloat maximumOffset = isHorizontal
+      ? MAX(0, _scrollView.contentSize.width - viewportSize.width)
+      : MAX(0, _scrollView.contentSize.height - viewportSize.height);
+
+    // Calculate the snap offsets adjacent to the initial offset target
+    CGFloat targetOffset = isHorizontal ? targetContentOffset->x : targetContentOffset->y;
+    CGFloat smallerOffset = 0.0;
+    CGFloat largerOffset = maximumOffset;
+
+    for (int i = 0; i < self.snapToOffsets.count; i++) {
+      CGFloat offset = [[self.snapToOffsets objectAtIndex:i] floatValue];
+
+      if (offset <= targetOffset) {
+        if (targetOffset - offset < targetOffset - smallerOffset) {
+          smallerOffset = offset;
+        }
+      }
+
+      if (offset >= targetOffset) {
+        if (offset - targetOffset < largerOffset - targetOffset) {
+          largerOffset = offset;
+        }
+      }
+    }
+
+    // Calculate the nearest offset
+    CGFloat nearestOffset = targetOffset - smallerOffset < largerOffset - targetOffset
+      ? smallerOffset
+      : largerOffset;
+
+    CGFloat firstOffset = [[self.snapToOffsets firstObject] floatValue];
+    CGFloat lastOffset = [[self.snapToOffsets lastObject] floatValue];
+
+    // if scrolling after the last snap offset and snapping to the
+    // end of the list is disabled, then we allow free scrolling
+    if (!self.snapToEnd && targetOffset >= lastOffset) {
+      if (offsetAlongAxis >= lastOffset) {
+        // free scrolling
+      } else {
+        // snap to end
+        targetOffset = lastOffset;
+      }
+    } else if (!self.snapToStart && targetOffset <= firstOffset) {
+      if (offsetAlongAxis <= firstOffset) {
+        // free scrolling
+      } else {
+        // snap to beginning
+        targetOffset = firstOffset;
+      }
+    } else if (velocityAlongAxis > 0.0) {
+      targetOffset = largerOffset;
+    } else if (velocityAlongAxis < 0.0) {
+      targetOffset = smallerOffset;
+    } else {
+      targetOffset = nearestOffset;
+    }
+
+    // Make sure the new offset isn't out of bounds
+    targetOffset = MIN(MAX(0, targetOffset), maximumOffset);
+
+    // Set new targetContentOffset
+    if (isHorizontal) {
+      targetContentOffset->x = targetOffset;
+    } else {
+      targetContentOffset->y = targetOffset;
+    }
+  } else if (self.snapToInterval) {
+    // An alternative to enablePaging which allows setting custom stopping intervals,
+    // smaller than a full page size. Often seen in apps which feature horizonally
+    // scrolling items. snapToInterval does not enforce scrolling one interval at a time
+    // but guarantees that the scroll will stop at an interval point.
     CGFloat snapToIntervalF = (CGFloat)self.snapToInterval;
 
     // Find which axis to snap
diff --git a/React/Views/ScrollView/RCTScrollViewManager.h b/React/Views/ScrollView/RCTScrollViewManager.h
index 40c1a9ddb10b42..5912c894ab6822 100644
--- a/React/Views/ScrollView/RCTScrollViewManager.h
+++ b/React/Views/ScrollView/RCTScrollViewManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/ScrollView/RCTScrollViewManager.m b/React/Views/ScrollView/RCTScrollViewManager.m
index e5824afd3f386d..6494d52f48fb29 100644
--- a/React/Views/ScrollView/RCTScrollViewManager.m
+++ b/React/Views/ScrollView/RCTScrollViewManager.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -81,10 +81,14 @@ - (UIView *)view
 RCT_EXPORT_VIEW_PROPERTY(contentInset, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(scrollIndicatorInsets, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(snapToInterval, int)
+RCT_EXPORT_VIEW_PROPERTY(snapToOffsets, NSArray<NSNumber *>)
+RCT_EXPORT_VIEW_PROPERTY(snapToStart, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(snapToEnd, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(snapToAlignment, NSString)
 RCT_REMAP_VIEW_PROPERTY(contentOffset, scrollView.contentOffset, CGPoint)
 RCT_EXPORT_VIEW_PROPERTY(onScrollBeginDrag, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onScroll, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onScrollToTop, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onScrollEndDrag, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMomentumScrollBegin, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMomentumScrollEnd, RCTDirectEventBlock)
diff --git a/React/Views/ScrollView/RCTScrollableProtocol.h b/React/Views/ScrollView/RCTScrollableProtocol.h
index 33ed067ec4acac..e7720c05dc4333 100644
--- a/React/Views/ScrollView/RCTScrollableProtocol.h
+++ b/React/Views/ScrollView/RCTScrollableProtocol.h
@@ -1,11 +1,12 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
+#import <React/RCTComponent.h>
 
 /**
  * Contains any methods related to scrolling. Any `RCTView` that has scrolling
@@ -28,3 +29,13 @@
 - (void)removeScrollListener:(NSObject<UIScrollViewDelegate> *)scrollListener;
 
 @end
+
+/**
+ * Denotes a view which implements custom pull to refresh functionality.
+ */
+@protocol RCTCustomRefreshContolProtocol
+
+@property (nonatomic, copy) RCTDirectEventBlock onRefresh;
+@property (nonatomic, readonly, getter=isRefreshing) BOOL refreshing;
+
+@end
diff --git a/React/Views/UIView+Private.h b/React/Views/UIView+Private.h
index 7a8d6587ddcebd..6725e645977891 100644
--- a/React/Views/UIView+Private.h
+++ b/React/Views/UIView+Private.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/UIView+React.h b/React/Views/UIView+React.h
index 3d0ac2c5af7a57..b6c4feb23b175a 100644
--- a/React/Views/UIView+React.h
+++ b/React/Views/UIView+React.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/Views/UIView+React.m b/React/Views/UIView+React.m
index 613083b4c44027..0afeed12f4fa72 100644
--- a/React/Views/UIView+React.m
+++ b/React/Views/UIView+React.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/React/third-party.xcconfig b/React/third-party.xcconfig
index 24bf1727b3848c..3d0599443abe0a 100644
--- a/React/third-party.xcconfig
+++ b/React/third-party.xcconfig
@@ -2,9 +2,11 @@
 //  folly.xcconfig
 //  CxxReact
 //
-//  Created by Marc Horowitz on 1/12/17.
-//  Copyright © 2017 Facebook. All rights reserved.
+//  Copyright (c) Facebook, Inc. and its affiliates.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 //
 
-HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_63_0 $(SRCROOT)/../third-party/folly-2016.10.31.00 $(SRCROOT)/../third-party/glog-0.3.4/src
+HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_63_0 $(SRCROOT)/../third-party/folly-2016.10.31.00 $(SRCROOT)/../third-party/glog-0.3.5/src
 OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index dc0734a9534920..70a38af77b29f1 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -1,12 +1,13 @@
-// Copyright (c) 2015-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its 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: 'com.android.library'
-apply plugin: 'maven'
-
-apply plugin: 'de.undercouch.download'
+plugins {
+    id("com.android.library")
+    id("maven")
+    id("de.undercouch.download")
+}
 
 import de.undercouch.gradle.tasks.download.Download
 import org.apache.tools.ant.taskdefs.condition.Os
@@ -39,60 +40,60 @@ task createNativeDepsDirectories {
 }
 
 task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
-    src 'https://github.com/react-native-community/boost-for-react-native/releases/download/v1.63.0-0/boost_1_63_0.tar.gz'
+    src "https://github.com/react-native-community/boost-for-react-native/releases/download/v${BOOST_VERSION.replace("_", ".")}-0/boost_${BOOST_VERSION}.tar.gz"
     onlyIfNewer true
     overwrite false
-    dest new File(downloadsDir, 'boost_1_63_0.tar.gz')
+    dest new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz")
 }
 
 task prepareBoost(dependsOn: boostPath ? [] : [downloadBoost], type: Copy) {
     from boostPath ?: tarTree(resources.gzip(downloadBoost.dest))
     from 'src/main/jni/third-party/boost/Android.mk'
-    include 'Android.mk', 'boost_1_63_0/boost/**/*.hpp', 'boost/boost/**/*.hpp'
+    include 'Android.mk', "boost_${BOOST_VERSION}/boost/**/*.hpp", 'boost/boost/**/*.hpp'
     includeEmptyDirs = false
     into "$thirdPartyNdkDir/boost"
     doLast {
-        file("$thirdPartyNdkDir/boost/boost").renameTo("$thirdPartyNdkDir/boost/boost_1_63_0")
+        file("$thirdPartyNdkDir/boost/boost").renameTo("$thirdPartyNdkDir/boost/boost_${BOOST_VERSION}")
     }
 }
 
 task downloadDoubleConversion(dependsOn: createNativeDepsDirectories, type: Download) {
-    src 'https://github.com/google/double-conversion/archive/v1.1.6.tar.gz'
+    src "https://github.com/google/double-conversion/archive/v${DOUBLE_CONVERSION_VERSION}.tar.gz"
     onlyIfNewer true
     overwrite false
-    dest new File(downloadsDir, 'double-conversion-1.1.6.tar.gz')
+    dest new File(downloadsDir, "double-conversion-${DOUBLE_CONVERSION_VERSION}.tar.gz")
 }
 
 task prepareDoubleConversion(dependsOn: dependenciesPath ? [] : [downloadDoubleConversion], type: Copy) {
     from dependenciesPath ?: tarTree(downloadDoubleConversion.dest)
     from 'src/main/jni/third-party/double-conversion/Android.mk'
-    include 'double-conversion-1.1.6/src/**/*', 'Android.mk'
+    include "double-conversion-${DOUBLE_CONVERSION_VERSION}/src/**/*", 'Android.mk'
     filesMatching('*/src/**/*', {fname -> fname.path = "double-conversion/${fname.name}"})
     includeEmptyDirs = false
     into "$thirdPartyNdkDir/double-conversion"
 }
 
 task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
-    src 'https://github.com/facebook/folly/archive/v2016.10.31.00.tar.gz'
+    src "https://github.com/facebook/folly/archive/v${FOLLY_VERSION}.tar.gz"
     onlyIfNewer true
     overwrite false
-    dest new File(downloadsDir, 'folly-2016.10.31.00.tar.gz');
+    dest new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz");
 }
 
 task prepareFolly(dependsOn: dependenciesPath ? [] : [downloadFolly], type: Copy) {
     from dependenciesPath ?: tarTree(downloadFolly.dest)
     from 'src/main/jni/third-party/folly/Android.mk'
-    include 'folly-2016.10.31.00/folly/**/*', 'Android.mk'
-    eachFile {fname -> fname.path = (fname.path - "folly-2016.10.31.00/")}
+    include "folly-${FOLLY_VERSION}/folly/**/*", 'Android.mk'
+    eachFile {fname -> fname.path = (fname.path - "folly-${FOLLY_VERSION}/")}
     includeEmptyDirs = false
     into "$thirdPartyNdkDir/folly"
 }
 
 task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
-    src 'https://github.com/google/glog/archive/v0.3.5.tar.gz'
+    src "https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz"
     onlyIfNewer true
     overwrite false
-    dest new File(downloadsDir, 'glog-0.3.5.tar.gz')
+    dest new File(downloadsDir, "glog-${GLOG_VERSION}.tar.gz")
 }
 
 // Prepare glog sources to be compiled, this task will perform steps that normally should've been
@@ -100,7 +101,7 @@ task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
 task prepareGlog(dependsOn: dependenciesPath ? [] : [downloadGlog], type: Copy) {
     from dependenciesPath ?: tarTree(downloadGlog.dest)
     from 'src/main/jni/third-party/glog/'
-    include 'glog-0.3.5/src/**/*', 'Android.mk', 'config.h'
+    include "glog-${GLOG_VERSION}/src/**/*", 'Android.mk', 'config.h'
     includeEmptyDirs = false
     filesMatching('**/*.h.in') {
         filter(ReplaceTokens, tokens: [
@@ -128,7 +129,7 @@ task prepareGlog(dependsOn: dependenciesPath ? [] : [downloadGlog], type: Copy)
 task downloadJSCHeaders(type: Download) {
     // in sync with webkit SVN revision 174650
     def jscAPIBaseURL = 'https://raw.githubusercontent.com/WebKit/webkit/38b15a3ba3c1b0798f2036f7cea36ffdc096202e/Source/JavaScriptCore/API/'
-    def jscHeaderFiles = ['JavaScript.h', 'JSBase.h', 'JSContextRef.h', 'JSObjectRef.h', 'JSRetainPtr.h', 'JSStringRef.h', 'JSValueRef.h', 'WebKitAvailability.h']
+    def jscHeaderFiles = ['JavaScript.h', 'JSBase.h', 'JSContextRef.h', 'JSObjectRef.h', 'JSStringRef.h', 'JSValueRef.h', 'WebKitAvailability.h']
     def output = new File(downloadsDir, 'jsc')
     output.mkdirs()
     src(jscHeaderFiles.collect { headerName -> "$jscAPIBaseURL$headerName" })
@@ -220,6 +221,7 @@ task buildReactNdkLib(dependsOn: [prepareJSC, prepareBoost, prepareDoubleConvers
             "NDK_LIBS_OUT=$buildDir/react-ndk/all",
             "THIRD_PARTY_NDK_DIR=$buildDir/third-party-ndk",
             "REACT_COMMON_DIR=$projectDir/../ReactCommon",
+            "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react",
             '-C', file('src/main/jni/react/jni').absolutePath,
             '--jobs', project.hasProperty("jobs") ? project.property("jobs") : Runtime.runtime.availableProcessors()
 }
@@ -245,12 +247,12 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
 }
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.3"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
 
@@ -293,30 +295,30 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'src/main/third-party/java/infer-annotations/', include: ['*.jar'])
-    compile 'javax.inject:javax.inject:1'
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0'
-    compile 'com.facebook.fresco:fresco:1.9.0'
-    compile 'com.facebook.fresco:imagepipeline-okhttp3:1.9.0'
-    compile 'com.facebook.soloader:soloader:0.3.0'
-    compile 'com.google.code.findbugs:jsr305:3.0.0'
-    compile 'com.squareup.okhttp3:okhttp:3.10.0'
-    compile 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0'
-    compile 'com.squareup.okio:okio:1.14.0'
-    compile 'org.webkit:android-jsc:r174650'
-
-    testCompile "junit:junit:${JUNIT_VERSION}"
-    testCompile "org.powermock:powermock-api-mockito:${POWERMOCK_VERSION}"
-    testCompile "org.powermock:powermock-module-junit4-rule:${POWERMOCK_VERSION}"
-    testCompile "org.powermock:powermock-classloading-xstream:${POWERMOCK_VERSION}"
-    testCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}"
-    testCompile "org.easytesting:fest-assert-core:${FEST_ASSERT_CORE_VERSION}"
-    testCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
-
-    androidTestCompile fileTree(dir: 'src/main/third-party/java/buck-android-support/', include: ['*.jar'])
-    androidTestCompile 'com.android.support.test:runner:0.3'
-    androidTestCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}"
+    api 'com.facebook.infer.annotation:infer-annotation:0.11.2'
+    api 'javax.inject:javax.inject:1'
+    api 'com.android.support:appcompat-v7:27.1.1'
+    api "com.facebook.fresco:fresco:${FRESCO_VERSION}"
+    api "com.facebook.fresco:imagepipeline-okhttp3:${FRESCO_VERSION}"
+    api 'com.facebook.soloader:soloader:0.5.1'
+    api 'com.google.code.findbugs:jsr305:3.0.2'
+    api "com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}"
+    api "com.squareup.okhttp3:okhttp-urlconnection:${OKHTTP_VERSION}"
+    api 'com.squareup.okio:okio:1.14.0'
+    compile project(':android-jsc')
+
+    testImplementation "junit:junit:${JUNIT_VERSION}"
+    testImplementation "org.powermock:powermock-api-mockito:${POWERMOCK_VERSION}"
+    testImplementation "org.powermock:powermock-module-junit4-rule:${POWERMOCK_VERSION}"
+    testImplementation "org.powermock:powermock-classloading-xstream:${POWERMOCK_VERSION}"
+    testImplementation "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}"
+    testImplementation "org.easytesting:fest-assert-core:${FEST_ASSERT_CORE_VERSION}"
+    testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
+
+    androidTestImplementation fileTree(dir: 'src/main/third-party/java/buck-android-support/', include: ['*.jar'])
+    androidTestImplementation "com.android.support.test:runner:${ANDROID_SUPPORT_TEST_VERSION}"
+    androidTestImplementation "com.android.support.test:rules:${ANDROID_SUPPORT_TEST_VERSION}"
+    androidTestImplementation "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}"
 }
 
 apply from: 'release.gradle'
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 9b7ac6d1254dc8..72f09651936936 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -5,10 +5,17 @@ POM_NAME=ReactNative
 POM_ARTIFACT_ID=react-native
 POM_PACKAGING=aar
 
-android.useDeprecatedNdk=true
-
-MOCKITO_CORE_VERSION=1.10.19
+MOCKITO_CORE_VERSION=2.19.1
 POWERMOCK_VERSION=1.6.2
 ROBOLECTRIC_VERSION=3.0
 JUNIT_VERSION=4.12
 FEST_ASSERT_CORE_VERSION=2.0M10
+
+ANDROID_SUPPORT_TEST_VERSION=1.0.2
+FRESCO_VERSION=1.10.0
+OKHTTP_VERSION=3.11.0
+
+BOOST_VERSION=1_63_0
+DOUBLE_CONVERSION_VERSION=1.1.6
+FOLLY_VERSION=2016.10.31.00
+GLOG_VERSION=0.3.5
diff --git a/ReactAndroid/libs/BUCK b/ReactAndroid/libs/BUCK
index 018a73b2d7cba1..9d188656453694 100644
--- a/ReactAndroid/libs/BUCK
+++ b/ReactAndroid/libs/BUCK
@@ -6,8 +6,8 @@ android_prebuilt_aar(
 
 remote_file(
     name = "appcompat-binary-aar",
-    sha1 = "da5771a9ac6e8f3a461360eed3c6f921dc7580fd",
-    url = "mvn:com.android.support:appcompat-v7:aar:26.1.0",
+    sha1 = "22b1ef4ff9ef1a3513c18eb132d597eac6ef1a86",
+    url = "mvn:com.android.support:appcompat-v7:aar:27.1.1",
 )
 
 android_prebuilt_aar(
diff --git a/ReactAndroid/proguard-rules.pro b/ReactAndroid/proguard-rules.pro
index 668d5bd472f8de..aa586132f2f853 100644
--- a/ReactAndroid/proguard-rules.pro
+++ b/ReactAndroid/proguard-rules.pro
@@ -51,10 +51,6 @@
 -dontwarn com.facebook.react.**
 -keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
 
-# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
-# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
--dontwarn android.text.StaticLayout
-
 # okhttp
 
 -keepattributes Signature
diff --git a/ReactAndroid/release.gradle b/ReactAndroid/release.gradle
index d01daf739de1bf..cc66a47e39eb65 100644
--- a/ReactAndroid/release.gradle
+++ b/ReactAndroid/release.gradle
@@ -1,4 +1,4 @@
-// Copyright (c) 2015-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/assets/BUCK b/ReactAndroid/src/androidTest/assets/BUCK
index 97e046d36f0cba..6bead0a25d6abb 100644
--- a/ReactAndroid/src/androidTest/assets/BUCK
+++ b/ReactAndroid/src/androidTest/assets/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_resource")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_resource")
 
 rn_android_resource(
     name = "assets",
diff --git a/ReactAndroid/src/androidTest/buck-runner/BUCK b/ReactAndroid/src/androidTest/buck-runner/BUCK
index d854a78f7a7a9c..61848a4977a37c 100644
--- a/ReactAndroid/src/androidTest/buck-runner/BUCK
+++ b/ReactAndroid/src/androidTest/buck-runner/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "KEYSTORE_TARGET", "react_native_dep", "react_native_integration_tests_target", "react_native_target", "rn_android_binary")
+load("//tools/build_defs/oss:rn_defs.bzl", "KEYSTORE_TARGET", "react_native_dep", "react_native_integration_tests_target", "react_native_target", "rn_android_binary")
 
 # We are running instrumentation tests in simple mode: app code and instrumentation are in the same APK
 # Currently you need to run these commands to execute tests:
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java
index 713ab5962d6d40..efd2ab6f1f6a49 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java
index 0d1e87860033e6..16ac3f8182c335 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index 8b61c439ef5276..a88b8ccb4e0ddb 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -1,9 +1,9 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_integration_tests_target", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_integration_tests_target", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "testing",
     srcs = glob(
-        ["**/*.java"],
+        ["*.java"],
         exclude = [
             "idledetection/**/*.java",
             "network/**/*.java",
@@ -28,7 +28,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/devsupport:interfaces"),
         react_native_target("java/com/facebook/react/fabric:fabric"),
-        react_native_target("java/com/facebook/react/fabric/jsc:jsc"),
+        react_native_target("java/com/facebook/react/jscexecutor:jscexecutor"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/module/model:model"),
         react_native_target("java/com/facebook/react/modules/core:core"),
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FabricUIManagerFactory.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FabricUIManagerFactory.java
new file mode 100644
index 00000000000000..2dedfa9006efe6
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FabricUIManagerFactory.java
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * <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.facebook.react.testing;
+
+import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.UIManager;
+import com.facebook.react.uimanager.ViewManagerRegistry;
+
+/** Factory used to create FabricUIManager in Testing infrastructure. */
+public interface FabricUIManagerFactory {
+
+  UIManager getFabricUIManager(
+      ReactApplicationContext reactApplicationContext,
+      ViewManagerRegistry viewManagerRegistry,
+      JavaScriptContextHolder jsContext);
+}
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java
index 2d52005eb0976a..34e1c2f19ffb15 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java
index b5bf197683c4e1..52d0467e4a0a5b 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java
index cdfb21491bdba0..4e9399771679d5 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java
index 7806dacdf62ce6..1650611acb9031 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java
index 59b949e979509e..478cd0d2ea2d6c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java
index 6073cd6b96e5e2..533fa1aa49a82b 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
index b01d0542af4b12..18f35707ac565c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
index 5ca48fcf643746..3dce0330d0bc6f 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
@@ -1,10 +1,9 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * <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.facebook.react.testing;
 
 import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;
@@ -29,8 +28,6 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.common.LifecycleState;
-import com.facebook.react.fabric.FabricUIManager;
-import com.facebook.react.fabric.jsc.FabricJSCBinding;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
@@ -47,6 +44,7 @@
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
 
+
 public class ReactAppTestActivity extends FragmentActivity
     implements DefaultHardwareBackBtnHandler, PermissionAwareActivity {
 
@@ -56,11 +54,10 @@ public class ReactAppTestActivity extends FragmentActivity
   private static final int ROOT_VIEW_ID = 8675309;
   // we need a bigger timeout for CI builds because they run on a slow emulator
   private static final long IDLE_TIMEOUT_MS = 120000;
-
+  private final CountDownLatch mDestroyCountDownLatch = new CountDownLatch(1);
   private CountDownLatch mLayoutEvent = new CountDownLatch(1);
   private @Nullable ReactBridgeIdleSignaler mBridgeIdleSignaler;
   private ScreenshotingFrameLayout mScreenshotingFrameLayout;
-  private final CountDownLatch mDestroyCountDownLatch = new CountDownLatch(1);
   private @Nullable ReactInstanceManager mReactInstanceManager;
   private @Nullable ReactRootView mReactRootView;
   private LifecycleState mLifecycleState = LifecycleState.BEFORE_RESUME;
@@ -138,10 +135,7 @@ public void loadApp(String appKey, ReactInstanceSpecForTest spec, boolean enable
     loadApp(appKey, spec, null, DEFAULT_BUNDLE_NAME, enableDevSupport);
   }
 
-  public void loadApp(
-    String appKey,
-    ReactInstanceSpecForTest spec,
-    String bundleName) {
+  public void loadApp(String appKey, ReactInstanceSpecForTest spec, String bundleName) {
     loadApp(appKey, spec, null, bundleName, false /* = useDevSupport */);
   }
 
@@ -160,11 +154,11 @@ public void resetRootViewForScreenshotTests() {
   }
 
   public void loadApp(
-    String appKey,
-    ReactInstanceSpecForTest spec,
-    @Nullable Bundle initialProps,
-    String bundleName,
-    boolean useDevSupport) {
+      String appKey,
+      ReactInstanceSpecForTest spec,
+      @Nullable Bundle initialProps,
+      String bundleName,
+      boolean useDevSupport) {
     loadBundle(spec, bundleName, useDevSupport);
     renderComponent(appKey, initialProps);
   }
@@ -175,32 +169,34 @@ public void renderComponent(String appKey) {
 
   public void renderComponent(final String appKey, final @Nullable Bundle initialProps) {
     final CountDownLatch currentLayoutEvent = mLayoutEvent = new CountDownLatch(1);
-    runOnUiThread(new Runnable() {
-      @Override
-      public void run() {
-        Assertions.assertNotNull(mReactRootView).getViewTreeObserver().addOnGlobalLayoutListener(
-            new ViewTreeObserver.OnGlobalLayoutListener() {
-              @Override
-              public void onGlobalLayout() {
-                currentLayoutEvent.countDown();
-              }
-            });
-        Assertions.assertNotNull(mReactRootView)
-            .startReactApplication(mReactInstanceManager, appKey, initialProps);
-      }
-    });
-    try {
-      waitForBridgeAndUIIdle();
-      waitForLayout(5000);
-    } catch (InterruptedException e) {
-      throw new RuntimeException("Layout never occurred for component " + appKey, e);
-    }
+    runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            Assertions.assertNotNull(mReactRootView)
+                .getViewTreeObserver()
+                .addOnGlobalLayoutListener(
+                    new ViewTreeObserver.OnGlobalLayoutListener() {
+                      @Override
+                      public void onGlobalLayout() {
+                        currentLayoutEvent.countDown();
+                        Assertions.assertNotNull(mReactRootView)
+                            .getViewTreeObserver()
+                            .removeGlobalOnLayoutListener(this);
+                      }
+                    });
+            Assertions.assertNotNull(mReactRootView)
+                .startReactApplication(mReactInstanceManager, appKey, initialProps);
+          }
+        });
+        try {
+          waitForBridgeAndUIIdle();
+          waitForLayout(5000);
+        } catch (InterruptedException e) {
+          throw new RuntimeException("Layout never occurred for component " + appKey, e);}
   }
 
-  public void loadBundle(
-      ReactInstanceSpecForTest spec,
-      String bundleName,
-      boolean useDevSupport) {
+  public void loadBundle(final ReactInstanceSpecForTest spec, String bundleName, boolean useDevSupport) {
 
     mBridgeIdleSignaler = new ReactBridgeIdleSignaler();
 
@@ -209,6 +205,9 @@ public void loadBundle(
             .getReactInstanceManagerBuilder()
             .setApplication(getApplication())
             .setBundleAssetName(bundleName);
+    if (spec.getJavaScriptExecutorFactory() != null) {
+      builder.setJavaScriptExecutorFactory(spec.getJavaScriptExecutorFactory());
+    }
     if (!spec.getAlternativeReactPackagesForTest().isEmpty()) {
       builder.addPackages(spec.getAlternativeReactPackagesForTest());
     } else {
@@ -219,7 +218,7 @@ public void loadBundle(
         // By not setting a JS module name, we force the bundle to be always loaded from
         // assets, not the devserver, even if dev mode is enabled (such as when testing redboxes).
         // This makes sense because we never run the devserver in tests.
-        //.setJSMainModuleName()
+        // .setJSMainModuleName()
         .setUseDeveloperSupport(useDevSupport)
         .setBridgeIdleDebugListener(mBridgeIdleSignaler)
         .setInitialLifecycleState(mLifecycleState)
@@ -230,43 +229,45 @@ public List<JSIModuleSpec> getJSIModules(
                   final ReactApplicationContext reactApplicationContext,
                   final JavaScriptContextHolder jsContext) {
                 return Arrays.<JSIModuleSpec>asList(
-                  new JSIModuleSpec() {
-                    @Override
-                    public Class<? extends JSIModule> getJSIModuleClass() {
-                      return UIManager.class;
-                    }
-
-                    @Override
-                    public JSIModuleProvider getJSIModuleProvider() {
-                      return new JSIModuleProvider() {
-                        @Override
-                        public FabricUIManager get() {
-                          List<ViewManager> viewManagers =
-                            mReactInstanceManager.getOrCreateViewManagers(reactApplicationContext);
-                          EventDispatcher eventDispatcher =
-                            reactApplicationContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
-                          FabricUIManager fabricUIManager =
-                            new FabricUIManager(reactApplicationContext, new ViewManagerRegistry(viewManagers), jsContext, eventDispatcher);
-                          new FabricJSCBinding().installFabric(jsContext, fabricUIManager);
-                          return fabricUIManager;
-                        }
-                      };
-                    }
-                  });
-              }});
+                    new JSIModuleSpec() {
+                      @Override
+                      public Class<? extends JSIModule> getJSIModuleClass() {
+                        return UIManager.class;
+                      }
+
+                      @Override
+                      public JSIModuleProvider getJSIModuleProvider() {
+                        return new JSIModuleProvider() {
+                          @Override
+                          public UIManager get() {
+                            ViewManagerRegistry viewManagerRegistry =
+                              new ViewManagerRegistry(
+                                mReactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
+
+                            FabricUIManagerFactory factory = spec.getFabricUIManagerFactory();
+                            return factory != null ? factory.getFabricUIManager(reactApplicationContext, viewManagerRegistry, jsContext) : null;
+                          }
+                        };
+                      }
+                    });
+              }
+            });
 
     final CountDownLatch latch = new CountDownLatch(1);
-    runOnUiThread(new Runnable() {
-      @Override
-      public void run() {
-        mReactInstanceManager = builder.build();
-        mReactInstanceManager.onHostResume(ReactAppTestActivity.this, ReactAppTestActivity.this);
-        latch.countDown();
-      }
-    });
+    runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            mReactInstanceManager = builder.build();
+            mReactInstanceManager.onHostResume(
+                ReactAppTestActivity.this, ReactAppTestActivity.this);
+            latch.countDown();
+          }
+        });
     try {
       latch.await(1000, TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
+
       throw new RuntimeException(
           "ReactInstanceManager never finished initializing " + bundleName, e);
     }
@@ -286,9 +287,7 @@ public void waitForBridgeAndUIIdle() {
 
   public void waitForBridgeAndUIIdle(long timeoutMs) {
     ReactIdleDetectionUtil.waitForBridgeAndUIIdle(
-        Assertions.assertNotNull(mBridgeIdleSignaler),
-        getReactContext(),
-        timeoutMs);
+        Assertions.assertNotNull(mBridgeIdleSignaler), getReactContext(), timeoutMs);
   }
 
   public View getRootView() {
@@ -309,7 +308,7 @@ private ReactContext waitForReactContext() {
       while (true) {
         ReactContext reactContext = mReactInstanceManager.getCurrentReactContext();
         if (reactContext != null) {
-           return reactContext;
+          return reactContext;
         }
         Thread.sleep(100);
       }
@@ -323,9 +322,8 @@ public void postDelayed(Runnable r, int delayMS) {
   }
 
   /**
-   * Does not ensure that this is run on the UI thread or that the UI Looper is idle like
-   * {@link ReactAppInstrumentationTestCase#getScreenshot()}. You probably want to use that
-   * instead.
+   * Does not ensure that this is run on the UI thread or that the UI Looper is idle like {@link
+   * ReactAppInstrumentationTestCase#getScreenshot()}. You probably want to use that instead.
    */
   public Bitmap getCurrentScreenshot() {
     return mScreenshotingFrameLayout.getLastDrawnBitmap();
@@ -346,10 +344,7 @@ public void invokeDefaultOnBackPressed() {
 
   @Override
   public void onRequestPermissionsResult(
-      int requestCode,
-      String[] permissions,
-      int[] grantResults) {
-  }
+      int requestCode, String[] permissions, int[] grantResults) {}
 
   @Override
   public void requestPermissions(
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
index 4f37e63f7d97bc..f26917dc3de370 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
@@ -1,20 +1,21 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * <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.facebook.react.testing;
 
 import android.annotation.SuppressLint;
 import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.uimanager.ViewManager;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.Nullable;
 
 /**
  * A spec that allows a test to add additional NativeModules/JS modules to the ReactInstance. This
@@ -25,16 +26,24 @@
 public class ReactInstanceSpecForTest {
 
   private final List<NativeModule> mNativeModules =
-    new ArrayList<NativeModule>(Arrays.asList(new FakeWebSocketModule()));
+      new ArrayList<NativeModule>(Arrays.asList(new FakeWebSocketModule()));
   private final List<Class<? extends JavaScriptModule>> mJSModuleSpecs = new ArrayList<>();
   private final List<ViewManager> mViewManagers = new ArrayList<>();
   private final ArrayList<ReactPackage> mReactPackages = new ArrayList<>();
+  @Nullable private FabricUIManagerFactory mFabricUIManagerFactory = null;
+  @Nullable private JavaScriptExecutorFactory mJavaScriptExecutorFactory = null;
 
   public ReactInstanceSpecForTest addNativeModule(NativeModule module) {
     mNativeModules.add(module);
     return this;
   }
 
+  public ReactInstanceSpecForTest setJavaScriptExecutorFactory(
+      JavaScriptExecutorFactory javaScriptExecutorFactory) {
+    mJavaScriptExecutorFactory = javaScriptExecutorFactory;
+    return this;
+  }
+
   public ReactInstanceSpecForTest setPackage(ReactPackage reactPackage) {
     if (!mReactPackages.isEmpty()) {
       throw new IllegalStateException(
@@ -44,6 +53,16 @@ public ReactInstanceSpecForTest setPackage(ReactPackage reactPackage) {
     return this;
   }
 
+  public ReactInstanceSpecForTest setFabricUIManagerFactory(@Nullable FabricUIManagerFactory fabricUIManagerFactory) {
+    mFabricUIManagerFactory = fabricUIManagerFactory;
+    return this;
+  }
+
+  @Nullable
+  public FabricUIManagerFactory getFabricUIManagerFactory() {
+    return mFabricUIManagerFactory;
+  }
+
   public ReactInstanceSpecForTest addPackages(List<ReactPackage> reactPackages) {
     mReactPackages.addAll(reactPackages);
     return this;
@@ -66,6 +85,11 @@ public ReactPackage getAlternativeReactPackageForTest() {
     return mReactPackages.get(0);
   }
 
+  @Nullable
+  public JavaScriptExecutorFactory getJavaScriptExecutorFactory() {
+    return mJavaScriptExecutorFactory;
+  }
+
   public List<ReactPackage> getAlternativeReactPackagesForTest() {
     return mReactPackages;
   }
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstrumentationTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstrumentationTest.java
index 938835f3def79c..9e3e489c959b17 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstrumentationTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstrumentationTest.java
@@ -1,32 +1,37 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * <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.facebook.react.testing;
 
 import android.content.Intent;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
 import android.view.ViewGroup;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.testing.idledetection.IdleWaiter;
+import javax.annotation.Nullable;
 
 /**
  * Base class for instrumentation tests that runs React based application.
  *
- * This is similar to ReactAppInstrumentationTestCase except ReactInstrumentationTest allows
+ * <p>This is similar to ReactAppInstrumentationTestCase except ReactInstrumentationTest allows
  * optional rendering of components. A test case can render no components or render multiple
  * components.
  */
-public abstract class ReactInstrumentationTest extends
-    ActivityInstrumentationTestCase2<ReactAppTestActivity> implements IdleWaiter {
+public abstract class ReactInstrumentationTest
+    extends ActivityInstrumentationTestCase2<ReactAppTestActivity> implements IdleWaiter {
 
   protected StringRecordingModule mRecordingModule;
 
+  @Nullable protected FabricUIManagerFactory mFabricUIManagerFactory = null;
+
+  @Nullable protected JavaScriptExecutorFactory mJavaScriptExecutorFactory = null;
+
   public ReactInstrumentationTest() {
     super(ReactAppTestActivity.class);
   }
@@ -40,16 +45,11 @@ protected void setUp() throws Exception {
     setActivityIntent(intent);
     mRecordingModule = new StringRecordingModule();
     final ReactAppTestActivity activity = getActivity();
-    activity.loadBundle(
-        createReactInstanceSpecForTest(),
-        getBundleName(),
-        getEnableDevSupport());
+    activity.loadBundle(createReactInstanceSpecForTest(), getBundleName(), getEnableDevSupport());
   }
 
-  /**
-   * Renders this component within this test's activity
-   */
-  public void renderComponent(final String componentName) throws Exception {
+  /** Renders this component within this test's activity */
+  public void renderComponent(final String componentName) {
     getActivity().renderComponent(componentName, null);
     waitForBridgeAndUIIdle();
   }
@@ -66,8 +66,8 @@ public ViewGroup getRootView() {
   }
 
   public <T extends View> T getViewByTestId(String testID) {
-    return (T) ReactTestHelper
-        .getViewWithReactTestId((ViewGroup) getRootView().getParent(), testID);
+    return (T)
+        ReactTestHelper.getViewWithReactTestId((ViewGroup) getRootView().getParent(), testID);
   }
 
   public SingleTouchGestureGenerator createGestureGenerator() {
@@ -94,16 +94,20 @@ protected <T extends JavaScriptModule> T getJSModule(Class<T> jsInterface) {
     return getReactContext().getJSModule(jsInterface);
   }
 
-  /**
-   * Override this method to provide extra native modules to be loaded before the app starts
-   */
+  /** Override this method to provide extra native modules to be loaded before the app starts */
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
-    return new ReactInstanceSpecForTest().addNativeModule(mRecordingModule);
+    ReactInstanceSpecForTest reactInstanceSpecForTest =
+        new ReactInstanceSpecForTest().addNativeModule(mRecordingModule);
+    if (mJavaScriptExecutorFactory != null) {
+      reactInstanceSpecForTest.setJavaScriptExecutorFactory(mJavaScriptExecutorFactory);
+    }
+    if (mFabricUIManagerFactory != null) {
+      reactInstanceSpecForTest.setFabricUIManagerFactory(mFabricUIManagerFactory);
+    }
+    return reactInstanceSpecForTest;
   }
 
-  /**
-   * Implement this method to provide the bundle for this test
-   */
+  /** Implement this method to provide the bundle for this test */
   protected abstract String getBundleName();
 
   protected ReactContext getReactContext() {
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
index e08878d3c780f9..6c0828a6aa311f 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java
index 47137dbbe177af..20945f5316f6a4 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java
index 54d03bc35f192b..8ec1cf9ab0e091 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java
index fdf40c300f3dc5..49db8b66d1e4fc 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java
index 20cbfb938b4018..f22dbb7b206655 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
index 1452899dba9725..a11a6a3499a529 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,10 @@
 
 package com.facebook.react.testing;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import javax.annotation.Nullable;
 
 import android.app.Instrumentation;
@@ -20,6 +24,7 @@
 import com.facebook.react.R;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactInstanceManagerBuilder;
+import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.JavaScriptModuleRegistry;
 import com.facebook.react.bridge.NativeModule;
@@ -29,10 +34,10 @@
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.bridge.CatalystInstanceImpl;
 import com.facebook.react.bridge.JSBundleLoader;
-import com.facebook.react.bridge.JSCJavaScriptExecutorFactory;
 import com.facebook.react.bridge.JavaScriptExecutor;
+import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.ReactChoreographer;
-
+import com.facebook.react.uimanager.ViewManager;
 import com.android.internal.util.Predicate;
 
 public class ReactTestHelper {
@@ -50,15 +55,24 @@ public ReactInstanceEasyBuilder setContext(Context context) {
       }
 
       @Override
-      public ReactInstanceEasyBuilder addNativeModule(NativeModule nativeModule) {
+      public ReactInstanceEasyBuilder addNativeModule(final NativeModule nativeModule) {
         if (mNativeModuleRegistryBuilder == null) {
           mNativeModuleRegistryBuilder = new NativeModuleRegistryBuilder(
             (ReactApplicationContext) mContext,
-            null,
-            false);
+            null);
         }
         Assertions.assertNotNull(nativeModule);
-        mNativeModuleRegistryBuilder.addNativeModule(nativeModule);
+        mNativeModuleRegistryBuilder.processPackage(new ReactPackage(){
+        	@Override
+        	public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        	   return Collections.emptyList();
+        	}
+
+        	@Override
+        	public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        		return Arrays.asList(nativeModule);
+        	}
+        });
         return this;
       }
 
@@ -67,12 +81,11 @@ public CatalystInstance build() {
         if (mNativeModuleRegistryBuilder == null) {
           mNativeModuleRegistryBuilder = new NativeModuleRegistryBuilder(
             (ReactApplicationContext) mContext,
-            null,
-            false);
+            null);
         }
         JavaScriptExecutor executor = null;
         try {
-          executor = new JSCJavaScriptExecutorFactory("ReactTestHelperApp", "ReactTestHelperDevice").create();
+          executor = new JSCExecutorFactory("ReactTestHelperApp", "ReactTestHelperDevice").create();
         } catch (Exception e) {
           throw new RuntimeException(e);
         }
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
index 42eb0abfda88fa..b21088a8e2a314 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
index 027291dcaf8f5b..8340977b73ec71 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java
index bc827f2a85ff3c..6dd70646f0d77c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 35312a7305a9b8..61925bb545baec 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "idledetection",
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
index d32494f92a5d5f..958e15dfec668e 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
index 05b6662493fdae..72aa0d46c4b0af 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
index 00f9aefaa4e99b..c749cfef94a280 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,7 @@
 
 package com.facebook.react.testing.idledetection;
 
+import android.view.Choreographer;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -55,7 +56,8 @@ private static void waitForChoreographer(long timeToWait) {
         new Runnable() {
           @Override
           public void run() {
-            ChoreographerCompat.getInstance().postFrameCallback(
+            final ChoreographerCompat choreographerCompat = ChoreographerCompat.getInstance();
+            choreographerCompat.postFrameCallback(
                 new ChoreographerCompat.FrameCallback() {
 
                   private int frameCount = 0;
@@ -66,7 +68,7 @@ public void doFrame(long frameTimeNanos) {
                     if (frameCount == waitFrameCount) {
                       latch.countDown();
                     } else {
-                      ChoreographerCompat.getInstance().postFrameCallback(this);
+                      choreographerCompat.postFrameCallback(this);
                     }
                   }
                 });
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 bcb816f893a824..4d3c1f73dbabd8 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "network",
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
index 0f5c96831099c5..64bb99301d7a37 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK
new file mode 100644
index 00000000000000..e1c7eed2913c06
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK
@@ -0,0 +1,37 @@
+# BUILD FILE SYNTAX: SKYLARK
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "IS_OSS_BUILD",
+    "react_native_dep",
+    "react_native_integration_tests_target",
+    "react_native_target",
+    "rn_android_library",
+)
+
+rn_android_library(
+    name = "rule",
+    srcs = glob(["*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = ([
+        react_native_dep("third-party/java/espresso:espresso"),
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_dep("third-party/java/junit:junit"),
+        react_native_dep("third-party/java/testing-support-lib:testing-support-lib"),
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+        react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"),
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_integration_tests_target("java/com/facebook/react/testing:testing"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
+        react_native_target("java/com/facebook/react:react"),
+        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/modules/core:core"),
+        react_native_target("java/com/facebook/react/shell:shell"),
+        react_native_target("java/com/facebook/react/uimanager:uimanager"),
+    ]) + ([
+        react_native_dep("java/com/facebook/testing/instrumentation:instrumentation"),
+        react_native_dep("java/com/facebook/testing/instrumentation/base:base"),
+    ]) if not IS_OSS_BUILD else [],
+)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/ReactNativeTestRule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/ReactNativeTestRule.java
new file mode 100644
index 00000000000000..1f19e85aa0fbbc
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/ReactNativeTestRule.java
@@ -0,0 +1,180 @@
+//  Copyright (c) Facebook, Inc. and its 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.testing.rule;
+
+import android.app.Activity;
+import android.os.Build;
+import android.support.test.rule.ActivityTestRule;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactRootView;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.common.LifecycleState;
+import com.facebook.react.shell.MainReactPackage;
+import com.facebook.react.testing.ReactInstanceSpecForTest;
+import com.facebook.react.testing.ReactTestHelper;
+import com.facebook.react.testing.idledetection.ReactBridgeIdleSignaler;
+import com.facebook.react.testing.idledetection.ReactIdleDetectionUtil;
+import com.facebook.react.uimanager.ReactShadowNode;
+import com.facebook.react.uimanager.UIImplementation;
+import com.facebook.react.uimanager.UIManagerModule;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.Rule;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/** A test rule to simplify React Native rendering tests. */
+public class ReactNativeTestRule implements TestRule {
+
+  // we need a bigger timeout for CI builds because they run on a slow emulator
+  private static final long IDLE_TIMEOUT_MS = 120000;
+
+  @Rule public ActivityTestRule<Activity> mActivityRule = new ActivityTestRule<>(Activity.class);
+
+  private final String mBundleName;
+  private ReactPackage mReactPackage;
+  private ReactInstanceManager mReactInstanceManager;
+  private ReactBridgeIdleSignaler mBridgeIdleSignaler;
+  private ReactRootView mView;
+  private CountDownLatch mLatch;
+
+  public ReactNativeTestRule(String bundleName) {
+    this(bundleName, null);
+  }
+
+  public ReactNativeTestRule(String bundleName, ReactPackage reactPackage) {
+    mBundleName = bundleName;
+    mReactPackage = reactPackage;
+  }
+
+  @Override
+  public Statement apply(final Statement base, final Description description) {
+    return new Statement() {
+      @Override
+      public void evaluate() throws Throwable {
+        setUp();
+        base.evaluate();
+        tearDown();
+      }
+    };
+  }
+
+  @SuppressWarnings("deprecation")
+  private void setUp() {
+    final Activity activity = mActivityRule.launchActivity(null);
+    mView = new ReactRootView(activity);
+
+    activity.runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            mBridgeIdleSignaler = new ReactBridgeIdleSignaler();
+            mReactInstanceManager =
+                ReactTestHelper.getReactTestFactory()
+                    .getReactInstanceManagerBuilder()
+                    .setApplication(activity.getApplication())
+                    .setBundleAssetName(mBundleName)
+                    .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
+                    .setBridgeIdleDebugListener(mBridgeIdleSignaler)
+                    .addPackage(mReactPackage != null ? mReactPackage : new MainReactPackage())
+                    .build();
+            mReactInstanceManager.onHostResume(activity);
+
+            // This threading garbage will be replaced by Surface
+            final AtomicBoolean isLayoutUpdated = new AtomicBoolean(false);
+            mReactInstanceManager.addReactInstanceEventListener(
+                new ReactInstanceManager.ReactInstanceEventListener() {
+                  @Override
+                  public void onReactContextInitialized(ReactContext reactContext) {
+                    final UIManagerModule uiManagerModule =
+                        reactContext.getCatalystInstance().getNativeModule(UIManagerModule.class);
+                    uiManagerModule
+                        .getUIImplementation()
+                        .setLayoutUpdateListener(
+                            new UIImplementation.LayoutUpdateListener() {
+                              @Override
+                              public void onLayoutUpdated(ReactShadowNode reactShadowNode) {
+                                uiManagerModule.getUIImplementation().removeLayoutUpdateListener();
+                                isLayoutUpdated.set(true);
+                              }
+                            });
+                  }
+                });
+            mView
+                .getViewTreeObserver()
+                .addOnGlobalLayoutListener(
+                    new OnGlobalLayoutListener() {
+                      @Override
+                      public void onGlobalLayout() {
+                        if (isLayoutUpdated.get()) {
+                          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                            mView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                          } else {
+                            mView.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                          }
+                          mLatch.countDown();
+                        }
+                      }
+                    });
+          }
+        });
+  }
+
+  private void tearDown() {
+    final ReactRootView view = mView;
+    final ReactInstanceManager reactInstanceManager = mReactInstanceManager;
+    mView = null;
+    mReactInstanceManager = null;
+    mActivityRule
+        .getActivity()
+        .runOnUiThread(
+            new Runnable() {
+              @Override
+              public void run() {
+                view.unmountReactApplication();
+                reactInstanceManager.destroy();
+              }
+            });
+  }
+
+  /** Renders the react component and waits until the layout has completed before returning */
+  public void render(final String componentName) {
+    mLatch = new CountDownLatch(1);
+    final Activity activity = mActivityRule.getActivity();
+    activity.runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            ReactRootView view = getView();
+            view.startReactApplication(mReactInstanceManager, componentName);
+            activity.setContentView(view);
+          }
+        });
+    int timeoutSec = 10;
+    try {
+      mLatch.await(timeoutSec, TimeUnit.SECONDS);
+    } catch (InterruptedException e) {
+      throw new RuntimeException(
+          "Failed to render " + componentName + " after " + timeoutSec + " seconds");
+    }
+  }
+
+  public void waitForIdleSync() {
+    ReactIdleDetectionUtil.waitForBridgeAndUIIdle(
+      mBridgeIdleSignaler,
+      mReactInstanceManager.getCurrentReactContext(),
+      IDLE_TIMEOUT_MS);
+  }
+
+  /** Returns the react view */
+  public ReactRootView getView() {
+    return mView;
+  }
+}
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
index e39c0147a7cb75..a80f3f40ef4e60 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
@@ -1,8 +1,8 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_integration_tests_target", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_integration_tests_target", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "tests",
-    srcs = glob(["**/*.java"]),
+    srcs = glob(["*.java"]),
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java
index 6f3d5843b1a91e..a86805fb62c0de 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java
index 1a2a783dcc9beb..9a18ca66cb5103 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
index a2d42bb1a66152..9db47e58b09862 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
index 3ba5bc1989b08c..0014233333e56e 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
index 63a2ff0a727838..d53d98feb5a8ea 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java
index 4b360901013fc3..5b7033695cd954 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java
index b150641e020155..7b9a7f8431d366 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
index 895b1df155098f..1c98ec39d217cf 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java
index cf5949e667a81d..b131f813c97aa8 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ImageOverlayColorTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ImageOverlayColorTestCase.java
new file mode 100644
index 00000000000000..4dd334af88f6e1
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ImageOverlayColorTestCase.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * 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;
+
+/**
+ * Simple test case for passing overlayColor prop to the Image component
+ */
+public class ImageOverlayColorTestCase extends ReactAppInstrumentationTestCase {
+
+  @Override
+  protected String getReactApplicationKeyUnderTest() {
+    return "ImageOverlayColorTestApp";
+  }
+
+  public void testOverlayColorDoesNotCrash() {
+    View image = getViewByTestId("image");
+    assertNotNull(image);
+  }
+}
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java
index 99de8a830014fc..bf754df05df6e1 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
index 85eeb6c584fb2e..3875ad878f85ef 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,6 +11,7 @@
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.modules.appstate.AppStateModule;
+import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.testing.FakeWebSocketModule;
 import com.facebook.react.testing.ReactIntegrationTestCase;
@@ -50,6 +51,7 @@ protected void setUp() throws Exception {
         new Runnable() {
           @Override
           public void run() {
+            ReactChoreographer.initialize();
             mUIManager.onHostResume();
           }
         });
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java
index ca05cfae197fed..077298065b0283 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java
index bab295fa709c42..f9f7741d8c7dd2 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
index 6888f021d9757d..0cfd4d6c277104 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
index eae42334412f0b..19989b52426beb 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java
index 52a8750d43066a..e1defbb208b36c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
index cc2f680a37941c..ec8fd977a0a0e5 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactRootViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactRootViewTestCase.java
deleted file mode 100644
index f912347b497d82..00000000000000
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactRootViewTestCase.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- *
- * 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 android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import com.facebook.react.testing.ReactInstanceSpecForTest;
-import com.facebook.react.testing.ReactAppInstrumentationTestCase;
-import com.facebook.react.testing.StringRecordingModule;
-import com.facebook.react.ReactRootView;
-
-import org.junit.Ignore;
-
-/**
- * Integration test for {@link ReactRootView}.
- */
-public class ReactRootViewTestCase extends ReactAppInstrumentationTestCase {
-
-  private StringRecordingModule mRecordingModule;
-
-  @Override
-  protected String getReactApplicationKeyUnderTest() {
-    return "CatalystRootViewTestApp";
-  }
-
-  @Ignore("t6596940: fix intermittently failing test")
-  public void testResizeRootView() throws Throwable {
-    final ReactRootView rootView = (ReactRootView) getRootView();
-    final View childView = rootView.getChildAt(0);
-
-    assertEquals(rootView.getWidth(), childView.getWidth());
-
-    final int newWidth = rootView.getWidth() / 2;
-
-    runTestOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            rootView.setLayoutParams(new FrameLayout.LayoutParams(
-                    newWidth,
-                    ViewGroup.LayoutParams.MATCH_PARENT));
-          }
-        });
-
-    getInstrumentation().waitForIdleSync();
-    waitForBridgeAndUIIdle();
-
-    assertEquals(newWidth, childView.getWidth());
-  }
-
-  /**
-   * Verify that removing the root view from hierarchy will trigger subviews removal both on JS and
-   * native side
-   */
-  public void testRemoveRootView() throws Throwable {
-    final ReactRootView rootView = (ReactRootView) getRootView();
-
-    assertEquals(1, rootView.getChildCount());
-
-    runTestOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            ViewGroup parent = (ViewGroup) rootView.getParent();
-            parent.removeView(rootView);
-            // removing from parent should not remove child views, child views should be removed as
-            // an effect of native call to UIManager.removeRootView
-            assertEquals(1, rootView.getChildCount());
-          }
-        });
-
-    getInstrumentation().waitForIdleSync();
-    waitForBridgeAndUIIdle();
-
-    assertEquals("root component should not be automatically unmounted", 0, mRecordingModule.getCalls().size());
-    assertEquals(1, rootView.getChildCount());
-
-    runTestOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            rootView.unmountReactApplication();
-          }
-        });
-    waitForBridgeAndUIIdle();
-
-    assertEquals(1, mRecordingModule.getCalls().size());
-    assertEquals("RootComponentWillUnmount", mRecordingModule.getCalls().get(0));
-    assertEquals(0, rootView.getChildCount());
-  }
-
-  @Override
-  protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
-    mRecordingModule = new StringRecordingModule();
-    return new ReactInstanceSpecForTest()
-        .addNativeModule(mRecordingModule);
-  }
-}
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java
index b947e50a87a405..0267bb8e28b01b 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java
index 417bf4159b98a5..a75b217131f13d 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java
index ccfa9f2b862d6a..83dae93deec17a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java
index 1b0a904cdfddbc..47696a68460717 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 cd0e8362d8f415..ffc9c9e8ce2468 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java
index 3af83b91877572..a15ecbcae42e1a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
index 1b28762be5905a..edccc5e89f9361 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK
new file mode 100644
index 00000000000000..5f87d7e94d91e7
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK
@@ -0,0 +1,28 @@
+# BUILD FILE SYNTAX: SKYLARK
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "IS_OSS_BUILD",
+    "react_native_dep",
+    "react_native_integration_tests_target",
+    "react_native_target",
+    "rn_android_library",
+)
+
+rn_android_library(
+    name = "core",
+    srcs = glob(["*.java"]),
+    deps = ([
+        react_native_dep("third-party/java/espresso:espresso"),
+        react_native_dep("third-party/java/fest:fest"),
+        react_native_dep("third-party/java/junit:junit"),
+        react_native_dep("third-party/java/testing-support-lib:testing-support-lib"),
+        react_native_integration_tests_target("java/com/facebook/react/testing:testing"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/rule:rule"),
+        react_native_target("java/com/facebook/react:react"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/shell:shell"),
+        react_native_target("java/com/facebook/react/uimanager:uimanager"),
+    ]) + ([
+        react_native_dep("java/com/facebook/fbreact/testing:testing"),
+    ]) if not IS_OSS_BUILD else [],
+)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactRootViewTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactRootViewTest.java
new file mode 100644
index 00000000000000..f7cc389c2e2257
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactRootViewTest.java
@@ -0,0 +1,132 @@
+//  Copyright (c) Facebook, Inc. and its 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.core;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactRootView;
+import com.facebook.react.bridge.ModuleSpec;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.shell.MainReactPackage;
+import com.facebook.react.testing.StringRecordingModule;
+import com.facebook.react.testing.rule.ReactNativeTestRule;
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Provider;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ReactRootViewTest {
+
+  final StringRecordingModule mRecordingModule = new StringRecordingModule();
+  final ReactPackage mReactPackage = new MainReactPackage() {
+    @Override
+    public List<ModuleSpec> getNativeModules(ReactApplicationContext context) {
+      List<ModuleSpec> modules = new ArrayList<>(super.getNativeModules(context));
+      modules.add(
+        ModuleSpec.nativeModuleSpec(
+          StringRecordingModule.class,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return mRecordingModule;
+            }
+          }));
+      return modules;
+    }
+  };
+
+  @Rule
+  public ReactNativeTestRule mReactNativeRule =
+    new ReactNativeTestRule("AndroidTestBundle.js", mReactPackage);
+
+  @Before
+  public void setup() {
+    mReactNativeRule.render("CatalystRootViewTestApp");
+  }
+
+  @Test
+  public void testResizeRootView() {
+    final ReactRootView rootView = mReactNativeRule.getView();
+    final View childView = rootView.getChildAt(0);
+
+    assertThat(rootView.getWidth()).isEqualTo(childView.getWidth());
+
+    final int newWidth = rootView.getWidth() / 2;
+
+    Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+    instrumentation.runOnMainSync(
+      new Runnable() {
+        @Override
+        public void run() {
+          rootView.setLayoutParams(new FrameLayout.LayoutParams(
+            newWidth,
+            ViewGroup.LayoutParams.MATCH_PARENT));
+        }
+      });
+
+    instrumentation.waitForIdleSync();
+    mReactNativeRule.waitForIdleSync();
+
+    assertThat(newWidth).isEqualTo(childView.getWidth());
+  }
+
+  /**
+   * Verify that removing the root view from hierarchy will trigger subviews removal both on JS and
+   * native side
+   */
+  @Test
+  public void testRemoveRootView() {
+    final ReactRootView rootView = mReactNativeRule.getView();
+
+    assertThat(rootView.getChildCount()).isEqualTo(1);
+
+    Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+    instrumentation.runOnMainSync(
+      new Runnable() {
+        @Override
+        public void run() {
+          ViewGroup parent = (ViewGroup) rootView.getParent();
+          parent.removeView(rootView);
+          // removing from parent should not remove child views, child views should be removed as
+          // an effect of native call to UIManager.removeRootView
+          assertThat(rootView.getChildCount()).isEqualTo(1);
+        }
+      });
+
+    instrumentation.waitForIdleSync();
+    mReactNativeRule.waitForIdleSync();
+
+    assertThat(mRecordingModule.getCalls().size())
+      .isEqualTo(0)
+      .overridingErrorMessage("root component should not be automatically unmounted");
+    assertThat(rootView.getChildCount()).isEqualTo(1);
+
+    instrumentation.runOnMainSync(
+      new Runnable() {
+        @Override
+        public void run() {
+          rootView.unmountReactApplication();
+        }
+      });
+    mReactNativeRule.waitForIdleSync();
+
+    assertThat(mRecordingModule.getCalls().size()).isEqualTo(1);
+    assertThat(mRecordingModule.getCalls().get(0)).isEqualTo("RootComponentWillUnmount");
+    assertThat(rootView.getChildCount()).isEqualTo(0);
+  }
+}
diff --git a/ReactAndroid/src/androidTest/js/Asserts.js b/ReactAndroid/src/androidTest/js/Asserts.js
index 467065d0e944ee..0a684d0b3cd30d 100644
--- a/ReactAndroid/src/androidTest/js/Asserts.js
+++ b/ReactAndroid/src/androidTest/js/Asserts.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js b/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js
index 497fc48e353075..b5c710dbeeaf4e 100644
--- a/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js
+++ b/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js b/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js
index b15808cde63478..1f4699e7c7c707 100644
--- a/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js
+++ b/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/ImageOverlayColorTestApp.js b/ReactAndroid/src/androidTest/js/ImageOverlayColorTestApp.js
new file mode 100644
index 00000000000000..0d0c9b5e818368
--- /dev/null
+++ b/ReactAndroid/src/androidTest/js/ImageOverlayColorTestApp.js
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * 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';
+
+var React = require('React');
+var Image = require('Image');
+
+class ImageOverlayColorTestApp extends React.Component {
+  render() {
+    const uri =
+      'data:image/gif;base64,' +
+      'R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAwAAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapy' +
+      'uvUUlvONmOZtfzgFzByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSpa/' +
+      'TPg7JpJHxyendzWTBfX0cxOnKPjgBzi4diinWGdkF8kjdfnycQZXZeYGejmJlZeGl9i2icVqaNVailT6F5' +
+      'iJ90m6mvuTS4OK05M0vDk0Q4XUtwvKOzrcd3iq9uisF81M1OIcR7lEewwcLp7tuNNkM3uNna3F2JQFo97V' +
+      'riy/Xl4/f1cf5VWzXyym7PHhhx4dbgYKAAA7';
+
+    return <Image testID="image" source={{uri: uri}} overlayColor="#FF0000" />;
+  }
+}
+
+module.exports = ImageOverlayColorTestApp;
diff --git a/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js b/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js
index c031fde6046f2e..0894466d0987f4 100644
--- a/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js
+++ b/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/JSResponderTestApp.js b/ReactAndroid/src/androidTest/js/JSResponderTestApp.js
index ff518018654079..8be0e1ede5e6f6 100644
--- a/ReactAndroid/src/androidTest/js/JSResponderTestApp.js
+++ b/ReactAndroid/src/androidTest/js/JSResponderTestApp.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js b/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js
index df25944f11664e..c2607b7bf25c8a 100644
--- a/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js
+++ b/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js b/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js
index 03e156b6f4cf63..cf53a27f8cf823 100644
--- a/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js
+++ b/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js b/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js
index 58f6a460501c06..ea83b9b8bafb20 100644
--- a/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js
+++ b/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/NativeIdTestModule.js b/ReactAndroid/src/androidTest/js/NativeIdTestModule.js
index eb791c356d1201..161318fa10c806 100644
--- a/ReactAndroid/src/androidTest/js/NativeIdTestModule.js
+++ b/ReactAndroid/src/androidTest/js/NativeIdTestModule.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js b/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
index 97210eccb083e7..3868a0bca99f33 100644
--- a/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
+++ b/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js b/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js
index e9b4b563ba82ed..f2b8ed0e9cbea1 100644
--- a/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
index f6f83beee3109b..ac88ac4cd75b9f 100644
--- a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
@@ -1,31 +1,40 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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';
 
-var BatchedBridge = require('BatchedBridge');
-var React = require('React');
-var createReactClass = require('create-react-class');
-var View = require('View');
-var ScrollView = require('ScrollView');
-var Text = require('Text');
-var StyleSheet = require('StyleSheet');
-var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
-var ScrollListener = require('NativeModules').ScrollListener;
+const BatchedBridge = require('BatchedBridge');
+const React = require('React');
+const View = require('View');
+const ScrollView = require('ScrollView');
+const Text = require('Text');
+const StyleSheet = require('StyleSheet');
+const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
+const ScrollListener = require('NativeModules').ScrollListener;
 
-var NUM_ITEMS = 100;
+const NUM_ITEMS = 100;
+
+import type {PressEvent} from 'CoreEventTypes';
 
 // Shared by integration tests for ScrollView and HorizontalScrollView
 
-var scrollViewApp;
+let scrollViewApp;
+
+type ItemProps = $ReadOnly<{|
+  onPress: (event: PressEvent) => void,
+  text: string,
+|}>;
+
+type ItemState = {||};
 
-class Item extends React.Component {
+class Item extends React.Component<ItemProps, ItemState> {
   render() {
     return (
       <TouchableWithoutFeedback onPress={this.props.onPress}>
@@ -37,7 +46,7 @@ class Item extends React.Component {
   }
 }
 
-var getInitialState = function() {
+const getInitialState = function() {
   var data = [];
   for (var i = 0; i < NUM_ITEMS; i++) {
     data[i] = {text: 'Item ' + i + '!'};
@@ -47,90 +56,99 @@ var getInitialState = function() {
   };
 };
 
-var onScroll = function(e) {
+const onScroll = function(e) {
   ScrollListener.onScroll(
     e.nativeEvent.contentOffset.x,
     e.nativeEvent.contentOffset.y,
   );
 };
 
-var onScrollBeginDrag = function(e) {
+const onScrollBeginDrag = function(e) {
   ScrollListener.onScrollBeginDrag(
     e.nativeEvent.contentOffset.x,
     e.nativeEvent.contentOffset.y,
   );
 };
 
-var onScrollEndDrag = function(e) {
+const onScrollEndDrag = function(e) {
   ScrollListener.onScrollEndDrag(
     e.nativeEvent.contentOffset.x,
     e.nativeEvent.contentOffset.y,
   );
 };
 
-var onItemPress = function(itemNumber) {
+const onItemPress = function(itemNumber) {
   ScrollListener.onItemPress(itemNumber);
 };
 
-var ScrollViewTestApp = createReactClass({
-  displayName: 'ScrollViewTestApp',
-  getInitialState: getInitialState,
-  onScroll: onScroll,
-  onItemPress: onItemPress,
-  onScrollBeginDrag: onScrollBeginDrag,
-  onScrollEndDrag: onScrollEndDrag,
+type Props = $ReadOnly<{||}>;
+type State = {|
+  data: $ReadOnlyArray<{|text: string|}>,
+|};
 
-  scrollTo: function(destX, destY) {
-    this.refs.scrollView.scrollTo(destY, destX);
-  },
+class ScrollViewTestApp extends React.Component<Props, State> {
+  scrollView = React.createRef();
+  state = getInitialState();
+
+  scrollTo(destX: number, destY: number) {
+    const scrollView = this.scrollView.current;
+    if (scrollView == null) {
+      return;
+    }
 
-  render: function() {
+    scrollView.scrollTo(destY, destX);
+  }
+
+  render() {
     scrollViewApp = this;
     var children = this.state.data.map((item, index) => (
       <Item
         key={index}
         text={item.text}
-        onPress={this.onItemPress.bind(this, index)}
+        onPress={onItemPress.bind(this, index)}
       />
     ));
     return (
       <ScrollView
-        onScroll={this.onScroll}
-        onScrollBeginDrag={this.onScrollBeginDrag}
-        onScrollEndDrag={this.onScrollEndDrag}
-        ref="scrollView">
+        onScroll={onScroll}
+        onScrollBeginDrag={onScrollBeginDrag}
+        onScrollEndDrag={onScrollEndDrag}
+        ref={this.scrollView}>
         {children}
       </ScrollView>
     );
-  },
-});
+  }
+}
 
-var HorizontalScrollViewTestApp = createReactClass({
-  displayName: 'HorizontalScrollViewTestApp',
-  getInitialState: getInitialState,
-  onScroll: onScroll,
-  onItemPress: onItemPress,
+class HorizontalScrollViewTestApp extends React.Component<Props, State> {
+  scrollView = React.createRef();
+  state = getInitialState();
 
-  scrollTo: function(destX, destY) {
-    this.refs.scrollView.scrollTo(destY, destX);
-  },
+  scrollTo(destX: number, destY: number) {
+    const scrollView = this.scrollView.current;
+    if (scrollView == null) {
+      return;
+    }
+
+    scrollView.scrollTo(destY, destX);
+  }
 
-  render: function() {
+  render() {
     scrollViewApp = this;
     var children = this.state.data.map((item, index) => (
       <Item
         key={index}
         text={item.text}
-        onPress={this.onItemPress.bind(this, index)}
+        onPress={onItemPress.bind(this, index)}
       />
     ));
     return (
-      <ScrollView horizontal={true} onScroll={this.onScroll} ref="scrollView">
+      <ScrollView horizontal={true} onScroll={onScroll} ref={this.scrollView}>
         {children}
       </ScrollView>
     );
-  },
-});
+  }
+}
 
 var styles = StyleSheet.create({
   item_container: {
@@ -147,7 +165,7 @@ var styles = StyleSheet.create({
 var ScrollViewTestModule = {
   ScrollViewTestApp: ScrollViewTestApp,
   HorizontalScrollViewTestApp: HorizontalScrollViewTestApp,
-  scrollTo: function(destX, destY) {
+  scrollTo(destX: number, destY: number) {
     scrollViewApp.scrollTo(destX, destY);
   },
 };
diff --git a/ReactAndroid/src/androidTest/js/ShareTestModule.js b/ReactAndroid/src/androidTest/js/ShareTestModule.js
index 3c230a3d0147a2..058dbda3fb0ffb 100644
--- a/ReactAndroid/src/androidTest/js/ShareTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ShareTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js b/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js
index 312dcb2c5d633b..30c996f7c876ae 100644
--- a/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js
+++ b/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js b/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js
index 0bd3fabf20080f..3ab42ddcbfc019 100644
--- a/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js
+++ b/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/TestBundle.js b/ReactAndroid/src/androidTest/js/TestBundle.js
index 59da7e6695b842..7da52c6d01e147 100644
--- a/ReactAndroid/src/androidTest/js/TestBundle.js
+++ b/ReactAndroid/src/androidTest/js/TestBundle.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -54,6 +54,10 @@ var apps = [
     component: () =>
       require('ScrollViewTestModule').HorizontalScrollViewTestApp,
   },
+  {
+    appKey: 'ImageOverlayColorTestApp',
+    component: () => require('ImageOverlayColorTestApp'),
+  },
   {
     appKey: 'InitialPropsTestApp',
     component: () => require('InitialPropsTestApp'),
diff --git a/ReactAndroid/src/androidTest/js/TestIdTestModule.js b/ReactAndroid/src/androidTest/js/TestIdTestModule.js
index 5b045d38fbaa43..adbf3fd78fc711 100644
--- a/ReactAndroid/src/androidTest/js/TestIdTestModule.js
+++ b/ReactAndroid/src/androidTest/js/TestIdTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js b/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js
index 9a5915396d1f2b..f84ea1735c60a3 100644
--- a/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js b/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js
index ec31e15cb55f23..52b64a6714662d 100644
--- a/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js b/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js
index d112ff213d025c..7cbf76b1b16bf2 100644
--- a/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js b/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js
index e21f8600cbf45c..248edf85746d30 100644
--- a/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/TextInputTestModule.js b/ReactAndroid/src/androidTest/js/TextInputTestModule.js
index 48d29344de316e..e0a126c82ba1bc 100644
--- a/ReactAndroid/src/androidTest/js/TextInputTestModule.js
+++ b/ReactAndroid/src/androidTest/js/TextInputTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js b/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js
index 5db19b67e45bd5..3c179fd4ee1c9f 100644
--- a/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js
+++ b/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js b/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js
index 4ae71bf70f2cdb..f2c523e09f3649 100644
--- a/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js
+++ b/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/androidTest/js/UIManagerTestModule.js b/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
index 33d1d3aca1b029..9690f6fce16e1c 100644
--- a/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
+++ b/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
@@ -1,224 +1,274 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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';
 
-var BatchedBridge = require('BatchedBridge');
-var React = require('React');
-var StyleSheet = require('StyleSheet');
-var View = require('View');
-var Text = require('Text');
-
-var createReactClass = require('create-react-class');
-var renderApplication = require('renderApplication');
-
-var FlexTestApp = createReactClass({
-  displayName: 'FlexTestApp',
-  _styles: StyleSheet.create({
-    container: {
-      width: 200,
-      height: 200,
-      flexDirection: 'row',
-    },
-    child: {
-      flex: 1,
-    },
-    absolute: {
-      position: 'absolute',
-      top: 15,
-      left: 10,
-      width: 50,
-      height: 60,
-    },
-  }),
-  render: function() {
+const BatchedBridge = require('BatchedBridge');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const View = require('View');
+const Text = require('Text');
+
+const renderApplication = require('renderApplication');
+
+type FlexTestAppProps = $ReadOnly<{||}>;
+class FlexTestApp extends React.Component<FlexTestAppProps> {
+  render() {
     return (
       <View
-        style={this._styles.container}
+        style={FlexTestAppStyles.container}
         testID="container"
         collapsable={false}>
         <View
-          style={[this._styles.child, {backgroundColor: '#ff0000'}]}
+          style={[FlexTestAppStyles.child, FlexTestAppStyles.bgRed]}
           collapsable={false}
         />
         <View
-          style={[this._styles.child, {backgroundColor: '#0000ff'}]}
+          style={[FlexTestAppStyles.child, FlexTestAppStyles.bgBlue]}
           collapsable={false}
         />
       </View>
     );
+  }
+}
+
+const FlexTestAppStyles = StyleSheet.create({
+  container: {
+    width: 200,
+    height: 200,
+    flexDirection: 'row',
+  },
+  child: {
+    flex: 1,
+  },
+  absolute: {
+    position: 'absolute',
+    top: 15,
+    left: 10,
+    width: 50,
+    height: 60,
+  },
+  bgRed: {
+    backgroundColor: '#ff0000',
+  },
+  bgBlue: {
+    backgroundColor: '#0000ff',
   },
 });
 
-var FlexWithText = createReactClass({
-  displayName: 'FlexWithText',
-  _styles: StyleSheet.create({
-    container: {
-      flexDirection: 'column',
-      margin: 20,
-    },
-    row: {
-      flexDirection: 'row',
-      alignItems: 'flex-end',
-      height: 300,
-    },
-    inner: {
-      flex: 1,
-      margin: 10,
-    },
-  }),
-  render: function() {
+type FlexWithTextProps = $ReadOnly<{||}>;
+class FlexWithText extends React.Component<FlexWithTextProps> {
+  render() {
     return (
       <View
-        style={this._styles.container}
+        style={FlexWithTextStyles.container}
         testID="container"
         collapsable={false}>
-        <View style={this._styles.row} collapsable={false}>
-          <Text style={this._styles.inner}>Hello</Text>
-          <Text style={this._styles.inner}>World</Text>
+        <View style={FlexWithTextStyles.row} collapsable={false}>
+          <Text style={FlexWithTextStyles.inner}>Hello</Text>
+          <Text style={FlexWithTextStyles.inner}>World</Text>
         </View>
       </View>
     );
+  }
+}
+
+const FlexWithTextStyles = StyleSheet.create({
+  container: {
+    flexDirection: 'column',
+    margin: 20,
+  },
+  row: {
+    flexDirection: 'row',
+    alignItems: 'flex-end',
+    height: 300,
+  },
+  inner: {
+    flex: 1,
+    margin: 10,
   },
 });
 
-var AbsolutePositionTestApp = createReactClass({
-  displayName: 'AbsolutePositionTestApp',
-  _styles: StyleSheet.create({
-    absolute: {
-      position: 'absolute',
-      top: 15,
-      left: 10,
-      width: 50,
-      height: 60,
-    },
-  }),
-  render: function() {
+type AbsolutePositionTestAppProps = $ReadOnly<{||}>;
+class AbsolutePositionTestApp extends React.Component<
+  AbsolutePositionTestAppProps,
+> {
+  render() {
     return (
       <View
-        style={this._styles.absolute}
+        style={AbsolutePositionTestAppStyles.absolute}
         testID="absolute"
         collapsable={false}
       />
     );
+  }
+}
+
+const AbsolutePositionTestAppStyles = StyleSheet.create({
+  absolute: {
+    position: 'absolute',
+    top: 15,
+    left: 10,
+    width: 50,
+    height: 60,
   },
 });
 
-var AbsolutePositionBottomRightTestApp = createReactClass({
-  displayName: 'AbsolutePositionBottomRightTestApp',
-  _styles: StyleSheet.create({
-    container: {
-      width: 100,
-      height: 100,
-    },
-    absolute: {
-      position: 'absolute',
-      bottom: 15,
-      right: 10,
-      width: 50,
-      height: 60,
-    },
-  }),
-  render: function() {
+type AbsolutePositionBottomRightTestAppProps = $ReadOnly<{||}>;
+class AbsolutePositionBottomRightTestApp extends React.Component<
+  AbsolutePositionBottomRightTestAppProps,
+> {
+  render() {
     return (
       <View
-        style={this._styles.container}
+        style={AbsolutePositionBottomRightTestAppStyles.container}
         testID="container"
         collapsable={false}>
-        <View style={this._styles.absolute} collapsable={false} />
+        <View
+          style={AbsolutePositionBottomRightTestAppStyles.absolute}
+          collapsable={false}
+        />
       </View>
     );
+  }
+}
+
+const AbsolutePositionBottomRightTestAppStyles = StyleSheet.create({
+  container: {
+    width: 100,
+    height: 100,
+  },
+  absolute: {
+    position: 'absolute',
+    bottom: 15,
+    right: 10,
+    width: 50,
+    height: 60,
   },
 });
 
-var CenteredTextView = createReactClass({
-  displayName: 'CenteredTextView',
-  _styles: StyleSheet.create({
-    parent: {
-      width: 200,
-      height: 100,
-      backgroundColor: '#aa3311',
-      justifyContent: 'center',
-      alignItems: 'center',
-    },
-    text: {
-      fontSize: 15,
-      color: '#672831',
-    },
-  }),
-  render: function() {
+type CenteredTextViewProps = $ReadOnly<{|
+  text?: ?string,
+|}>;
+class CenteredTextView extends React.Component<CenteredTextViewProps> {
+  render() {
     return (
       <View collapsable={false}>
-        <View style={this._styles.parent} collapsable={false}>
-          <Text style={this._styles.text} testID="text">
+        <View style={CenteredTextViewStyles.parent} collapsable={false}>
+          <Text style={CenteredTextViewStyles.text} testID="text">
             {this.props.text}
           </Text>
         </View>
       </View>
     );
+  }
+}
+
+const CenteredTextViewStyles = StyleSheet.create({
+  parent: {
+    width: 200,
+    height: 100,
+    backgroundColor: '#aa3311',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  text: {
+    fontSize: 15,
+    color: '#672831',
   },
 });
 
-var flushUpdatePositionInList = null;
-var UpdatePositionInListTestApp = createReactClass({
-  displayName: 'UpdatePositionInListTestApp',
-  _styles: StyleSheet.create({
-    element: {
-      height: 10,
-    },
-    active: {
-      height: 50,
-    },
-  }),
-  getInitialState: function() {
+let flushUpdatePositionInList = null;
+
+type UpdatePositionInListTestAppProps = $ReadOnly<{||}>;
+type UpdatePositionInListTestAppState = {|
+  active: boolean,
+|};
+class UpdatePositionInListTestApp extends React.Component<
+  UpdatePositionInListTestAppProps,
+  UpdatePositionInListTestAppState,
+> {
+  state = {
+    active: false,
+  };
+
+  constructor(...args) {
+    super(...args);
     flushUpdatePositionInList = () => this.setState({active: true});
-    return {active: false};
-  },
-  render: function() {
+  }
+
+  render() {
     return (
       <View collapsable={false} testID="container">
-        <View style={this._styles.element} collapsable={false} />
+        <View
+          style={UpdatePositionInListTestAppStyles.element}
+          collapsable={false}
+        />
         <View
           style={[
-            this._styles.element,
-            this.state.active && this._styles.active,
+            UpdatePositionInListTestAppStyles.element,
+            this.state.active && UpdatePositionInListTestAppStyles.active,
           ]}
           collapsable={false}
         />
-        <View style={this._styles.element} collapsable={false} />
+        <View
+          style={UpdatePositionInListTestAppStyles.element}
+          collapsable={false}
+        />
       </View>
     );
+  }
+}
+
+const UpdatePositionInListTestAppStyles = StyleSheet.create({
+  element: {
+    height: 10,
+  },
+  active: {
+    height: 50,
   },
 });
 
-var UIManagerTestModule = {
-  renderFlexTestApplication: function(rootTag) {
-    renderApplication(FlexTestApp, {}, rootTag);
+/**
+ * This is a workaround for the following flow problem:
+ *
+ *   const emptyObject: {||} = {}; // Raises error
+ *
+ * @see https://github.com/facebook/flow/issues/2977
+ */
+const emptyExactProps = Object.freeze({});
+
+const UIManagerTestModule = {
+  renderFlexTestApplication(rootTag: number) {
+    renderApplication(FlexTestApp, emptyExactProps, rootTag);
   },
-  renderFlexWithTextApplication: function(rootTag) {
-    renderApplication(FlexWithText, {}, rootTag);
+  renderFlexWithTextApplication(rootTag: number) {
+    renderApplication(FlexWithText, emptyExactProps, rootTag);
   },
-  renderAbsolutePositionBottomRightTestApplication: function(rootTag) {
-    renderApplication(AbsolutePositionBottomRightTestApp, {}, rootTag);
+  renderAbsolutePositionBottomRightTestApplication(rootTag: number) {
+    renderApplication(
+      AbsolutePositionBottomRightTestApp,
+      emptyExactProps,
+      rootTag,
+    );
   },
-  renderAbsolutePositionTestApplication: function(rootTag) {
-    renderApplication(AbsolutePositionTestApp, {}, rootTag);
+  renderAbsolutePositionTestApplication(rootTag: number) {
+    renderApplication(AbsolutePositionTestApp, emptyExactProps, rootTag);
   },
-  renderCenteredTextViewTestApplication: function(rootTag, text) {
+  renderCenteredTextViewTestApplication(rootTag: number, text: string) {
     renderApplication(CenteredTextView, {text: text}, rootTag);
   },
-  renderUpdatePositionInListTestApplication: function(rootTag) {
-    renderApplication(UpdatePositionInListTestApp, {}, rootTag);
-  },
-  flushUpdatePositionInList: function() {
-    flushUpdatePositionInList();
+  renderUpdatePositionInListTestApplication(rootTag: number) {
+    renderApplication(UpdatePositionInListTestApp, emptyExactProps, rootTag);
   },
+  flushUpdatePositionInList,
 };
 
 BatchedBridge.registerCallableModule(
diff --git a/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js b/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js
index c2215318a52f41..95ab116b84b1b5 100644
--- a/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/android_res/com/facebook/catalyst/appcompat/BUCK b/ReactAndroid/src/main/android_res/com/facebook/catalyst/appcompat/BUCK
index 868485a2b73cdc..d0d6a03da817d1 100644
--- a/ReactAndroid/src/main/android_res/com/facebook/catalyst/appcompat/BUCK
+++ b/ReactAndroid/src/main/android_res/com/facebook/catalyst/appcompat/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_resource")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_resource")
 
 # used by ReactToolbarManager because of Gradle
 # TODO t10182713 will be replaced with appcompat-orig when we stop using Gradle
diff --git a/ReactAndroid/src/main/java/com/facebook/BUCK b/ReactAndroid/src/main/java/com/facebook/BUCK
index bc03b864be0f16..46f5b18b63cae6 100644
--- a/ReactAndroid/src/main/java/com/facebook/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "yoga",
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK
index caed19622ab7db..a161001ec1cab1 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "model",
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/DebugOverlayTag.java b/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/DebugOverlayTag.java
index 07d2605717a68e..9a0347df7a5bc3 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/DebugOverlayTag.java
+++ b/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/DebugOverlayTag.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK
index e28e0062d3e466..9212d5990f14dd 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "holder",
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/holder/NoopPrinter.java b/ReactAndroid/src/main/java/com/facebook/debug/holder/NoopPrinter.java
index a7bba058310597..487375bc91ca01 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/holder/NoopPrinter.java
+++ b/ReactAndroid/src/main/java/com/facebook/debug/holder/NoopPrinter.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/holder/Printer.java b/ReactAndroid/src/main/java/com/facebook/debug/holder/Printer.java
index 4fcfc24ca6f172..8b7ffadbd9cb3f 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/holder/Printer.java
+++ b/ReactAndroid/src/main/java/com/facebook/debug/holder/Printer.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/holder/PrinterHolder.java b/ReactAndroid/src/main/java/com/facebook/debug/holder/PrinterHolder.java
index e0405a4b99c955..c73e8d94e8b8fb 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/holder/PrinterHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/debug/holder/PrinterHolder.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK
index 85aaf21d912e88..1442e63d2acfdf 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "tags",
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.java b/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.java
index 879743ce91a0df..877aa14c9c9a5e 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.java
+++ b/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/jni/BUCK
index b0dee43c7991a2..33a2d0bf6a5b42 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/jni/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "jni",
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/Countable.java b/ReactAndroid/src/main/java/com/facebook/jni/Countable.java
index 342a6f01e28c2f..ba3216e0f0819d 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/Countable.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/Countable.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/CpuCapabilitiesJni.java b/ReactAndroid/src/main/java/com/facebook/jni/CpuCapabilitiesJni.java
index ce3ae8da14b980..d0df3db702ba51 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/CpuCapabilitiesJni.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/CpuCapabilitiesJni.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/DestructorThread.java b/ReactAndroid/src/main/java/com/facebook/jni/DestructorThread.java
index 3ae10379969d5d..38bc2e7d8480fa 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/DestructorThread.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/DestructorThread.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/HybridClassBase.java b/ReactAndroid/src/main/java/com/facebook/jni/HybridClassBase.java
index 3e39175c42f6d2..540c1ca5e05223 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/HybridClassBase.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/HybridClassBase.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/HybridData.java b/ReactAndroid/src/main/java/com/facebook/jni/HybridData.java
index ad4077e669c9f6..47a331e24c171a 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/HybridData.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/HybridData.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java b/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java
index 928870d2bfc434..88e2de6353d39a 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/JniTerminateHandler.java b/ReactAndroid/src/main/java/com/facebook/jni/JniTerminateHandler.java
index eec0fbc1610b49..f48d639a8fe233 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/JniTerminateHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/JniTerminateHandler.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java b/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java
index e50cd7d56bc150..e57cb9f173396b 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java b/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java
index 34216a29c8ff54..10a2517a22391f 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/ThreadScopeSupport.java b/ReactAndroid/src/main/java/com/facebook/jni/ThreadScopeSupport.java
index 9490f87062c3dd..743724b1b5f366 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/ThreadScopeSupport.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/ThreadScopeSupport.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/perftest/BUCK b/ReactAndroid/src/main/java/com/facebook/perftest/BUCK
index bc3a5ab52c4935..974cfdbcd02591 100644
--- a/ReactAndroid/src/main/java/com/facebook/perftest/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/perftest/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
 
 rn_android_library(
     name = "perftest",
diff --git a/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java b/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java
index e8fef3b4299e77..7420ab0dce90f2 100644
--- a/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK
index 66cbb88e582182..d67d02d3b95d37 100644
--- a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
 
 rn_android_library(
     name = "annotations",
diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java
index a2752bbb0f8a3c..e73cd266897e5d 100644
--- a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java
+++ b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java
index 4c261c5c9b27ea..127dd91ba6c503 100644
--- a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java
+++ b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK
index 743bb34bb69448..8f2c72e8c0454b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK
@@ -1,10 +1,11 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "react",
     srcs = glob(["*.java"]),
     provided_deps = [
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
+        react_native_dep("third-party/android/support-annotations:android-support-annotations"),
     ],
     visibility = [
         "PUBLIC",
@@ -21,6 +22,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/devsupport:devsupport"),
         react_native_target("java/com/facebook/react/devsupport:interfaces"),
+        react_native_target("java/com/facebook/react/jscexecutor:jscexecutor"),
         react_native_target("java/com/facebook/react/jstasks:jstasks"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/module/model:model"),
@@ -33,6 +35,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
         react_native_target("java/com/facebook/react/modules/toast:toast"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
+        react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
     ],
     exported_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java
index 7aff02cfccfef3..af045b5a7e53d3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java
@@ -1,10 +1,9 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * <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.facebook.react;
 
 import com.facebook.react.bridge.NativeModule;
@@ -24,16 +23,15 @@
  * {@code CompositeReactPackage} allows to create a single package composed of views and modules
  * from several other packages.
  */
-public class CompositeReactPackage extends ReactInstancePackage
-    implements ViewManagerOnDemandReactPackage {
+public class CompositeReactPackage implements ViewManagerOnDemandReactPackage, ReactPackage {
 
   private final List<ReactPackage> mChildReactPackages = new ArrayList<>();
 
   /**
-   * The order in which packages are passed matters. It may happen that a NativeModule or
-   * or a ViewManager exists in two or more ReactPackages. In that case the latter will win
-   * i.e. the latter will overwrite the former. This re-occurrence is detected by
-   * comparing a name of a module.
+   * The order in which packages are passed matters. It may happen that a NativeModule or or a
+   * ViewManager exists in two or more ReactPackages. In that case the latter will win i.e. the
+   * latter will overwrite the former. This re-occurrence is detected by comparing a name of a
+   * module.
    */
   public CompositeReactPackage(ReactPackage arg1, ReactPackage arg2, ReactPackage... args) {
     mChildReactPackages.add(arg1);
@@ -42,54 +40,25 @@ public CompositeReactPackage(ReactPackage arg1, ReactPackage arg2, ReactPackage.
     Collections.addAll(mChildReactPackages, args);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
     // This is for backward compatibility.
     final Map<String, NativeModule> moduleMap = new HashMap<>();
-    for (ReactPackage reactPackage: mChildReactPackages) {
-      for (NativeModule nativeModule: reactPackage.createNativeModules(reactContext)) {
-        moduleMap.put(nativeModule.getName(), nativeModule);
-      }
-    }
-    return new ArrayList<>(moduleMap.values());
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public List<NativeModule> createNativeModules(
-      ReactApplicationContext reactContext,
-      ReactInstanceManager reactInstanceManager) {
-    final Map<String, NativeModule> moduleMap = new HashMap<>();
-    for (ReactPackage reactPackage: mChildReactPackages) {
-      List<NativeModule> nativeModules;
-      if (reactPackage instanceof ReactInstancePackage) {
-        ReactInstancePackage reactInstancePackage = (ReactInstancePackage) reactPackage;
-        nativeModules = reactInstancePackage.createNativeModules(
-            reactContext,
-            reactInstanceManager);
-      } else {
-        nativeModules = reactPackage.createNativeModules(reactContext);
-      }
-      for (NativeModule nativeModule: nativeModules) {
+    for (ReactPackage reactPackage : mChildReactPackages) {
+      for (NativeModule nativeModule : reactPackage.createNativeModules(reactContext)) {
         moduleMap.put(nativeModule.getName(), nativeModule);
       }
     }
     return new ArrayList<>(moduleMap.values());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
     final Map<String, ViewManager> viewManagerMap = new HashMap<>();
-    for (ReactPackage reactPackage: mChildReactPackages) {
-      for (ViewManager viewManager: reactPackage.createViewManagers(reactContext)) {
+    for (ReactPackage reactPackage : mChildReactPackages) {
+      for (ViewManager viewManager : reactPackage.createViewManagers(reactContext)) {
         viewManagerMap.put(viewManager.getName(), viewManager);
       }
     }
@@ -103,8 +72,7 @@ public List<String> getViewManagerNames(ReactApplicationContext reactContext) {
     for (ReactPackage reactPackage : mChildReactPackages) {
       if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
         List<String> names =
-            ((ViewManagerOnDemandReactPackage) reactPackage)
-                .getViewManagerNames(reactContext);
+            ((ViewManagerOnDemandReactPackage) reactPackage).getViewManagerNames(reactContext);
         if (names != null) {
           uniqueNames.addAll(names);
         }
@@ -115,8 +83,10 @@ public List<String> getViewManagerNames(ReactApplicationContext reactContext) {
 
   /** {@inheritDoc} */
   @Override
-  public @Nullable ViewManager createViewManager(ReactApplicationContext reactContext, String viewManagerName) {
-    ListIterator<ReactPackage> iterator = mChildReactPackages.listIterator(mChildReactPackages.size());
+  public @Nullable ViewManager createViewManager(
+      ReactApplicationContext reactContext, String viewManagerName) {
+    ListIterator<ReactPackage> iterator =
+        mChildReactPackages.listIterator(mChildReactPackages.size());
     while (iterator.hasPrevious()) {
       ReactPackage reactPackage = iterator.previous();
       if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
index 1b3d4c10fa6f32..d28f94aba04960 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -71,7 +71,7 @@
   public List<ModuleSpec> getNativeModules(final ReactApplicationContext reactContext) {
     return Arrays.asList(
         ModuleSpec.nativeModuleSpec(
-            AndroidInfoModule.class,
+            AndroidInfoModule.NAME,
             new Provider<NativeModule>() {
               @Override
               public NativeModule get() {
@@ -79,7 +79,7 @@ public NativeModule get() {
               }
             }),
         ModuleSpec.nativeModuleSpec(
-            DeviceEventManagerModule.class,
+            DeviceEventManagerModule.NAME,
             new Provider<NativeModule>() {
               @Override
               public NativeModule get() {
@@ -87,7 +87,7 @@ public NativeModule get() {
               }
             }),
         ModuleSpec.nativeModuleSpec(
-            ExceptionsManagerModule.class,
+            ExceptionsManagerModule.NAME,
             new Provider<NativeModule>() {
               @Override
               public NativeModule get() {
@@ -95,7 +95,7 @@ public NativeModule get() {
               }
             }),
         ModuleSpec.nativeModuleSpec(
-            HeadlessJsTaskSupportModule.class,
+            HeadlessJsTaskSupportModule.NAME,
             new Provider<NativeModule>() {
               @Override
               public NativeModule get() {
@@ -103,7 +103,7 @@ public NativeModule get() {
               }
             }),
         ModuleSpec.nativeModuleSpec(
-            SourceCodeModule.class,
+            SourceCodeModule.NAME,
             new Provider<NativeModule>() {
               @Override
               public NativeModule get() {
@@ -111,7 +111,7 @@ public NativeModule get() {
               }
             }),
         ModuleSpec.nativeModuleSpec(
-            Timing.class,
+            Timing.NAME,
             new Provider<NativeModule>() {
               @Override
               public NativeModule get() {
@@ -119,7 +119,7 @@ public NativeModule get() {
               }
             }),
         ModuleSpec.nativeModuleSpec(
-            UIManagerModule.class,
+            UIManagerModule.NAME,
             new Provider<NativeModule>() {
               @Override
               public NativeModule get() {
@@ -127,7 +127,7 @@ public NativeModule get() {
               }
             }),
         ModuleSpec.nativeModuleSpec(
-            DeviceInfoModule.class,
+            DeviceInfoModule.NAME,
             new Provider<NativeModule>() {
               @Override
               public NativeModule get() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java b/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
index 1de05ef8977a2f..1ecb2d5557d39f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/EagerModuleProvider.java b/ReactAndroid/src/main/java/com/facebook/react/EagerModuleProvider.java
index 9b429baa3a88b4..6af684d33b521e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/EagerModuleProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/EagerModuleProvider.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java b/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java
index 6bfac567bb2a04..8f84722bbb3849 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
index 68c184a0e1ccdf..91394befee298b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
@@ -1,31 +1,34 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * <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.facebook.react;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
 
+import android.support.annotation.NonNull;
+import com.facebook.react.bridge.ModuleHolder;
 import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.systrace.SystraceMessage;
-
-import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /**
  * React package supporting lazy creation of native modules.
  *
- * TODO(t11394819): Make this default and deprecate ReactPackage
+ * <p>TODO(t11394819): Make this default and deprecate ReactPackage
  */
 public abstract class LazyReactPackage implements ReactPackage {
 
@@ -33,48 +36,116 @@ public static ReactModuleInfoProvider getReactModuleInfoProviderViaReflection(
       LazyReactPackage lazyReactPackage) {
     Class<?> reactModuleInfoProviderClass;
     try {
-      reactModuleInfoProviderClass = Class.forName(
-          lazyReactPackage.getClass().getCanonicalName() + "$$ReactModuleInfoProvider");
+      reactModuleInfoProviderClass =
+          Class.forName(
+              lazyReactPackage.getClass().getCanonicalName() + "$$ReactModuleInfoProvider");
     } catch (ClassNotFoundException e) {
-      throw new RuntimeException(e);
+      // In OSS case, when the annotation processor does not run, we fall back to non-lazy mode
+      // For this, we simply return an empty moduleMap.
+      // NativeModuleRegistryBuilder will eagerly get all the modules, and get the info from the
+      // modules directly
+      return new ReactModuleInfoProvider() {
+        @Override
+        public Map<String, ReactModuleInfo> getReactModuleInfos() {
+          return Collections.emptyMap();
+        }
+      };
     }
 
     if (reactModuleInfoProviderClass == null) {
-      throw new RuntimeException("ReactModuleInfoProvider class for " +
-          lazyReactPackage.getClass().getCanonicalName() + " not found.");
+      throw new RuntimeException(
+          "ReactModuleInfoProvider class for "
+              + lazyReactPackage.getClass().getCanonicalName()
+              + " not found.");
     }
 
     try {
       return (ReactModuleInfoProvider) reactModuleInfoProviderClass.newInstance();
     } catch (InstantiationException e) {
       throw new RuntimeException(
-          "Unable to instantiate ReactModuleInfoProvider for " + lazyReactPackage.getClass(),
-          e);
+          "Unable to instantiate ReactModuleInfoProvider for " + lazyReactPackage.getClass(), e);
     } catch (IllegalAccessException e) {
       throw new RuntimeException(
-          "Unable to instantiate ReactModuleInfoProvider for " + lazyReactPackage.getClass(),
-          e);
+          "Unable to instantiate ReactModuleInfoProvider for " + lazyReactPackage.getClass(), e);
     }
   }
 
+  /**
+   * We return an iterable
+   *
+   * @param reactContext
+   * @return
+   */
+  /* package */
+  Iterable<ModuleHolder> getNativeModuleIterator(final ReactApplicationContext reactContext) {
+    final Map<String, ReactModuleInfo> reactModuleInfoMap =
+        getReactModuleInfoProvider().getReactModuleInfos();
+    final List<ModuleSpec> nativeModules = getNativeModules(reactContext);
+
+    return new Iterable<ModuleHolder>() {
+      @NonNull
+      @Override
+      public Iterator<ModuleHolder> iterator() {
+        return new Iterator<ModuleHolder>() {
+          int position = 0;
+
+          @Override
+          public ModuleHolder next() {
+            ModuleSpec moduleSpec = nativeModules.get(position++);
+            String name = moduleSpec.getName();
+            ReactModuleInfo reactModuleInfo = reactModuleInfoMap.get(name);
+            ModuleHolder moduleHolder;
+            if (reactModuleInfo == null) {
+              NativeModule module;
+              ReactMarker.logMarker(ReactMarkerConstants.CREATE_MODULE_START, name);
+              try {
+                module = moduleSpec.getProvider().get();
+              } finally {
+                ReactMarker.logMarker(ReactMarkerConstants.CREATE_MODULE_END);
+              }
+              moduleHolder = new ModuleHolder(module);
+            } else {
+              moduleHolder = new ModuleHolder(reactModuleInfo, moduleSpec.getProvider());
+            }
+            return moduleHolder;
+          }
+
+          @Override
+          public boolean hasNext() {
+            return position < nativeModules.size();
+          }
+
+          @Override
+          public void remove() {
+            throw new UnsupportedOperationException("Cannot remove native modules from the list");
+          }
+        };
+      }
+    };
+  }
+
   /**
    * @param reactContext react application context that can be used to create modules
    * @return list of module specs that can create the native modules
    */
-  public abstract List<ModuleSpec> getNativeModules(
-    ReactApplicationContext reactContext);
+  protected abstract List<ModuleSpec> getNativeModules(ReactApplicationContext reactContext);
 
+  /**
+   * This is only used when a LazyReactPackage is a part of {@link CompositeReactPackage} Once we
+   * deprecate {@link CompositeReactPackage}, this can be removed too
+   *
+   * @param reactContext react application context that can be used to create modules
+   * @return
+   */
   @Override
   public final List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
     List<NativeModule> modules = new ArrayList<>();
     for (ModuleSpec holder : getNativeModules(reactContext)) {
       NativeModule nativeModule;
       SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createNativeModule")
-        .arg("module", holder.getType())
-        .flush();
-      ReactMarker.logMarker(
-        ReactMarkerConstants.CREATE_MODULE_START,
-        holder.getType().getSimpleName());
+          .arg("module", holder.getType())
+          .flush();
+      ReactMarker.logMarker(ReactMarkerConstants.CREATE_MODULE_START, holder.getName());
       try {
         nativeModule = holder.getProvider().get();
       } finally {
@@ -85,7 +156,6 @@ public final List<NativeModule> createNativeModules(ReactApplicationContext reac
     }
     return modules;
   }
-
   /**
    * @param reactContext react application context that can be used to create View Managers.
    * @return list of module specs that can create the View Managers.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.java b/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.java
index 627b962f667517..209c21f5f0fb9c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java
index 85097e7a6036e3..3bb541bf8c036b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java
@@ -1,143 +1,65 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its 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 java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.facebook.common.logging.FLog;
-import com.facebook.react.bridge.BaseJavaModule;
-import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.ModuleHolder;
-import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.NativeModuleRegistry;
-import com.facebook.react.bridge.OnBatchCompleteListener;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactMarker;
-import com.facebook.react.bridge.ReactMarkerConstants;
-import com.facebook.react.common.ReactConstants;
-import com.facebook.react.module.model.ReactModuleInfo;
+import java.util.HashMap;
+import java.util.Map;
 
-/**
- * Helper class to build NativeModuleRegistry.
- */
+/** Helper class to build NativeModuleRegistry. */
 public class NativeModuleRegistryBuilder {
 
   private final ReactApplicationContext mReactApplicationContext;
   private final ReactInstanceManager mReactInstanceManager;
-  private final boolean mLazyNativeModulesEnabled;
 
-  private final Map<Class<? extends NativeModule>, ModuleHolder> mModules = new HashMap<>();
-  private final Map<String, Class<? extends NativeModule>> namesToType = new HashMap<>();
+  private final Map<String, ModuleHolder> mModules = new HashMap<>();
 
   public NativeModuleRegistryBuilder(
-    ReactApplicationContext reactApplicationContext,
-    ReactInstanceManager reactInstanceManager,
-    boolean lazyNativeModulesEnabled) {
+      ReactApplicationContext reactApplicationContext, ReactInstanceManager reactInstanceManager) {
     mReactApplicationContext = reactApplicationContext;
     mReactInstanceManager = reactInstanceManager;
-    mLazyNativeModulesEnabled = lazyNativeModulesEnabled;
   }
 
   public void processPackage(ReactPackage reactPackage) {
-    if (mLazyNativeModulesEnabled) {
-      if (!(reactPackage instanceof LazyReactPackage)) {
-        throw new IllegalStateException("Lazy native modules requires all ReactPackage to " +
-          "inherit from LazyReactPackage");
-      }
-
-      LazyReactPackage lazyReactPackage = (LazyReactPackage) reactPackage;
-      List<ModuleSpec> moduleSpecs = lazyReactPackage.getNativeModules(mReactApplicationContext);
-      Map<Class, ReactModuleInfo> reactModuleInfoMap = lazyReactPackage.getReactModuleInfoProvider()
-        .getReactModuleInfos();
-
-      for (ModuleSpec moduleSpec : moduleSpecs) {
-        Class<? extends NativeModule> type = moduleSpec.getType();
-        ReactModuleInfo reactModuleInfo = reactModuleInfoMap.get(type);
-        ModuleHolder moduleHolder;
-        if (reactModuleInfo == null) {
-          if (BaseJavaModule.class.isAssignableFrom(type)) {
-            throw new IllegalStateException("Native Java module " + type.getSimpleName() +
-              " should be annotated with @ReactModule and added to a @ReactModuleList.");
-          }
-          NativeModule module;
-          ReactMarker.logMarker(
-            ReactMarkerConstants.CREATE_MODULE_START,
-            moduleSpec.getType().getName());
-          try {
-            module = moduleSpec.getProvider().get();
-          } finally {
-            ReactMarker.logMarker(ReactMarkerConstants.CREATE_MODULE_END);
-          }
-          moduleHolder = new ModuleHolder(module);
-        } else {
-          moduleHolder = new ModuleHolder(reactModuleInfo, moduleSpec.getProvider());
-        }
-
-        String name = moduleHolder.getName();
-        putModuleTypeAndHolderToModuleMaps(type, name, moduleHolder);
-      }
+    // We use an iterable instead of an iterator here to ensure thread safety, and that this list
+    // cannot be modified
+    Iterable<ModuleHolder> moduleHolders;
+    if (reactPackage instanceof LazyReactPackage) {
+      moduleHolders =
+          ((LazyReactPackage) reactPackage).getNativeModuleIterator(mReactApplicationContext);
+    } else if (reactPackage instanceof TurboReactPackage) {
+      moduleHolders =
+          ((TurboReactPackage) reactPackage).getNativeModuleIterator(mReactApplicationContext);
     } else {
-      FLog.d(
-        ReactConstants.TAG,
-        reactPackage.getClass().getSimpleName() +
-          " is not a LazyReactPackage, falling back to old version.");
-      List<NativeModule> nativeModules;
-      if (reactPackage instanceof ReactInstancePackage) {
-        ReactInstancePackage reactInstancePackage = (ReactInstancePackage) reactPackage;
-        nativeModules = reactInstancePackage.createNativeModules(
-            mReactApplicationContext,
-            mReactInstanceManager);
-      } else {
-        nativeModules = reactPackage.createNativeModules(mReactApplicationContext);
-      }
-      for (NativeModule nativeModule : nativeModules) {
-        addNativeModule(nativeModule);
-      }
+      moduleHolders =
+          ReactPackageHelper.getNativeModuleIterator(
+              reactPackage, mReactApplicationContext, mReactInstanceManager);
     }
-  }
 
-  public void addNativeModule(NativeModule nativeModule) {
-    String name = nativeModule.getName();
-    Class<? extends NativeModule> type = nativeModule.getClass();
-    putModuleTypeAndHolderToModuleMaps(type, name, new ModuleHolder(nativeModule));
-  }
-
-  private void putModuleTypeAndHolderToModuleMaps(Class<? extends NativeModule> type, String underName,
-                                                  ModuleHolder moduleHolder) throws IllegalStateException {
-    if (namesToType.containsKey(underName)) {
-      Class<? extends NativeModule> existingNativeModule = namesToType.get(underName);
-      if (!moduleHolder.getCanOverrideExistingModule()) {
-        throw new IllegalStateException("Native module " + type.getSimpleName() +
-          " tried to override " + existingNativeModule.getSimpleName() + " for module name " +
-          underName + ". Check the getPackages() method in MainApplication.java, it might be " +
-          "that module is being created twice. " +
-          "If this was your intention, set canOverrideExistingModule=true");
+    for (ModuleHolder moduleHolder : moduleHolders) {
+      String name = moduleHolder.getName();
+      if (mModules.containsKey(name)) {
+        ModuleHolder existingNativeModule = mModules.get(name);
+        if (!moduleHolder.getCanOverrideExistingModule()) {
+          throw new IllegalStateException(
+              "Native module "
+                  + name
+                  + " tried to override "
+                  + existingNativeModule.getClassName()
+                  + " for module name .Check the getPackages() method in MainApplication.java, it might be that module is being created twice. If this was your intention, set canOverrideExistingModule=true");
+        }
+        mModules.remove(existingNativeModule);
       }
-
-      mModules.remove(existingNativeModule);
+      mModules.put(name, moduleHolder);
     }
-
-    namesToType.put(underName, type);
-    mModules.put(type, moduleHolder);
   }
 
   public NativeModuleRegistry build() {
-    ArrayList<ModuleHolder> batchCompleteListenerModules = new ArrayList<>();
-    for (Map.Entry<Class<? extends NativeModule>, ModuleHolder> entry : mModules.entrySet()) {
-      if (OnBatchCompleteListener.class.isAssignableFrom(entry.getKey())) {
-        batchCompleteListenerModules.add(entry.getValue());
-      }
-    }
-
-    return new NativeModuleRegistry(
-      mReactApplicationContext,
-      mModules,
-      batchCompleteListenerModules);
+    return new NativeModuleRegistry(mReactApplicationContext, mModules);
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
index bbe9cad4473816..788148db5c4030 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
index c0691c748db507..c18ccc473c08b6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -205,14 +205,14 @@ public void invoke(Object... args) {
     };
   }
 
-  private Context getContext() {
+  protected Context getContext() {
     if (mActivity != null) {
       return mActivity;
     }
     return Assertions.assertNotNull(mFragmentActivity);
   }
 
-  private Activity getPlainActivity() {
+  protected Activity getPlainActivity() {
     return ((Activity) getContext());
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java b/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java
index 8c3df938340e47..35bbf17ed012ab 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -25,20 +25,18 @@ public class ReactAndroidHWInputDeviceHelper {
    * Contains a mapping between handled KeyEvents and the corresponding navigation event
    * that should be fired when the KeyEvent is received.
    */
-  private static final Map<Integer, String> KEY_EVENTS_ACTIONS = MapBuilder.of(
-    KeyEvent.KEYCODE_DPAD_CENTER,
-    "select",
-    KeyEvent.KEYCODE_ENTER,
-    "select",
-    KeyEvent.KEYCODE_SPACE,
-    "select",
-    KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE,
-    "playPause",
-    KeyEvent.KEYCODE_MEDIA_REWIND,
-    "rewind",
-    KeyEvent.KEYCODE_MEDIA_FAST_FORWARD,
-    "fastForward"
-  );
+  private static final Map<Integer, String> KEY_EVENTS_ACTIONS = MapBuilder.<Integer, String>builder()
+    .put(KeyEvent.KEYCODE_DPAD_CENTER, "select")
+    .put(KeyEvent.KEYCODE_ENTER, "select")
+    .put(KeyEvent.KEYCODE_SPACE, "select")
+    .put(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, "playPause")
+    .put(KeyEvent.KEYCODE_MEDIA_REWIND, "rewind")
+    .put(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD, "fastForward")
+    .put(KeyEvent.KEYCODE_DPAD_UP, "up")
+    .put(KeyEvent.KEYCODE_DPAD_RIGHT, "right")
+    .put(KeyEvent.KEYCODE_DPAD_DOWN, "down")
+    .put(KeyEvent.KEYCODE_DPAD_LEFT, "left")
+    .build();
 
   /**
    * We keep a reference to the last focused view id
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java b/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java
index 88b7ab2093fc1b..0a63e0149ea45d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java b/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
index b104b91e4ef521..8676a88ff9c956 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 075ba03ea260c8..cf16006567187f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -25,6 +25,7 @@
 import static com.facebook.react.bridge.ReactMarkerConstants.REACT_CONTEXT_THREAD_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.SETUP_REACT_CONTEXT_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.SETUP_REACT_CONTEXT_START;
+import static com.facebook.react.bridge.ReactMarkerConstants.VM_INIT;
 import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_APPS;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
@@ -158,7 +159,6 @@ public interface ReactInstanceEventListener {
   private volatile Boolean mHasStartedDestroying = false;
   private final MemoryPressureRouter mMemoryPressureRouter;
   private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
-  private final boolean mLazyNativeModulesEnabled;
   private final @Nullable JSIModulePackage mJSIModulePackage;
   private List<ViewManager> mViewManagers;
 
@@ -202,7 +202,6 @@ public static ReactInstanceManagerBuilder builder() {
     LifecycleState initialLifecycleState,
     NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler,
     @Nullable RedBoxHandler redBoxHandler,
-    boolean lazyNativeModulesEnabled,
     boolean lazyViewManagersEnabled,
     @Nullable DevBundleDownloadListener devBundleDownloadListener,
     int minNumShakes,
@@ -222,6 +221,8 @@ public static ReactInstanceManagerBuilder builder() {
     mJSMainModulePath = jsMainModulePath;
     mPackages = new ArrayList<>();
     mUseDeveloperSupport = useDeveloperSupport;
+    Systrace.beginSection(
+        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.initDevSupportManager");
     mDevSupportManager =
         DevSupportManagerFactory.create(
             applicationContext,
@@ -232,11 +233,11 @@ public static ReactInstanceManagerBuilder builder() {
             devBundleDownloadListener,
             minNumShakes,
             customPackagerCommandHandlers);
+    Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
     mBridgeIdleDebugListener = bridgeIdleDebugListener;
     mLifecycleState = initialLifecycleState;
     mMemoryPressureRouter = new MemoryPressureRouter(applicationContext);
     mNativeModuleCallExceptionHandler = nativeModuleCallExceptionHandler;
-    mLazyNativeModulesEnabled = lazyNativeModulesEnabled;
     synchronized (mPackages) {
       PrinterHolder.getPrinter()
           .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: Use Split Packages");
@@ -353,9 +354,7 @@ private void recreateReactContextInBackgroundInner() {
         .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: recreateReactContextInBackground");
     UiThreadUtil.assertOnUiThread();
 
-    if (mUseDeveloperSupport
-        && mJSMainModulePath != null
-        && !Systrace.isTracing(TRACE_TAG_REACT_APPS | TRACE_TAG_REACT_JS_VM_CALLS)) {
+    if (mUseDeveloperSupport && mJSMainModulePath != null) {
       final DeveloperSettings devSettings = mDevSupportManager.getDevSettings();
 
       // If remote JS debugging is enabled, load from dev server.
@@ -364,30 +363,35 @@ private void recreateReactContextInBackgroundInner() {
         // If there is a up-to-date bundle downloaded from server,
         // with remote JS debugging disabled, always use that.
         onJSBundleLoadedFromServer(null);
-      } else if (mBundleLoader == null) {
-        mDevSupportManager.handleReloadJS();
-      } else {
-        mDevSupportManager.isPackagerRunning(
-            new PackagerStatusCallback() {
-              @Override
-              public void onPackagerStatusFetched(final boolean packagerIsRunning) {
-                UiThreadUtil.runOnUiThread(
-                    new Runnable() {
-                      @Override
-                      public void run() {
-                        if (packagerIsRunning) {
-                          mDevSupportManager.handleReloadJS();
-                        } else {
-                          // If dev server is down, disable the remote JS debugging.
-                          devSettings.setRemoteJSDebugEnabled(false);
-                          recreateReactContextInBackgroundFromBundleLoader();
+        return;
+      }
+
+      if (!Systrace.isTracing(TRACE_TAG_REACT_APPS | TRACE_TAG_REACT_JS_VM_CALLS)) {
+        if (mBundleLoader == null) {
+          mDevSupportManager.handleReloadJS();
+        } else {
+          mDevSupportManager.isPackagerRunning(
+              new PackagerStatusCallback() {
+                @Override
+                public void onPackagerStatusFetched(final boolean packagerIsRunning) {
+                  UiThreadUtil.runOnUiThread(
+                      new Runnable() {
+                        @Override
+                        public void run() {
+                          if (packagerIsRunning) {
+                            mDevSupportManager.handleReloadJS();
+                          } else {
+                            // If dev server is down, disable the remote JS debugging.
+                            devSettings.setRemoteJSDebugEnabled(false);
+                            recreateReactContextInBackgroundFromBundleLoader();
+                          }
                         }
-                      }
-                    });
-              }
-            });
+                      });
+                }
+              });
+        }
+        return;
       }
-      return;
     }
 
     recreateReactContextInBackgroundFromBundleLoader();
@@ -454,7 +458,6 @@ public void onNewIntent(Intent intent) {
           currentContext.getNativeModule(DeviceEventManagerModule.class);
         deviceEventManagerModule.emitNewIntentReceived(uri);
       }
-
       currentContext.onNewIntent(mCurrentActivity, intent);
     }
   }
@@ -720,7 +723,7 @@ public void attachRootView(ReactRootView rootView) {
     // automatically when creation completes, as root view is part of the attached root view list.
     ReactContext currentContext = getCurrentReactContext();
     if (mCreateReactContextThread == null && currentContext != null) {
-      attachRootViewToInstance(rootView, currentContext.getCatalystInstance());
+      attachRootViewToInstance(rootView);
     }
   }
 
@@ -791,6 +794,7 @@ public List<ViewManager> getOrCreateViewManagers(
   }
 
   public @Nullable List<String> getViewManagerNames() {
+    Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.getViewManagerNames");
     ReactApplicationContext context;
     synchronized(mReactContextLock) {
       context = (ReactApplicationContext) getCurrentReactContext();
@@ -802,15 +806,19 @@ public List<ViewManager> getOrCreateViewManagers(
     synchronized (mPackages) {
       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) {
           List<String> names =
-              ((ViewManagerOnDemandReactPackage) reactPackage)
-                  .getViewManagerNames(context);
+              ((ViewManagerOnDemandReactPackage) reactPackage).getViewManagerNames(context);
           if (names != null) {
             uniqueNames.addAll(names);
           }
         }
+        SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
       }
+      Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
       return new ArrayList<>(uniqueNames);
     }
   }
@@ -840,6 +848,10 @@ public LifecycleState getLifecycleState() {
     return mLifecycleState;
   }
 
+  public String getJsExecutorName() {
+    return mJavaScriptExecutorFactory.toString();
+  }
+
   @ThreadConfined(UI)
   private void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.onReloadWithJSDebugger()");
@@ -894,6 +906,7 @@ private void runCreateReactContextOnNewThread(final ReactContextInitParams initP
 
     mCreateReactContextThread =
         new Thread(
+            null,
             new Runnable() {
               @Override
               public void run() {
@@ -912,6 +925,7 @@ public void run() {
 
                 try {
                   Process.setThreadPriority(Process.THREAD_PRIORITY_DISPLAY);
+                  ReactMarker.logMarker(VM_INIT);
                   final ReactApplicationContext reactApplicationContext =
                       createReactContext(
                           initParams.getJsExecutorFactory().create(),
@@ -947,7 +961,8 @@ public void run() {
                   mDevSupportManager.handleException(e);
                 }
               }
-            });
+            },
+            "create_react_context");
     ReactMarker.logMarker(REACT_CONTEXT_THREAD_START);
     mCreateReactContextThread.start();
   }
@@ -971,7 +986,7 @@ private void setupReactContext(final ReactApplicationContext reactContext) {
     ReactMarker.logMarker(ATTACH_MEASURED_ROOT_VIEWS_START);
     synchronized (mAttachedRootViews) {
       for (ReactRootView rootView : mAttachedRootViews) {
-        attachRootViewToInstance(rootView, catalystInstance);
+        attachRootViewToInstance(rootView);
       }
     }
     ReactMarker.logMarker(ATTACH_MEASURED_ROOT_VIEWS_END);
@@ -1009,11 +1024,11 @@ public void run() {
   }
 
   private void attachRootViewToInstance(
-      final ReactRootView rootView,
-      CatalystInstance catalystInstance) {
+      final ReactRootView rootView) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.attachRootViewToInstance()");
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "attachRootViewToInstance");
     UIManager uiManagerModule = UIManagerHelper.getUIManager(mCurrentReactContext, rootView.getUIManagerType());
+
     final int rootTag = uiManagerModule.addRootView(rootView);
     rootView.setRootViewTag(rootTag);
     rootView.runApplication();
@@ -1058,7 +1073,11 @@ private void tearDownReactContext(ReactContext reactContext) {
 
     synchronized (mAttachedRootViews) {
       for (ReactRootView rootView : mAttachedRootViews) {
-        rootView.removeAllViews();
+        if (rootView.getUIManagerType() != FABRIC) {
+          // All the views created in surfaces that are managed by Fabric, are removed and deleted
+          // by the Mounting Layer.
+          rootView.removeAllViews();
+        }
         rootView.setId(View.NO_ID);
       }
     }
@@ -1114,9 +1133,13 @@ private ReactApplicationContext createReactContext(
       catalystInstance.setGlobalVariable("__RCTProfileIsProfiling", "true");
     }
     ReactMarker.logMarker(ReactMarkerConstants.PRE_RUN_JS_BUNDLE_START);
+    Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "runJSBundle");
     catalystInstance.runJSBundle();
+    Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+
     reactContext.initializeWithInstance(catalystInstance);
 
+
     return reactContext;
   }
 
@@ -1126,8 +1149,7 @@ private NativeModuleRegistry processPackages(
     boolean checkAndUpdatePackageMembership) {
     NativeModuleRegistryBuilder nativeModuleRegistryBuilder = new NativeModuleRegistryBuilder(
       reactContext,
-      this,
-      mLazyNativeModulesEnabled);
+      this);
 
     ReactMarker.logMarker(PROCESS_PACKAGES_START);
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
index 42a4a7476a4198..9c458612ad3dd9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -11,7 +11,6 @@
 import android.app.Application;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JSBundleLoader;
-import com.facebook.react.bridge.JSCJavaScriptExecutorFactory;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
@@ -20,6 +19,7 @@
 import com.facebook.react.devsupport.RedBoxHandler;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
+import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.packagerconnection.RequestHandler;
 import java.util.ArrayList;
@@ -45,7 +45,6 @@ public class ReactInstanceManagerBuilder {
   private @Nullable Activity mCurrentActivity;
   private @Nullable DefaultHardwareBackBtnHandler mDefaultHardwareBackBtnHandler;
   private @Nullable RedBoxHandler mRedBoxHandler;
-  private boolean mLazyNativeModulesEnabled;
   private boolean mLazyViewManagersEnabled;
   private @Nullable DevBundleDownloadListener mDevBundleDownloadListener;
   private @Nullable JavaScriptExecutorFactory mJavaScriptExecutorFactory;
@@ -192,11 +191,6 @@ public ReactInstanceManagerBuilder setRedBoxHandler(@Nullable RedBoxHandler redB
     return this;
   }
 
-  public ReactInstanceManagerBuilder setLazyNativeModulesEnabled(boolean lazyNativeModulesEnabled) {
-    mLazyNativeModulesEnabled = lazyNativeModulesEnabled;
-    return this;
-  }
-
   public ReactInstanceManagerBuilder setLazyViewManagersEnabled(boolean lazyViewManagersEnabled) {
     mLazyViewManagersEnabled = lazyViewManagersEnabled;
     return this;
@@ -257,7 +251,7 @@ public ReactInstanceManager build() {
         mCurrentActivity,
         mDefaultHardwareBackBtnHandler,
         mJavaScriptExecutorFactory == null
-            ? new JSCJavaScriptExecutorFactory(appName, deviceName)
+            ? new JSCExecutorFactory(appName, deviceName)
             : mJavaScriptExecutorFactory,
         (mJSBundleLoader == null && mJSBundleAssetUrl != null)
             ? JSBundleLoader.createAssetLoader(
@@ -270,7 +264,6 @@ public ReactInstanceManager build() {
         Assertions.assertNotNull(mInitialLifecycleState, "Initial lifecycle state was not set"),
         mNativeModuleCallExceptionHandler,
         mRedBoxHandler,
-        mLazyNativeModulesEnabled,
         mLazyViewManagersEnabled,
         mDevBundleDownloadListener,
         mMinNumShakes,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java
index 03e872ae79da8b..3095ff155bf2d3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -18,7 +18,9 @@
  * the instance manager for more information, like {@link DevSupportManager}.
  *
  * TODO(t11394819): Consolidate this with LazyReactPackage
+ * Use {@link ReactPackage} or {@link LazyReactPackage} and inject reactInstanceManager as a part of when plugins are initialized.
  */
+@Deprecated
 public abstract class ReactInstancePackage implements ReactPackage {
 
   public abstract List<NativeModule> createNativeModules(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
index b408d9e2ebafed..f4e2d1fe933db5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java
index 51828a144a249a..0dd952216a8c09 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,13 +7,11 @@
 
 package com.facebook.react;
 
-import java.util.List;
-
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
+import java.util.List;
 
 /**
  * Main interface for providing additional capabilities to the catalyst framework by couple of
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.java b/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.java
new file mode 100644
index 00000000000000..83630844bac243
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.java
@@ -0,0 +1,62 @@
+package com.facebook.react;
+
+import android.support.annotation.NonNull;
+import com.facebook.common.logging.FLog;
+import com.facebook.react.bridge.ModuleHolder;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.common.ReactConstants;
+import java.util.Iterator;
+import java.util.List;
+
+public class ReactPackageHelper {
+  /**
+   * A helper method to iterate over a list of Native Modules and convert them to an iterable.
+   *
+   * @param reactPackage
+   * @param reactApplicationContext
+   * @param reactInstanceManager
+   * @return
+   */
+  public static Iterable<ModuleHolder> getNativeModuleIterator(
+      ReactPackage reactPackage,
+      ReactApplicationContext reactApplicationContext,
+      ReactInstanceManager reactInstanceManager) {
+    FLog.d(
+        ReactConstants.TAG,
+        reactPackage.getClass().getSimpleName()
+            + " is not a LazyReactPackage, falling back to old version.");
+    final List<NativeModule> nativeModules;
+    if (reactPackage instanceof ReactInstancePackage) {
+      ReactInstancePackage reactInstancePackage = (ReactInstancePackage) reactPackage;
+      nativeModules =
+          reactInstancePackage.createNativeModules(reactApplicationContext, reactInstanceManager);
+    } else {
+      nativeModules = reactPackage.createNativeModules(reactApplicationContext);
+    }
+    return new Iterable<ModuleHolder>() {
+      @NonNull
+      @Override
+      public Iterator<ModuleHolder> iterator() {
+        return new Iterator<ModuleHolder>() {
+          int position = 0;
+
+          @Override
+          public ModuleHolder next() {
+            return new ModuleHolder(nativeModules.get(position++));
+          }
+
+          @Override
+          public boolean hasNext() {
+            return position < nativeModules.size();
+          }
+
+          @Override
+          public void remove() {
+            throw new UnsupportedOperationException("Cannot remove methods ");
+          }
+        };
+      }
+    };
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactPackageLogger.java b/ReactAndroid/src/main/java/com/facebook/react/ReactPackageLogger.java
index eba45f3be229f3..38b2f2bddb65df 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactPackageLogger.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactPackageLogger.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index 6e8a92f603683c..4178ba21a94ca5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -48,6 +48,7 @@
 import com.facebook.react.uimanager.RootView;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.common.MeasureSpecProvider;
 import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.common.UIManagerType;
@@ -97,14 +98,21 @@ public interface ReactRootViewEventListener {
 
   public ReactRootView(Context context) {
     super(context);
+    init();
   }
 
   public ReactRootView(Context context, AttributeSet attrs) {
     super(context, attrs);
+    init();
   }
 
   public ReactRootView(Context context, AttributeSet attrs, int defStyle) {
     super(context, attrs, defStyle);
+    init();
+  }
+
+  private void init() {
+    setClipChildren(false);
   }
 
   @Override
@@ -398,16 +406,10 @@ private void updateRootLayoutSpecs(final int widthMeasureSpec, final int heightM
       return;
     }
     final ReactContext reactApplicationContext = mReactInstanceManager.getCurrentReactContext();
+
     if (reactApplicationContext != null) {
-      reactApplicationContext.runOnNativeModulesQueueThread(
-          new GuardedRunnable(reactApplicationContext) {
-            @Override
-            public void runGuarded() {
-              UIManagerHelper
-                .getUIManager(reactApplicationContext, getUIManagerType())
-                .updateRootLayoutSpecs(getRootViewTag(), widthMeasureSpec, heightMeasureSpec);
-            }
-          });
+      UIManagerHelper.getUIManager(reactApplicationContext, getUIManagerType())
+        .updateRootLayoutSpecs(getRootViewTag(), widthMeasureSpec, heightMeasureSpec);
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java
new file mode 100644
index 00000000000000..a55e473af53e87
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java
@@ -0,0 +1,119 @@
+package com.facebook.react;
+
+import android.support.annotation.NonNull;
+import com.facebook.react.bridge.ModuleHolder;
+import com.facebook.react.bridge.ModuleSpec;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.uimanager.ViewManager;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.inject.Provider;
+
+/** This will eventually replace {@link LazyReactPackage} when TurboModules are finally done. */
+public abstract class TurboReactPackage implements ReactPackage {
+
+  @Override
+  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+    throw new UnsupportedOperationException(
+        "In case of TurboModules, createNativeModules is not supported. NativeModuleRegistry should instead use getModuleList or getModule method");
+  }
+
+  /**
+   * The API needed for TurboModules. Given a module name, it returns an instance of {@link
+   * NativeModule} for the name
+   *
+   * @param name
+   * @param reactContext
+   * @return
+   */
+  public abstract NativeModule getModule(String name, final ReactApplicationContext reactContext);
+
+  /**
+   * This is a temporary method till we implement TurboModules. Once we implement TurboModules, we
+   * will be able to directly call {@link TurboReactPackage#getModule(String,
+   * ReactApplicationContext)} This method will be removed when TurboModule implementation is
+   * complete
+   *
+   * @param reactContext
+   * @return
+   */
+  public Iterable<ModuleHolder> getNativeModuleIterator(
+      final ReactApplicationContext reactContext) {
+    final Set<Map.Entry<String, ReactModuleInfo>> entrySet =
+        getReactModuleInfoProvider().getReactModuleInfos().entrySet();
+    final Iterator<Map.Entry<String, ReactModuleInfo>> entrySetIterator = entrySet.iterator();
+    return new Iterable<ModuleHolder>() {
+      @NonNull
+      @Override
+      // This should ideally be an IteratorConvertor, but we don't have any internal library for it
+      public Iterator<ModuleHolder> iterator() {
+        return new Iterator<ModuleHolder>() {
+          @Override
+          public boolean hasNext() {
+            return entrySetIterator.hasNext();
+          }
+
+          @Override
+          public ModuleHolder next() {
+            Map.Entry<String, ReactModuleInfo> entry = entrySetIterator.next();
+            String name = entry.getKey();
+            ReactModuleInfo reactModuleInfo = entry.getValue();
+            return new ModuleHolder(reactModuleInfo, new ModuleHolderProvider(name, reactContext));
+          }
+
+          @Override
+          public void remove() {
+            throw new UnsupportedOperationException("Cannot remove native modules from the list");
+          }
+        };
+      }
+    };
+  }
+
+  /**
+   * @param reactContext react application context that can be used to create View Managers.
+   * @return list of module specs that can create the View Managers.
+   */
+  protected List<ModuleSpec> getViewManagers(ReactApplicationContext reactContext) {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+    List<ModuleSpec> viewManagerModuleSpecs = getViewManagers(reactContext);
+    if (viewManagerModuleSpecs == null || viewManagerModuleSpecs.isEmpty()) {
+      return Collections.emptyList();
+    }
+
+    List<ViewManager> viewManagers = new ArrayList<>();
+    for (ModuleSpec moduleSpec : viewManagerModuleSpecs) {
+      viewManagers.add((ViewManager) moduleSpec.getProvider().get());
+    }
+    return viewManagers;
+  }
+
+  public abstract ReactModuleInfoProvider getReactModuleInfoProvider();
+
+  private class ModuleHolderProvider implements Provider<NativeModule> {
+
+    private final String mName;
+    private final ReactApplicationContext mReactContext;
+
+    public ModuleHolderProvider(String name, ReactApplicationContext reactContext) {
+      mName = name;
+      mReactContext = reactContext;
+    }
+
+    @Override
+    public NativeModule get() {
+      return getModule(mName, mReactContext);
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java
index c28f91f60ee859..c8bd730bb0c839 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java
index 5b2640f60049cd..221ba9e5363292 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java
index beaa02926368ce..c4493b59b90099 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java
index 09dbb65bc34bfc..6c92345f11b728 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
index 079a07add26733..894a6d557f16bc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
index 245797afcd291e..406ef5c79a1153 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "animated",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
index 1547633a386585..1781cb83875fff 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java
index 8f812a4b8143e7..7f077a6610c5cf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java
index 8dc720e72ce924..96e96059e885d4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 e0a1b0d1234037..7e2c46eef26c88 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
index f8fca1f9d22921..84551c418d473e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -41,7 +41,7 @@ public void resetConfig(ReadableMap config) {
     for (int i = 0; i < numberOfFrames; i++) {
       mFrames[i] = frames.getDouble(i);
     }
-    mToValue = config.getDouble("toValue");
+    mToValue = config.hasKey("toValue") ? config.getDouble("toValue") : 0;
     mIterations = config.hasKey("iterations") ? config.getInt("iterations") : 1;
     mCurrentLoop = 1;
     mHasFinished = mIterations == 0;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java
index b1a138e2b54f48..0b91c37814b56b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java
index d942d757459914..6d90a82729405d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java
index ae1a4d7b850760..23839c5c221876 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 de29f0383455f7..406ee41c72fcc5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 07357fd7eea998..41d2746e0774dc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java
index 813d72b075e6b0..d59a05aa953361 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java
index 0b77e1f043fca5..0a46c31facd05a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/SubtractionAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/SubtractionAnimatedNode.java
index 4a8ecd8ce736a7..ac29638a2d3c73 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/SubtractionAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/SubtractionAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java
index a339780dfdb60f..76108b548a3ddc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java
index d5f7f79b8efddd..9288c25d6bfd0a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java
index a28511b481b76f..49426c77ebb237 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java
index e29a94a2e46225..b086f8fdcc91f9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java
index 2ef6befadbb964..cfa24177eca220 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java b/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java
index 670db11335181f..af29fdeaae0918 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java
index ed192daeef3a9b..bc4b9e2916858d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java
index 3f0a8d1a37c101..b815210be58018 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java
index 4df661c8be1c92..58b9518801cc8a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animation/BUCK
index 0fa55d8134c0c9..1c2781c23b47b6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "animation",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java
index dff3fa06d497a5..4949d68dfe20b1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java
index 7a94de2ddf5da9..04a5ee9ee4b149 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java
index e53aa8227cf678..7ca1af8a30a6df 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java
index ab3678ff0e9310..9d2e9737106c46 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java
index e089fdec658bf0..772fa09a236f99 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java
index de4167972a66ed..dd8bb4c24c458f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java
index 996e95d68f7149..779527b1a86159 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java
index 533d6717f2efa2..e3bf36cfb6c087 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java
index 6642260e68b392..f4b6f51f933fbd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
index 1979edaa880c6e..0fd9e82a271373 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java
index 651ec03a927497..e225b718dd3a0e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
index d473c9cf2107a0..f76357ec486ca7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
@@ -1,8 +1,24 @@
-load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "react_native_dep", "react_native_target", "rn_android_library")
+
+INTERFACES = [
+    "Dynamic.java",
+    "ReadableMap.java",
+    "ReadableMapKeySetIterator.java",
+    "WritableArray.java",
+    "WritableMap.java",
+    "NativeModule.java",
+    "JSInstance.java",
+    "ReadableArray.java",
+    "ReadableType.java",
+    "NativeArrayInterface.java",
+]
 
 rn_android_library(
     name = "bridge",
-    srcs = glob(["**/*.java"]),
+    srcs = glob(
+        ["**/*.java"],
+        exclude = INTERFACES,
+    ),
     proguard_config = "reactnative.pro",
     provided_deps = [
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
@@ -12,6 +28,7 @@ rn_android_library(
         "PUBLIC",
     ],
     deps = [
+        react_native_dep("third-party/android/support-annotations:android-support-annotations"),
         react_native_dep("java/com/facebook/debug/debugoverlay/model:model"),
         react_native_dep("java/com/facebook/systrace:systrace"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
@@ -21,12 +38,37 @@ 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/common:common"),
+        react_native_target("java/com/facebook/react/config:config"),
         react_native_target("java/com/facebook/react/module/model:model"),
         react_native_target("java/com/facebook/react/uimanager/common:common"),
+        react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ] + ([react_native_target("jni/react/jni:jni")] if not IS_OSS_BUILD else []),
     exported_deps = [
         react_native_dep("java/com/facebook/jni:jni"),
         react_native_dep("java/com/facebook/proguard/annotations:annotations"),
         react_native_dep("third-party/java/jsr-330:jsr-330"),
+        react_native_target("java/com/facebook/react/bridge:interfaces"),
+    ],
+)
+
+rn_android_library(
+    name = "interfaces",
+    srcs = glob(INTERFACES),
+    proguard_config = "reactnative.pro",
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
+    required_for_source_only_abi = True,
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        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/debug/tags:tags"),
+    ],
+    exported_deps = [
+        react_native_dep("java/com/facebook/proguard/annotations:annotations"),
+        react_native_dep("third-party/java/jsr-330:jsr-330"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java
index 2e9b492e1d592e..d7369ad1932c4a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
index 694428509b1a06..04ca7a91c74969 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java
index 1a7810d6f97b11..26cb5b4c483ff4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
index e1d28cfb8500e2..9bef1b06189028 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
index c58e1afe09eb68..50aff5fcb4de35 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -38,7 +38,7 @@ public interface CatalystInstance
   @Override @DoNotStrip
   void invokeCallback(
       int callbackID,
-      NativeArray arguments);
+      NativeArrayInterface arguments);
   @DoNotStrip
   void callFunction(
       String module,
@@ -63,6 +63,7 @@ void callFunction(
   <T extends JavaScriptModule> T getJSModule(Class<T> jsInterface);
   <T extends NativeModule> boolean hasNativeModule(Class<T> nativeModuleInterface);
   <T extends NativeModule> T getNativeModule(Class<T> nativeModuleInterface);
+  NativeModule getNativeModule(String moduleName);
   <T extends JSIModule> T getJSIModule(Class<T> jsiModuleInterface);
   Collection<NativeModule> getNativeModules();
 
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 71c6f25baa10c3..b0cf871adcfc14 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,8 @@
 
 package com.facebook.react.bridge;
 
+import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
+
 import android.content.res.AssetManager;
 import android.os.AsyncTask;
 import android.util.Log;
@@ -21,8 +23,11 @@
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.TraceListener;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Native;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -102,6 +107,8 @@ private CatalystInstanceImpl(
       final JSBundleLoader jsBundleLoader,
       NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler) {
     Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge.");
+    Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createCatalystInstanceImpl");
+
     mHybridData = initHybrid();
 
     mReactQueueConfiguration = ReactQueueConfigurationImpl.create(
@@ -114,8 +121,10 @@ private CatalystInstanceImpl(
     mNativeModuleCallExceptionHandler = nativeModuleCallExceptionHandler;
     mNativeModulesQueueThread = mReactQueueConfiguration.getNativeModulesQueueThread();
     mTraceListener = new JSProfilerTraceListener(this);
+    Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
 
     Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
+    Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "initializeCxxBridge");
     initializeBridge(
       new BridgeCallback(this),
       jsExecutor,
@@ -124,6 +133,7 @@ private CatalystInstanceImpl(
       mNativeModuleRegistry.getJavaModules(this),
       mNativeModuleRegistry.getCxxModules());
     Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
+    Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
 
     mJavaScriptContextHolder = new JavaScriptContextHolder(getJavaScriptContext());
   }
@@ -306,13 +316,13 @@ public void callFunction(PendingJSCall function) {
   private native void jniCallJSCallback(int callbackID, NativeArray arguments);
 
   @Override
-  public void invokeCallback(final int callbackID, final NativeArray arguments) {
+  public void invokeCallback(final int callbackID, final NativeArrayInterface arguments) {
     if (mDestroyed) {
       FLog.w(ReactConstants.TAG, "Invoking JS callback after bridge has been destroyed.");
       return;
     }
 
-    jniCallJSCallback(callbackID, arguments);
+    jniCallJSCallback(callbackID, (NativeArray) arguments);
   }
 
   /**
@@ -415,13 +425,25 @@ public <T extends JavaScriptModule> T getJSModule(Class<T> jsInterface) {
 
   @Override
   public <T extends NativeModule> boolean hasNativeModule(Class<T> nativeModuleInterface) {
-    return mNativeModuleRegistry.hasModule(nativeModuleInterface);
+    return mNativeModuleRegistry.hasModule(getNameFromAnnotation(nativeModuleInterface));
   }
 
-  // This is only ever called with UIManagerModule or CurrentViewerModule.
   @Override
   public <T extends NativeModule> T getNativeModule(Class<T> nativeModuleInterface) {
-    return mNativeModuleRegistry.getModule(nativeModuleInterface);
+    return (T) mNativeModuleRegistry.getModule(getNameFromAnnotation(nativeModuleInterface));
+  }
+
+  @Override
+  public NativeModule getNativeModule(String moduleName) {
+    return mNativeModuleRegistry.getModule(moduleName);
+  }
+
+  private <T extends NativeModule> String getNameFromAnnotation(Class<T> nativeModuleInterface){
+    ReactModule annotation = nativeModuleInterface.getAnnotation(ReactModule.class);
+    if (annotation == null) {
+      throw new IllegalArgumentException("Could not find @ReactModule annotation in " + nativeModuleInterface.getCanonicalName());
+    }
+    return annotation.name();
   }
 
   // This is only used by com.facebook.react.modules.common.ModuleDataCleaner
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java
index ff5340631a214f..fc68cb84bff0fc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxCallbackImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxCallbackImpl.java
index 8d33451f4268ac..839da9a704b214 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxCallbackImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxCallbackImpl.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapper.java
index b270579443a301..a60704ecb42665 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapper.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java
index 6b3a9346cf0c51..1fa8e97019fa37 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java
index c730a5de7548e9..0204a14e873bc5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java
index feeab03bb228f1..67f414ddff6341 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java
index 6c107feeaa50a6..77a1bc9a42826d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java
index 4d268ea8614ccc..0d9f9a3a2a588d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,13 +9,18 @@
 
 import javax.annotation.Nullable;
 
-import android.support.v4.util.Pools;
+import android.support.v4.util.Pools.SimplePool;
 
 /**
  * Implementation of Dynamic wrapping a ReadableMap.
  */
 public class DynamicFromMap implements Dynamic {
-  private static final Pools.SimplePool<DynamicFromMap> sPool = new Pools.SimplePool<>(10);
+  private static final ThreadLocal<SimplePool<DynamicFromMap>> sPool = new ThreadLocal<SimplePool<DynamicFromMap>>() {
+    @Override
+    protected SimplePool<DynamicFromMap> initialValue() {
+      return new SimplePool<>(10);
+    }
+  };
 
   private @Nullable ReadableMap mMap;
   private @Nullable String mName;
@@ -24,7 +29,7 @@ public class DynamicFromMap implements Dynamic {
   private DynamicFromMap() {}
 
   public static DynamicFromMap create(ReadableMap map, String name) {
-    DynamicFromMap dynamic = sPool.acquire();
+    DynamicFromMap dynamic = sPool.get().acquire();
     if (dynamic == null) {
       dynamic = new DynamicFromMap();
     }
@@ -37,7 +42,7 @@ public static DynamicFromMap create(ReadableMap map, String name) {
   public void recycle() {
     mMap = null;
     mName = null;
-    sPool.release(this);
+    sPool.get().release(this);
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java
index 816c3d6c3b1dfc..93f14f1f4e28bc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java
index 749d6555338efc..9b81961efee12c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedResultAsyncTask.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedResultAsyncTask.java
index 0145c26dfc2aac..df0d857186b545 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedResultAsyncTask.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedResultAsyncTask.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedRunnable.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedRunnable.java
index e69bc052e5f61c..b550cbaeade5b5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedRunnable.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedRunnable.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
index 8cac1350640238..44ef6b7b826f03 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -86,7 +86,9 @@ private Page(int id, String title, String vm) {
 
   @DoNotStrip
   public interface RemoteConnection {
+    @DoNotStrip
     void onMessage(String message);
+    @DoNotStrip
     void onDisconnect();
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java
index e57fe494f18001..c13de24f45bbb7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java
index 7c6d5faa893af5..078b042e7b6e4d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java
index 70716b269a4759..365ac08bd19cfb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java
index c62b1675aa0fa3..44164e32eeb06d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java
index ead9806f50960b..08e6ca3ad442c5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java
index 5e360808c03d6e..7fe2f16403c380 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -24,4 +24,9 @@ public JavaScriptExecutor create() throws Exception {
     jscConfig.putString("DeviceIdentity", mDeviceName);
     return new JSCJavaScriptExecutor(jscConfig);
   }
+
+  @Override
+  public String toString() {
+    return "JSCExecutor";
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java
index fb1333680e1241..a20ee7089b28de 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -15,7 +15,7 @@
 public interface JSInstance {
   void invokeCallback(
       int callbackID,
-      NativeArray arguments);
+      NativeArrayInterface arguments);
   // TODO if this interface survives refactoring, think about adding
   // callFunction.
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java
index 801b550a8c1569..4f6c057631ecda 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java
index e0490c10a8bb12..3a8bfcda2eed74 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -26,14 +26,14 @@ public int getJSArgumentsNeeded() {
     }
 
     public abstract @Nullable T extractArgument(
-      JSInstance jsInstance, ReadableNativeArray jsArguments, int atIndex);
+      JSInstance jsInstance, ReadableArray jsArguments, int atIndex);
   }
 
   static final private ArgumentExtractor<Boolean> ARGUMENT_EXTRACTOR_BOOLEAN =
     new ArgumentExtractor<Boolean>() {
       @Override
       public Boolean extractArgument(
-        JSInstance jsInstance, ReadableNativeArray jsArguments, int atIndex) {
+        JSInstance jsInstance, ReadableArray jsArguments, int atIndex) {
         return jsArguments.getBoolean(atIndex);
       }
     };
@@ -42,7 +42,7 @@ public Boolean extractArgument(
     new ArgumentExtractor<Double>() {
       @Override
       public Double extractArgument(
-        JSInstance jsInstance, ReadableNativeArray jsArguments, int atIndex) {
+        JSInstance jsInstance, ReadableArray jsArguments, int atIndex) {
         return jsArguments.getDouble(atIndex);
       }
     };
@@ -51,7 +51,7 @@ public Double extractArgument(
     new ArgumentExtractor<Float>() {
       @Override
       public Float extractArgument(
-        JSInstance jsInstance, ReadableNativeArray jsArguments, int atIndex) {
+        JSInstance jsInstance, ReadableArray jsArguments, int atIndex) {
         return (float) jsArguments.getDouble(atIndex);
       }
     };
@@ -60,7 +60,7 @@ public Float extractArgument(
     new ArgumentExtractor<Integer>() {
       @Override
       public Integer extractArgument(
-        JSInstance jsInstance, ReadableNativeArray jsArguments, int atIndex) {
+        JSInstance jsInstance, ReadableArray jsArguments, int atIndex) {
         return (int) jsArguments.getDouble(atIndex);
       }
     };
@@ -69,16 +69,16 @@ public Integer extractArgument(
     new ArgumentExtractor<String>() {
       @Override
       public String extractArgument(
-        JSInstance jsInstance, ReadableNativeArray jsArguments, int atIndex) {
+        JSInstance jsInstance, ReadableArray jsArguments, int atIndex) {
         return jsArguments.getString(atIndex);
       }
     };
 
-  static final private ArgumentExtractor<ReadableNativeArray> ARGUMENT_EXTRACTOR_ARRAY =
-    new ArgumentExtractor<ReadableNativeArray>() {
+  static final private ArgumentExtractor<ReadableArray> ARGUMENT_EXTRACTOR_ARRAY =
+    new ArgumentExtractor<ReadableArray>() {
       @Override
-      public ReadableNativeArray extractArgument(
-        JSInstance jsInstance, ReadableNativeArray jsArguments, int atIndex) {
+      public ReadableArray extractArgument(
+        JSInstance jsInstance, ReadableArray jsArguments, int atIndex) {
         return jsArguments.getArray(atIndex);
       }
     };
@@ -87,7 +87,7 @@ public ReadableNativeArray extractArgument(
     new ArgumentExtractor<Dynamic>() {
       @Override
       public Dynamic extractArgument(
-        JSInstance jsInstance, ReadableNativeArray jsArguments, int atIndex) {
+        JSInstance jsInstance, ReadableArray jsArguments, int atIndex) {
         return DynamicFromArray.create(jsArguments, atIndex);
       }
     };
@@ -96,7 +96,7 @@ public Dynamic extractArgument(
     new ArgumentExtractor<ReadableMap>() {
       @Override
       public ReadableMap extractArgument(
-        JSInstance jsInstance, ReadableNativeArray jsArguments, int atIndex) {
+        JSInstance jsInstance, ReadableArray jsArguments, int atIndex) {
         return jsArguments.getMap(atIndex);
       }
     };
@@ -105,7 +105,7 @@ public ReadableMap extractArgument(
     new ArgumentExtractor<Callback>() {
       @Override
       public @Nullable Callback extractArgument(
-        JSInstance jsInstance, ReadableNativeArray jsArguments, int atIndex) {
+        JSInstance jsInstance, ReadableArray jsArguments, int atIndex) {
         if (jsArguments.isNull(atIndex)) {
           return null;
         } else {
@@ -124,7 +124,7 @@ public int getJSArgumentsNeeded() {
 
       @Override
       public Promise extractArgument(
-        JSInstance jsInstance, ReadableNativeArray jsArguments, int atIndex) {
+        JSInstance jsInstance, ReadableArray jsArguments, int atIndex) {
         Callback resolve = ARGUMENT_EXTRACTOR_CALLBACK
           .extractArgument(jsInstance, jsArguments, atIndex);
         Callback reject = ARGUMENT_EXTRACTOR_CALLBACK
@@ -328,7 +328,7 @@ private String getAffectedRange(int startIndex, int jsArgumentsNeeded) {
   }
 
   @Override
-  public void invoke(JSInstance jsInstance, ReadableNativeArray parameters) {
+  public void invoke(JSInstance jsInstance, ReadableArray parameters) {
     String traceName = mModuleWrapper.getName() + "." + mMethod.getName();
     SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "callJavaModuleMethod")
       .arg("method", traceName)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
index ae91556b269034..dc787a04c9818b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -49,14 +49,12 @@ public class MethodDescriptor {
 
   private final JSInstance mJSInstance;
   private final ModuleHolder mModuleHolder;
-  private final Class<? extends NativeModule> mModuleClass;
   private final ArrayList<NativeModule.NativeMethod> mMethods;
   private final ArrayList<MethodDescriptor> mDescs;
 
-  public JavaModuleWrapper(JSInstance jsInstance, Class<? extends NativeModule> moduleClass, ModuleHolder moduleHolder) {
+  public JavaModuleWrapper(JSInstance jsInstance, ModuleHolder moduleHolder) {
     mJSInstance = jsInstance;
     mModuleHolder = moduleHolder;
-    mModuleClass = moduleClass;
     mMethods = new ArrayList<>();
     mDescs = new ArrayList();
   }
@@ -76,9 +74,9 @@ private void findMethods() {
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "findMethods");
     Set<String> methodNames = new HashSet<>();
 
-    Class<? extends NativeModule> classForMethods = mModuleClass;
+    Class<? extends NativeModule> classForMethods = mModuleHolder.getModule().getClass();
     Class<? extends NativeModule> superClass =
-        (Class<? extends NativeModule>) mModuleClass.getSuperclass();
+        (Class<? extends NativeModule>) classForMethods.getSuperclass();
     if (ReactModuleWithSpec.class.isAssignableFrom(superClass)) {
       // For java module that is based on generated flow-type spec, inspect the
       // spec abstract class instead, which is the super class of the given java
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
index 0533cfd3e4c829..83684d7a245ed2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
index bce96a33921d93..ba565105fe740c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptContextHolder.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptContextHolder.java
index fdf5fc8f6c67a8..13c767afc6c020 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptContextHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptContextHolder.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java
index 9c72fd1f8e54d0..4333cfbbda767a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java
index e34b4b1d00b3fe..1530755ca58dca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java
index c086508a3d6cdf..e3b5f56813579b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java
index 5df3309135e915..5bb25881ca4bbd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java
index 33714b555102d8..924b7915629515 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java
index cc55b7d9259714..712197ae088f30 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java
index 3fa44d4b8ecd3a..908e13db416bbe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/MemoryPressure.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/MemoryPressure.java
index f0cd074795c911..315ad7bc2b39e0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/MemoryPressure.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/MemoryPressure.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/MemoryPressureListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/MemoryPressureListener.java
index 35e014d5929795..972f17aa397da0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/MemoryPressureListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/MemoryPressureListener.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java
index e438d06c49d654..a71bcd41bde6e8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -24,11 +24,12 @@
 /**
  * Holder to enable us to lazy create native modules.
  *
- * This works by taking a provider instead of an instance, when it is first required we'll create
+ * <p>This works by taking a provider instead of an instance, when it is first required we'll create
  * and initialize it. Initialization currently always happens on the UI thread but this is due to
  * change for performance reasons.
  *
- * Lifecycle events via a {@link LifecycleEventListener} will still always happen on the UI thread.
+ * <p>Lifecycle events via a {@link LifecycleEventListener} will still always happen on the UI
+ * thread.
  */
 @DoNotStrip
 public class ModuleHolder {
@@ -38,8 +39,7 @@ public class ModuleHolder {
   private final int mInstanceKey = sInstanceKeyCounter.getAndIncrement();
 
   private final String mName;
-  private final boolean mCanOverrideExistingModule;
-  private final boolean mHasConstants;
+  private final ReactModuleInfo mReactModuleInfo;
 
   private @Nullable Provider<? extends NativeModule> mProvider;
   // Outside of the constructur, these should only be checked or set when synchronized on this
@@ -52,9 +52,8 @@ public class ModuleHolder {
 
   public ModuleHolder(ReactModuleInfo moduleInfo, Provider<? extends NativeModule> provider) {
     mName = moduleInfo.name();
-    mCanOverrideExistingModule = moduleInfo.canOverrideExistingModule();
-    mHasConstants = moduleInfo.hasConstants();
     mProvider = provider;
+    mReactModuleInfo = moduleInfo;
     if (moduleInfo.needsEagerInit()) {
       mModule = create();
     }
@@ -62,18 +61,25 @@ public ModuleHolder(ReactModuleInfo moduleInfo, Provider<? extends NativeModule>
 
   public ModuleHolder(NativeModule nativeModule) {
     mName = nativeModule.getName();
-    mCanOverrideExistingModule = nativeModule.canOverrideExistingModule();
-    mHasConstants = true;
+    mReactModuleInfo =
+        new ReactModuleInfo(
+            nativeModule.getName(),
+            nativeModule.getClass().getSimpleName(),
+            nativeModule.canOverrideExistingModule(),
+            true,
+            true,
+            CxxModuleWrapper.class.isAssignableFrom(nativeModule.getClass()));
+
     mModule = nativeModule;
     PrinterHolder.getPrinter()
         .logMessage(ReactDebugOverlayTags.NATIVE_MODULE, "NativeModule init: %s", mName);
   }
 
   /*
-  * Checks if mModule has been created, and if so tries to initialize the module unless another
-  * thread is already doing the initialization.
-  * If mModule has not been created, records that initialization is needed
-  */
+   * Checks if mModule has been created, and if so tries to initialize the module unless another
+   * thread is already doing the initialization.
+   * If mModule has not been created, records that initialization is needed
+   */
   /* package */ void markInitializable() {
     boolean shouldInitializeNow = false;
     NativeModule module = null;
@@ -106,11 +112,19 @@ public String getName() {
   }
 
   public boolean getCanOverrideExistingModule() {
-    return mCanOverrideExistingModule;
+    return mReactModuleInfo.canOverrideExistingModule();
   }
 
   public boolean getHasConstants() {
-    return mHasConstants;
+    return mReactModuleInfo.hasConstants();
+  }
+
+  public boolean isCxxModule() {
+    return mReactModuleInfo.isCxxModule();
+  }
+
+  public String getClassName() {
+    return mReactModuleInfo.className();
   }
 
   @DoNotStrip
@@ -120,11 +134,12 @@ public NativeModule getModule() {
     synchronized (this) {
       if (mModule != null) {
         return mModule;
-      // if mModule has not been set, and no one is creating it. Then this thread should call create
+        // if mModule has not been set, and no one is creating it. Then this thread should call
+        // create
       } else if (!mIsCreating) {
         shouldCreate = true;
         mIsCreating = true;
-      } else  {
+      } else {
         // Wait for mModule to be created by another thread
       }
     }
@@ -158,8 +173,8 @@ private NativeModule create() {
     SoftAssertions.assertCondition(mModule == null, "Creating an already created module.");
     ReactMarker.logMarker(CREATE_MODULE_START, mName, mInstanceKey);
     SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "ModuleHolder.createModule")
-      .arg("name", mName)
-      .flush();
+        .arg("name", mName)
+        .flush();
     PrinterHolder.getPrinter()
         .logMessage(ReactDebugOverlayTags.NATIVE_MODULE, "NativeModule init: %s", mName);
     NativeModule module;
@@ -167,7 +182,7 @@ private NativeModule create() {
       module = assertNotNull(mProvider).get();
       mProvider = null;
       boolean shouldInitializeNow = false;
-      synchronized(this) {
+      synchronized (this) {
         mModule = module;
         if (mInitializable && !mIsInitializing) {
           shouldInitializeNow = true;
@@ -185,8 +200,8 @@ private NativeModule create() {
 
   private void doInitialize(NativeModule module) {
     SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "ModuleHolder.initialize")
-      .arg("name", mName)
-      .flush();
+        .arg("name", mName)
+        .flush();
     ReactMarker.logMarker(ReactMarkerConstants.INITIALIZE_MODULE_START, mName, mInstanceKey);
     try {
       boolean shouldInitialize = false;
@@ -199,7 +214,8 @@ private void doInitialize(NativeModule module) {
       }
       if (shouldInitialize) {
         module.initialize();
-        // Once finished, set flags accordingly, but we don't expect anyone to wait for this to finish
+        // Once finished, set flags accordingly, but we don't expect anyone to wait for this to
+        // finish
         // So no need to notify other threads
         synchronized (this) {
           mIsInitializing = false;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java
index 537a610e513b27..64766f16f179d8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java
@@ -1,109 +1,78 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * <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.facebook.react.bridge;
 
-import com.facebook.react.common.build.ReactBuildConfig;
-import java.lang.reflect.Constructor;
+import com.facebook.common.logging.FLog;
+import com.facebook.react.module.annotations.ReactModule;
 import javax.annotation.Nullable;
 import javax.inject.Provider;
 
 /**
- * A specification for a native module. This exists so that we don't have to pay the cost
- * for creation until/if the module is used.
- *
- * If your module either has a default constructor or one taking ReactApplicationContext you can use
- * {@link #simple(Class)} or {@link #simple(Class, ReactApplicationContext)}} methods.
+ * A specification for a native module. This exists so that we don't have to pay the cost for
+ * creation until/if the module is used.
  */
 public class ModuleSpec {
-  private static final Class[] EMPTY_SIGNATURE = {};
-  private static final Class[] CONTEXT_SIGNATURE = { ReactApplicationContext.class };
 
+  private static final String TAG = "ModuleSpec";
   private final @Nullable Class<? extends NativeModule> mType;
   private final Provider<? extends NativeModule> mProvider;
+  private final String mName;
 
-  /**
-   * Simple spec for modules with a default constructor.
-   */
-  public static ModuleSpec simple(final Class<? extends NativeModule> type) {
-    return new ModuleSpec(type, new ConstructorProvider(type, EMPTY_SIGNATURE) {
-      @Override
-      public NativeModule get() {
-        try {
-          return getConstructor(type, EMPTY_SIGNATURE).newInstance();
-        } catch (Exception e) {
-          throw new RuntimeException("ModuleSpec with class: " + type.getName(), e);
-        }
-      }
-    });
+  public static ModuleSpec viewManagerSpec(Provider<? extends NativeModule> provider) {
+    return new ModuleSpec(provider);
   }
 
-  /**
-   * Simple spec for modules with a constructor taking ReactApplicationContext.
-   */
-  public static ModuleSpec simple(
-      final Class<? extends NativeModule> type,
-      final ReactApplicationContext context) {
-    return new ModuleSpec(type, new ConstructorProvider(type, CONTEXT_SIGNATURE) {
-      @Override
-      public NativeModule get() {
-        try {
-          return getConstructor(type, CONTEXT_SIGNATURE).newInstance(context);
-        } catch (Exception e) {
-          throw new RuntimeException("ModuleSpec with class: " + type.getName(), e);
-        }
-      }
-    });
+  public static ModuleSpec nativeModuleSpec(
+      Class<? extends NativeModule> type, Provider<? extends NativeModule> provider) {
+    ReactModule annotation = type.getAnnotation(ReactModule.class);
+    if (annotation == null) {
+      FLog.w(
+          TAG,
+          "Could not find @ReactModule annotation on "
+              + type.getName()
+              + ". So creating the module eagerly to get the name. Consider adding an annotation to make this Lazy");
+      NativeModule nativeModule = provider.get();
+      return new ModuleSpec(provider, nativeModule.getName());
+    } else {
+      return new ModuleSpec(provider, annotation.name());
+    }
   }
 
-  public static ModuleSpec viewManagerSpec(Provider<? extends NativeModule> provider) {
-    return new ModuleSpec(null, provider);
+  public static ModuleSpec nativeModuleSpec(
+      String className, Provider<? extends NativeModule> provider) {
+    return new ModuleSpec(provider, className);
   }
 
-  public static ModuleSpec nativeModuleSpec(
-      Class<? extends NativeModule> type, Provider<? extends NativeModule> provider) {
-    return new ModuleSpec(type, provider);
+  /**
+   * Called by View Managers
+   *
+   * @param provider
+   */
+  private ModuleSpec(Provider<? extends NativeModule> provider) {
+    mType = null;
+    mProvider = provider;
+    mName = null;
   }
 
-  private ModuleSpec(
-      @Nullable Class<? extends NativeModule> type, Provider<? extends NativeModule> provider) {
-    mType = type;
+  private ModuleSpec(Provider<? extends NativeModule> provider, String name) {
+    mType = null;
     mProvider = provider;
+    mName = name;
   }
 
   public @Nullable Class<? extends NativeModule> getType() {
     return mType;
   }
 
-  public Provider<? extends NativeModule> getProvider() {
-    return mProvider;
+  public String getName() {
+    return mName;
   }
 
-  private static abstract class ConstructorProvider implements Provider<NativeModule> {
-    protected @Nullable Constructor<? extends NativeModule> mConstructor;
-
-    public ConstructorProvider(Class<? extends NativeModule> type, Class[] signature) {
-      if (ReactBuildConfig.DEBUG) {
-        try {
-          mConstructor = getConstructor(type, signature);
-        } catch (NoSuchMethodException e) {
-          throw new IllegalArgumentException("No such constructor", e);
-        }
-      }
-    }
-
-    protected Constructor<? extends NativeModule> getConstructor(
-        Class<? extends NativeModule> mType,
-        Class[] signature) throws NoSuchMethodException {
-      if (mConstructor != null) {
-        return mConstructor;
-      } else {
-        return mType.getConstructor(signature);
-      }
-    }
+  public Provider<? extends NativeModule> getProvider() {
+    return mProvider;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java
index 7cd373a6785ab8..3dd3617293e988 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java
index bd314caf65985c..9ae9251f23ec4d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,7 +14,7 @@
  * Base class for an array whose members are stored in native code (C++).
  */
 @DoNotStrip
-public abstract class NativeArray {
+public abstract class NativeArray implements NativeArrayInterface{
   static {
     ReactBridge.staticInit();
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArrayInterface.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArrayInterface.java
new file mode 100644
index 00000000000000..74b49a890e7321
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArrayInterface.java
@@ -0,0 +1,6 @@
+package com.facebook.react.bridge;
+
+public interface NativeArrayInterface {
+  @Override
+  String toString();
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeDeltaClient.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeDeltaClient.java
index 6b87c972c275d6..97eb4337284186 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeDeltaClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeDeltaClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java
index 55b32d7171d752..d1dbf145ef1678 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
index a57b41f93cc698..44d65b11f53a9b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,7 +20,7 @@
 @DoNotStrip
 public interface NativeModule {
   interface NativeMethod {
-    void invoke(JSInstance jsInstance, ReadableNativeArray parameters);
+    void invoke(JSInstance jsInstance, ReadableArray parameters);
     String getType();
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java
index 9d77885dac77c7..ada610f1f06923 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
index 66c73e6af16890..126e7fb75767ee 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
@@ -1,43 +1,33 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * <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.facebook.react.bridge;
 
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.systrace.Systrace;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
-import com.facebook.infer.annotation.Assertions;
-import com.facebook.systrace.Systrace;
-
-/**
-  * A set of Java APIs to expose to a particular JavaScript instance.
-  */
+/** A set of Java APIs to expose to a particular JavaScript instance. */
 public class NativeModuleRegistry {
 
   private final ReactApplicationContext mReactApplicationContext;
-  private final Map<Class<? extends NativeModule>, ModuleHolder> mModules;
-  private final ArrayList<ModuleHolder> mBatchCompleteListenerModules;
+  private final Map<String, ModuleHolder> mModules;
 
   public NativeModuleRegistry(
-    ReactApplicationContext reactApplicationContext,
-    Map<Class<? extends NativeModule>, ModuleHolder> modules,
-    ArrayList<ModuleHolder> batchCompleteListenerModules) {
+      ReactApplicationContext reactApplicationContext, Map<String, ModuleHolder> modules) {
     mReactApplicationContext = reactApplicationContext;
     mModules = modules;
-    mBatchCompleteListenerModules = batchCompleteListenerModules;
   }
 
-  /**
-   * Private getters for combining NativeModuleRegistrys
-   */
-  private Map<Class<? extends NativeModule>, ModuleHolder> getModuleMap() {
+  /** Private getters for combining NativeModuleRegistrys */
+  private Map<String, ModuleHolder> getModuleMap() {
     return mModules;
   }
 
@@ -45,17 +35,11 @@ private ReactApplicationContext getReactApplicationContext() {
     return mReactApplicationContext;
   }
 
-  private ArrayList<ModuleHolder> getBatchCompleteListenerModules() {
-    return mBatchCompleteListenerModules;
-  }
-
-  /* package */ Collection<JavaModuleWrapper> getJavaModules(
-      JSInstance jsInstance) {
+  /* package */ Collection<JavaModuleWrapper> getJavaModules(JSInstance jsInstance) {
     ArrayList<JavaModuleWrapper> javaModules = new ArrayList<>();
-    for (Map.Entry<Class<? extends NativeModule>, ModuleHolder> entry : mModules.entrySet()) {
-      Class<? extends NativeModule> type = entry.getKey();
-      if (!CxxModuleWrapperBase.class.isAssignableFrom(type)) {
-        javaModules.add(new JavaModuleWrapper(jsInstance, type, entry.getValue()));
+    for (Map.Entry<String, ModuleHolder> entry : mModules.entrySet()) {
+      if (!entry.getValue().isCxxModule()) {
+        javaModules.add(new JavaModuleWrapper(jsInstance, entry.getValue()));
       }
     }
     return javaModules;
@@ -63,9 +47,8 @@ private ArrayList<ModuleHolder> getBatchCompleteListenerModules() {
 
   /* package */ Collection<ModuleHolder> getCxxModules() {
     ArrayList<ModuleHolder> cxxModules = new ArrayList<>();
-    for (Map.Entry<Class<? extends NativeModule>, ModuleHolder> entry : mModules.entrySet()) {
-      Class<?> type = entry.getKey();
-      if (CxxModuleWrapperBase.class.isAssignableFrom(type)) {
+    for (Map.Entry<String, ModuleHolder> entry : mModules.entrySet()) {
+      if (entry.getValue().isCxxModule()) {
         cxxModules.add(entry.getValue());
       }
     }
@@ -73,23 +56,20 @@ private ArrayList<ModuleHolder> getBatchCompleteListenerModules() {
   }
 
   /*
-  * Adds any new modules to the current module registry
-  */
+   * Adds any new modules to the current module registry
+   */
   /* package */ void registerModules(NativeModuleRegistry newRegister) {
 
-    Assertions.assertCondition(mReactApplicationContext.equals(newRegister.getReactApplicationContext()),
-      "Extending native modules with non-matching application contexts.");
+    Assertions.assertCondition(
+        mReactApplicationContext.equals(newRegister.getReactApplicationContext()),
+        "Extending native modules with non-matching application contexts.");
 
-    Map<Class<? extends NativeModule>, ModuleHolder> newModules = newRegister.getModuleMap();
-    ArrayList<ModuleHolder> batchCompleteListeners = newRegister.getBatchCompleteListenerModules();
+    Map<String, ModuleHolder> newModules = newRegister.getModuleMap();
 
-    for (Map.Entry<Class<? extends NativeModule>, ModuleHolder> entry : newModules.entrySet()) {
-      Class<? extends NativeModule> key = entry.getKey();
+    for (Map.Entry<String, ModuleHolder> entry : newModules.entrySet()) {
+      String key = entry.getKey();
       if (!mModules.containsKey(key)) {
         ModuleHolder value = entry.getValue();
-        if (batchCompleteListeners.contains(value)) {
-          mBatchCompleteListenerModules.add(value);
-        }
         mModules.put(key, value);
       }
     }
@@ -98,8 +78,7 @@ private ArrayList<ModuleHolder> getBatchCompleteListenerModules() {
   /* package */ void notifyJSInstanceDestroy() {
     mReactApplicationContext.assertOnNativeModulesQueueThread();
     Systrace.beginSection(
-        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-        "NativeModuleRegistry_notifyJSInstanceDestroy");
+        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "NativeModuleRegistry_notifyJSInstanceDestroy");
     try {
       for (ModuleHolder module : mModules.values()) {
         module.destroy();
@@ -110,14 +89,14 @@ private ArrayList<ModuleHolder> getBatchCompleteListenerModules() {
   }
 
   /* package */ void notifyJSInstanceInitialized() {
-    mReactApplicationContext.assertOnNativeModulesQueueThread("From version React Native v0.44, " +
-      "native modules are explicitly not initialized on the UI thread. See " +
-      "https://github.com/facebook/react-native/wiki/Breaking-Changes#d4611211-reactnativeandroidbreaking-move-nativemodule-initialization-off-ui-thread---aaachiuuu " +
-      " for more details.");
+    mReactApplicationContext.assertOnNativeModulesQueueThread(
+        "From version React Native v0.44, "
+            + "native modules are explicitly not initialized on the UI thread. See "
+            + "https://github.com/facebook/react-native/wiki/Breaking-Changes#d4611211-reactnativeandroidbreaking-move-nativemodule-initialization-off-ui-thread---aaachiuuu "
+            + " for more details.");
     ReactMarker.logMarker(ReactMarkerConstants.NATIVE_MODULE_INITIALIZE_START);
     Systrace.beginSection(
-        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-        "NativeModuleRegistry_notifyJSInstanceInitialized");
+        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "NativeModuleRegistry_notifyJSInstanceInitialized");
     try {
       for (ModuleHolder module : mModules.values()) {
         module.markInitializable();
@@ -129,20 +108,44 @@ private ArrayList<ModuleHolder> getBatchCompleteListenerModules() {
   }
 
   public void onBatchComplete() {
-    for (ModuleHolder moduleHolder : mBatchCompleteListenerModules) {
-      if (moduleHolder.hasInstance()) {
-        ((OnBatchCompleteListener) moduleHolder.getModule()).onBatchComplete();
-      }
+    // The only native module that uses the onBatchComplete is the UI Manager. Hence, instead of
+    // iterating over all the modules for find this one instance, and then calling it, we
+    // short-circuit
+    // the search, and simply call OnBatchComplete on the UI Manager.
+    // With Fabric, UIManager would no longer be a NativeModule, so this call would simply go away
+    ModuleHolder moduleHolder = mModules.get("UIManager");
+    if (moduleHolder != null && moduleHolder.hasInstance()) {
+      ((OnBatchCompleteListener) moduleHolder.getModule()).onBatchComplete();
     }
   }
 
   public <T extends NativeModule> boolean hasModule(Class<T> moduleInterface) {
-    return mModules.containsKey(moduleInterface);
+    String name = moduleInterface.getAnnotation(ReactModule.class).name();
+    return mModules.containsKey(name);
   }
 
   public <T extends NativeModule> T getModule(Class<T> moduleInterface) {
-    return (T) Assertions.assertNotNull(
-        mModules.get(moduleInterface), moduleInterface.getSimpleName()).getModule();
+    ReactModule annotation = moduleInterface.getAnnotation(ReactModule.class);
+    if (annotation == null) {
+      throw new IllegalArgumentException(
+          "Could not find @ReactModule annotation in class " + moduleInterface.getName());
+    }
+    return (T)
+        Assertions.assertNotNull(
+                mModules.get(annotation.name()),
+                annotation.name()
+                    + " could not be found. Is it defined in "
+                    + moduleInterface.getName())
+            .getModule();
+  }
+
+  public boolean hasModule(String name) {
+    return mModules.containsKey(name);
+  }
+
+  public NativeModule getModule(String name) {
+    return Assertions.assertNotNull(
+        mModules.get(name), "Could not find module with name " + name).getModule();
   }
 
   public List<NativeModule> getAllModules() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java
index e1b1e2829acbf8..56488cc11c5425 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java
index 2531b9793b5d48..680702561a55ae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java
index 4faaa4fe363108..720cc2ac9fee62 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java
index 5448bc8fd06ad5..e785ab843e0096 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java
index 984eb785904650..645851c9316535 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java
index aa8c3bee4a83fb..2ee1626f02396e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java
index 1ee2380ff8bba6..de4f7c4b42ef2f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
index 5442daa3a96c75..ea5d126f799d1b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,10 +7,9 @@
 
 package com.facebook.react.bridge;
 
-import javax.annotation.Nullable;
-
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
+import javax.annotation.Nullable;
 
 /**
  * JavaScript executor that delegates JS calls processed by native code back to a java version
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java
index 1d33a2d24a2e2a..f94c238275147b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
index a9463c20dd5752..a116d87818c710 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,7 +7,10 @@
 
 package com.facebook.react.bridge;
 
+import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
+
 import com.facebook.soloader.SoLoader;
+import com.facebook.systrace.Systrace;
 
 public class ReactBridge {
   private static boolean sDidInit = false;
@@ -15,8 +18,10 @@ public static void staticInit() {
     // No locking required here, worst case we'll call into SoLoader twice
     // which will do its own locking internally
     if (!sDidInit) {
+      Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "ReactBridge.staticInit::load:reactnativejni");
       SoLoader.loadLibrary("reactnativejni");
       sDidInit = true;
+      Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
     }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java
index 7cd1e898142857..bc690b52a7e23c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
index 6818d17727fe25..d83fe1be13db05 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
index 2a7c4482136ff6..00ff1173067613 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java
index efc480dc47c1a8..d3f3e9f22505e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
index c3dffabbaa7aa8..d8e03fc957485d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -85,4 +85,8 @@ public enum ReactMarkerConstants {
   CREATE_MC_MODULE_END,
   CREATE_MC_MODULE_GET_METADATA_START,
   CREATE_MC_MODULE_GET_METADATA_END,
+  REGISTER_JS_SEGMENT_START,
+  REGISTER_JS_SEGMENT_STOP,
+  VM_INIT,
+  ON_FRAGMENT_CREATE,
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java
index 1a15f6ab31432f..2f52f534db90b8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java
index e7dac2d49593e5..716b2a3f6f5639 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
index f4e17403f27cfa..3a7a31517e15ab 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java
index 1af1631b8a353b..bad731e709c099 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java
index fad9c994ed728c..c4cfbe019e4a3e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
index 2e2b13f1bcc178..80f360adc1d63f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,12 +7,12 @@
 
 package com.facebook.react.bridge;
 
+import com.facebook.infer.annotation.Assertions;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
-
+import com.facebook.react.config.ReactFeatureFlags;
 import java.util.ArrayList;
 import java.util.Arrays;
-import com.facebook.infer.annotation.Assertions;
 import javax.annotation.Nullable;
 
 /**
@@ -34,9 +34,8 @@ protected ReadableNativeArray(HybridData hybridData) {
   private @Nullable ReadableType[] mLocalTypeArray;
 
   private static int jniPassCounter = 0;
-  private static boolean mUseNativeAccessor = false;
   public static void setUseNativeAccessor(boolean useNativeAccessor) {
-    mUseNativeAccessor = useNativeAccessor;
+    ReactFeatureFlags.useArrayNativeAccessor = useNativeAccessor;
   }
   public static int getJNIPassCounter() {
     return jniPassCounter;
@@ -77,7 +76,7 @@ private ReadableType[] getLocalTypeArray() {
 
   @Override
   public int size() {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useArrayNativeAccessor) {
       jniPassCounter++;
       return sizeNative();
     }
@@ -87,7 +86,7 @@ public int size() {
 
   @Override
   public boolean isNull(int index) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useArrayNativeAccessor) {
       jniPassCounter++;
       return isNullNative(index);
     }
@@ -97,7 +96,7 @@ public boolean isNull(int index) {
 
   @Override
   public boolean getBoolean(int index) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useArrayNativeAccessor) {
       jniPassCounter++;
       return getBooleanNative(index);
     }
@@ -107,7 +106,7 @@ public boolean getBoolean(int index) {
 
   @Override
   public double getDouble(int index) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useArrayNativeAccessor) {
       jniPassCounter++;
       return getDoubleNative(index);
     }
@@ -117,7 +116,7 @@ public double getDouble(int index) {
 
   @Override
   public int getInt(int index) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useArrayNativeAccessor) {
       jniPassCounter++;
       return getIntNative(index);
     }
@@ -127,7 +126,7 @@ public int getInt(int index) {
 
   @Override
   public String getString(int index) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useArrayNativeAccessor) {
       jniPassCounter++;
       return getStringNative(index);
     }
@@ -137,7 +136,7 @@ public String getString(int index) {
 
   @Override
   public ReadableNativeArray getArray(int index) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useArrayNativeAccessor) {
       jniPassCounter++;
       return getArrayNative(index);
     }
@@ -147,7 +146,7 @@ public ReadableNativeArray getArray(int index) {
 
   @Override
   public ReadableNativeMap getMap(int index) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useArrayNativeAccessor) {
       jniPassCounter++;
       return getMapNative(index);
     }
@@ -157,7 +156,7 @@ public ReadableNativeMap getMap(int index) {
 
   @Override
   public ReadableType getType(int index) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useArrayNativeAccessor) {
       jniPassCounter++;
       return getTypeNative(index);
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
index 40cbe0d8d22fe7..1ece8d666b0a44 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,13 +7,12 @@
 
 package com.facebook.react.bridge;
 
+import com.facebook.infer.annotation.Assertions;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
-
+import com.facebook.react.config.ReactFeatureFlags;
 import java.util.HashMap;
 import java.util.Iterator;
-
-import com.facebook.infer.annotation.Assertions;
 import javax.annotation.Nullable;
 
 /**
@@ -33,10 +32,9 @@ protected ReadableNativeMap(HybridData hybridData) {
   private @Nullable String[] mKeys;
   private @Nullable HashMap<String,Object> mLocalMap;
   private @Nullable HashMap<String,ReadableType> mLocalTypeMap;
-  private static boolean mUseNativeAccessor;
   private static int mJniCallCounter;
   public static void setUseNativeAccessor(boolean useNativeAccessor) {
-    mUseNativeAccessor = useNativeAccessor;
+    ReactFeatureFlags.useMapNativeAccessor = useNativeAccessor;
   }
   public static int getJNIPassCounter() {
     return mJniCallCounter;
@@ -94,7 +92,7 @@ private HashMap<String,ReadableType> getLocalTypeMap() {
 
   @Override
   public boolean hasKey(String name) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useMapNativeAccessor) {
       mJniCallCounter++;
       return hasKeyNative(name);
     }
@@ -104,7 +102,7 @@ public boolean hasKey(String name) {
 
   @Override
   public boolean isNull(String name) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useMapNativeAccessor) {
       mJniCallCounter++;
       return isNullNative(name);
     }
@@ -151,7 +149,7 @@ private void checkInstance(String name, Object value, Class type) {
 
   @Override
   public boolean getBoolean(String name) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useMapNativeAccessor) {
       mJniCallCounter++;
       return getBooleanNative(name);
     }
@@ -161,7 +159,7 @@ public boolean getBoolean(String name) {
 
   @Override
   public double getDouble(String name) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useMapNativeAccessor) {
       mJniCallCounter++;
       return getDoubleNative(name);
     }
@@ -171,7 +169,7 @@ public double getDouble(String name) {
 
   @Override
   public int getInt(String name) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useMapNativeAccessor) {
       mJniCallCounter++;
       return getIntNative(name);
     }
@@ -183,7 +181,7 @@ public int getInt(String name) {
 
   @Override
   public @Nullable String getString(String name) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useMapNativeAccessor) {
       mJniCallCounter++;
       return getStringNative(name);
     }
@@ -193,7 +191,7 @@ public int getInt(String name) {
 
   @Override
   public @Nullable ReadableArray getArray(String name) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useMapNativeAccessor) {
       mJniCallCounter++;
       return getArrayNative(name);
     }
@@ -203,7 +201,7 @@ public int getInt(String name) {
 
   @Override
   public @Nullable ReadableNativeMap getMap(String name) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useMapNativeAccessor) {
       mJniCallCounter++;
       return getMapNative(name);
     }
@@ -213,7 +211,7 @@ public int getInt(String name) {
 
   @Override
   public ReadableType getType(String name) {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useMapNativeAccessor) {
       mJniCallCounter++;
       return getTypeNative(name);
     }
@@ -236,7 +234,7 @@ public ReadableMapKeySetIterator keySetIterator() {
 
   @Override
   public HashMap<String, Object> toHashMap() {
-    if (mUseNativeAccessor) {
+    if (ReactFeatureFlags.useMapNativeAccessor) {
       ReadableMapKeySetIterator iterator = keySetIterator();
       HashMap<String, Object> hashMap = new HashMap<>();
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java
index b1a9057e8e198b..9845f33f588b37 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
index b9093263671655..168b67d62bc638 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Systrace.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Systrace.java
index cd5c4615a5b813..8f0520844ae32d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Systrace.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Systrace.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
index e08133ded2566f..29a5a93148b272 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
@@ -12,6 +12,11 @@ public interface UIManager extends JSIModule, PerformanceCounter {
    */
   <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(final T rootView);
 
+  /**
+   * Unregisters a new root view.
+   */
+  void removeRootView(int reactRootTag);
+
   /**
    * Updates the layout specs of the RootShadowNode based on the Measure specs received by
    * parameters.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
index 292efedd310196..3adf9b8359e6f3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java
index f15e4886a19b03..c5400ddbae0983 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java
index 0b7b5d175d5e36..f0006c81df447f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java
index 62073f177ca2db..1aaef7cc51d25f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java
index 90bd2de5add358..074446485c282f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java
index e10caeb95c28c5..4c7365a53810dd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java
index 2449cafb726c37..732d2f897ceed2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java
index d2be287f9e338c..d62247b845b751 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java
index be06d0615ba44d..d169a578e70c4e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java
index c9df9ca5436c78..bc48673a1b68c2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java
index f474e8f972e350..c5b0e2e0405ea6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java
index 4da397799cef42..2f8a2e5e914ea5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java
index 4139da528c47d6..f0f08a3cccd9bb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java
index 010dc872daef44..5a666785553a7a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java
index cc02e072190d41..4388949362c258 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
index d49a26b5434c2d..f81deff7c75226 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
index 829e1069830b5b..6a6a5452b351ad 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_build_config", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_build_config", "rn_android_library")
 
 SUB_PROJECTS = [
     "network/**/*",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/ClearableSynchronizedPool.java b/ReactAndroid/src/main/java/com/facebook/react/common/ClearableSynchronizedPool.java
index 5d12c9f16d40c6..2b296f71400a4b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/ClearableSynchronizedPool.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/ClearableSynchronizedPool.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java b/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java
index 4c10cb114f99cd..bc2423b665b8ce 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java b/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java
index ecb1ba83eca3ea..52a56e93b68455 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java b/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java
index 45402ab0da5a56..656d77d9678eb4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java b/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java
index 883bd714ceabb6..9b6191182fd8fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java
index 151fbf144d0fcc..5c668ad14cd5a5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java b/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java
index eae26cdebb35b6..83ca41a2a99c84 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java b/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java
index ad45c64d2d5dfd..01a0da121d66ac 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java b/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java
index 3f541304849041..63a1ea638752e0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java b/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java
index 0c26d6c499db81..8246db9dc956b7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java b/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java
index 4877b64ea9765f..ce7cc73baf6996 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java b/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java
index 4d77e7f3a05dce..5a8cb0e98fd9ae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java b/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
index dcbc7c8fd26df0..f2ea5a6a4b0378 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java b/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java
index aca28f748fe7db..d220e2efe41025 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 ae1b2ae7f656f9..934c22700dffe1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "network",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java b/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
index e7b5380a1c56b3..82d24461ad1c04 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/BUCK b/ReactAndroid/src/main/java/com/facebook/react/config/BUCK
new file mode 100644
index 00000000000000..82c24dc8158a27
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/config/BUCK
@@ -0,0 +1,11 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
+
+rn_android_library(
+    name = "config",
+    srcs = glob(["**/*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
new file mode 100644
index 00000000000000..f9f1b70833301b
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
@@ -0,0 +1,26 @@
+package com.facebook.react.config;
+
+/**
+ * Hi there, traveller! This configuration class is not meant to be used by end-users of RN. It
+ * contains mainly flags for features that are either under active development and not ready for
+ * public consumption, or for use in experiments.
+ *
+ * These values are safe defaults and should not require manual changes.
+ */
+public class ReactFeatureFlags {
+
+  /**
+   * Whether we should load a specific view manager immediately or when it is accessed by JS
+   */
+  public static boolean lazilyLoadViewManagers = false;
+
+  /**
+   * Reduce the number of Java-JS interops while accessing native arrays
+   */
+  public static boolean useArrayNativeAccessor = false;
+
+  /**
+   * Reduce the number of Java-JS interops while accessing native maps
+   */
+  public static boolean useMapNativeAccessor = false;
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
index 16336b6e1be936..5cff33c82c5ffb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "devsupport",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDeltaClient.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDeltaClient.java
index 93fbb49679e753..5af95bd5be9fa6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDeltaClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDeltaClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
index cf35c8a6ce9478..ba798c14165ccc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java
index 9450e27dc4bb0a..9eb96e58100e78 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
index e9ebe0c2492fb6..4e18237ef7ca03 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 9d8ed683a85861..0658141be3c33c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index b1342c0555e7c1..f7d9748c967d3e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Handler;
+import android.os.Looper;
 import android.widget.Toast;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
@@ -137,7 +138,7 @@ public DevServerHelper(
       .build();
     mBundleDownloader = new BundleDownloader(mClient);
 
-    mRestartOnChangePollingHandler = new Handler();
+    mRestartOnChangePollingHandler = new Handler(Looper.getMainLooper());
     mPackageName = packageName;
   }
 
@@ -539,7 +540,7 @@ public void startPollingOnChangeEndpoint(
     mOnChangePollingEnabled = true;
     mOnServerContentChangeListener = onServerContentChangeListener;
     mOnChangePollingClient = new OkHttpClient.Builder()
-        .connectionPool(new ConnectionPool(1, LONG_POLL_KEEP_ALIVE_DURATION_MS, TimeUnit.MINUTES))
+        .connectionPool(new ConnectionPool(1, LONG_POLL_KEEP_ALIVE_DURATION_MS, TimeUnit.MILLISECONDS))
         .connectTimeout(HTTP_CONNECT_TIMEOUT_MS, TimeUnit.MILLISECONDS)
         .build();
     enqueueOnChangeEndpointLongPolling();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
index 757887ba7d243b..3e059df4e13a84 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
index 590db9362dd970..6f808d0b93c571 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
index 8764597391f801..b925c24ba87750 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
index 3441755eb94356..daa11f0ee6b0a8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java
index a6fcfa6dcdbf21..ae604d12c9f5be 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java
index 8a65c8bc39c503..d190c0c40c490b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -39,7 +39,7 @@ public FpsView(ReactContext reactContext) {
     super(reactContext);
     inflate(reactContext, R.layout.fps_view, this);
     mTextView = (TextView) findViewById(R.id.fps_text);
-    mFrameCallback = new FpsDebugFrameCallback(ChoreographerCompat.getInstance(), reactContext);
+    mFrameCallback = new FpsDebugFrameCallback(reactContext);
     mFPSMonitorRunnable = new FPSMonitorRunnable();
     setCurrentFPS(0, 0, 0, 0);
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java
index cc1c8bf763dba2..56d838124b6fb2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
index 45b7897f8c0308..11b99dac873075 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java
index 7f99c0fd0f2f42..803ba002dff318 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java
index c69c8eb631fb31..59c05dcf4f2234 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java
index 132ae6ba30a6e3..a6b44a5af0405d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java
index 4a84be20254aff..f2b0e937b74f3f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java
index d4dfb627225ada..7f7721fabb6034 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
index 80eb0b6e4d51a6..a7e1db130e8083 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java
index 7033a21fda478f..b9c35a5ee2ea46 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java
index 6d912d545f90ef..5618a07e708386 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
index 071e7dc4d3c6a7..e723713dc60971 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
index 3e66d52e61acac..1476b30a8ade58 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java
index 9a4a581e761bf8..ffeb568382e3c0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java
index b08ba97066a341..1d7f2a49ebaa14 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java
index 9efe1bd75483cf..9e84ae97432a5f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
index 4a081e56d43b67..fbd777ea52088e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java
index 8612d2db9da5c5..4d251bb0d6cb35 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java
index 5fc3027c555c21..d257023bcd4068 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java
index 3fdc1ea07e94b7..f512198c1719e2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
index ef2e3e18772d62..62d36a016e3883 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "fabric",
@@ -19,7 +19,6 @@ rn_android_library(
         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:react"),
         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"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinder.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinder.java
new file mode 100644
index 00000000000000..c3bd8d5de46439
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinder.java
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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;
+
+public interface FabricBinder<T extends FabricBinding> {
+
+  void setBinding(T binding);
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
index 4db39a42522fe9..29ed2c9c39cd9d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
@@ -1,36 +1,18 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * <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.facebook.react.fabric;
 
 import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.NativeMap;
 
 public interface FabricBinding {
 
-  void installFabric(JavaScriptContextHolder jsContext, FabricUIManager fabricModule);
-
-  void releaseEventTarget(long jsContextNativePointer, long eventTargetPointer);
-
-  void releaseEventHandler(long jsContextNativePointer, long eventHandlerPointer);
-
-  void dispatchEventToEmptyTarget(
-    long jsContextNativePointer,
-    long eventHandlerPointer,
-    String type,
-    NativeMap payload
-  );
-
-  void dispatchEventToTarget(
-    long jsContextNativePointer,
-    long eventHandlerPointer,
-    long eventTargetPointer,
-    String type,
-    NativeMap payload
-  );
+  // TODO: T31905686 change types of UIManager and EventBeatManager when moving to OSS
+  void register(
+      JavaScriptContextHolder jsContext, FabricBinder fabricBinder, Object eventBeatManager);
 
+  void unregister();
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricReconciler.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricReconciler.java
deleted file mode 100644
index de87cb2c55d4e3..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricReconciler.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- *
- * 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 com.facebook.common.logging.FLog;
-import com.facebook.debug.holder.PrinterHolder;
-import com.facebook.debug.tags.ReactDebugOverlayTags;
-import com.facebook.react.common.ArrayUtils;
-import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.uimanager.ReactShadowNode;
-import com.facebook.react.uimanager.UIViewOperationQueue;
-import com.facebook.react.uimanager.ViewAtIndex;
-import com.facebook.systrace.Systrace;
-import com.facebook.systrace.SystraceMessage;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import javax.annotation.Nullable;
-
-public class FabricReconciler {
-
-  private static final String TAG = FabricReconciler.class.getSimpleName();
-    private static final boolean DEBUG = ReactBuildConfig.DEBUG || PrinterHolder
-    .getPrinter().shouldDisplayLogMessage(ReactDebugOverlayTags.FABRIC_RECONCILER);
-
-  private UIViewOperationQueue uiViewOperationQueue;
-
-  public FabricReconciler(UIViewOperationQueue uiViewOperationQueue) {
-    this.uiViewOperationQueue = uiViewOperationQueue;
-  }
-
-  public void manageChildren(ReactShadowNode previousRootShadowNode, ReactShadowNode newRootShadowNode) {
-    SystraceMessage.beginSection(
-      Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-      "FabricReconciler.manageChildren")
-      .flush();
-
-    try {
-      List<ReactShadowNode> prevList =
-        previousRootShadowNode == null ? null :  previousRootShadowNode.getChildrenList();
-      manageChildren(newRootShadowNode, prevList, newRootShadowNode.getChildrenList());
-    } finally{
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  private void manageChildren(
-    ReactShadowNode parent,
-    @Nullable List<ReactShadowNode> prevList,
-    @Nullable List<ReactShadowNode> newList) {
-    prevList = prevList == null ? Collections.<ReactShadowNode>emptyList() : prevList;
-    newList = newList == null ? Collections.<ReactShadowNode>emptyList() : newList;
-
-    // Iterate through each child list and compare each previous and next child. Same nodes
-    // implies no change is needed. If the nodes are different but are referencing the same view,
-    // the view needs to be updated with new props and children. Otherwise, there has been
-    // a change in the children positions.
-    int sameReactTagIndex = 0;
-    for (; sameReactTagIndex < Math.min(prevList.size(), newList.size()); sameReactTagIndex++) {
-      ReactShadowNode prevNode = prevList.get(sameReactTagIndex);
-      ReactShadowNode newNode = newList.get(sameReactTagIndex);
-      if (prevNode == newNode) {
-        continue;
-      }
-      if (prevNode.getReactTag() != newNode.getReactTag()) {
-        break;
-      }
-      enqueueUpdateProperties(newNode, prevNode);
-      manageChildren(prevNode, prevNode.getChildrenList(), newNode.getChildrenList());
-      newNode.setOriginalReactShadowNode(null);
-    }
-    int firstRemovedOrAddedViewIndex = sameReactTagIndex;
-
-    // Every ReactShadowNode on the newList that is on the right side of
-    // firstRemovedOrAddedViewIndex is defined as an added view.
-    // It is more efficient to reorder removing and adding all the views in the right order, instead
-    // of calculating the minimum amount of reorder operations.
-    Set<Integer> addedTags = new HashSet<>();
-    List<ViewAtIndex> viewsToAdd = new LinkedList<>();
-    for (int k = firstRemovedOrAddedViewIndex; k < newList.size(); k++) {
-      ReactShadowNode newNode = newList.get(k);
-      if (newNode.isVirtual()) continue;
-      enqueueUpdateProperties(newNode, newNode.getOriginalReactShadowNode());
-      viewsToAdd.add(new ViewAtIndex(newNode.getReactTag(), k));
-      List previousChildrenList = newNode.getOriginalReactShadowNode() == null ? null : newNode.getOriginalReactShadowNode().getChildrenList();
-      manageChildren(newNode, previousChildrenList, newNode.getChildrenList());
-      newNode.setOriginalReactShadowNode(null);
-      addedTags.add(newNode.getReactTag());
-    }
-
-    // Every ReactShadowNode on the prevList that is on the right side of
-    // firstRemovedOrAddedViewIndex is defined as a removed view.
-    // It is more efficient to reorder removing and adding all the views in the right order, instead
-    // of calculating the minimum amount of reorder operations.
-    // If a View is not re-ordered, then the ReactTag is deleted (ReactShadowNode and native View
-    // are released from memory)
-    List<Integer> tagsToDelete = new LinkedList<>();
-    List<Integer> indicesToRemove = new LinkedList<>();
-    for (int j = prevList.size() - 1; j >= firstRemovedOrAddedViewIndex; j--) {
-      ReactShadowNode nodeToRemove = prevList.get(j);
-      if (nodeToRemove.isVirtual()) continue;
-      indicesToRemove.add(0, j);
-      if (!addedTags.contains(nodeToRemove.getReactTag())) {
-        tagsToDelete.add(nodeToRemove.getReactTag());
-      }
-    }
-
-    // TODO (t27180994): Mutate views synchronously on main thread
-    if (!(indicesToRemove.isEmpty() && viewsToAdd.isEmpty() && tagsToDelete.isEmpty())) {
-      int[] indicesToRemoveArray = ArrayUtils.copyListToArray(indicesToRemove);
-      ViewAtIndex[] viewsToAddArray = viewsToAdd.toArray(new ViewAtIndex[viewsToAdd.size()]);
-      int[] tagsToDeleteArray = ArrayUtils.copyListToArray(tagsToDelete);
-      if (DEBUG) {
-        FLog.d(
-            TAG,
-            "manageChildren.enqueueManageChildren parent: " + parent.getReactTag() +
-                "\n\tIndices2Remove: " + Arrays.toString(indicesToRemoveArray) +
-                "\n\tViews2Add: " + Arrays.toString(viewsToAddArray) +
-                "\n\tTags2Delete: " + Arrays.toString(tagsToDeleteArray));
-      }
-      uiViewOperationQueue.enqueueManageChildren(
-        parent.getReactTag(), indicesToRemoveArray, viewsToAddArray, tagsToDeleteArray);
-    }
-  }
-
-  private void enqueueUpdateProperties(ReactShadowNode newNode, ReactShadowNode prevNode) {
-    int reactTag = newNode.getReactTag();
-    if (DEBUG) {
-      FLog.d(
-        TAG,
-        "manageChildren.enqueueUpdateProperties " +
-          "\n\ttag: " + reactTag +
-          "\n\tviewClass: " + newNode.getViewClass() +
-          "\n\tinstanceHandle: " + newNode.getInstanceHandle() +
-          "\n\tnewProps: " + newNode.getNewProps());
-    }
-
-    if (prevNode != null) {
-      newNode.updateScreenLayout(prevNode);
-    }
-
-    if (newNode.getNewProps() != null) {
-      uiViewOperationQueue.enqueueUpdateProperties(
-        reactTag, newNode.getViewClass(), newNode.getNewProps());
-    }
-
-    uiViewOperationQueue.enqueueUpdateInstanceHandle(
-      reactTag, newNode.getInstanceHandle());
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
deleted file mode 100644
index 87d1850e674226..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ /dev/null
@@ -1,681 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 static android.view.View.MeasureSpec.AT_MOST;
-import static android.view.View.MeasureSpec.EXACTLY;
-import static android.view.View.MeasureSpec.UNSPECIFIED;
-import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
-
-import android.os.SystemClock;
-import android.view.View;
-import com.facebook.common.logging.FLog;
-import com.facebook.debug.holder.PrinterHolder;
-import com.facebook.debug.tags.ReactDebugOverlayTags;
-import com.facebook.infer.annotation.Assertions;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableNativeMap;
-import com.facebook.react.bridge.UIManager;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.common.ReactConstants;
-import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.fabric.events.FabricEventEmitter;
-import com.facebook.react.modules.i18nmanager.I18nUtil;
-import com.facebook.react.uimanager.DisplayMetricsHolder;
-import com.facebook.react.uimanager.NativeViewHierarchyManager;
-import com.facebook.react.uimanager.ReactRootViewTagGenerator;
-import com.facebook.react.uimanager.ReactShadowNode;
-import com.facebook.react.uimanager.ReactShadowNodeImpl;
-import com.facebook.react.uimanager.ReactStylesDiffMap;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIViewOperationQueue;
-import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.uimanager.ViewManagerRegistry;
-import com.facebook.react.uimanager.common.MeasureSpecProvider;
-import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.systrace.Systrace;
-import com.facebook.systrace.SystraceMessage;
-import com.facebook.yoga.YogaDirection;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nullable;
-
-/**
- * This class is responsible to create, clone and update {@link ReactShadowNode} using the Fabric
- * API.
- */
-@SuppressWarnings("unused") // used from JNI
-@DoNotStrip
-public class FabricUIManager implements UIManager, JSHandler {
-
-  private static final String TAG = FabricUIManager.class.getSimpleName();
-  private static final boolean DEBUG = ReactBuildConfig.DEBUG || PrinterHolder.getPrinter().shouldDisplayLogMessage(ReactDebugOverlayTags.FABRIC_UI_MANAGER);
-
-  private final RootShadowNodeRegistry mRootShadowNodeRegistry = new RootShadowNodeRegistry();
-  private final ReactApplicationContext mReactApplicationContext;
-  private final ViewManagerRegistry mViewManagerRegistry;
-  private final UIViewOperationQueue mUIViewOperationQueue;
-  private final NativeViewHierarchyManager mNativeViewHierarchyManager;
-  private final JavaScriptContextHolder mJSContext;
-  private volatile int mCurrentBatch = 0;
-  private final FabricReconciler mFabricReconciler;
-  private final EventDispatcher mEventDispatcher;
-  private FabricBinding mBinding;
-  private final FabricEventEmitter mFabricEventEmitter;
-  private long mEventHandlerPointer;
-  private long mLastCalculateLayoutTime = 0;
-
-  public FabricUIManager(
-      ReactApplicationContext reactContext,
-      ViewManagerRegistry viewManagerRegistry,
-      JavaScriptContextHolder jsContext,
-      EventDispatcher eventDispatcher) {
-    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext);
-    mReactApplicationContext = reactContext;
-    mViewManagerRegistry = viewManagerRegistry;
-    mNativeViewHierarchyManager = new NativeViewHierarchyManager(viewManagerRegistry);
-    mUIViewOperationQueue =
-        new UIViewOperationQueue(
-            reactContext, mNativeViewHierarchyManager, 0);
-    mFabricReconciler = new FabricReconciler(mUIViewOperationQueue);
-    mFabricEventEmitter =
-      new FabricEventEmitter(mReactApplicationContext, this);
-    mEventDispatcher = eventDispatcher;
-    mJSContext = jsContext;
-  }
-
-  public void setBinding(FabricBinding binding) {
-    mBinding = binding;
-  }
-
-  /** Creates a new {@link ReactShadowNode} */
-  @Nullable
-  @DoNotStrip
-  public ReactShadowNode createNode(
-      int reactTag, String viewName, int rootTag, ReadableNativeMap props, long eventTarget) {
-    if (DEBUG) {
-      FLog.d(TAG, "createNode \n\ttag: " + reactTag +
-          "\n\tviewName: " + viewName +
-          "\n\trootTag: " + rootTag +
-          "\n\tprops: " + props);
-    }
-    try {
-      ViewManager viewManager = mViewManagerRegistry.get(viewName);
-      ReactShadowNode node = viewManager.createShadowNodeInstance(mReactApplicationContext);
-      ReactShadowNode rootNode = getRootNode(rootTag);
-      node.setRootTag(rootNode.getReactTag());
-      node.setViewClassName(viewName);
-      node.setInstanceHandle(eventTarget);
-      node.setReactTag(reactTag);
-      node.setThemedContext(rootNode.getThemedContext());
-
-      ReactStylesDiffMap styles = updateProps(node, props);
-
-      if (!node.isVirtual()) {
-        mUIViewOperationQueue.enqueueCreateView(
-            rootNode.getThemedContext(), reactTag, viewName, styles);
-      }
-      return node;
-    } catch (Throwable t) {
-      handleException(getRootNode(rootTag), t);
-      return null;
-    }
-  }
-
-  @VisibleForTesting
-  ReactShadowNode getRootNode(int rootTag) {
-    return mRootShadowNodeRegistry.getNode(rootTag);
-  }
-
-  private ReactStylesDiffMap updateProps(ReactShadowNode node, @Nullable ReadableNativeMap props) {
-    ReactStylesDiffMap styles = null;
-    if (props != null) {
-      styles = new ReactStylesDiffMap(props);
-      node.updateProperties(styles);
-    }
-    return styles;
-  }
-
-  /**
-   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
-   *     ReactShadowNode will contain a copy of all the internal data of the original node,
-   *     including its children set (note that the children nodes will not be cloned).
-   */
-  @Nullable
-  @DoNotStrip
-  public ReactShadowNode cloneNode(ReactShadowNode node) {
-    if (DEBUG) {
-      FLog.d(TAG, "cloneNode \n\tnode: " + node);
-    }
-    SystraceMessage.beginSection(
-      Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-      "FabricUIManager.cloneNode")
-      .flush();
-    try {
-      ReactShadowNode clone = node.mutableCopy(node.getInstanceHandle());
-      assertReactShadowNodeCopy(node, clone);
-      return clone;
-    } catch (Throwable t) {
-      handleException(node, t);
-      return null;
-    } finally{
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  /**
-   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
-   *     ReactShadowNode will contain a copy of all the internal data of the original node, but its
-   *     children set will be empty.
-   */
-  @Nullable
-  @DoNotStrip
-  public ReactShadowNode cloneNodeWithNewChildren(ReactShadowNode node) {
-    if (DEBUG) {
-      FLog.d(TAG, "cloneNodeWithNewChildren \n\tnode: " + node);
-    }
-    SystraceMessage.beginSection(
-      Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-      "FabricUIManager.cloneNodeWithNewChildren")
-      .flush();
-    try {
-      ReactShadowNode clone = node.mutableCopyWithNewChildren(node.getInstanceHandle());
-      assertReactShadowNodeCopy(node, clone);
-      return clone;
-    } catch (Throwable t) {
-      handleException(node, t);
-      return null;
-    } finally{
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  /**
-   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
-   *     ReactShadowNode will contain a copy of all the internal data of the original node, but its
-   *     props will be overridden with the {@link ReadableMap} received by parameter.
-   */
-  @Nullable
-  @DoNotStrip
-  public ReactShadowNode cloneNodeWithNewProps(
-      ReactShadowNode node, @Nullable ReadableNativeMap newProps) {
-    if (DEBUG) {
-      FLog.d(TAG, "cloneNodeWithNewProps \n\tnode: " + node + "\n\tprops: " + newProps);
-    }
-    SystraceMessage.beginSection(
-      Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-      "FabricUIManager.cloneNodeWithNewProps")
-      .flush();
-    try {
-      ReactShadowNode clone = node.mutableCopyWithNewProps(node.getInstanceHandle(),
-            newProps == null ? null : new ReactStylesDiffMap(newProps));
-      assertReactShadowNodeCopy(node, clone);
-      return clone;
-    } catch (Throwable t) {
-      handleException(node, t);
-      return null;
-    } finally{
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  /**
-   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
-   *     ReactShadowNode will contain a copy of all the internal data of the original node, but its
-   *     props will be overridden with the {@link ReadableMap} received by parameter and its
-   *     children set will be empty.
-   */
-  @Nullable
-  @DoNotStrip
-  public ReactShadowNode cloneNodeWithNewChildrenAndProps(
-      ReactShadowNode node, ReadableNativeMap newProps) {
-    if (DEBUG) {
-      FLog.d(TAG, "cloneNodeWithNewChildrenAndProps \n\tnode: " + node + "\n\tnewProps: " + newProps);
-    }
-    SystraceMessage.beginSection(
-      Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-      "FabricUIManager.cloneNodeWithNewChildrenAndProps")
-      .flush();
-    try {
-      ReactShadowNode clone =
-          node.mutableCopyWithNewChildrenAndProps(node.getInstanceHandle(),
-              newProps == null ? null : new ReactStylesDiffMap(newProps));
-      assertReactShadowNodeCopy(node, clone);
-      return clone;
-    } catch (Throwable t) {
-      handleException(node, t);
-      return null;
-    } finally{
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  private void assertReactShadowNodeCopy(ReactShadowNode source, ReactShadowNode target) {
-    Assertions.assertCondition(
-        source.getClass().equals(target.getClass()),
-        "Found "
-            + target.getClass()
-            + " class when expecting: "
-            + source.getClass()
-            + ". Check that "
-            + source.getClass()
-            + " implements the copy() method correctly.");
-  }
-
-  /**
-   * Appends the child {@link ReactShadowNode} to the children set of the parent {@link
-   * ReactShadowNode}.
-   */
-  @Nullable
-  @DoNotStrip
-  public void appendChild(ReactShadowNode parent, ReactShadowNode child) {
-    if (DEBUG) {
-      FLog.d(TAG, "appendChild \n\tparent: " + parent + "\n\tchild: " + child);
-    }
-    SystraceMessage.beginSection(
-      Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-      "FabricUIManager.appendChild")
-      .flush();
-    try {
-      // If the child to append was already committed (child.isSealed()),
-      // then we add a mutation of it. In the future this will be performed by FabricJS / Fiber.
-      //TODO: T27926878 avoid cloning shared child
-      if (child.isSealed()) {
-        child = child.mutableCopy(child.getInstanceHandle());
-      }
-      parent.addChildAt(child, parent.getChildCount());
-    } catch (Throwable t) {
-      handleException(parent, t);
-    } finally{
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  /**
-   * @return an empty {@link List<ReactShadowNode>} that will be used to append the {@link
-   *     ReactShadowNode} elements of the root. Typically this List will contain one element.
-   */
-  @DoNotStrip
-  public List<ReactShadowNode> createChildSet(int rootTag) {
-    if (DEBUG) {
-      FLog.d(TAG, "createChildSet rootTag: " + rootTag);
-    }
-    return new ArrayList<>(1);
-  }
-
-  /**
-   * Adds the {@link ReactShadowNode} to the {@link List<ReactShadowNode>} received by parameter.
-   */
-  @DoNotStrip
-  public void appendChildToSet(List<ReactShadowNode> childList, ReactShadowNode child) {
-    childList.add(child);
-  }
-
-  @DoNotStrip
-  public synchronized void completeRoot(int rootTag, @Nullable List<ReactShadowNode> childList) {
-    SystraceMessage.beginSection(
-      Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-      "FabricUIManager.completeRoot")
-      .flush();
-    try {
-      long startTime = SystemClock.uptimeMillis();
-      childList = childList == null ? new LinkedList<ReactShadowNode>() : childList;
-      if (DEBUG) {
-        FLog.d(TAG, "completeRoot rootTag: " + rootTag + ", childList: " + childList);
-      }
-      ReactShadowNode currentRootShadowNode = getRootNode(rootTag);
-      Assertions.assertNotNull(
-          currentRootShadowNode,
-          "Root view with tag " + rootTag + " must be added before completeRoot is called");
-
-      currentRootShadowNode = calculateDiffingAndCreateNewRootNode(currentRootShadowNode, childList);
-
-      if (DEBUG) {
-        FLog.d(
-          TAG,
-          "ReactShadowNodeHierarchy after diffing: " + currentRootShadowNode.getHierarchyInfo());
-      }
-
-      applyUpdatesRecursive(currentRootShadowNode);
-      mUIViewOperationQueue.dispatchViewUpdates(
-        mCurrentBatch++, startTime, mLastCalculateLayoutTime);
-
-      mRootShadowNodeRegistry.replaceNode(currentRootShadowNode);
-    } catch (Exception e) {
-      handleException(getRootNode(rootTag), e);
-    } finally{
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  public void dispatchCommand(int reactTag, int commandId, @Nullable ReadableArray commandArgs) {
-    mUIViewOperationQueue.enqueueDispatchCommand(reactTag, commandId, commandArgs);
-  }
-
-  private void notifyOnBeforeLayoutRecursive(ReactShadowNode node) {
-    if (!node.hasUpdates()) {
-      return;
-    }
-    for (int i = 0; i < node.getChildCount(); i++) {
-      notifyOnBeforeLayoutRecursive(node.getChildAt(i));
-    }
-    node.onBeforeLayout();
-  }
-
-  private ReactShadowNode calculateDiffingAndCreateNewRootNode(
-      ReactShadowNode currentRootShadowNode, List<ReactShadowNode> newChildList) {
-    SystraceMessage.beginSection(
-      Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-      "FabricUIManager.calculateDiffingAndCreateNewRootNode")
-      .flush();
-    try {
-      ReactShadowNode newRootShadowNode = currentRootShadowNode.mutableCopyWithNewChildren(currentRootShadowNode.getInstanceHandle());
-      for (ReactShadowNode child : newChildList) {
-        appendChild(newRootShadowNode, child);
-      }
-
-      if (DEBUG) {
-        FLog.d(
-          TAG,
-          "ReactShadowNodeHierarchy before calculateLayout: " + newRootShadowNode.getHierarchyInfo());
-      }
-
-      notifyOnBeforeLayoutRecursive(newRootShadowNode);
-
-      calculateLayout(newRootShadowNode);
-
-      if (DEBUG) {
-        FLog.d(
-          TAG,
-          "ReactShadowNodeHierarchy after calculateLayout: " + newRootShadowNode.getHierarchyInfo());
-      }
-
-      mFabricReconciler.manageChildren(currentRootShadowNode, newRootShadowNode);
-      return newRootShadowNode;
-    } finally{
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  private void calculateLayout(ReactShadowNode newRootShadowNode) {
-    SystraceMessage.beginSection(
-      Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-      "FabricUIManager.calculateLayout")
-      .flush();
-    long startTime = SystemClock.uptimeMillis();
-    try {
-      newRootShadowNode.calculateLayout();
-    } finally{
-      mLastCalculateLayoutTime = SystemClock.uptimeMillis() - startTime;
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  private void applyUpdatesRecursive(ReactShadowNode node) {
-    SystraceMessage.beginSection(
-            Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricUIManager.applyUpdatesRecursive")
-        .flush();
-    try {
-      applyUpdatesRecursive(node, 0, 0);
-    } finally{
-      SystraceMessage.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  private void applyUpdatesRecursive(ReactShadowNode node, float absoluteX, float absoluteY) {
-    if (!node.hasUpdates()) {
-      return;
-    }
-
-    if (!node.isVirtualAnchor()) {
-      for (int i = 0; i < node.getChildCount(); i++) {
-        applyUpdatesRecursive(
-            node.getChildAt(i),
-            absoluteX + node.getLayoutX(),
-            absoluteY + node.getLayoutY());
-      }
-    }
-
-    int tag = node.getReactTag();
-    if (getRootNode(tag) == null) {
-      boolean frameDidChange =
-          node.dispatchUpdates(absoluteX, absoluteY, mUIViewOperationQueue, null);
-      // Notify JS about layout event if requested
-      // and if the position or dimensions actually changed
-      // (consistent with iOS and Android Default implementation).
-      if (frameDidChange && node.shouldNotifyOnLayout()) {
-        mUIViewOperationQueue.enqueueOnLayoutEvent(tag,
-          node.getScreenX(),
-          node.getScreenY(),
-          node.getScreenWidth(),
-          node.getScreenHeight());
-      }
-    }
-
-    // Set the reference to the OriginalReactShadowNode to NULL, as the tree is already committed
-    // and we do not need to hold references to the previous tree anymore
-    node.setOriginalReactShadowNode(null);
-    node.markUpdateSeen();
-    node.markAsSealed();
-  }
-
-  @Override
-  @DoNotStrip
-  public <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(
-      final T rootView) {
-
-    SystraceMessage.beginSection(
-      Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-      "FabricUIManager.addRootView")
-      .flush();
-    try {
-      final int rootTag = ReactRootViewTagGenerator.getNextRootViewTag();
-      ThemedReactContext themedRootContext =
-          new ThemedReactContext(mReactApplicationContext, rootView.getContext());
-
-      ReactShadowNode rootShadowNode = createRootShadowNode(rootTag, themedRootContext);
-
-      int widthMeasureSpec = rootView.getWidthMeasureSpec();
-      int heightMeasureSpec = rootView.getHeightMeasureSpec();
-      updateRootView(rootShadowNode, widthMeasureSpec, heightMeasureSpec);
-
-      rootView.setOnSizeChangedListener(
-        new SizeMonitoringFrameLayout.OnSizeChangedListener() {
-          @Override
-          public void onSizeChanged(final int width, final int height, int oldW, int oldH) {
-            updateRootSize(rootTag, width, height);
-          }
-        });
-
-      mRootShadowNodeRegistry.registerNode(rootShadowNode);
-      mUIViewOperationQueue.addRootView(rootTag, rootView, themedRootContext);
-      return rootTag;
-    } finally{
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  @Override
-  @DoNotStrip
-  public synchronized void updateRootLayoutSpecs(int rootViewTag, int widthMeasureSpec, int heightMeasureSpec) {
-    ReactShadowNode rootNode = getRootNode(rootViewTag);
-    if (rootNode == null) {
-      FLog.w(ReactConstants.TAG, "Tried to update non-existent root tag: " + rootViewTag);
-      return;
-    }
-
-    ReactShadowNode newRootNode = rootNode.mutableCopy(rootNode.getInstanceHandle());
-    updateRootView(newRootNode, widthMeasureSpec, heightMeasureSpec);
-    mRootShadowNodeRegistry.replaceNode(newRootNode);
-  }
-
-  /**
-   * Updates the root view size and re-render the RN surface.
-   *
-   * //TODO: change synchronization to integrate with new #render loop.
-   */
-  private synchronized void updateRootSize(int rootTag, int newWidth, int newHeight) {
-    ReactShadowNode rootNode = getRootNode(rootTag);
-    if (rootNode == null) {
-      FLog.w(
-        ReactConstants.TAG,
-        "Tried to update size of non-existent tag: " + rootTag);
-      return;
-    }
-
-    ReactShadowNode newRootNode = rootNode.mutableCopy(rootNode.getInstanceHandle());
-    int newWidthSpec = View.MeasureSpec.makeMeasureSpec(newWidth, View.MeasureSpec.EXACTLY);
-    int newHeightSpec = View.MeasureSpec.makeMeasureSpec(newHeight, View.MeasureSpec.EXACTLY);
-    updateRootView(newRootNode, newWidthSpec, newHeightSpec);
-
-    completeRoot(rootTag, newRootNode.getChildrenList());
-  }
-
-  public void removeRootView(int rootTag) {
-    mRootShadowNodeRegistry.removeNode(rootTag);
-  }
-
-  private ReactShadowNode createRootShadowNode(int rootTag, ThemedReactContext themedReactContext) {
-    ReactShadowNode rootNode = new ReactShadowNodeImpl();
-    I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance();
-    if (sharedI18nUtilInstance.isRTL(themedReactContext)) {
-      rootNode.setLayoutDirection(YogaDirection.RTL);
-    }
-    rootNode.setViewClassName("Root");
-    rootNode.setReactTag(rootTag);
-    rootNode.setThemedContext(themedReactContext);
-    return rootNode;
-  }
-
-  /**
-   * Updates the styles of the {@link ReactShadowNode} based on the Measure specs received by
-   * parameters.
-   */
-  private void updateRootView(
-      ReactShadowNode node, int widthMeasureSpec, int heightMeasureSpec) {
-    int widthMode = View.MeasureSpec.getMode(widthMeasureSpec);
-    int widthSize = View.MeasureSpec.getSize(widthMeasureSpec);
-    switch (widthMode) {
-      case EXACTLY:
-        node.setStyleWidth(widthSize);
-        break;
-      case AT_MOST:
-        node.setStyleMaxWidth(widthSize);
-        break;
-      case UNSPECIFIED:
-        node.setStyleWidthAuto();
-        break;
-    }
-
-    int heightMode = View.MeasureSpec.getMode(heightMeasureSpec);
-    int heightSize = View.MeasureSpec.getSize(heightMeasureSpec);
-    switch (heightMode) {
-      case EXACTLY:
-        node.setStyleHeight(heightSize);
-        break;
-      case AT_MOST:
-        node.setStyleMaxHeight(heightSize);
-        break;
-      case UNSPECIFIED:
-        node.setStyleHeightAuto();
-        break;
-    }
-  }
-
-  private void handleException(ReactShadowNode node, Throwable t) {
-    try {
-      ThemedReactContext context = node.getThemedContext();
-      // TODO move exception management to JNI side, and refactor to avoid wrapping Throwable into
-      // a RuntimeException
-      context.handleException(new RuntimeException(t));
-    } catch (Exception ex) {
-      FLog.e(TAG, "Exception while executing a Fabric method", t);
-      throw new RuntimeException(ex.getMessage(), t);
-    }
-  }
-
-  @Nullable
-  @DoNotStrip
-  public long getEventTarget(int reactTag) {
-    long instanceHandle = mNativeViewHierarchyManager.getInstanceHandle(reactTag);
-    return instanceHandle;
-  }
-
-  @DoNotStrip
-  public void registerEventHandler(long eventHandlerPointer) {
-    mEventHandlerPointer = eventHandlerPointer;
-  }
-
-  @DoNotStrip
-  public void releaseEventTarget(long eventTargetPointer) {
-    mBinding.releaseEventTarget(mJSContext.get(), eventTargetPointer);
-  }
-
-  @DoNotStrip
-  public void releaseEventHandler(long eventHandlerPointer) {
-    mBinding.releaseEventHandler(mJSContext.get(), eventHandlerPointer);
-  }
-
-  @Override
-  @DoNotStrip
-  public void invoke(long eventTarget, String name, WritableMap params) {
-    if (DEBUG) {
-      FLog.d(
-        TAG,
-        "Dispatching event for target: " + eventTarget);
-    }
-    if (params == null) {
-      params = new WritableNativeMap();
-    }
-    mBinding.dispatchEventToTarget(mJSContext.get(), mEventHandlerPointer, eventTarget, name, (WritableNativeMap) params);
-  }
-
-  @Override
-  public void setJSResponder(int reactTag, boolean blockNativeResponder) {
-    // TODO: Do nothing for now
-  }
-
-  @Override
-  public void clearJSResponder() {
-    // TODO: Do nothing for now
-  }
-
-  @Override
-  public void initialize() {
-    FabricEventEmitter eventEmitter =
-      new FabricEventEmitter(mReactApplicationContext, this);
-    mEventDispatcher.registerEventEmitter(FABRIC, mFabricEventEmitter);
-  }
-
-  @Override
-  public void onCatalystInstanceDestroy() {
-    mBinding.releaseEventHandler(mJSContext.get(), mEventHandlerPointer);
-    mEventDispatcher.unregisterEventEmitter(FABRIC);
-    mFabricEventEmitter.close();
-  }
-
-  @Override
-  public void profileNextBatch() {
-    mUIViewOperationQueue.profileNextBatch();
-  }
-
-  @Override
-  public Map<String, Long> getPerformanceCounters() {
-    // TODO change profiling when enabling multi-thread rendering.
-    return mUIViewOperationQueue.getProfiledBatchPerfCounters();
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/JSHandler.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/JSHandler.java
deleted file mode 100644
index 471c016a6888d4..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/JSHandler.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- *
- * 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 com.facebook.react.bridge.WritableMap;
-
-public interface JSHandler {
-
-  void invoke(long instanceHandle, String name, WritableMap params);
-
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java
deleted file mode 100644
index 1d66d4b500e6d3..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 com.facebook.react.uimanager.ReactShadowNode;
-import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.concurrent.ThreadSafe;
-
-/**
- * Simple container class to keep track of {@link ReactShadowNode}s that represents the Root
- * Shadow Nodes of a {@link FabricUIManager}.
- */
-@ThreadSafe
-public class RootShadowNodeRegistry {
-
-  private final ConcurrentHashMap<Integer, ReactShadowNode> mTagsToRootNodes = new ConcurrentHashMap<>();
-
-  /**
-   * Registers the {@link ReactShadowNode} received as a parameter as a RootShadowNode.
-   */
-  public synchronized void registerNode(ReactShadowNode node) {
-    mTagsToRootNodes.put(node.getReactTag(), node);
-  }
-
-  /**
-   * Register the {@link ReactShadowNode} received as a parameter as a RootShadowNode, replacing
-   * the previous RootShadowNode associated for the {@link ReactShadowNode#getReactTag()}
-   */
-  public void replaceNode(ReactShadowNode node) {
-    mTagsToRootNodes.replace(node.getReactTag(), node);
-  }
-
-  public void removeNode(Integer tag) {
-    mTagsToRootNodes.remove(tag);
-  }
-
-  public ReactShadowNode getNode(int tag) {
-    return mTagsToRootNodes.get(tag);
-  }
-
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/Scheduler.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/Scheduler.java
deleted file mode 100644
index fb199435f99bb9..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/Scheduler.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.facebook.react.fabric;
-
-import com.facebook.common.logging.FLog;
-import com.facebook.react.bridge.ReactContext;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-/**
- * This class allows Native code to schedule work in JS.
- * Work (following JS naming) represents a task that needs to be executed in JS.
- *
- * Four types of work are supported by this class:
- *
- * Synchronous:
- * - Sync work                   -> flushSync()
- * - Work work                   -> flushSerial()
- *
- * Asynchronous:
- * - Interactive work (serial):  -> scheduleSerial()
- * - Deferred work:              -> scheduleWork()
- *
- */
-public class Scheduler {
-
-  private static final String TAG = Scheduler.class.getSimpleName();
-  // The usage of this executor might change in the near future.
-  private final ExecutorService mExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingDeque<Runnable>());
-  private final ReactContext mReactContext;
-
-  public Scheduler(ReactContext reactContext) {
-    mReactContext = reactContext;
-  }
-
-  /**
-   * This method schedules work to be executed with the lowest priority in the JS Thread.
-   *
-   * The current implementation queues "work"s in an unbounded queue tight to a SingleThreadExecutor.
-   * Work objects are going to be submitted one-by-one at the end of the JS Queue Thread.
-   *
-   * Notice that the current implementation might experience some delays in JS work execution,
-   * depending on the size of the JS Queue and the time it takes to execute each work in JS.
-   *
-   * TODO: This implementation is very likely to change in the near future.
-   */
-  public void scheduleWork(final Work work) {
-    try {
-      mExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          mReactContext.runOnJSQueueThread(new Runnable() {
-            @Override
-            public void run() {
-              try {
-                work.run();
-              } catch (Exception ex) {
-                FLog.w(TAG, "Exception running work in JS.", ex);
-                throw ex;
-              }
-            }
-          });
-        }
-      });
-    } catch (RejectedExecutionException ex) {
-      // This can happen if a Work is scheduled when the Scheduler is being shutdown.
-      // For now, we log and do not take any action.
-      FLog.i(TAG, "Unable to schedule task.");
-    }
-  }
-
-  public void flushSync(Work work) {
-    // TODO T26717866 this method needs to be implemented. The current implementation is just for
-    // testing purpose.
-  }
-
-  public void flushSerial(Work work) {
-    // TODO T26717866 this method needs to be implemented. The current implementation is just for
-    // testing purpose.
-  }
-
-  public void scheduleSerial(Work work) {
-    // TODO T26717866 this method needs to be implemented. The current implementation is just for
-    // testing purpose.
-  }
-
-  /**
-   * Shutdowns the {@link Scheduler}. this operation will attempt to stop all "active executing"
-   * Works items and it will "halts:" all the Works items waiting to be executed.
-   */
-  public void shutdown() {
-    mExecutor.shutdownNow();
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/Work.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/Work.java
deleted file mode 100644
index d179b00439dcde..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/Work.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- *
- * 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;
-
-/**
- * Interface that represents a task or piece of code that will be executed by {@link Scheduler}
- * This follows React API naming for consistency.
- */
-public interface Work {
-
-  void run();
-
-}
-
-
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java
deleted file mode 100644
index 2d1c01d8692226..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- *
- * 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.events;
-
-import static com.facebook.react.uimanager.events.TouchesHelper.CHANGED_TOUCHES_KEY;
-import static com.facebook.react.uimanager.events.TouchesHelper.TARGET_KEY;
-import static com.facebook.react.uimanager.events.TouchesHelper.TOP_TOUCH_CANCEL_KEY;
-import static com.facebook.react.uimanager.events.TouchesHelper.TOP_TOUCH_END_KEY;
-import static com.facebook.react.uimanager.events.TouchesHelper.TOUCHES_KEY;
-
-import android.annotation.TargetApi;
-import android.os.Build;
-import android.util.Pair;
-import com.facebook.common.logging.FLog;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeArray;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.fabric.FabricUIManager;
-import com.facebook.react.fabric.Scheduler;
-import com.facebook.react.fabric.Work;
-import com.facebook.react.uimanager.IllegalViewOperationException;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-import java.io.Closeable;
-import java.util.HashSet;
-import java.util.Set;
-import javax.annotation.Nullable;
-
-@TargetApi(Build.VERSION_CODES.ECLAIR)
-public class FabricEventEmitter implements RCTEventEmitter, Closeable {
-
-  private static final String TAG = FabricEventEmitter.class.getSimpleName();
-
-  private final FabricUIManager mFabricUIManager;
-  private final Scheduler mScheduler;
-
-  public FabricEventEmitter(ReactApplicationContext context, FabricUIManager fabricUIManager) {
-    mScheduler = new Scheduler(context);
-    mFabricUIManager = fabricUIManager;
-  }
-
-  @Override
-  public void receiveEvent(int reactTag, String eventName, @Nullable WritableMap params) {
-    try {
-      long eventTarget = mFabricUIManager.getEventTarget(reactTag);
-      mScheduler.scheduleWork(new FabricUIManagerWork(eventTarget, eventName, params));
-    } catch (IllegalViewOperationException e) {
-      FLog.e(TAG, "Unable to emmit event for tag " + reactTag, e);
-    }
-  }
-
-  @Override
-  public void close() {
-    mScheduler.shutdown();
-  }
-
-  private class FabricUIManagerWork implements Work {
-    private final long mEventTarget;
-    private final String mEventName;
-    private final WritableMap mParams;
-
-    public FabricUIManagerWork(long eventTarget, String eventName, @Nullable WritableMap params) {
-      mEventTarget = eventTarget;
-      mEventName = eventName;
-      mParams = params;
-    }
-
-    @Override
-    public void run() {
-      try {
-        mFabricUIManager.invoke(mEventTarget, mEventName, mParams);
-      } catch (Throwable t) {
-        FLog.e(TAG, "Error sending event " + mEventName, t);
-        //TODO: manage exception properly
-      } finally{
-        // TODO(dvacca): We need to only release this after all shadow nodes
-        // have been released. The easiest way would be to adopt the event
-        // emitter approach from the C++ Fabric. For now, we'll just leak.
-        // mFabricUIManager.releaseEventTarget(mEventTarget);
-      }
-    }
-  }
-
-  @Override
-  public void receiveTouches(String eventTopLevelType, WritableArray touches,
-    WritableArray changedIndices) {
-    Pair<WritableArray, WritableArray> result =
-      TOP_TOUCH_END_KEY.equalsIgnoreCase(eventTopLevelType) ||
-        TOP_TOUCH_CANCEL_KEY.equalsIgnoreCase(eventTopLevelType)
-        ? removeTouchesAtIndices(touches, changedIndices)
-        : touchSubsequence(touches, changedIndices);
-
-    WritableArray changedTouches = result.first;
-    touches = result.second;
-
-    for (int jj = 0; jj < changedTouches.size(); jj++) {
-      WritableMap touch = getWritableMap(changedTouches.getMap(jj));
-      // Touch objects can fulfill the role of `DOM` `Event` objects if we set
-      // the `changedTouches`/`touches`. This saves allocations.
-      touch.putArray(CHANGED_TOUCHES_KEY, changedTouches);
-      touch.putArray(TOUCHES_KEY, touches);
-      WritableMap nativeEvent = touch;
-      int rootNodeID = 0;
-      int target = nativeEvent.getInt(TARGET_KEY);
-      if (target < 1) {
-        FLog.e(TAG,"A view is reporting that a touch occurred on tag zero.");
-      } else {
-        rootNodeID = target;
-      }
-      receiveEvent(rootNodeID, eventTopLevelType, touch);
-    }
-  }
-
-  /**
-   * Destroys `touches` by removing touch objects at indices `indices`. This is
-   * to maintain compatibility with W3C touch "end" events, where the active
-   * touches don't include the set that has just been "ended".
-   *
-   * This method was originally in ReactNativeRenderer.js
-   *
-   * TODO: this method is a copy from ReactNativeRenderer.removeTouchesAtIndices and it needs
-   * to be rewritten in a more efficient way,
-   *
-   * @param touches {@link WritableArray} Deserialized touch objects.
-   * @param indices {WritableArray} Indices to remove from `touches`.
-   * @return {Array<Touch>} Subsequence of removed touch objects.
-   */
-  private Pair<WritableArray, WritableArray> removeTouchesAtIndices(WritableArray touches, WritableArray indices) {
-    WritableArray rippedOut = new WritableNativeArray();
-    // use an unsafe downcast to alias to nullable elements,
-    // so we can delete and then compact.
-    WritableArray tempTouches = new WritableNativeArray();
-    Set<Integer> rippedOutIndices = new HashSet<>();
-    for (int i = 0; i < indices.size(); i++) {
-      int index = indices.getInt(i);
-      rippedOut.pushMap(getWritableMap(touches.getMap(index)));
-      rippedOutIndices.add(index);
-    }
-    for (int j = 0 ; j < touches.size() ; j++) {
-      if (!rippedOutIndices.contains(j)) {
-        tempTouches.pushMap(getWritableMap(touches.getMap(j)));
-      }
-    }
-
-    return new Pair<>(rippedOut, tempTouches);
-  }
-
-  /**
-   * Selects a subsequence of `Touch`es, without destroying `touches`.
-   *
-   * This method was originally in ReactNativeRenderer.js
-   *
-   * @param touches {@link WritableArray} Deserialized touch objects.
-   * @param changedIndices {@link WritableArray} Indices by which to pull subsequence.
-   * @return {Array<Touch>} Subsequence of touch objects.
-   */
-  private Pair<WritableArray, WritableArray> touchSubsequence(WritableArray touches, WritableArray changedIndices) {
-    WritableArray result = new WritableNativeArray();
-    for (int i = 0; i < changedIndices.size(); i++) {
-      result.pushMap(getWritableMap(touches.getMap(i)));
-    }
-    return new Pair<>(result, touches);
-  }
-
-  /**
-   * TODO: this is required because the WritableNativeArray.getMap() returns a ReadableMap instead
-   * of the original writableMap. this will change in the near future.
-   *
-   * @param readableMap {@link ReadableMap} source map
-   */
-  private WritableMap getWritableMap(ReadableMap readableMap) {
-    WritableNativeMap map = new WritableNativeMap();
-    map.merge(readableMap);
-    return map;
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/BUCK
deleted file mode 100644
index 18312ac1c7a179..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/BUCK
+++ /dev/null
@@ -1,24 +0,0 @@
-load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_dep", "react_native_target", "rn_android_library")
-
-rn_android_library(
-    name = "jsc",
-    srcs = glob(["**/*.java"]),
-    provided_deps = [
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
-    ],
-    required_for_source_only_abi = True,
-    visibility = [
-        "PUBLIC",
-    ],
-    deps = [
-        react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
-        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
-        react_native_target("java/com/facebook/react/bridge:bridge"),
-        react_native_target("java/com/facebook/react/fabric:fabric"),
-        react_native_target("java/com/facebook/react/fabric/jsc/jni:jni"),
-    ],
-    exported_deps = [
-        react_native_dep("java/com/facebook/jni:jni"),
-        react_native_dep("java/com/facebook/proguard/annotations:annotations"),
-    ],
-)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/FabricJSCBinding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/FabricJSCBinding.java
deleted file mode 100644
index 92e82d41e51ea6..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/FabricJSCBinding.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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.jsc;
-
-import com.facebook.jni.HybridData;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.fabric.FabricBinding;
-import com.facebook.react.fabric.FabricUIManager;
-import com.facebook.react.bridge.NativeMap;
-import com.facebook.soloader.SoLoader;
-
-@DoNotStrip
-public class FabricJSCBinding implements FabricBinding {
-
-  static {
-    SoLoader.loadLibrary("fabricjscjni");
-  }
-
-  // used from native
-  @SuppressWarnings("unused")
-  private final HybridData mHybridData;
-
-  private static native HybridData initHybrid();
-
-  @Override
-  public native void releaseEventTarget(long jsContextNativePointer, long eventTargetPointer);
-
-  @Override
-  public native void releaseEventHandler(long jsContextNativePointer, long eventHandlerPointer);
-
-  @Override
-  public native void dispatchEventToEmptyTarget(
-    long jsContextNativePointer,
-    long eventHandlerPointer,
-    String type,
-    NativeMap payload
-  );
-
-  @Override
-  public native void dispatchEventToTarget(
-    long jsContextNativePointer,
-    long eventHandlerPointer,
-    long eventTargetPointer,
-    String type,
-    NativeMap payload
-  );
-
-  private native void installFabric(long jsContextNativePointer, Object fabricModule);
-
-  public FabricJSCBinding() {
-    mHybridData = initHybrid();
-  }
-
-  @Override
-  public void installFabric(JavaScriptContextHolder jsContext, FabricUIManager fabricModule) {
-    fabricModule.setBinding(this);
-    installFabric(jsContext.get(), fabricModule);
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/BUCK
deleted file mode 100644
index 81f476d41d97f2..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/BUCK
+++ /dev/null
@@ -1,21 +0,0 @@
-load("//ReactNative: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"]),
-    compiler_flags = [
-        "-Wall",
-        "-fexceptions",
-        "-std=gnu++1y",
-    ],
-    platforms = ANDROID,
-    soname = "libfabricjscjni.$(ext)",
-    visibility = ["PUBLIC"],
-    deps = [
-        FBJNI_TARGET,
-        "xplat//folly:molly",
-        react_native_xplat_target("jschelpers:jschelpers"),
-        react_native_target("jni/react/jni:jni"),
-    ],
-)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/FabricJSCBinding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/FabricJSCBinding.cpp
deleted file mode 100644
index 5717c930b6821e..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/FabricJSCBinding.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "FabricJSCBinding.h"
-#include <fb/fbjni.h>
-#include <jschelpers/JavaScriptCore.h>
-#include <jschelpers/Unicode.h>
-
-using namespace facebook::jni;
-
-namespace facebook {
-namespace react {
-
-namespace {
-
-bool useCustomJSC = false;
-
-struct JList : public JavaClass<JList> {
-  static constexpr auto kJavaDescriptor = "Ljava/util/List;";
-};
-
-struct JShadowNode : public JavaClass<JShadowNode> {
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/react/uimanager/ReactShadowNode;";
-};
-
-typedef struct FabricJSCUIManager {
-  FabricJSCUIManager(alias_ref<jobject> module, JSClassRef classRef, bool customJSC)
-    : wrapperObjectClassRef(classRef)
-    , useCustomJSC(customJSC) {
-    fabricUiManager = make_global(module);
-    JSC_JSClassRetain(useCustomJSC, wrapperObjectClassRef);
-  }
-  global_ref<jobject> fabricUiManager;
-  JSClassRef wrapperObjectClassRef;
-  bool useCustomJSC;
-
-  ~FabricJSCUIManager() {
-    JSC_JSClassRelease(useCustomJSC, wrapperObjectClassRef);
-  }
-} FabricJSCUIManager;
-
-jobject makePlainGlobalRef(jobject object) {
-  // When storing the global reference we need it to be a plain
-  // pointer. That's why we use plain jni instead of fbjni here.
-  return Environment::current()->NewGlobalRef(object);
-}
-
-local_ref<JString> JSValueToJString(JSContextRef ctx, JSValueRef value) {
-  JSStringRef strRef = JSC_JSValueToStringCopy(ctx, value, NULL);
-  const size_t size = JSStringGetMaximumUTF8CStringSize(strRef);
-  char buffer[size];
-  JSStringGetUTF8CString(strRef, buffer, size);
-  JSC_JSStringRelease(ctx, strRef);
-  return make_jstring(buffer);
-}
-
-local_ref<JShadowNode> JSValueToJShadowNode(JSContextRef ctx, JSValueRef value) {
-  JSObjectRef obj = JSC_JSValueToObject(ctx, value, NULL);
-  auto node = static_cast<JShadowNode::javaobject>(JSC_JSObjectGetPrivate(useCustomJSC, obj));
-  return make_local(node);
-}
-
-local_ref<JList> JSValueToJList(JSContextRef ctx, JSValueRef value) {
-  JSObjectRef obj = JSC_JSValueToObject(ctx, value, NULL);
-  auto node = static_cast<JList::javaobject>(JSC_JSObjectGetPrivate(useCustomJSC, obj));
-  return make_local(node);
-}
-
-local_ref<ReadableNativeMap::jhybridobject> JSValueToReadableMapViaJSON(JSContextRef ctx, JSValueRef value) {
-  JSStringRef jsonRef = JSC_JSValueCreateJSONString(ctx, value, 0, NULL);
-  size_t size = JSC_JSStringGetLength(ctx, jsonRef);
-  const JSChar* utf16 = JSC_JSStringGetCharactersPtr(ctx, jsonRef);
-  std::string json = unicode::utf16toUTF8(utf16, size);
-  JSC_JSStringRelease(ctx, jsonRef);
-  folly::dynamic dynamicValue = folly::parseJson(json);
-  return ReadableNativeMap::newObjectCxxArgs(std::move(dynamicValue));
-}
-
-JSValueRef ReadableMapToJSValueViaJSON(JSContextRef ctx, NativeMap *map) {
-  folly::dynamic dynamicValue = map->consume();
-  auto json = folly::toJson(dynamicValue);
-  JSStringRef jsonRef = JSC_JSStringCreateWithUTF8CString(ctx, json.c_str());
-  auto value = JSC_JSValueMakeFromJSONString(ctx, jsonRef);
-  JSC_JSStringRelease(ctx, jsonRef);
-  return value;
-}
-
-JSValueRef createNode(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception) {
-  FabricJSCUIManager *managerWrapper = (FabricJSCUIManager *)JSC_JSObjectGetPrivate(useCustomJSC, function);
-  alias_ref<jobject> manager = managerWrapper->fabricUiManager;
-  JSClassRef classRef = managerWrapper->wrapperObjectClassRef;
-
-  static auto createNode =
-    jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-      ->getMethod<alias_ref<JShadowNode>(jint, jstring, jint, ReadableNativeMap::javaobject, jlong)>("createNode");
-
-  int reactTag = (int)JSC_JSValueToNumber(ctx, arguments[0], NULL);
-  auto viewName = JSValueToJString(ctx, arguments[1]);
-  int rootTag = (int)JSC_JSValueToNumber(ctx, arguments[2], NULL);
-  auto props = JSC_JSValueIsNull(ctx, arguments[3]) ? local_ref<ReadableNativeMap::jhybridobject>(nullptr) :
-               JSValueToReadableMapViaJSON(ctx, arguments[3]);;
-  auto eventTarget = (void *)arguments[4];
-
-  auto node = createNode(manager, reactTag, viewName.get(), rootTag, props.get(), (jlong)eventTarget);
-
-  return JSC_JSObjectMake(ctx, classRef, makePlainGlobalRef(node.get()));
-}
-
-JSValueRef cloneNode(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception) {
-  FabricJSCUIManager *managerWrapper = (FabricJSCUIManager *)JSC_JSObjectGetPrivate(useCustomJSC, function);
-  alias_ref<jobject> manager = managerWrapper->fabricUiManager;
-  JSClassRef classRef = managerWrapper->wrapperObjectClassRef;
-
-  static auto cloneNode =
-    jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-      ->getMethod<alias_ref<JShadowNode>(JShadowNode::javaobject)>("cloneNode");
-
-  auto previousNode = JSValueToJShadowNode(ctx, arguments[0]);
-  auto newNode = cloneNode(manager, previousNode.get());
-
-  return JSC_JSObjectMake(ctx, classRef, makePlainGlobalRef(newNode.get()));
-}
-
-JSValueRef cloneNodeWithNewChildren(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception) {
-  FabricJSCUIManager *managerWrapper = (FabricJSCUIManager *)JSC_JSObjectGetPrivate(useCustomJSC, function);
-  alias_ref<jobject> manager = managerWrapper->fabricUiManager;
-  JSClassRef classRef = managerWrapper->wrapperObjectClassRef;
-
-  static auto cloneNodeWithNewChildren =
-    jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-      ->getMethod<alias_ref<JShadowNode>(JShadowNode::javaobject)>("cloneNodeWithNewChildren");
-
-  auto previousNode = JSValueToJShadowNode(ctx, arguments[0]);
-  auto newNode = cloneNodeWithNewChildren(manager, previousNode.get());
-
-  return JSC_JSObjectMake(ctx, classRef, makePlainGlobalRef(newNode.get()));
-}
-
-JSValueRef cloneNodeWithNewProps(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception) {
-  FabricJSCUIManager *managerWrapper = (FabricJSCUIManager *)JSC_JSObjectGetPrivate(useCustomJSC, function);
-  alias_ref<jobject> manager = managerWrapper->fabricUiManager;
-  JSClassRef classRef = managerWrapper->wrapperObjectClassRef;
-
-  static auto cloneNodeWithNewProps =
-    jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-      ->getMethod<alias_ref<JShadowNode>(JShadowNode::javaobject, ReadableNativeMap::javaobject)>("cloneNodeWithNewProps");
-
-  auto previousNode = JSValueToJShadowNode(ctx, arguments[0]);
-  auto props = JSValueToReadableMapViaJSON(ctx, arguments[1]);
-  auto newNode = cloneNodeWithNewProps(manager, previousNode.get(), props.get());
-
-  return JSC_JSObjectMake(ctx, classRef, makePlainGlobalRef(newNode.get()));
-}
-
-JSValueRef cloneNodeWithNewChildrenAndProps(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception) {
-  FabricJSCUIManager *managerWrapper = (FabricJSCUIManager *)JSC_JSObjectGetPrivate(useCustomJSC, function);
-  alias_ref<jobject> manager = managerWrapper->fabricUiManager;
-  JSClassRef classRef = managerWrapper->wrapperObjectClassRef;
-
-  static auto cloneNodeWithNewChildrenAndProps =
-    jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-      ->getMethod<alias_ref<JShadowNode>(JShadowNode::javaobject, ReadableNativeMap::javaobject)>("cloneNodeWithNewChildrenAndProps");
-
-  auto previousNode = JSValueToJShadowNode(ctx, arguments[0]);
-  auto props = JSValueToReadableMapViaJSON(ctx, arguments[1]);
-  auto newNode = cloneNodeWithNewChildrenAndProps(manager, previousNode.get(), props.get());
-
-  return JSC_JSObjectMake(ctx, classRef, makePlainGlobalRef(newNode.get()));
-}
-
-JSValueRef appendChild(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception) {
-  FabricJSCUIManager *managerWrapper = (FabricJSCUIManager *)JSC_JSObjectGetPrivate(useCustomJSC, function);
-  alias_ref<jobject> manager = managerWrapper->fabricUiManager;
-
-  static auto appendChild =
-    jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-      ->getMethod<void(JShadowNode::javaobject, JShadowNode::javaobject)>("appendChild");
-
-  auto parentNode = JSValueToJShadowNode(ctx, arguments[0]);
-  auto childNode = JSValueToJShadowNode(ctx, arguments[1]);
-
-  appendChild(manager, parentNode.get(), childNode.get());
-
-  return JSC_JSValueMakeUndefined(ctx);
-}
-
-JSValueRef createChildSet(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception) {
-  FabricJSCUIManager *managerWrapper = (FabricJSCUIManager *)JSC_JSObjectGetPrivate(useCustomJSC, function);
-  alias_ref<jobject> manager = managerWrapper->fabricUiManager;
-  JSClassRef classRef = managerWrapper->wrapperObjectClassRef;
-
-  static auto createChildSet =
-    jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-      ->getMethod<alias_ref<JList>(jint)>("createChildSet");
-
-  int rootTag = (int)JSC_JSValueToNumber(ctx, arguments[0], NULL);
-  auto childSet = createChildSet(manager, rootTag);
-
-  return JSC_JSObjectMake(ctx, classRef, makePlainGlobalRef(childSet.get()));
-}
-
-JSValueRef appendChildToSet(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception) {
-  FabricJSCUIManager *managerWrapper = (FabricJSCUIManager *)JSC_JSObjectGetPrivate(useCustomJSC, function);
-  alias_ref<jobject> manager = managerWrapper->fabricUiManager;
-
-  static auto appendChildToSet =
-    jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-      ->getMethod<void(JList::javaobject, JShadowNode::javaobject)>("appendChildToSet");
-
-  auto childSet = JSValueToJList(ctx, arguments[0]);
-  auto childNode = JSValueToJShadowNode(ctx, arguments[1]);
-
-  appendChildToSet(manager, childSet.get(), childNode.get());
-
-  return JSC_JSValueMakeUndefined(ctx);
-}
-
-JSValueRef completeRoot(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception) {
-  FabricJSCUIManager *managerWrapper = (FabricJSCUIManager *)JSC_JSObjectGetPrivate(useCustomJSC, function);
-  alias_ref<jobject> manager = managerWrapper->fabricUiManager;
-
-  static auto completeRoot =
-    jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-      ->getMethod<void(jint, JList::javaobject)>("completeRoot");
-
-  int rootTag = (int)JSC_JSValueToNumber(ctx, arguments[0], NULL);
-  auto childSet = JSValueToJList(ctx, arguments[1]);
-
-  completeRoot(manager, rootTag, childSet.get());
-
-  return JSC_JSValueMakeUndefined(ctx);
-}
-
-JSValueRef registerEventHandler(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception) {
-  FabricJSCUIManager *managerWrapper = (FabricJSCUIManager *)JSC_JSObjectGetPrivate(useCustomJSC, function);
-  alias_ref<jobject> manager = managerWrapper->fabricUiManager;
-
-  static auto registerEventHandler =
-    jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-      ->getMethod<void(jlong)>("registerEventHandler");
-
-  auto eventHandler = arguments[0];
-  JSC_JSValueProtect(ctx, eventHandler);
-  registerEventHandler(manager, (jlong)eventHandler);
-
-  return JSC_JSValueMakeUndefined(ctx);
-}
-
-void finalizeJNIObject(JSObjectRef object) {
-  // Release whatever global ref object we're storing here.
-  jobject globalRef = (jobject)JSC_JSObjectGetPrivate(useCustomJSC, object);
-  Environment::current()->DeleteGlobalRef(globalRef);
-}
-
-void finalizeWrapper(JSObjectRef object) {
-  FabricJSCUIManager *managerWrapper = (FabricJSCUIManager *)JSC_JSObjectGetPrivate(useCustomJSC, object);
-  delete managerWrapper;
-}
-
-void addFabricMethod(
-  JSContextRef context,
-  jni::alias_ref<jobject> fabricModule,
-  JSClassRef nodeClassRef,
-  JSObjectRef module,
-  const char *name,
-  JSObjectCallAsFunctionCallback callback
-) {
-  JSClassDefinition definition = kJSClassDefinitionEmpty;
-  definition.callAsFunction = callback;
-  definition.finalize = finalizeWrapper;
-  JSClassRef classRef = JSC_JSClassCreate(useCustomJSC, &definition);
-  FabricJSCUIManager *managerWrapper = new FabricJSCUIManager(fabricModule, nodeClassRef, useCustomJSC);
-  JSObjectRef functionRef = JSC_JSObjectMake(context, classRef, managerWrapper);
-  JSC_JSClassRelease(useCustomJSC, classRef);
-
-  JSStringRef nameStr = JSC_JSStringCreateWithUTF8CString(context, name);
-  JSC_JSObjectSetProperty(context, module, nameStr, functionRef, kJSPropertyAttributeNone, NULL);
-  JSC_JSStringRelease(context, nameStr);
-}
-
-}
-
-jni::local_ref<FabricJSCBinding::jhybriddata> FabricJSCBinding::initHybrid(
-    jni::alias_ref<jclass>) {
-  return makeCxxInstance();
-}
-
-void FabricJSCBinding::releaseEventTarget(
-  jlong jsContextNativePointer,
-  jlong eventTargetPointer
-) {
-  // This is now a noop.
-}
-
-void FabricJSCBinding::releaseEventHandler(
-  jlong jsContextNativePointer,
-  jlong eventHandlerPointer
-) {
-  JSContextRef context = (JSContextRef)jsContextNativePointer;
-  JSValueRef value = (JSValueRef)((void *)eventHandlerPointer);
-  // Release this function.
-  JSC_JSValueUnprotect(context, value);
-}
-
-void FabricJSCBinding::dispatchEventToEmptyTarget(
-  jlong jsContextNativePointer,
-  jlong eventHandlerPointer,
-  std::string type,
-  NativeMap *payloadMap
-) {
-  JSContextRef context = (JSContextRef)jsContextNativePointer;
-  JSObjectRef eventHandler = (JSObjectRef)((void *)eventHandlerPointer);
-  JSValueRef eventTarget = JSC_JSValueMakeNull(context);
-
-  JSObjectRef thisArg = (JSObjectRef)JSC_JSValueMakeUndefined(context);
-  JSStringRef typeStr = JSC_JSStringCreateWithUTF8CString(context, type.c_str());
-  JSValueRef typeRef = JSC_JSValueMakeString(context, typeStr);
-  JSC_JSStringRelease(context, typeStr);
-  JSValueRef payloadRef = ReadableMapToJSValueViaJSON(context, payloadMap);
-  JSValueRef args[] = {eventTarget, typeRef, payloadRef};
-  JSValueRef exn;
-  JSValueRef result = JSC_JSObjectCallAsFunction(
-    context,
-    eventHandler,
-    thisArg,
-    3,
-    args,
-    &exn
-  );
-  if (!result) {
-    // TODO: Handle error in exn
-  }
-}
-
-void FabricJSCBinding::dispatchEventToTarget(
-  jlong jsContextNativePointer,
-  jlong eventHandlerPointer,
-  jlong eventTargetPointer,
-  std::string type,
-  NativeMap *payloadMap
-) {
-  JSContextRef context = (JSContextRef)jsContextNativePointer;
-  JSObjectRef eventHandler = (JSObjectRef)((void *)eventHandlerPointer);
-  JSObjectRef eventTarget = (JSObjectRef)((void *)eventTargetPointer);
-
-  JSObjectRef thisArg = (JSObjectRef)JSC_JSValueMakeUndefined(context);
-  JSStringRef typeStr = JSC_JSStringCreateWithUTF8CString(context, type.c_str());
-  JSValueRef typeRef = JSC_JSValueMakeString(context, typeStr);
-  JSC_JSStringRelease(context, typeStr);
-  JSValueRef payloadRef = ReadableMapToJSValueViaJSON(context, payloadMap);
-  JSValueRef args[] = {eventTarget, typeRef, payloadRef};
-  JSValueRef exn;
-  JSValueRef result = JSC_JSObjectCallAsFunction(
-    context,
-    eventHandler,
-    thisArg,
-    3,
-    args,
-    &exn
-  );
-  if (!result) {
-    // TODO: Handle error in exn
-  }
-}
-
-void FabricJSCBinding::installFabric(jlong jsContextNativePointer,
-    jni::alias_ref<jobject> fabricModule) {
-  JSContextRef context = (JSContextRef)jsContextNativePointer;
-  useCustomJSC = facebook::react::isCustomJSCPtr(context);
-
-  JSObjectRef module = JSC_JSObjectMake(context, NULL, NULL);
-
-  // Class definition for wrapper objects around nodes and sets
-  JSClassDefinition definition = kJSClassDefinitionEmpty;
-  definition.finalize = finalizeJNIObject;
-  JSClassRef classRef = JSC_JSClassCreate(useCustomJSC, &definition);
-
-  addFabricMethod(context, fabricModule, classRef, module, "createNode", createNode);
-  addFabricMethod(context, fabricModule, classRef, module, "cloneNode", cloneNode);
-  addFabricMethod(context, fabricModule, classRef, module, "cloneNodeWithNewChildren", cloneNodeWithNewChildren);
-  addFabricMethod(context, fabricModule, classRef, module, "cloneNodeWithNewProps", cloneNodeWithNewProps);
-  addFabricMethod(context, fabricModule, classRef, module, "cloneNodeWithNewChildrenAndProps", cloneNodeWithNewChildrenAndProps);
-
-  addFabricMethod(context, fabricModule, classRef, module, "appendChild", appendChild);
-  addFabricMethod(context, fabricModule, classRef, module, "createChildSet", createChildSet);
-  addFabricMethod(context, fabricModule, classRef, module, "appendChildToSet", appendChildToSet);
-  addFabricMethod(context, fabricModule, classRef, module, "completeRoot", completeRoot);
-
-  addFabricMethod(context, fabricModule, classRef, module, "registerEventHandler", registerEventHandler);
-
-  JSC_JSClassRelease(useCustomJSC, classRef);
-
-  JSObjectRef globalObject = JSC_JSContextGetGlobalObject(context);
-  JSStringRef globalName = JSC_JSStringCreateWithUTF8CString(context, "nativeFabricUIManager");
-  JSC_JSObjectSetProperty(context, globalObject, globalName, module, kJSPropertyAttributeNone, NULL);
-  JSC_JSStringRelease(context, globalName);
-}
-
-void FabricJSCBinding::registerNatives() {
-  registerHybrid({
-    makeNativeMethod("initHybrid", FabricJSCBinding::initHybrid),
-    makeNativeMethod("installFabric", FabricJSCBinding::installFabric),
-    makeNativeMethod("releaseEventTarget", FabricJSCBinding::releaseEventTarget),
-    makeNativeMethod("releaseEventHandler", FabricJSCBinding::releaseEventHandler),
-    makeNativeMethod("dispatchEventToEmptyTarget", FabricJSCBinding::dispatchEventToEmptyTarget),
-    makeNativeMethod("dispatchEventToTarget", FabricJSCBinding::dispatchEventToTarget),
-  });
-}
-
-}
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/FabricJSCBinding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/FabricJSCBinding.h
deleted file mode 100644
index d47a0bb584d8cb..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/FabricJSCBinding.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <memory>
-#include <fb/fbjni.h>
-#include <react/jni/ReadableNativeMap.h>
-
-namespace facebook {
-namespace react {
-
-class Instance;
-
-class FabricJSCBinding : public jni::HybridClass<FabricJSCBinding> {
-public:
-  constexpr static const char *const kJavaDescriptor =
-    "Lcom/facebook/react/fabric/jsc/FabricJSCBinding;";
-
-  static void registerNatives();
-
-private:
-
-  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
-
-  void releaseEventTarget(jlong jsContextNativePointer, jlong eventTargetPointer);
-
-  void releaseEventHandler(jlong jsContextNativePointer, jlong eventHandlerPointer);
-
-  void dispatchEventToEmptyTarget(
-    jlong jsContextNativePointer,
-    jlong eventHandlerPointer,
-    std::string type,
-    NativeMap *payload
-  );
-
-  void dispatchEventToTarget(
-    jlong jsContextNativePointer,
-    jlong eventHandlerPointer,
-    jlong eventTargetPointer,
-    std::string type,
-    NativeMap *payload
-  );
-
-  void installFabric(jlong jsContextNativePointer, jni::alias_ref<jobject> fabricModule);
-
-};
-
-}
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/OnLoad.cpp
deleted file mode 100644
index e6b84dd24c9b63..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/jni/OnLoad.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <fb/fbjni.h>
-#include <fb/xplat_init.h>
-
-#include "FabricJSCBinding.h"
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
-  return facebook::xplat::initialize(vm, [] {
-    facebook::react::FabricJSCBinding::registerNatives();
-  });
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk
new file mode 100644
index 00000000000000..9b7404543b56c5
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := jscexecutor
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti
+
+LOCAL_STATIC_LIBRARIES := libjsi libjsireact
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libreactnativejni
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK
new file mode 100644
index 00000000000000..7888574707aa94
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK
@@ -0,0 +1,35 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "rn_xplat_cxx_library", "react_native_xplat_target", "react_native_target", "react_native_dep", "rn_android_library")
+
+rn_android_library(
+    name = "jscexecutor",
+    srcs = glob(["*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        ":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 = ["-fexceptions"],
+    platforms = ANDROID,
+    fbandroid_allow_jni_merging = True,
+    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/jscexecutor/JSCExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutor.java
new file mode 100644
index 00000000000000..7455dffb402e50
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutor.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * <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.facebook.react.jscexecutor;
+
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.JavaScriptExecutor;
+import com.facebook.react.bridge.ReadableNativeMap;
+import com.facebook.soloader.SoLoader;
+
+@DoNotStrip
+/* package */ class JSCExecutor extends JavaScriptExecutor {
+  static {
+    SoLoader.loadLibrary("jscexecutor");
+  }
+
+  /* package */ JSCExecutor(ReadableNativeMap jscConfig) {
+    super(initHybrid(jscConfig));
+  }
+
+  @Override
+  public String getName() {
+    return "JSCExecutor";
+  }
+
+  private static native HybridData initHybrid(ReadableNativeMap jscConfig);
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutorFactory.java b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutorFactory.java
new file mode 100644
index 00000000000000..a71b9bcc8311e9
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutorFactory.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * 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.jscexecutor;
+
+import com.facebook.react.bridge.JavaScriptExecutor;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
+import com.facebook.react.bridge.WritableNativeMap;
+
+public class JSCExecutorFactory implements JavaScriptExecutorFactory {
+  private final String mAppName;
+  private final String mDeviceName;
+
+  public JSCExecutorFactory(String appName, String deviceName) {
+    this.mAppName = appName;
+    this.mDeviceName = deviceName;
+  }
+
+  @Override
+  public JavaScriptExecutor create() throws Exception {
+    WritableNativeMap jscConfig = new WritableNativeMap();
+    jscConfig.putString("OwnerIdentity", "ReactNative");
+    jscConfig.putString("AppIdentity", mAppName);
+    jscConfig.putString("DeviceIdentity", mDeviceName);
+    return new JSCExecutor(jscConfig);
+  }
+
+  @Override
+  public String toString() {
+    return "JSIExecutor+JSCRuntime";
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/OnLoad.cpp
new file mode 100644
index 00000000000000..c6f185aacbda96
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/OnLoad.cpp
@@ -0,0 +1,70 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include <fb/fbjni.h>
+#include <folly/Memory.h>
+#include <jsi/JSCRuntime.h>
+#include <jsireact/JSIExecutor.h>
+#include <react/jni/JavaScriptExecutorHolder.h>
+#include <react/jni/JReactMarker.h>
+#include <react/jni/JSLogging.h>
+#include <react/jni/ReadableNativeMap.h>
+
+namespace facebook {
+namespace react {
+
+namespace {
+
+class JSCExecutorFactory : public JSExecutorFactory {
+public:
+  std::unique_ptr<JSExecutor> createJSExecutor(
+      std::shared_ptr<ExecutorDelegate> delegate,
+      std::shared_ptr<MessageQueueThread> jsQueue) override {
+    return folly::make_unique<JSIExecutor>(
+      jsc::makeJSCRuntime(),
+      delegate,
+      [](const std::string& message, unsigned int logLevel) {
+        reactAndroidLoggingHook(message, logLevel);
+      },
+      JSIExecutor::defaultTimeoutInvoker,
+      nullptr);
+  }
+};
+
+}
+
+// This is not like JSCJavaScriptExecutor, which calls JSC directly.  This uses
+// JSIExecutor with JSCRuntime.
+class JSCExecutorHolder
+    : public jni::HybridClass<JSCExecutorHolder, JavaScriptExecutorHolder> {
+ public:
+  static constexpr auto kJavaDescriptor = "Lcom/facebook/react/jscexecutor/JSCExecutor;";
+
+  static jni::local_ref<jhybriddata> initHybrid(
+      jni::alias_ref<jclass>, ReadableNativeMap*) {
+    // This is kind of a weird place for stuff, but there's no other
+    // good place for initialization which is specific to JSC on
+    // Android.
+    JReactMarker::setLogPerfMarkerIfNeeded();
+    // TODO mhorowitz T28461666 fill in some missing nice to have glue
+    return makeCxxInstance(folly::make_unique<JSCExecutorFactory>());
+  }
+
+  static void registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JSCExecutorHolder::initHybrid),
+    });
+  }
+
+ private:
+  friend HybridBase;
+  using HybridBase::HybridBase;
+};
+
+} // namespace react
+} // namespace facebook
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
+  return facebook::jni::initialize(vm, [] {
+      facebook::react::JSCExecutorHolder::registerNatives();
+  });
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK b/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
index 55fea181c649a5..fa2fc5ceadf033 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "jstasks",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskConfig.java b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskConfig.java
index 5a9136fb908c23..f0e15451f7cd7e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskConfig.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.java b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.java
index 86196f0db99706..fbf38f1a41ee4a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java
index af7acc6da72d55..420abed320edd5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 5fb4c959ecf4c7..211b98157bf10e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "annotations",
@@ -10,6 +10,6 @@ rn_android_library(
     deps = [
         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/bridge:interfaces"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java
index e70ae678a44d9c..3ff3a56fba400c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,16 +7,14 @@
 
 package com.facebook.react.module.annotations;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import com.facebook.react.bridge.BaseJavaModule;
-
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
- * Annotation for use on {@link BaseJavaModule}s to describe properties for that module.
+ * Annotation for use on {@link com.facebook.react.bridge.BaseJavaModule}s to describe properties for that module.
  */
 @Retention(RUNTIME)
 @Target(TYPE)
@@ -44,4 +42,10 @@
    *  correct annotation is not included
    */
   boolean hasConstants() default true;
+
+  /**
+   * Indicates if a module is a C++ module or a Java Module
+   * @return
+   */
+  boolean isCxxModule() default false;
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModuleList.java b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModuleList.java
index a2b13a407018ae..f8253f84d0eae1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModuleList.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModuleList.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 85da7f8a66a823..b76f609c809272 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "model",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.java b/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.java
index b980df1f46004d..198a6c58903440 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -15,22 +15,30 @@ public class ReactModuleInfo {
   private final boolean mCanOverrideExistingModule;
   private final boolean mNeedsEagerInit;
   private final boolean mHasConstants;
+  private final boolean mIsCxxModule;
+  private String mClassName;
 
   public ReactModuleInfo(
     String name,
+    String className,
     boolean canOverrideExistingModule,
     boolean needsEagerInit,
-    boolean hasConstants) {
+    boolean hasConstants,
+    boolean isCxxModule) {
     mName = name;
+    mClassName = className;
     mCanOverrideExistingModule = canOverrideExistingModule;
     mNeedsEagerInit = needsEagerInit;
     mHasConstants = hasConstants;
+    mIsCxxModule = isCxxModule;
   }
 
   public String name() {
     return mName;
   }
 
+  public String className() {return mClassName;}
+
   public boolean canOverrideExistingModule() {
     return mCanOverrideExistingModule;
   }
@@ -42,4 +50,7 @@ public boolean needsEagerInit() {
   public boolean hasConstants() {
     return mHasConstants;
   }
+
+  public boolean isCxxModule() {return mIsCxxModule; }
+
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfoProvider.java b/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfoProvider.java
index 24d2c80aff115c..3d575a1ddf3666 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfoProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfoProvider.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -12,5 +12,5 @@
  */
 public interface ReactModuleInfoProvider {
 
-  Map<Class, ReactModuleInfo> getReactModuleInfos();
+  Map<String, ReactModuleInfo> getReactModuleInfos();
 }
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 c8ebf04bc92ded..01c0dc0f732562 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_java_annotation_processor", "rn_java_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_java_annotation_processor", "rn_java_library")
 
 rn_java_annotation_processor(
     name = "processing",
@@ -22,7 +22,6 @@ rn_java_library(
         react_native_dep("third-party/java/javapoet:javapoet"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
-        react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/module/model:model"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java b/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
index 9f269ef6ebf0c5..65bcb3d09b9599 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
@@ -1,10 +1,32 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its 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.module.processing;
 
+import static javax.lang.model.element.Modifier.PUBLIC;
+import static javax.tools.Diagnostic.Kind.ERROR;
+
+import com.facebook.infer.annotation.SuppressFieldNotInitialized;
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.module.annotations.ReactModuleList;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.CodeBlock;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;
@@ -13,7 +35,6 @@
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
-import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.Modifier;
@@ -21,32 +42,8 @@
 import javax.lang.model.type.MirroredTypesException;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Elements;
+import javax.lang.model.util.Types;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.stream.Stream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.facebook.infer.annotation.SuppressFieldNotInitialized;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.module.annotations.ReactModuleList;
-import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.react.module.model.ReactModuleInfoProvider;
-
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
-
-import static javax.lang.model.element.Modifier.PUBLIC;
-import static javax.tools.Diagnostic.Kind.ERROR;
 
 /**
  * Generates a list of ReactModuleInfo for modules annotated with {@link ReactModule} in
@@ -62,7 +59,7 @@ public class ReactModuleSpecProcessor extends AbstractProcessor {
   private static final TypeName COLLECTIONS_TYPE = ParameterizedTypeName.get(Collections.class);
   private static final TypeName MAP_TYPE = ParameterizedTypeName.get(
     Map.class,
-    Class.class,
+    String.class,
     ReactModuleInfo.class);
   private static final TypeName INSTANTIATED_MAP_TYPE = ParameterizedTypeName.get(HashMap.class);
 
@@ -72,6 +69,7 @@ public class ReactModuleSpecProcessor extends AbstractProcessor {
   private Elements mElements;
   @SuppressFieldNotInitialized
   private Messager mMessager;
+  private Types mTypes;
 
   @Override
   public synchronized void init(ProcessingEnvironment processingEnv) {
@@ -80,6 +78,7 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
     mFiler = processingEnv.getFiler();
     mElements = processingEnv.getElementUtils();
     mMessager = processingEnv.getMessager();
+    mTypes = processingEnv.getTypeUtils();
   }
 
   @Override
@@ -155,7 +154,7 @@ private CodeBlock getCodeBlockForReactModuleInfos(List<String> nativeModules)
       builder.addStatement("$T map = new $T()", MAP_TYPE, INSTANTIATED_MAP_TYPE);
 
       for (String nativeModule : nativeModules) {
-        String keyString = nativeModule + ".class";
+        String keyString = nativeModule;
 
         TypeElement typeElement = mElements.getTypeElement(nativeModule);
         if (typeElement == null) {
@@ -163,6 +162,7 @@ private CodeBlock getCodeBlockForReactModuleInfos(List<String> nativeModules)
             keyString + " not found by ReactModuleSpecProcessor. " +
             "Did you misspell the module?");
         }
+
         ReactModule reactModule = typeElement.getAnnotation(ReactModule.class);
         if (reactModule == null) {
           throw new ReactModuleSpecException(
@@ -185,13 +185,15 @@ private CodeBlock getCodeBlockForReactModuleInfos(List<String> nativeModules)
         String valueString = new StringBuilder()
           .append("new ReactModuleInfo(")
           .append("\"").append(reactModule.name()).append("\"").append(", ")
-          .append(reactModule.canOverrideExistingModule()).append(", ")
+            .append("\"").append(keyString).append("\"").append(", ")
+           .append(reactModule.canOverrideExistingModule()).append(", ")
           .append(reactModule.needsEagerInit()).append(", ")
-          .append(hasConstants)
+          .append(hasConstants).append(", ")
+          .append(reactModule.isCxxModule())
           .append(")")
           .toString();
 
-        builder.addStatement("map.put(" + keyString + ", " + valueString + ")");
+        builder.addStatement("map.put(\"" + reactModule.name() + "\", " + valueString + ")");
       }
       builder.addStatement("return map");
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java
index e4e2b4eadf095f..ce094e669c5e0f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 2c9fcb5f44251a..be5241876638d7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "accessibilityinfo",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java
index 16b39acd67a9c0..da206630c3f6f5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 34947b84a03c32..5ea989b39c9429 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "appregistry",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
index f4bc26fbafedbf..4eebd65da29aed 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 86d7baccaa09bb..74e84bf5f6d8fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "appstate",
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 2674bdc7fde4e2..5732738b051a43 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "blob",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
index 379a5735ebd42c..9c64c966256a1b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
index 8e46ba7f0bd066..0f124314130bb1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java
index 88a15734836385..a5293261ad9876 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 34cbb9cbbae8a2..75929307c49184 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "camera",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java
index eb332268ad6690..8a6ab9052afc52 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -443,7 +443,7 @@ private static boolean putImageInfo(
           retriever.release();
           photoDescriptor.close();
         }
-      } catch (IOException e) {
+      } catch (Exception e) {
         FLog.e(ReactConstants.TAG, "Could not get video metadata for " + photoUri.toString(), e);
         return false;
       }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java
index 930a12fb757c19..417b7a002a59ae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
index 5615bbd0d1a280..235cdd1931bb7a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 246e8fb17b1170..9e0390ea8527b8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "clipboard",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
index 4aeaea2d7ba61b..7e054aaa3b1edc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 265fcc86a56bce..938ef3c649f912 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "common",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java b/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java
index e085008dd48eda..b794529d0f1717 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 eb5205a4c1f3cd..57580c41a7f00e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "core",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java
index cfa29c7af11f21..98a9eeebd6296e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,6 +13,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.view.Choreographer;
+import com.facebook.react.bridge.UiThreadUtil;
 
 /**
  * Wrapper class for abstracting away availability of the JellyBean Choreographer. If Choreographer
@@ -23,13 +24,17 @@ public class ChoreographerCompat {
   private static final long ONE_FRAME_MILLIS = 17;
   private static final boolean IS_JELLYBEAN_OR_HIGHER =
     Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
-  private static final ChoreographerCompat INSTANCE = new ChoreographerCompat();
+  private static ChoreographerCompat sInstance;
 
   private Handler mHandler;
   private Choreographer mChoreographer;
 
   public static ChoreographerCompat getInstance() {
-    return INSTANCE;
+    UiThreadUtil.assertOnUiThread();
+    if (sInstance == null){
+      sInstance = new ChoreographerCompat();
+    }
+    return sInstance;
   }
 
   private ChoreographerCompat() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java
index ec0e92188f15a2..288f4032850405 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java
index 11570143e09c87..56109af8af0ec1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -23,9 +23,9 @@
 /**
  * Native module that handles device hardware events like hardware back presses.
  */
-@ReactModule(name = "DeviceEventManager")
+@ReactModule(name = DeviceEventManagerModule.NAME)
 public class DeviceEventManagerModule extends ReactContextBaseJavaModule {
-
+  public static final String NAME = "DeviceEventManager";
   public interface RCTDeviceEventEmitter extends JavaScriptModule {
     void emit(String eventName, @Nullable Object data);
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
index c3b995baac638a..76f95a6a4415a2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,7 +20,7 @@
 @ReactModule(name = ExceptionsManagerModule.NAME)
 public class ExceptionsManagerModule extends BaseJavaModule {
 
-  protected static final String NAME = "ExceptionsManager";
+  public static final String NAME = "ExceptionsManager";
 
   private final DevSupportManager mDevSupportManager;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java
index 62fd4d553ac8d8..2d783585a77a6d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -18,10 +18,10 @@
  * Simple native module that allows JS to notify native of having completed some task work, so that
  * it can e.g. release any resources, stop timers etc.
  */
-@ReactModule(name = HeadlessJsTaskSupportModule.MODULE_NAME)
+@ReactModule(name = HeadlessJsTaskSupportModule.NAME)
 public class HeadlessJsTaskSupportModule extends ReactContextBaseJavaModule {
 
-  protected static final String MODULE_NAME = "HeadlessJsTaskSupport";
+  public static final String NAME = "HeadlessJsTaskSupport";
 
   public HeadlessJsTaskSupportModule(ReactApplicationContext reactContext) {
     super(reactContext);
@@ -29,7 +29,7 @@ public HeadlessJsTaskSupportModule(ReactApplicationContext reactContext) {
 
   @Override
   public String getName() {
-    return MODULE_NAME;
+    return NAME;
   }
 
   @ReactMethod
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java
index 5520a713770211..9db79d5568bf40 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java
index f8c780626c9a2c..8d1149220f08ab 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java
index 205ce21c894e68..a8b524fa6c6a87 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java
index c59d8e0e11380c..2ec210fd09d1ef 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java
index 653b9d999edbb1..d937d9eeb0ed4f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,11 +7,12 @@
 
 package com.facebook.react.modules.core;
 
+import com.facebook.react.bridge.UiThreadUtil;
 import java.util.ArrayDeque;
+import javax.annotation.Nullable;
 
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
 
 /**
@@ -65,7 +66,6 @@ private CallbackType(int order) {
 
   public static void initialize() {
     if (sInstance == null) {
-      UiThreadUtil.assertOnUiThread();
       sInstance = new ReactChoreographer();
     }
   }
@@ -75,7 +75,8 @@ public static ReactChoreographer getInstance() {
     return sInstance;
   }
 
-  private final ChoreographerCompat mChoreographer;
+  // This needs to be volatile due to double checked locking issue - https://fburl.com/z409owpf
+  private @Nullable volatile ChoreographerCompat mChoreographer;
   private final ReactChoreographerDispatcher mReactChoreographerDispatcher;
   private final ArrayDeque<ChoreographerCompat.FrameCallback>[] mCallbackQueues;
 
@@ -83,12 +84,12 @@ public static ReactChoreographer getInstance() {
   private boolean mHasPostedCallback = false;
 
   private ReactChoreographer() {
-    mChoreographer = ChoreographerCompat.getInstance();
     mReactChoreographerDispatcher = new ReactChoreographerDispatcher();
     mCallbackQueues = new ArrayDeque[CallbackType.values().length];
     for (int i = 0; i < mCallbackQueues.length; i++) {
       mCallbackQueues[i] = new ArrayDeque<>();
     }
+    initializeChoreographer(null);
   }
 
   public synchronized void postFrameCallback(
@@ -98,11 +99,40 @@ public synchronized void postFrameCallback(
     mTotalCallbacks++;
     Assertions.assertCondition(mTotalCallbacks > 0);
     if (!mHasPostedCallback) {
-      mChoreographer.postFrameCallback(mReactChoreographerDispatcher);
-      mHasPostedCallback = true;
+      if (mChoreographer == null) {
+        initializeChoreographer(new Runnable(){
+          @Override
+          public void run() {
+            postFrameCallbackOnChoreographer();
+          }
+        });
+      } else {
+        postFrameCallbackOnChoreographer();
+      }
     }
   }
 
+  public void postFrameCallbackOnChoreographer() {
+    mChoreographer.postFrameCallback(mReactChoreographerDispatcher);
+    mHasPostedCallback = true;
+  }
+
+  public void initializeChoreographer(@Nullable final Runnable runnable) {
+    UiThreadUtil.runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        synchronized (ReactChoreographer.class) {
+          if (mChoreographer == null) {
+            mChoreographer = ChoreographerCompat.getInstance();
+          }
+        }
+        if (runnable != null) {
+          runnable.run();
+        }
+      }
+    });
+  }
+
   public synchronized void removeFrameCallback(
     CallbackType type,
     ChoreographerCompat.FrameCallback frameCallback) {
@@ -117,7 +147,9 @@ public synchronized void removeFrameCallback(
   private void maybeRemoveFrameCallback() {
     Assertions.assertCondition(mTotalCallbacks >= 0);
     if (mTotalCallbacks == 0 && mHasPostedCallback) {
-      mChoreographer.removeFrameCallback(mReactChoreographerDispatcher);
+      if (mChoreographer != null) {
+        mChoreographer.removeFrameCallback(mReactChoreographerDispatcher);
+      }
       mHasPostedCallback = false;
     }
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
index 0716ddaa56b6da..9fe45e741dca49 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -35,7 +35,7 @@
 public final class Timing extends ReactContextBaseJavaModule implements LifecycleEventListener,
   HeadlessJsTaskEventListener {
 
-  protected static final String NAME = "Timing";
+  public static final String NAME = "Timing";
 
   // These timing contants should be kept in sync with the ones in `JSTimers.js`.
   // The minimum time in milliseconds left in the frame to call idle callbacks.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
index c8017cafb89ea2..edb587a8d9b68f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "datepicker",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java
index 8ba3c5555205f2..db327d4bd1158a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
index 8d531ce65dd323..d57cec4992db4e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java
index a499657a67d273..61dc5c620f9e8c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
index 18c3ea2faac9db..25017c2916dbc6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java
index 582dc8c954e315..13d334692dbf3c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
index 96884ba62a24b5..df103404c69580 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -59,7 +59,6 @@ public void startRecordingFps() {
     }
 
     mFrameCallback = new FpsDebugFrameCallback(
-                          ChoreographerCompat.getInstance(),
                           getReactApplicationContext());
     mFrameCallback.startAndRecordFpsAtEachFrame();
   }
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 8f301cc1f2d007..fdead3b97595a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "debug",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java
index f0a65ff1c77335..02171bf163f9d8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java
index ee55407636be4b..eab166f2a66982 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,7 @@
 
 package com.facebook.react.modules.debug;
 
+import com.facebook.react.bridge.UiThreadUtil;
 import javax.annotation.Nullable;
 
 import java.util.Map;
@@ -59,7 +60,7 @@ public FpsInfo(
 
   private static final double EXPECTED_FRAME_TIME = 16.9;
 
-  private final ChoreographerCompat mChoreographer;
+  private @Nullable ChoreographerCompat mChoreographer;
   private final ReactContext mReactContext;
   private final UIManagerModule mUIManagerModule;
   private final DidJSUpdateUiDuringFrameDetector mDidJSUpdateUiDuringFrameDetector;
@@ -74,8 +75,7 @@ public FpsInfo(
   private boolean mIsRecordingFpsInfoAtEachFrame = false;
   private @Nullable TreeMap<Long, FpsInfo> mTimeToFps;
 
-  public FpsDebugFrameCallback(ChoreographerCompat choreographer, ReactContext reactContext) {
-    mChoreographer = choreographer;
+  public FpsDebugFrameCallback(ReactContext reactContext) {
     mReactContext = reactContext;
     mUIManagerModule = reactContext.getNativeModule(UIManagerModule.class);
     mDidJSUpdateUiDuringFrameDetector = new DidJSUpdateUiDuringFrameDetector();
@@ -120,8 +120,9 @@ public void doFrame(long l) {
       mTimeToFps.put(System.currentTimeMillis(), info);
     }
     mExpectedNumFramesPrev = expectedNumFrames;
-
-    mChoreographer.postFrameCallback(this);
+    if (mChoreographer != null) {
+      mChoreographer.postFrameCallback(this);
+    }
   }
 
   public void start() {
@@ -129,7 +130,14 @@ public void start() {
     mReactContext.getCatalystInstance().addBridgeIdleDebugListener(
         mDidJSUpdateUiDuringFrameDetector);
     mUIManagerModule.setViewHierarchyUpdateDebugListener(mDidJSUpdateUiDuringFrameDetector);
-    mChoreographer.postFrameCallback(this);
+    final FpsDebugFrameCallback fpsDebugFrameCallback = this;
+    UiThreadUtil.runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        mChoreographer = ChoreographerCompat.getInstance();
+        mChoreographer.postFrameCallback(fpsDebugFrameCallback);
+      }
+    });
   }
 
   public void startAndRecordFpsAtEachFrame() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java
index a631589365c6a3..b43061ea712203 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java
index 9850d0e2722a30..79254fdbff95fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 0b6a9250a7b381..76ee3429914464 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "deviceinfo",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
index 0b9e95b2401408..eb792e8c16e81c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -24,11 +24,11 @@
 /**
  * Module that exposes Android Constants to JS.
  */
-@ReactModule(name = DeviceInfoModule.sModuleName)
+@ReactModule(name = DeviceInfoModule.NAME)
 public class DeviceInfoModule extends BaseJavaModule implements
     LifecycleEventListener {
 
-  static final String sModuleName = "DeviceInfo";
+  public static final String NAME = "DeviceInfo";
 
   private @Nullable ReactApplicationContext mReactApplicationContext;
   private float mFontScale;
@@ -47,7 +47,7 @@ public DeviceInfoModule(Context context) {
 
   @Override
   public String getName() {
-    return sModuleName;
+    return NAME;
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
index ecb0229e32b15d..08d10e6cd88eac 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 6f0bb554ba19f6..6736b020638945 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "dialog",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
index df1f45aca0e0e9..2c4b839a6b53da 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java
index 0b360683d4dc45..5892a8502268e3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 3286d603995e7f..b19a3c20bbc8df 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "fabric",
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 168d551e5de779..081442a0198bae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "fresco",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
index 40e0a22eb0cdb1..57099c6b6955e0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -37,7 +37,7 @@
  *
  * <p>Does not expose any methods to JavaScript code. For initialization and cleanup only.
  */
-@ReactModule(name = "FrescoModule")
+@ReactModule(name = "FrescoModule", needsEagerInit = true)
 public class FrescoModule extends ReactContextBaseJavaModule implements
     ModuleDataCleaner.Cleanable, LifecycleEventListener {
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java
index 40f96f7aa515f3..2b5dc2a525791a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java
index 5b89fec6a50a95..e14f97081a2b45 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.java
index 6cdcb5d7545d91..0ad43b0188c895 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 3478c1e10e0ce4..b2ed1d5f32181f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "i18nmanager",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
index fdbf4b4ee62c9e..0d491160b39363 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java
index 9bba7414285525..bd5b4c6b8d95c9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 efb0c040eea635..030dafb0faa714 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "image",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java
index 3e10ad9262ef88..4ab19c62d010c5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 43083558b371ac..da676d6876ac67 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "intent",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java
index 2a4c20ed56c352..a7b84825881b46 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -79,7 +79,7 @@ public void openURL(String url, Promise promise) {
 
     try {
       Activity currentActivity = getCurrentActivity();
-      Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+      Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url).normalizeScheme());
 
       String selfPackageName = getReactApplicationContext().getPackageName();
       ComponentName componentName = intent.resolveActivity(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK
index 360d381076b084..37df1e9b950d93 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "location",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
index ba5059f93d471c..63fe5cce2d8451 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java b/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java
index f8dffa5850ae07..b643382c831e7a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK
index 81b4e1f788e911..c17147a4ec8a5c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "netinfo",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java
index 98c6a5f1761fa9..2f621145c076ad 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 76a899eb4b8097..4e9a5e2607909d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "network",
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 65a33066741ad7..222a7ce463652c 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
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -129,6 +129,7 @@ public void run() {
       for (String cookie : cookies) {
         addCookieAsync(url, cookie);
       }
+      getCookieManager().flush();
       mCookieSaver.onCookiesModified();
     }
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java
index 2f23bb15c1d806..a4d5116644718c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
index 5534eb6449cf55..9b335a4d0cbc8c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -47,6 +47,8 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 import okio.ByteString;
+import okio.GzipSource;
+import okio.Okio;
 
 /**
  * Implements the XMLHttpRequest JavaScript interface.
@@ -454,8 +456,26 @@ public void onResponse(Call call, Response response) throws IOException {
               translateHeaders(response.headers()),
               response.request().url().toString());
 
-            ResponseBody responseBody = response.body();
             try {
+              // OkHttp implements something called transparent gzip, which mean that it will
+              // automatically add the Accept-Encoding gzip header and handle decoding internally.
+              // The issue is that it won't handle decoding if the user provides a Accept-Encoding
+              // header. This is also undesirable considering that iOS does handle the decoding even
+              // when the header is provided. To make sure this works in all cases, handle gzip body
+              // here also. This works fine since OKHttp will remove the Content-Encoding header if
+              // it used transparent gzip.
+              // See https://github.com/square/okhttp/blob/5b37cda9e00626f43acf354df145fd452c3031f1/okhttp/src/main/java/okhttp3/internal/http/BridgeInterceptor.java#L76-L111
+              ResponseBody responseBody = response.body();
+              if ("gzip".equalsIgnoreCase(response.header("Content-Encoding")) &&
+                  responseBody != null) {
+                GzipSource gzipSource = new GzipSource(responseBody.source());
+                String contentType = response.header("Content-Type");
+                responseBody = ResponseBody.create(
+                    contentType != null ? MediaType.parse(contentType) : null,
+                    -1L,
+                    Okio.buffer(gzipSource));
+              }
+
               // Check if a handler is registered
               for (ResponseHandler handler : mResponseHandlers) {
                 if (handler.supports(responseType)) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java
index 25d2e521106d74..9baf4887799348 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
index 766290c40e067b..25c06d8a6d0919 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java
index 19376825dff0d6..cafbfba4f5cd5c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java
index 914ce3c901106a..e86a2c5e63b898 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -19,7 +19,6 @@ public class ProgressRequestBody extends RequestBody {
 
   private final RequestBody mRequestBody;
   private final ProgressListener mProgressListener;
-  private BufferedSink mBufferedSink;
   private long mContentLength = 0L;
 
   public ProgressRequestBody(RequestBody requestBody, ProgressListener progressListener) {
@@ -42,16 +41,17 @@ public long contentLength() throws IOException {
 
   @Override
   public void writeTo(BufferedSink sink) throws IOException {
-    if (mBufferedSink == null) {
-      mBufferedSink = Okio.buffer(outputStreamSink(sink));
-    }
+    // In 99% of cases, this method is called strictly once.
+    // The only case when it is called more than once is internal okhttp upload re-try.
+    // We need to re-create CountingOutputStream in this case as progress should be re-evaluated.
+    BufferedSink sinkWrapper = Okio.buffer(outputStreamSink(sink));
 
     // contentLength changes for input streams, since we're using inputStream.available(),
     // so get the length before writing to the sink
     contentLength();
 
-    mRequestBody.writeTo(mBufferedSink);
-    mBufferedSink.flush();
+    mRequestBody.writeTo(sinkWrapper);
+    sinkWrapper.flush();
   }
 
   private Sink outputStreamSink(BufferedSink sink) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.java
index 66c439820ddddf..6075ec9d82e367 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java
index afc6fdd94d26d0..45a1fe298a5157 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2017-present, Facebook, Inc.
+* Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java
index 2f4c13c32c48e4..f3eeb3895486e2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java
index 5d009245d0312b..f163ae7746792c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java
index 0cd441e6fb5c07..9c6037426221f6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 42266b65e8d778..224c3a735dc73a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "permissions",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java
index 26701edd94cda7..9658a65baa5b68 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 13ca4479af5296..2fd9a5a6e61215 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "share",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java
index aa9717e0b3bc15..ccfab744eb4974 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 525ff3d930ad2b..998fcbf3ff1d4d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "statusbar",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java
index 333b5ce5a4e788..a29ebc71c14351 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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
index 11f9a569e655e2..9efcad6416764e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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
index 381b46bd02d7bf..fa5436ce00976d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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
index c9fc96e575f169..ca8f410c9dfab9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,10 +7,13 @@
 
 package com.facebook.react.modules.storage;
 
+import java.util.ArrayDeque;
 import java.util.HashSet;
+import java.util.concurrent.Executor;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteStatement;
+import android.os.AsyncTask;
 
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.Arguments;
@@ -23,6 +26,7 @@
 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;
 
@@ -43,8 +47,47 @@ public final class AsyncStorageModule
   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);
   }
 
@@ -141,7 +184,7 @@ protected void doInBackgroundGuarded(Void... params) {
 
         callback.invoke(null, data);
       }
-    }.execute();
+    }.executeOnExecutor(executor);
   }
 
   /**
@@ -208,7 +251,7 @@ protected void doInBackgroundGuarded(Void... params) {
           callback.invoke();
         }
       }
-    }.execute();
+    }.executeOnExecutor(executor);
   }
 
   /**
@@ -259,7 +302,7 @@ protected void doInBackgroundGuarded(Void... params) {
           callback.invoke();
         }
       }
-    }.execute();
+    }.executeOnExecutor(executor);
   }
 
   /**
@@ -322,7 +365,7 @@ protected void doInBackgroundGuarded(Void... params) {
           callback.invoke();
         }
       }
-    }.execute();
+    }.executeOnExecutor(executor);
   }
 
   /**
@@ -345,7 +388,7 @@ protected void doInBackgroundGuarded(Void... params) {
           callback.invoke(AsyncStorageErrorUtil.getError(null, e.getMessage()));
         }
       }
-    }.execute();
+    }.executeOnExecutor(executor);
   }
 
   /**
@@ -379,7 +422,7 @@ protected void doInBackgroundGuarded(Void... params) {
         }
         callback.invoke(null, data);
       }
-    }.execute();
+    }.executeOnExecutor(executor);
   }
 
   /**
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
index be8391c2ad21d5..237ba8a039ea99 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "storage",
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
index 6e845fb802dd26..bcbb7f270d93d2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java
index da1e3fad8946be..719d49a0e1d8f5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 bc62a544f6d347..41ac510470b1a5 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -26,9 +26,9 @@
 /**
  * Module that exposes Android Constants to JS.
  */
-@ReactModule(name = "PlatformConstants")
+@ReactModule(name = AndroidInfoModule.NAME)
 public class AndroidInfoModule extends ReactContextBaseJavaModule {
-
+  public static final String NAME = "PlatformConstants";
   private static final String IS_TESTING = "IS_TESTING";
 
   public AndroidInfoModule(ReactApplicationContext reactContext) {
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 cd24044b70b8ac..40e4da54a03137 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "systeminfo",
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 9e8ac43662b364..6278912404c943 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
@@ -1,7 +1,7 @@
 /**
  * @generated by scripts/bump-oss-version.js
  *
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK
index 5b51a3ef489e2c..51685f7d9dec48 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "timepicker",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java
index 8e59a1b482dc8e..3a4d215b4b09a1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java
index 3dc5579cbd49e1..62a448c35a9e51 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java
index a5bf836efd5557..a76b3b41c114ff 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java
index d74f3a712ddca7..d4f237745ebc83 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java
index 26657481c87ea6..2b8243ef8ab3a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 83e213e1ea8d3f..9fa4212d088da9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "toast",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
index a75f1a9a995cd0..ea9594d0c1c1c1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 43ce290d72fb55..1373eef72f9bb0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "vibration",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java
index 8d92f019337044..91986606d25882 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 989d4ce0e8e3dd..22b82d1099c06f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "websocket",
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 fcdb890f8c4632..4095c8e5998720 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
index e0aa169fd21e9e..50ffba0ad27f64 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "packagerconnection",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
index 11cb364573728c..44c910bee5cfc9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
index 50340d6d5fe622..d7ddfe667e6067 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
index 1ff1f2c6e149a8..c88f04ff183750 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java
index 5ef2b73f7bc58b..98ac8cff7f552e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
index 46cfb6d907a196..daef24c9f9bedd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
index d6f97f97132a78..52504ded26027b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
index d4af3571fc736f..05520d541561c8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java
index c2d4a1f5d4792d..870508c2ad5545 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK b/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
index e61d20f8cb625b..f88f4fe679b860 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_java_annotation_processor", "rn_java_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_java_annotation_processor", "rn_java_library")
 
 rn_java_annotation_processor(
     name = "processing",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java b/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java
index 9b9b94607c81e1..f9742ac08d0ab8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK
index c7293b6cd4001b..841944ec0e765a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "shell",
@@ -63,6 +63,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/views/view:view"),
         react_native_target("java/com/facebook/react/views/viewpager:viewpager"),
         react_native_target("java/com/facebook/react/views/webview:webview"),
+        react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("res:shell"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java b/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java
index 388709b87eaaeb..62c20cfc433c11 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 5e1ebd5c33a960..31a871d5efaca3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,6 +12,7 @@
 import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.annotations.ReactModuleList;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.modules.accessibilityinfo.AccessibilityInfoModule;
 import com.facebook.react.modules.appstate.AppStateModule;
@@ -71,6 +72,35 @@
 /**
  * Package defining basic modules and view managers.
  */
+@ReactModuleList(nativeModules = {
+  AccessibilityInfoModule.class,
+  AppStateModule.class,
+  BlobModule.class,
+  FileReaderModule.class,
+  AsyncStorageModule.class,
+  CameraRollManager.class,
+  ClipboardModule.class,
+  DatePickerDialogModule.class,
+  DialogModule.class,
+  FrescoModule.class,
+  I18nManagerModule.class,
+  ImageEditingManager.class,
+  ImageLoaderModule.class,
+  ImageStoreManager.class,
+  IntentModule.class,
+  LocationModule.class,
+  NativeAnimatedModule.class,
+  NetworkingModule.class,
+  NetInfoModule.class,
+  PermissionsModule.class,
+  ShareModule.class,
+  StatusBarModule.class,
+  TimePickerDialogModule.class,
+  ToastModule.class,
+  VibrationModule.class,
+  WebSocketModule.class,
+
+})
 public class MainReactPackage extends LazyReactPackage {
 
   private MainPackageConfig mConfig;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK b/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK
index c4b885f791b661..865b37c05922e4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "touch",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java b/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java
index c206bc725752b3..b6c79d4fa64d80 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java
index 6bb2e71b907e10..46ee341d86c6e4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java
index 82f7f3d6bb5d2b..296768fbd682d9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java
index c75c1b017f268f..58063f4dca98d8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityDelegateUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityDelegateUtil.java
new file mode 100644
index 00000000000000..617773b24eb0fc
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityDelegateUtil.java
@@ -0,0 +1,148 @@
+// Copyright (c) Facebook, Inc. and its 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 android.content.Context;
+import android.support.v4.view.AccessibilityDelegateCompat;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
+import android.view.View;
+import com.facebook.react.R;
+import java.util.Locale;
+import javax.annotation.Nullable;
+
+/**
+ * Utility class that handles the addition of a "role" for accessibility to either a View or
+ * AccessibilityNodeInfo.
+ */
+
+public class AccessibilityDelegateUtil {
+
+  /**
+   * These roles are defined by Google's TalkBack screen reader, and this list should be kept up to
+   * date with their implementation. Details can be seen in their source code here:
+   *
+   * <p>https://github.com/google/talkback/blob/master/utils/src/main/java/Role.java
+   */
+
+  public enum AccessibilityRole {
+    NONE,
+    BUTTON,
+    LINK,
+    SEARCH,
+    IMAGE,
+    IMAGEBUTTON,
+    KEYBOARDKEY,
+    TEXT,
+    ADJUSTABLE,
+    SUMMARY,
+    HEADER;
+
+    public static String getValue(AccessibilityRole role) {
+      switch (role) {
+        case NONE:
+          return null;
+        case BUTTON:
+          return "android.widget.Button";
+        case LINK:
+          return "android.widget.ViewGroup";
+        case SEARCH:
+          return "android.widget.EditText";
+        case IMAGE:
+          return "android.widget.ImageView";
+        case IMAGEBUTTON:
+          return "android.widget.ImageView";
+        case KEYBOARDKEY:
+          return "android.inputmethodservice.Keyboard$Key";
+        case TEXT:
+          return "android.widget.ViewGroup";
+        case ADJUSTABLE:
+          return "android.widget.SeekBar";
+        case SUMMARY:
+          return "android.widget.ViewGroup";
+        case HEADER:
+          return "android.widget.ViewGroup";
+        default:
+          throw new IllegalArgumentException("Invalid accessibility role value: " + role);
+      }
+    }
+
+    public static AccessibilityRole fromValue(@Nullable String value) {
+      for (AccessibilityRole role : AccessibilityRole.values()) {
+        if (role.name().equalsIgnoreCase(value)) {
+          return role;
+        }
+      }
+      throw new IllegalArgumentException("Invalid accessibility role value: " + value);
+    }
+  }
+
+  private AccessibilityDelegateUtil() {
+    // No instances
+  }
+
+  public static void setDelegate(final View view) {
+    final String accessibilityHint = (String) view.getTag(R.id.accessibility_hint);
+    final AccessibilityRole accessibilityRole = (AccessibilityRole) view.getTag(R.id.accessibility_role);
+    // if a view already has an accessibility delegate, replacing it could cause problems,
+    // so leave it alone.
+    if (!ViewCompat.hasAccessibilityDelegate(view) &&
+      (accessibilityHint != null || accessibilityRole != null)) {
+      ViewCompat.setAccessibilityDelegate(
+        view,
+        new AccessibilityDelegateCompat() {
+          @Override
+          public void onInitializeAccessibilityNodeInfo(
+            View host, AccessibilityNodeInfoCompat info) {
+            super.onInitializeAccessibilityNodeInfo(host, info);
+            setRole(info, accessibilityRole, view.getContext());
+            if (!(accessibilityHint == null)) {
+              String contentDescription=(String)info.getContentDescription();
+              if (contentDescription != null) {
+                contentDescription = contentDescription + ", " + accessibilityHint;
+                info.setContentDescription(contentDescription);
+              } else {
+                info.setContentDescription(accessibilityHint);
+              }
+            }
+          }
+        });
+    }
+  }
+
+  /**
+   * Strings for setting the Role Description in english
+   */
+
+  //TODO: Eventually support for other languages on talkback
+
+  public static void setRole(AccessibilityNodeInfoCompat nodeInfo, AccessibilityRole role, final Context context) {
+    if (role == null) {
+      role = AccessibilityRole.NONE;
+    }
+    nodeInfo.setClassName(AccessibilityRole.getValue(role));
+    if (Locale.getDefault().getLanguage().equals(new Locale("en").getLanguage())) {
+      if (role.equals(AccessibilityRole.LINK)) {
+        nodeInfo.setRoleDescription(context.getString(R.string.link_description));
+      }
+      if (role.equals(AccessibilityRole.SEARCH)) {
+        nodeInfo.setRoleDescription(context.getString(R.string.search_description));
+      }
+      if (role.equals(AccessibilityRole.IMAGE)) {
+        nodeInfo.setRoleDescription(context.getString(R.string.image_description));
+      }
+      if (role.equals(AccessibilityRole.IMAGEBUTTON)) {
+        nodeInfo.setRoleDescription(context.getString(R.string.image_button_description));
+      }
+      if (role.equals(AccessibilityRole.ADJUSTABLE)) {
+        nodeInfo.setRoleDescription(context.getString(R.string.adjustable_description));
+      }
+    }
+    if (role.equals(AccessibilityRole.IMAGEBUTTON)) {
+      nodeInfo.setClickable(true);
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java
index 615bfbbcd8f6c7..faa5a74c6c07e4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityRoleUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityRoleUtil.java
deleted file mode 100644
index 1635f604596be0..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityRoleUtil.java
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 android.annotation.TargetApi;
-import android.os.Build;
-import android.support.v4.view.AccessibilityDelegateCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.view.View;
-import android.view.accessibility.AccessibilityNodeInfo;
-import javax.annotation.Nullable;
-
-/**
- * Utility class that handles the addition of a "role" for accessibility to either a View or
- * AccessibilityNodeInfo.
- */
-
-public class AccessibilityRoleUtil {
-
-  /**
-   * These roles are defined by Google's TalkBack screen reader, and this list should be kept up to
-   * date with their implementation. Details can be seen in their source code here:
-   *
-   * <p>https://github.com/google/talkback/blob/master/utils/src/main/java/Role.java
-   */
-
-  public enum AccessibilityRole {
-    NONE(null),
-    BUTTON("android.widget.Button"),
-    IMAGE("android.widget.ImageView"),
-    KEYBOARD_KEY("android.inputmethodservice.Keyboard$Key"),
-    TEXT("android.widget.ViewGroup");
-
-    @Nullable private final String mValue;
-
-    AccessibilityRole(String type) {
-      mValue = type;
-    }
-
-    @Nullable
-    public String getValue() {
-      return mValue;
-    }
-
-    public static AccessibilityRole fromValue(String value) {
-      for (AccessibilityRole role : AccessibilityRole.values()) {
-        if (role.getValue() != null && role.getValue().equals(value)) {
-          return role;
-        }
-      }
-      return AccessibilityRole.NONE;
-    }
-  }
-
-  private AccessibilityRoleUtil() {
-    // No instances
-  }
-
-  public static void setRole(View view, final AccessibilityRole role) {
-    // if a view already has an accessibility delegate, replacing it could cause problems,
-    // so leave it alone.
-    if (!ViewCompat.hasAccessibilityDelegate(view)) {
-      ViewCompat.setAccessibilityDelegate(
-        view,
-        new AccessibilityDelegateCompat() {
-          @Override
-          public void onInitializeAccessibilityNodeInfo(
-            View host, AccessibilityNodeInfoCompat info) {
-            super.onInitializeAccessibilityNodeInfo(host, info);
-            setRole(info, role);
-          }
-        });
-    }
-  }
-
-  public static void setRole(AccessibilityNodeInfoCompat nodeInfo, final AccessibilityRole role) {
-    nodeInfo.setClassName(role.getValue());
-  }
-
-  /**
-   * Variables and methods for setting accessibilityRole on view properties.
-   */
-  private static final String NONE = "none";
-  private static final String BUTTON = "button";
-  private static final String IMAGE = "image";
-  private static final String KEYBOARDKEY = "keyboardkey";
-  private static final String TEXT = "text";
-
-  public static void updateAccessibilityRole(View view, String role) {
-    if (role == null) {
-      view.setAccessibilityDelegate(null);
-    }
-    switch (role) {
-      case NONE:
-        break;
-      case BUTTON:
-        setRole(view, AccessibilityRoleUtil.AccessibilityRole.BUTTON);
-        break;
-      case IMAGE:
-        setRole(view, AccessibilityRoleUtil.AccessibilityRole.IMAGE);
-        break;
-      case KEYBOARDKEY:
-        setRole(view, AccessibilityRoleUtil.AccessibilityRole.KEYBOARD_KEY);
-        break;
-      case TEXT:
-        setRole(view, AccessibilityRoleUtil.AccessibilityRole.TEXT);
-        break;
-      default:
-        view.setAccessibilityDelegate(null);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
index 1090e3ce6b0cc3..9bb553e2e9aefe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "uimanager",
@@ -30,7 +30,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/animation:animation"),
         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/common:common"),
+        react_native_target("java/com/facebook/react/config:config"),
         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"),
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 5b4c312ea5819f..0eeac09cf2a485 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -11,8 +11,10 @@
 import android.view.ViewParent;
 import com.facebook.react.R;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.uimanager.AccessibilityDelegateUtil.AccessibilityRole;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.util.ReactFindViewUtil;
+import java.util.Locale;
 
 /**
  * Base class that should be suitable for the majority of subclasses of {@link ViewManager}.
@@ -28,8 +30,10 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
   private static final String PROP_RENDER_TO_HARDWARE_TEXTURE = "renderToHardwareTextureAndroid";
   private static final String PROP_ACCESSIBILITY_LABEL = "accessibilityLabel";
   private static final String PROP_ACCESSIBILITY_COMPONENT_TYPE = "accessibilityComponentType";
+  private static final String PROP_ACCESSIBILITY_HINT = "accessibilityHint";
   private static final String PROP_ACCESSIBILITY_LIVE_REGION = "accessibilityLiveRegion";
   private static final String PROP_ACCESSIBILITY_ROLE = "accessibilityRole";
+  private static final String PROP_ACCESSIBILITY_STATES = "accessibilityStates";
   private static final String PROP_IMPORTANT_FOR_ACCESSIBILITY = "importantForAccessibility";
 
   // DEPRECATED
@@ -118,9 +122,35 @@ public void setAccessibilityComponentType(T view, String accessibilityComponentT
     AccessibilityHelper.updateAccessibilityComponentType(view, accessibilityComponentType);
   }
 
+  @ReactProp(name = PROP_ACCESSIBILITY_HINT)
+  public void setAccessibilityHint(T view, String accessibilityHint) {
+    view.setTag(R.id.accessibility_hint, accessibilityHint);
+  }
+
   @ReactProp(name = PROP_ACCESSIBILITY_ROLE)
   public void setAccessibilityRole(T view, String accessibilityRole) {
-    AccessibilityRoleUtil.updateAccessibilityRole(view, accessibilityRole);
+    if (accessibilityRole == null) {
+      return;
+    }
+
+    view.setTag(R.id.accessibility_role, AccessibilityRole.fromValue(accessibilityRole));
+  }
+
+  @ReactProp(name = PROP_ACCESSIBILITY_STATES)
+  public void setViewStates(T view, ReadableArray accessibilityStates) {
+    view.setSelected(false);
+    view.setEnabled(true);
+    if (accessibilityStates == null) {
+      return;
+    }
+    for (int i = 0; i < accessibilityStates.size(); i++) {
+      String state = accessibilityStates.getString(i);
+      if (state.equals("selected")) {
+        view.setSelected(true);
+      } else if (state.equals("disabled")) {
+        view.setEnabled(false);
+      }
+    }
   }
 
   @ReactProp(name = PROP_IMPORTANT_FOR_ACCESSIBILITY)
@@ -221,4 +251,14 @@ private static void resetTransformProperty(View view) {
     view.setScaleY(1);
     view.setCameraDistance(0);
   }
+
+  private void updateViewAccessibility(T view) {
+    AccessibilityDelegateUtil.setDelegate(view);
+  }
+
+  @Override
+  protected void onAfterUpdateTransaction(T view) {
+    super.onAfterUpdateTransaction(view);
+    updateViewAccessibility(view);
+  }
 }
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 502242591f24ba..62d79ed925dd67 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java
index 79930641fbbc2c..c1464e842d6b26 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java
index abc9d1fb4c67ba..cf39087ecbae9a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java
index 4707a9c143c5b0..8ea4aec8b1d3ec 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
index 096a7beb69f384..46ea5edfa9d828 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 2bbe858f014a2a..1b89228e59d253 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -75,16 +75,6 @@ public LayoutShadowNode() {
     mTempYogaValue = new MutableYogaValue();
   }
 
-  protected LayoutShadowNode(LayoutShadowNode node) {
-    super(node);
-    mTempYogaValue = new MutableYogaValue(node.mTempYogaValue);
-  }
-
-  @Override
-  protected LayoutShadowNode copy() {
-    return new LayoutShadowNode(this);
-  }
-
   @ReactProp(name = ViewProps.WIDTH)
   public void setWidth(Dynamic width) {
     if (isVirtual()) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java
index 5dd2f36ac7711a..6f457dfef88fe1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
index 3e7d56a5e29f30..430f2478a2b2e1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -570,7 +570,9 @@ protected synchronized void dropView(View view) {
       ViewGroupManager viewGroupManager = (ViewGroupManager) viewManager;
       for (int i = viewGroupManager.getChildCount(viewGroup) - 1; i >= 0; i--) {
         View child = viewGroupManager.getChildAt(viewGroup, i);
-        if (mTagsToViews.get(child.getId()) != null) {
+        if (child == null) {
+            FLog.e(TAG, "Unable to drop null child view");
+        } else if (mTagsToViews.get(child.getId()) != null) {
           dropView(child);
         }
       }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
index b6562779875f19..084006fe4651cf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java
index 7fdf9d8943533c..22e13d6717b388 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
index 47de61c9a6d7fa..e3d2b3f6851d16 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
index 4f69c62e50059e..ad195d14d85b5f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -31,6 +31,13 @@ public static float toPixelFromDIP(double value) {
     return toPixelFromDIP((float) value);
   }
 
+  /**
+   * Convert from PX to SP
+   */
+  public static float toSPFromPixel(float value) {
+    return value / DisplayMetricsHolder.getScreenDisplayMetrics().scaledDensity;
+  }
+
   /**
    * Convert from SP to PX
    */
@@ -55,4 +62,11 @@ public static float toDIPFromPixel(float value) {
     return value / DisplayMetricsHolder.getWindowDisplayMetrics().density;
   }
 
+  /**
+   * @return {@link float} that represents the density of the display metrics for device screen.
+   */
+  public static float getDisplayMetricDensity() {
+    return DisplayMetricsHolder.getScreenDisplayMetrics().density;
+  }
+
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java
index da4f248fa76027..0be5d8f6ee3ed4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java
index a6b0f51efcbe73..04dd014e7c4fb7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
index 009cab688e4ae4..c5d9ab6a51a697 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java
index 4f2f27976f0a45..5c421b481abd67 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java
index e78f67bc9a230d..eb6c3e53de652a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java
index 4ac48ee9d9579d..695225b550e3c6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java
index 334b1949079749..477ef86e36d143 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRootViewTagGenerator.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRootViewTagGenerator.java
index 47d1daa54a0699..b3890dc319ad97 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRootViewTagGenerator.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRootViewTagGenerator.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 ac5780df2ec9de..47c97b11a11fe8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -68,17 +68,6 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
    */
   boolean isYogaLeafNode();
 
-  /**
-   * @return a mutable copy of the {@link ReactShadowNode}
-   */
-  T mutableCopy(long instanceHandle);
-
-  T mutableCopyWithNewProps(long instanceHandle, @Nullable ReactStylesDiffMap newProps);
-
-  T mutableCopyWithNewChildren(long instanceHandle);
-
-  T mutableCopyWithNewChildrenAndProps(long instanceHandle, @Nullable ReactStylesDiffMap newProps);
-
   String getViewClass();
 
   boolean hasUpdates();
@@ -366,28 +355,5 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
    */
   List<ReactShadowNode> getChildrenList();
 
-  /**
-   * @return the {@link ReactShadowNode} that was used during the cloning mechanism to create
-   * this {@link ReactShadowNode} or null if this object was not created using a clone operation.
-   */
-  @Nullable ReactShadowNode getOriginalReactShadowNode();
-
-  void setOriginalReactShadowNode(@Nullable ReactShadowNode node);
-
-  long getInstanceHandle();
-
-  void setInstanceHandle(long instanceHandle);
-
-  /**
-   * Mark this {@link ReactShadowNode} as sealed. This means that the node was already committed
-   * and it should not be updated anymore.
-   */
-  void markAsSealed();
-
-  /**
-   * @return a {@link boolean} that represents if the {@link ReactShadowNode} is sealed.
-   */
-  boolean isSealed();
-
   void updateScreenLayout(ReactShadowNode prevNode);
 }
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 706e005d0eee43..2f459eccc12d5c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,14 +8,11 @@
 
 import static java.lang.System.arraycopy;
 
-import com.facebook.common.logging.FLog;
 import com.facebook.debug.holder.PrinterHolder;
 import com.facebook.debug.tags.ReactDebugOverlayTags;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.uimanager.annotations.ReactPropertyHolder;
-import com.facebook.systrace.Systrace;
-import com.facebook.systrace.SystraceMessage;
 import com.facebook.yoga.YogaAlign;
 import com.facebook.yoga.YogaBaselineFunction;
 import com.facebook.yoga.YogaConfig;
@@ -27,7 +24,6 @@
 import com.facebook.yoga.YogaJustify;
 import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaNode;
-import com.facebook.yoga.YogaNodeCloneFunction;
 import com.facebook.yoga.YogaOverflow;
 import com.facebook.yoga.YogaPositionType;
 import com.facebook.yoga.YogaValue;
@@ -67,38 +63,9 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
   private static final boolean DEBUG = ReactBuildConfig.DEBUG || PrinterHolder.getPrinter().shouldDisplayLogMessage(ReactDebugOverlayTags.FABRIC_UI_MANAGER);
   private static final String TAG = ReactShadowNodeImpl.class.getSimpleName();
   private static final YogaConfig sYogaConfig;
+
   static {
     sYogaConfig = ReactYogaConfigProvider.get();
-    sYogaConfig.setOnCloneNode(new YogaNodeCloneFunction() {
-      @Override
-      public YogaNode cloneNode(YogaNode oldYogaNode,
-          YogaNode parent,
-          int childIndex) {
-        SystraceMessage.beginSection(
-          Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-          "FabricReconciler.YogaNodeCloneFunction")
-          .flush();
-        try {
-          ReactShadowNodeImpl parentReactShadowNode = (ReactShadowNodeImpl) parent.getData();
-          Assertions.assertNotNull(parentReactShadowNode);
-          ReactShadowNodeImpl oldReactShadowNode = (ReactShadowNodeImpl) oldYogaNode.getData();
-          Assertions.assertNotNull(oldReactShadowNode);
-
-          if (DEBUG) {
-            FLog.d(
-              TAG,
-              "YogaNode started cloning: oldYogaNode: " + oldReactShadowNode + " - parent: "
-                + parentReactShadowNode + " index: " + childIndex);
-          }
-
-          ReactShadowNodeImpl newNode = oldReactShadowNode.mutableCopy(oldReactShadowNode.getInstanceHandle());
-          parentReactShadowNode.replaceChild(newNode, childIndex);
-          return newNode.mYogaNode;
-        } finally{
-          Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-        }
-      }
-    });
   }
 
   private int mReactTag;
@@ -168,94 +135,6 @@ protected ReactShadowNodeImpl(ReactShadowNodeImpl original) {
     mIsSealed = false;
   }
 
-  private void replaceChild(ReactShadowNodeImpl newNode, int childIndex) {
-    mChildren.remove(childIndex);
-    mChildren.add(childIndex, newNode);
-    newNode.mParent = this;
-  }
-
-  /**
-   * @return a copy of this object (no including copy of its children or the underlying yogaNode).
-   */
-  protected ReactShadowNodeImpl copy() {
-    return new ReactShadowNodeImpl(this);
-  }
-
-  @Override
-  public ReactShadowNodeImpl mutableCopy(long instanceHandle) {
-    ReactShadowNodeImpl copy = copy();
-    Assertions.assertCondition(
-        getClass() == copy.getClass(),
-        "Copied shadow node must use the same class");
-    copy.mInstanceHandle = instanceHandle;
-    if (mYogaNode != null) {
-      copy.mYogaNode = mYogaNode.clone();
-      copy.mYogaNode.setData(copy);
-    } else {
-      // Virtual ReactShadowNode do not have a YogaNode associated
-      copy.mYogaNode = null;
-    }
-    copy.mTotalNativeChildren = mTotalNativeChildren;
-    copy.mNativeChildren = copyChildren(mNativeChildren);
-    copy.mChildren = copyChildren(mChildren);
-
-    return copy;
-  }
-
-  @Nullable
-  private ArrayList<ReactShadowNodeImpl> copyChildren(@Nullable List<ReactShadowNodeImpl> list){
-    ArrayList<ReactShadowNodeImpl> result = list == null ? null : new ArrayList<>(list);
-    if (result != null) {
-      for (ReactShadowNodeImpl child : result) {
-        child.mParent = null;
-      }
-    }
-    return result;
-  }
-
-  @Override
-  public ReactShadowNodeImpl mutableCopyWithNewChildren(long instanceHandle) {
-    ReactShadowNodeImpl copy = copy();
-    copy.mInstanceHandle = instanceHandle;
-    Assertions.assertCondition(
-        getClass() == copy.getClass(),
-        "Copied shadow node must use the same class");
-    if (mYogaNode != null) {
-      copy.mYogaNode = mYogaNode.cloneWithNewChildren();
-      copy.mYogaNode.setData(copy);
-    } else {
-      // Virtual ReactShadowNode do not have a YogaNode associated
-      copy.mYogaNode = null;
-    }
-    copy.mNativeChildren = null;
-    copy.mChildren = null;
-    copy.mTotalNativeChildren = 0;
-    return copy;
-  }
-
-  @Override
-  public ReactShadowNodeImpl mutableCopyWithNewProps(long instanceHandle,
-      @Nullable ReactStylesDiffMap newProps) {
-    ReactShadowNodeImpl copy = mutableCopy(instanceHandle);
-    if (newProps != null) {
-      copy.updateProperties(newProps);
-      copy.mNewProps = newProps;
-    }
-    return copy;
-  }
-
-  @Override
-  public ReactShadowNodeImpl mutableCopyWithNewChildrenAndProps(long instanceHandle,
-      @Nullable ReactStylesDiffMap newProps) {
-    ReactShadowNodeImpl copy = mutableCopyWithNewChildren(instanceHandle);
-    if (newProps != null) {
-      copy.updateProperties(newProps);
-      copy.mNewProps = newProps;
-    }
-    return copy;
-  }
-
-
   /**
    * Nodes that return {@code true} will be treated as "virtual" nodes. That is, nodes that are not
    * mapped into native views (e.g. nested text node). By default this method returns {@code false}.
@@ -299,7 +178,6 @@ public final boolean hasUpdates() {
 
   @Override
   public final void markUpdateSeen() {
-    assertNotSealed();
     mNodeUpdated = false;
     if (hasNewLayout()) {
       markLayoutSeen();
@@ -325,7 +203,6 @@ public final boolean hasUnseenUpdates() {
 
   @Override
   public void dirty() {
-    assertNotSealed();
     if (!isVirtual()) {
       mYogaNode.dirty();
     }
@@ -338,7 +215,6 @@ public final boolean isDirty() {
 
   @Override
   public void addChildAt(ReactShadowNodeImpl child, int i) {
-    assertNotSealed();
     if (mChildren == null) {
       mChildren = new ArrayList<>(4);
     }
@@ -370,7 +246,6 @@ public void addChildAt(ReactShadowNodeImpl child, int i) {
 
   @Override
   public ReactShadowNodeImpl removeChildAt(int i) {
-    assertNotSealed();
     if (mChildren == null) {
       throw new ArrayIndexOutOfBoundsException(
         "Index " + i + " out of bounds: node has no children");
@@ -543,7 +418,6 @@ public final int getReactTag() {
 
   @Override
   public void setReactTag(int reactTag) {
-    assertNotSealed();
     mReactTag = reactTag;
   }
 
@@ -555,13 +429,11 @@ public final int getRootTag() {
 
   @Override
   public final void setRootTag(int rootTag) {
-    assertNotSealed();
     mRootTag = rootTag;
   }
 
   @Override
   public final void setViewClassName(String viewClassName) {
-    assertNotSealed();
     mViewClassName = viewClassName;
   }
 
@@ -603,7 +475,6 @@ public final boolean hasNewLayout() {
 
   @Override
   public final void markLayoutSeen() {
-    assertNotSealed();
     if (mYogaNode != null) {
       mYogaNode.markLayoutSeen();
     }
@@ -615,7 +486,6 @@ public final void markLayoutSeen() {
    */
   @Override
   public final void addNativeChildAt(ReactShadowNodeImpl child, int nativeIndex) {
-    assertNotSealed();
     Assertions.assertCondition(!mIsLayoutOnly);
     Assertions.assertCondition(!child.mIsLayoutOnly);
 
@@ -667,7 +537,6 @@ public final int indexOfNativeChild(ReactShadowNodeImpl nativeChild) {
    */
   @Override
   public final void setIsLayoutOnly(boolean isLayoutOnly) {
-    assertNotSealed();
     Assertions.assertCondition(getParent() == null, "Must remove from no opt parent first");
     Assertions.assertCondition(mNativeParent == null, "Must remove from native parent first");
     Assertions.assertCondition(getNativeChildCount() == 0, "Must remove all native children first");
@@ -816,7 +685,6 @@ public final YogaDirection getLayoutDirection() {
 
   @Override
   public void setLayoutDirection(YogaDirection direction) {
-    assertNotSealed();
     mYogaNode.setDirection(direction);
   }
 
@@ -827,43 +695,36 @@ public final YogaValue getStyleWidth() {
 
   @Override
   public void setStyleWidth(float widthPx) {
-    assertNotSealed();
     mYogaNode.setWidth(widthPx);
   }
 
   @Override
   public void setStyleWidthPercent(float percent) {
-    assertNotSealed();
     mYogaNode.setWidthPercent(percent);
   }
 
   @Override
   public void setStyleWidthAuto() {
-    assertNotSealed();
     mYogaNode.setWidthAuto();
   }
 
   @Override
   public void setStyleMinWidth(float widthPx) {
-    assertNotSealed();
     mYogaNode.setMinWidth(widthPx);
   }
 
   @Override
   public void setStyleMinWidthPercent(float percent) {
-    assertNotSealed();
     mYogaNode.setMinWidthPercent(percent);
   }
 
   @Override
   public void setStyleMaxWidth(float widthPx) {
-    assertNotSealed();
     mYogaNode.setMaxWidth(widthPx);
   }
 
   @Override
   public void setStyleMaxWidthPercent(float percent) {
-    assertNotSealed();
     mYogaNode.setMaxWidthPercent(percent);
   }
 
@@ -874,151 +735,126 @@ public final YogaValue getStyleHeight() {
 
   @Override
   public void setStyleHeight(float heightPx) {
-    assertNotSealed();
     mYogaNode.setHeight(heightPx);
   }
 
   @Override
   public void setStyleHeightPercent(float percent) {
-    assertNotSealed();
     mYogaNode.setHeightPercent(percent);
   }
 
   @Override
   public void setStyleHeightAuto() {
-    assertNotSealed();
     mYogaNode.setHeightAuto();
   }
 
   @Override
   public void setStyleMinHeight(float widthPx) {
-    assertNotSealed();
     mYogaNode.setMinHeight(widthPx);
   }
 
   @Override
   public void setStyleMinHeightPercent(float percent) {
-    assertNotSealed();
     mYogaNode.setMinHeightPercent(percent);
   }
 
   @Override
   public void setStyleMaxHeight(float widthPx) {
-    assertNotSealed();
     mYogaNode.setMaxHeight(widthPx);
   }
 
   @Override
   public void setStyleMaxHeightPercent(float percent) {
-    assertNotSealed();
     mYogaNode.setMaxHeightPercent(percent);
   }
 
   @Override
   public void setFlex(float flex) {
-    assertNotSealed();
     mYogaNode.setFlex(flex);
   }
 
   @Override
   public void setFlexGrow(float flexGrow) {
-    assertNotSealed();
     mYogaNode.setFlexGrow(flexGrow);
   }
 
   @Override
   public void setFlexShrink(float flexShrink) {
-    assertNotSealed();
     mYogaNode.setFlexShrink(flexShrink);
   }
 
   @Override
   public void setFlexBasis(float flexBasis) {
-    assertNotSealed();
     mYogaNode.setFlexBasis(flexBasis);
   }
 
   @Override
   public void setFlexBasisAuto() {
-    assertNotSealed();
     mYogaNode.setFlexBasisAuto();
   }
 
   @Override
   public void setFlexBasisPercent(float percent) {
-    assertNotSealed();
     mYogaNode.setFlexBasisPercent(percent);
   }
 
   @Override
   public void setStyleAspectRatio(float aspectRatio) {
-    assertNotSealed();
     mYogaNode.setAspectRatio(aspectRatio);
   }
 
   @Override
   public void setFlexDirection(YogaFlexDirection flexDirection) {
-    assertNotSealed();
     mYogaNode.setFlexDirection(flexDirection);
   }
 
   @Override
   public void setFlexWrap(YogaWrap wrap) {
-    assertNotSealed();
     mYogaNode.setWrap(wrap);
   }
 
   @Override
   public void setAlignSelf(YogaAlign alignSelf) {
-    assertNotSealed();
     mYogaNode.setAlignSelf(alignSelf);
   }
 
   @Override
   public void setAlignItems(YogaAlign alignItems) {
-    assertNotSealed();
     mYogaNode.setAlignItems(alignItems);
   }
 
   @Override
   public void setAlignContent(YogaAlign alignContent) {
-    assertNotSealed();
     mYogaNode.setAlignContent(alignContent);
   }
 
   @Override
   public void setJustifyContent(YogaJustify justifyContent) {
-    assertNotSealed();
     mYogaNode.setJustifyContent(justifyContent);
   }
 
   @Override
   public void setOverflow(YogaOverflow overflow) {
-    assertNotSealed();
     mYogaNode.setOverflow(overflow);
   }
 
   @Override
   public void setDisplay(YogaDisplay display) {
-    assertNotSealed();
     mYogaNode.setDisplay(display);
   }
 
   @Override
   public void setMargin(int spacingType, float margin) {
-    assertNotSealed();
     mYogaNode.setMargin(YogaEdge.fromInt(spacingType), margin);
   }
 
   @Override
   public void setMarginPercent(int spacingType, float percent) {
-    assertNotSealed();
     mYogaNode.setMarginPercent(YogaEdge.fromInt(spacingType), percent);
   }
 
   @Override
   public void setMarginAuto(int spacingType) {
-    assertNotSealed();
     mYogaNode.setMarginAuto(YogaEdge.fromInt(spacingType));
   }
 
@@ -1034,14 +870,12 @@ public final YogaValue getStylePadding(int spacingType) {
 
   @Override
   public void setDefaultPadding(int spacingType, float padding) {
-    assertNotSealed();
     mDefaultPadding.set(spacingType, padding);
     updatePadding();
   }
 
   @Override
   public void setPadding(int spacingType, float padding) {
-    assertNotSealed();
     mPadding[spacingType] = padding;
     mPaddingIsPercent[spacingType] = false;
     updatePadding();
@@ -1049,14 +883,12 @@ public void setPadding(int spacingType, float padding) {
 
   @Override
   public void setPaddingPercent(int spacingType, float percent) {
-    assertNotSealed();
     mPadding[spacingType] = percent;
     mPaddingIsPercent[spacingType] = !YogaConstants.isUndefined(percent);
     updatePadding();
   }
 
   private void updatePadding() {
-    assertNotSealed();
     for (int spacingType = Spacing.LEFT; spacingType <= Spacing.ALL; spacingType++) {
       if (spacingType == Spacing.LEFT
           || spacingType == Spacing.RIGHT
@@ -1092,43 +924,36 @@ private void updatePadding() {
 
   @Override
   public void setBorder(int spacingType, float borderWidth) {
-    assertNotSealed();
     mYogaNode.setBorder(YogaEdge.fromInt(spacingType), borderWidth);
   }
 
   @Override
   public void setPosition(int spacingType, float position) {
-    assertNotSealed();
     mYogaNode.setPosition(YogaEdge.fromInt(spacingType), position);
   }
 
   @Override
   public void setPositionPercent(int spacingType, float percent) {
-    assertNotSealed();
     mYogaNode.setPositionPercent(YogaEdge.fromInt(spacingType), percent);
   }
 
   @Override
   public void setPositionType(YogaPositionType positionType) {
-    assertNotSealed();
     mYogaNode.setPositionType(positionType);
   }
 
   @Override
   public void setShouldNotifyOnLayout(boolean shouldNotifyOnLayout) {
-    assertNotSealed();
     mShouldNotifyOnLayout = shouldNotifyOnLayout;
   }
 
   @Override
   public void setBaselineFunction(YogaBaselineFunction baselineFunction) {
-    assertNotSealed();
     mYogaNode.setBaselineFunction(baselineFunction);
   }
 
   @Override
   public void setMeasureFunction(YogaMeasureFunction measureFunction) {
-    assertNotSealed();
     mYogaNode.setMeasureFunction(measureFunction);
   }
 
@@ -1184,43 +1009,6 @@ public List<ReactShadowNode> getChildrenList() {
     return mChildren == null ? null : Collections.<ReactShadowNode>unmodifiableList(mChildren);
   }
 
-  @Override
-  public ReactShadowNode getOriginalReactShadowNode() {
-    return mOriginalReactShadowNode;
-  }
-
-  @Override
-  public void setOriginalReactShadowNode(ReactShadowNode node) {
-    mOriginalReactShadowNode = node;
-  }
-
-  @Override
-  public long getInstanceHandle() {
-    return mInstanceHandle;
-  }
-
-  @Override
-  public void setInstanceHandle(long instanceHandle) {
-    assertNotSealed();
-    mInstanceHandle = instanceHandle;
-  }
-
-  @Override
-  public void markAsSealed() {
-    mIsSealed = true;
-  }
-
-  @Override
-  public boolean isSealed() {
-    return mIsSealed;
-  }
-
-  private void assertNotSealed() {
-    if (mIsSealed) {
-      throw new IllegalStateException("Can not modify sealed node " + toString());
-    }
-  }
-
   @Override
   public void updateScreenLayout(ReactShadowNode prevNode) {
     mScreenHeight = prevNode.getScreenHeight();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java
index d57504f4bb1002..733545bcf418d4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactZIndexedViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactZIndexedViewGroup.java
index a170ed75fb9030..fcd7adeea1949a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactZIndexedViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactZIndexedViewGroup.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java
index 1ce0316f9b9966..a74ab4929274b8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
index cc6ebae5366dc3..d97def825b99b4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
index 98727a39a8fdbe..7f1e023eb990c7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java
index bc68ab32607933..74a136caca4ef9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java
index 9430ca7a62cd5b..fd310c134e7825 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java
index e386db4db66420..899139e5103952 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
index 69dec9309e5c53..e061c11345bf35 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
index fc8c4cb1476d3e..cee8c4ad7c0079 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -177,7 +177,7 @@ private static boolean isTransformedTouchPointInView(
     if (child instanceof ReactHitSlopView && ((ReactHitSlopView) child).getHitSlopRect() != null) {
       Rect hitSlopRect = ((ReactHitSlopView) child).getHitSlopRect();
       if ((localX >= -hitSlopRect.left && localX < (child.getRight() - child.getLeft()) + hitSlopRect.right)
-          && (localY >= -hitSlopRect.top && localY < (child.getBottom() - child.getTop()) + hitSlopRect.bottom)) {
+        && (localY >= -hitSlopRect.top && localY < (child.getBottom() - child.getTop()) + hitSlopRect.bottom)) {
         outLocalPoint.set(localX, localY);
         return true;
       }
@@ -185,7 +185,7 @@ private static boolean isTransformedTouchPointInView(
       return false;
     } else {
       if ((localX >= 0 && localX < (child.getRight() - child.getLeft()))
-          && (localY >= 0 && localY < (child.getBottom() - child.getTop()))) {
+        && (localY >= 0 && localY < (child.getBottom() - child.getTop()))) {
         outLocalPoint.set(localX, localY);
         return true;
       }
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 2baee93cee9438..fd3448e8661020 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -709,7 +709,7 @@ protected void updateViewHierarchy() {
           }
 
           if (mLayoutUpdateListener != null) {
-            mLayoutUpdateListener.onLayoutUpdated(cssRoot);
+            mOperationsQueue.enqueueLayoutUpdateFinished(cssRoot, mLayoutUpdateListener);
           }
         }
       }
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 6be73b4e981bb7..6075cda134a378 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -1,10 +1,9 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * <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.facebook.react.uimanager;
 
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_CONSTANTS_END;
@@ -15,6 +14,7 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.media.AudioManager;
+import android.util.ArrayMap;
 import com.facebook.common.logging.FLog;
 import com.facebook.debug.holder.PrinterHolder;
 import com.facebook.debug.tags.ReactDebugOverlayTags;
@@ -44,52 +44,52 @@
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
 
 /**
- * <p>Native module to allow JS to create and update native Views.</p>
+ * Native module to allow JS to create and update native Views.
  *
  * <p>
+ *
  * <h2>== Transactional Requirement ==</h2>
+ *
  * A requirement of this class is to make sure that transactional UI updates occur all at once,
  * meaning that no intermediate state is ever rendered to the screen. For example, if a JS
  * application update changes the background of View A to blue and the width of View B to 100, both
  * need to appear at once. Practically, this means that all UI update code related to a single
  * transaction must be executed as a single code block on the UI thread. Executing as multiple code
  * blocks could allow the platform UI system to interrupt and render a partial UI state.
- * </p>
  *
  * <p>To facilitate this, this module enqueues operations that are then applied to native view
  * hierarchy through {@link NativeViewHierarchyManager} at the end of each transaction.
  *
  * <p>
+ *
  * <h2>== CSSNodes ==</h2>
- * In order to allow layout and measurement to occur on a non-UI thread, this module also
- * operates on intermediate CSSNodeDEPRECATED objects that correspond to a native view. These CSSNodeDEPRECATED are able
- * to calculate layout according to their styling rules, and then the resulting x/y/width/height of
- * that layout is scheduled as an operation that will be applied to native view hierarchy at the end
- * of current batch.
- * </p>
  *
- * TODO(5241856): Investigate memory usage of creating many small objects in UIManageModule and
- *                consider implementing a pool
- * TODO(5483063): Don't dispatch the view hierarchy at the end of a batch if no UI changes occurred
+ * In order to allow layout and measurement to occur on a non-UI thread, this module also operates
+ * on intermediate CSSNodeDEPRECATED objects that correspond to a native view. These
+ * CSSNodeDEPRECATED are able to calculate layout according to their styling rules, and then the
+ * resulting x/y/width/height of that layout is scheduled as an operation that will be applied to
+ * native view hierarchy at the end of current batch. TODO(5241856): Investigate memory usage of
+ * creating many small objects in UIManageModule and consider implementing a pool TODO(5483063):
+ * Don't dispatch the view hierarchy at the end of a batch if no UI changes occurred
  */
 @ReactModule(name = UIManagerModule.NAME)
-public class UIManagerModule extends ReactContextBaseJavaModule implements
-    OnBatchCompleteListener, LifecycleEventListener, UIManager {
+public class UIManagerModule extends ReactContextBaseJavaModule
+    implements OnBatchCompleteListener, LifecycleEventListener, UIManager {
 
-  /**
-   * Enables lazy discovery of a specific {@link ViewManager} by its name.
-   */
+  /** Enables lazy discovery of a specific {@link ViewManager} by its name. */
   public interface ViewManagerResolver {
     /**
-     * {@class UIManagerModule} class uses this method to get a ViewManager by its name.
-     * This is the same name that comes from JS by {@code UIManager.ViewManagerName} call.
+     * {@class UIManagerModule} class uses this method to get a ViewManager by its name. This is the
+     * same name that comes from JS by {@code UIManager.ViewManagerName} call.
      */
-    @Nullable ViewManager getViewManager(String viewManagerName);
+    @Nullable
+    ViewManager getViewManager(String viewManagerName);
 
     /**
      * Provides a list of view manager names to register in JS as {@code UIManager.ViewManagerName}
@@ -97,17 +97,14 @@ public interface ViewManagerResolver {
     List<String> getViewManagerNames();
   }
 
-  /**
-   * Resolves a name coming from native side to a name of the event that is exposed to JS.
-   */
+  /** Resolves a name coming from native side to a name of the event that is exposed to JS. */
   public interface CustomEventNamesResolver {
-    /**
-     * Returns custom event name by the provided event name.
-     */
-    @Nullable String resolveCustomEventName(String eventName);
+    /** Returns custom event name by the provided event name. */
+    @Nullable
+    String resolveCustomEventName(String eventName);
   }
 
-  protected static final String NAME = "UIManager";
+  public static final String NAME = "UIManager";
 
   private static final boolean DEBUG =
       PrinterHolder.getPrinter().shouldDisplayLogMessage(ReactDebugOverlayTags.UI_MANAGER);
@@ -118,6 +115,8 @@ public interface CustomEventNamesResolver {
   private final UIImplementation mUIImplementation;
   private final MemoryTrimCallback mMemoryTrimCallback = new MemoryTrimCallback();
   private final List<UIManagerModuleListener> mListeners = new ArrayList<>();
+  private @Nullable Map<String, WritableMap> mViewManagerConstantsCache;
+  volatile private int mViewManagerConstantsCacheSize;
 
   private int mBatchId = 0;
 
@@ -180,8 +179,7 @@ public Map<String, Object> getConstants() {
   public void initialize() {
     getReactApplicationContext().registerComponentCallbacks(mMemoryTrimCallback);
     mEventDispatcher.registerEventEmitter(
-      DEFAULT,
-      getReactApplicationContext().getJSModule(RCTEventEmitter.class));
+        DEFAULT, getReactApplicationContext().getJSModule(RCTEventEmitter.class));
   }
 
   @Override
@@ -212,7 +210,9 @@ public void onCatalystInstanceDestroy() {
 
   private static Map<String, Object> createConstants(ViewManagerResolver viewManagerResolver) {
     ReactMarker.logMarker(CREATE_UI_MANAGER_MODULE_CONSTANTS_START);
-    Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "CreateUIManagerConstants");
+    SystraceMessage.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "CreateUIManagerConstants")
+        .arg("Lazy", true)
+        .flush();
     try {
       return UIManagerModuleConstantsHelper.createConstants(viewManagerResolver);
     } finally {
@@ -226,7 +226,9 @@ private static Map<String, Object> createConstants(
       @Nullable Map<String, Object> customBubblingEvents,
       @Nullable Map<String, Object> customDirectEvents) {
     ReactMarker.logMarker(CREATE_UI_MANAGER_MODULE_CONSTANTS_START);
-    Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "CreateUIManagerConstants");
+    SystraceMessage.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "CreateUIManagerConstants")
+        .arg("Lazy", false)
+        .flush();
     try {
       return UIManagerModuleConstantsHelper.createConstants(
           viewManagers, customBubblingEvents, customDirectEvents);
@@ -236,8 +238,48 @@ private static Map<String, Object> createConstants(
     }
   }
 
+  /**
+   * Helper method to pre-compute the constants for a view manager. This method ensures that we
+   * don't block for getting the constants for view managers during TTI
+   *
+   * @param viewManagerNames
+   */
+  @Deprecated
+  public void preComputeConstantsForViewManager(List<String> viewManagerNames) {
+    Map<String, WritableMap> constantsMap = new ArrayMap<>();
+    for (String viewManagerName : viewManagerNames) {
+      WritableMap constants = computeConstantsForViewManager(viewManagerName);
+      if (constants != null) {
+        constantsMap.put(viewManagerName, constants);
+      }
+    }
+
+    // To ensure that this is thread safe, we return an unmodifiableMap
+    // We use mViewManagerConstantsCacheSize to count the times we access the contents of the map
+    // Once we have accessed all the values, we free this cache
+    // Assumption is that JS gets the constants only once for each viewManager.
+    // Using this mechanism prevents expensive synchronized blocks, due to the nature of how this is
+    // accessed - write one, read multiple times, and then throw the data away.
+    mViewManagerConstantsCacheSize = viewManagerNames.size();
+    mViewManagerConstantsCache = Collections.unmodifiableMap(constantsMap);
+  }
+
   @ReactMethod(isBlockingSynchronousMethod = true)
   public @Nullable WritableMap getConstantsForViewManager(final String viewManagerName) {
+    if (mViewManagerConstantsCache != null
+        && mViewManagerConstantsCache.containsKey(viewManagerName)) {
+      WritableMap constants = mViewManagerConstantsCache.get(viewManagerName);
+      if (--mViewManagerConstantsCacheSize <= 0) {
+        // Looks like we have read all the values from the cache, so we may as well free this cache
+        mViewManagerConstantsCache = null;
+      }
+      return constants;
+    } else {
+      return computeConstantsForViewManager(viewManagerName);
+    }
+  }
+
+  private @Nullable WritableMap computeConstantsForViewManager(final String viewManagerName) {
     ViewManager targetView =
         viewManagerName != null ? mUIImplementation.resolveViewManager(viewManagerName) : null;
     if (targetView == null) {
@@ -304,29 +346,27 @@ public Map<String, Long> getPerformanceCounters() {
   @Override
   public <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(
       final T rootView) {
-    Systrace.beginSection(
-      Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-      "UIManagerModule.addRootView");
+    Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "UIManagerModule.addRootView");
     final int tag = ReactRootViewTagGenerator.getNextRootViewTag();
     final ReactApplicationContext reactApplicationContext = getReactApplicationContext();
     final ThemedReactContext themedRootContext =
-      new ThemedReactContext(reactApplicationContext, rootView.getContext());
+        new ThemedReactContext(reactApplicationContext, rootView.getContext());
 
     mUIImplementation.registerRootView(rootView, tag, themedRootContext);
 
     rootView.setOnSizeChangedListener(
-      new SizeMonitoringFrameLayout.OnSizeChangedListener() {
-        @Override
-        public void onSizeChanged(final int width, final int height, int oldW, int oldH) {
-          reactApplicationContext.runOnNativeModulesQueueThread(
-            new GuardedRunnable(reactApplicationContext) {
-              @Override
-              public void runGuarded() {
-                updateNodeSize(tag, width, height);
-              }
-            });
-        }
-      });
+        new SizeMonitoringFrameLayout.OnSizeChangedListener() {
+          @Override
+          public void onSizeChanged(final int width, final int height, int oldW, int oldH) {
+            reactApplicationContext.runOnNativeModulesQueueThread(
+                new GuardedRunnable(reactApplicationContext) {
+                  @Override
+                  public void runGuarded() {
+                    updateNodeSize(tag, width, height);
+                  }
+                });
+          }
+        });
 
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     return tag;
@@ -344,13 +384,11 @@ public void updateNodeSize(int nodeViewTag, int newWidth, int newHeight) {
   }
 
   /**
-   * Sets local data for a shadow node corresponded with given tag.
-   * In some cases we need a way to specify some environmental data to shadow node
-   * to improve layout (or do something similar), so {@code localData} serves these needs.
-   * For example, any stateful embedded native views may benefit from this.
-   * Have in mind that this data is not supposed to interfere with the state of
-   * the shadow view.
-   * Please respect one-directional data flow of React.
+   * Sets local data for a shadow node corresponded with given tag. In some cases we need a way to
+   * specify some environmental data to shadow node to improve layout (or do something similar), so
+   * {@code localData} serves these needs. For example, any stateful embedded native views may
+   * benefit from this. Have in mind that this data is not supposed to interfere with the state of
+   * the shadow view. Please respect one-directional data flow of React.
    */
   public void setViewLocalData(final int tag, final Object data) {
     final ReactApplicationContext reactApplicationContext = getReactApplicationContext();
@@ -397,7 +435,7 @@ public void updateView(int tag, String className, ReadableMap props) {
    * @param addChildTags a list of tags of views to add to the parent
    * @param addAtIndices parallel to addChildTags, a list of indices to insert those children at
    * @param removeFrom a list of indices of views to permanently remove. The memory for the
-   *        corresponding views and data structures should be reclaimed.
+   *     corresponding views and data structures should be reclaimed.
    */
   @ReactMethod
   public void manageChildren(
@@ -425,25 +463,18 @@ public void manageChildren(
       PrinterHolder.getPrinter().logMessage(ReactDebugOverlayTags.UI_MANAGER, message);
     }
     mUIImplementation.manageChildren(
-        viewTag,
-        moveFrom,
-        moveTo,
-        addChildTags,
-        addAtIndices,
-        removeFrom);
+        viewTag, moveFrom, moveTo, addChildTags, addAtIndices, removeFrom);
   }
 
   /**
-   * Interface for fast tracking the initial adding of views.  Children view tags are assumed to be
+   * Interface for fast tracking the initial adding of views. Children view tags are assumed to be
    * in order
    *
    * @param viewTag the view tag of the parent view
    * @param childrenTags An array of tags to add to the parent in order
    */
   @ReactMethod
-  public void setChildren(
-    int viewTag,
-    ReadableArray childrenTags) {
+  public void setChildren(int viewTag, ReadableArray childrenTags) {
     if (DEBUG) {
       String message = "(UIManager.setChildren) tag: " + viewTag + ", children: " + childrenTags;
       FLog.d(ReactConstants.TAG, message);
@@ -464,8 +495,8 @@ public void replaceExistingNonRootView(int oldTag, int newTag) {
 
   /**
    * Method which takes a container tag and then releases all subviews for that container upon
-   * receipt.
-   * TODO: The method name is incorrect and will be renamed, #6033872
+   * receipt. TODO: The method name is incorrect and will be renamed, #6033872
+   *
    * @param containerTag the tag of the container for which the subviews must be removed
    */
   @ReactMethod
@@ -484,7 +515,7 @@ public void measure(int reactTag, Callback callback) {
 
   /**
    * Determines the location on screen, width, and height of the given view relative to the device
-   * screen and returns the values via an async callback.  This is the absolute position including
+   * screen and returns the values via an async callback. This is the absolute position including
    * things like the status bar
    */
   @ReactMethod
@@ -495,74 +526,61 @@ public void measureInWindow(int reactTag, Callback callback) {
   /**
    * Measures the view specified by tag relative to the given ancestorTag. This means that the
    * returned x, y are relative to the origin x, y of the ancestor view. Results are stored in the
-   * given outputBuffer. We allow ancestor view and measured view to be the same, in which case
-   * the position always will be (0, 0) and method will only measure the view dimensions.
+   * given outputBuffer. We allow ancestor view and measured view to be the same, in which case the
+   * position always will be (0, 0) and method will only measure the view dimensions.
    *
-   * NB: Unlike {@link #measure}, this will measure relative to the view layout, not the visible
+   * <p>NB: Unlike {@link #measure}, this will measure relative to the view layout, not the visible
    * window which can cause unexpected results when measuring relative to things like ScrollViews
    * that can have offset content on the screen.
    */
   @ReactMethod
   public void measureLayout(
-      int tag,
-      int ancestorTag,
-      Callback errorCallback,
-      Callback successCallback) {
+      int tag, int ancestorTag, Callback errorCallback, Callback successCallback) {
     mUIImplementation.measureLayout(tag, ancestorTag, errorCallback, successCallback);
   }
 
   /**
    * Like {@link #measure} and {@link #measureLayout} but measures relative to the immediate parent.
    *
-   * NB: Unlike {@link #measure}, this will measure relative to the view layout, not the visible
+   * <p>NB: Unlike {@link #measure}, this will measure relative to the view layout, not the visible
    * window which can cause unexpected results when measuring relative to things like ScrollViews
    * that can have offset content on the screen.
    */
   @ReactMethod
   public void measureLayoutRelativeToParent(
-      int tag,
-      Callback errorCallback,
-      Callback successCallback) {
+      int tag, Callback errorCallback, Callback successCallback) {
     mUIImplementation.measureLayoutRelativeToParent(tag, errorCallback, successCallback);
   }
 
   /**
-   * Find the touch target child native view in  the supplied root view hierarchy, given a react
+   * Find the touch target child native view in the supplied root view hierarchy, given a react
    * target location.
    *
-   * This method is currently used only by Element Inspector DevTool.
+   * <p>This method is currently used only by Element Inspector DevTool.
    *
    * @param reactTag the tag of the root view to traverse
    * @param point an array containing both X and Y target location
    * @param callback will be called if with the identified child view react ID, and measurement
-   *        info. If no view was found, callback will be invoked with no data.
+   *     info. If no view was found, callback will be invoked with no data.
    */
   @ReactMethod
   public void findSubviewIn(
-      final int reactTag,
-      final ReadableArray point,
-      final Callback callback) {
+      final int reactTag, final ReadableArray point, final Callback callback) {
     mUIImplementation.findSubviewIn(
-      reactTag,
-      Math.round(PixelUtil.toPixelFromDIP(point.getDouble(0))),
-      Math.round(PixelUtil.toPixelFromDIP(point.getDouble(1))),
-      callback);
+        reactTag,
+        Math.round(PixelUtil.toPixelFromDIP(point.getDouble(0))),
+        Math.round(PixelUtil.toPixelFromDIP(point.getDouble(1))),
+        callback);
   }
 
-  /**
-   *  Check if the first shadow node is the descendant of the second shadow node
-   */
+  /** Check if the first shadow node is the descendant of the second shadow node */
   @ReactMethod
   public void viewIsDescendantOf(
-      final int reactTag,
-      final int ancestorReactTag,
-      final Callback callback) {
+      final int reactTag, final int ancestorReactTag, final Callback callback) {
     mUIImplementation.viewIsDescendantOf(reactTag, ancestorReactTag, callback);
   }
 
-  /**
-   * Registers a new Animation that can then be added to a View using {@link #addAnimation}.
-   */
+  /** Registers a new Animation that can then be added to a View using {@link #addAnimation}. */
   public void registerAnimation(Animation animation) {
     mUIImplementation.registerAnimation(animation);
   }
@@ -574,9 +592,7 @@ public void addAnimation(int reactTag, int animationID, Callback onSuccess) {
     mUIImplementation.addAnimation(reactTag, animationID, onSuccess);
   }
 
-  /**
-   * Removes an existing Animation, canceling it if it was in progress.
-   */
+  /** Removes an existing Animation, canceling it if it was in progress. */
   public void removeAnimation(int reactTag, int animationID) {
     mUIImplementation.removeAnimation(reactTag, animationID);
   }
@@ -594,11 +610,12 @@ public void clearJSResponder() {
   }
 
   @ReactMethod
-  public void dispatchViewManagerCommand(int reactTag, int commandId, @Nullable ReadableArray commandArgs) {
-    //TODO: this is a temporary approach to support ViewManagerCommands in Fabric until
+  public void dispatchViewManagerCommand(
+      int reactTag, int commandId, @Nullable ReadableArray commandArgs) {
+    // TODO: this is a temporary approach to support ViewManagerCommands in Fabric until
     // the dispatchViewManagerCommand() method is supported by Fabric JS API.
     UIManagerHelper.getUIManager(getReactApplicationContext(), ViewUtil.getUIManagerType(reactTag))
-      .dispatchCommand(reactTag, commandId, commandArgs);
+        .dispatchCommand(reactTag, commandId, commandArgs);
   }
 
   @Override
@@ -608,7 +625,8 @@ public void dispatchCommand(int reactTag, int commandId, @Nullable ReadableArray
 
   @ReactMethod
   public void playTouchSound() {
-    AudioManager audioManager = (AudioManager) getReactApplicationContext().getSystemService(Context.AUDIO_SERVICE);
+    AudioManager audioManager =
+        (AudioManager) getReactApplicationContext().getSystemService(Context.AUDIO_SERVICE);
     if (audioManager != null) {
       audioManager.playSoundEffect(AudioManager.FX_KEY_CLICK);
     }
@@ -618,11 +636,11 @@ public void playTouchSound() {
    * Show a PopupMenu.
    *
    * @param reactTag the tag of the anchor view (the PopupMenu is displayed next to this view); this
-   *        needs to be the tag of a native view (shadow views can not be anchors)
+   *     needs to be the tag of a native view (shadow views can not be anchors)
    * @param items the menu items as an array of strings
    * @param error will be called if there is an error displaying the menu
    * @param success will be called with the position of the selected item as the first argument, or
-   *        no arguments if the menu is dismissed
+   *     no arguments if the menu is dismissed
    */
   @ReactMethod
   public void showPopupMenu(int reactTag, ReadableArray items, Callback error, Callback success) {
@@ -638,10 +656,10 @@ public void dismissPopupMenu() {
    * LayoutAnimation API on Android is currently experimental. Therefore, it needs to be enabled
    * explicitly in order to avoid regression in existing application written for iOS using this API.
    *
-   * Warning : This method will be removed in future version of React Native, and layout animation
-   * will be enabled by default, so always check for its existence before invoking it.
+   * <p>Warning : This method will be removed in future version of React Native, and layout
+   * animation will be enabled by default, so always check for its existence before invoking it.
    *
-   * TODO(9139831) : remove this method once layout animation is fully stable.
+   * <p>TODO(9139831) : remove this method once layout animation is fully stable.
    *
    * @param enabled whether layout animation is enabled or not
    */
@@ -651,38 +669,35 @@ public void setLayoutAnimationEnabledExperimental(boolean enabled) {
   }
 
   /**
-   * Configure an animation to be used for the native layout changes, and native views
-   * creation. The animation will only apply during the current batch operations.
+   * Configure an animation to be used for the native layout changes, and native views creation. The
+   * animation will only apply during the current batch operations.
    *
-   * TODO(7728153) : animating view deletion is currently not supported.
-   * TODO(7613721) : callbacks are not supported, this feature will likely be killed.
+   * <p>TODO(7728153) : animating view deletion is currently not supported. TODO(7613721) :
+   * callbacks are not supported, this feature will likely be killed.
    *
    * @param config the configuration of the animation for view addition/removal/update.
    * @param success will be called when the animation completes, or when the animation get
-   *        interrupted. In this case, callback parameter will be false.
+   *     interrupted. In this case, callback parameter will be false.
    * @param error will be called if there was an error processing the animation
    */
   @ReactMethod
-  public void configureNextLayoutAnimation(
-      ReadableMap config,
-      Callback success,
-      Callback error) {
+  public void configureNextLayoutAnimation(ReadableMap config, Callback success, Callback error) {
     mUIImplementation.configureNextLayoutAnimation(config, success, error);
   }
 
   /**
-   * To implement the transactional requirement mentioned in the class javadoc, we only commit
-   * UI changes to the actual view hierarchy once a batch of JS->Java calls have been completed.
-   * We know this is safe because all JS->Java calls that are triggered by a Java->JS call (e.g.
-   * the delivery of a touch event or execution of 'renderApplication') end up in a single
-   * JS->Java transaction.
+   * To implement the transactional requirement mentioned in the class javadoc, we only commit UI
+   * changes to the actual view hierarchy once a batch of JS->Java calls have been completed. We
+   * know this is safe because all JS->Java calls that are triggered by a Java->JS call (e.g. the
+   * delivery of a touch event or execution of 'renderApplication') end up in a single JS->Java
+   * transaction.
    *
-   * A better way to do this would be to have JS explicitly signal to this module when a UI
-   * transaction is done. Right now, though, this is how iOS does it, and we should probably
-   * update the JS and native code and make this change at the same time.
+   * <p>A better way to do this would be to have JS explicitly signal to this module when a UI
+   * transaction is done. Right now, though, this is how iOS does it, and we should probably update
+   * the JS and native code and make this change at the same time.
    *
-   * TODO(5279396): Make JS UI library explicitly notify the native UI module of the end of a UI
-   *                transaction using a standard native call
+   * <p>TODO(5279396): Make JS UI library explicitly notify the native UI module of the end of a UI
+   * transaction using a standard native call
    */
   @Override
   public void onBatchComplete() {
@@ -690,8 +705,8 @@ public void onBatchComplete() {
     mBatchId++;
 
     SystraceMessage.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "onBatchCompleteUI")
-          .arg("BatchId", batchId)
-          .flush();
+        .arg("BatchId", batchId)
+        .flush();
     for (UIManagerModuleListener listener : mListeners) {
       listener.willDispatchViewUpdates(this);
     }
@@ -717,28 +732,23 @@ public void sendAccessibilityEvent(int tag, int eventType) {
   }
 
   /**
-   * Schedule a block to be executed on the UI thread. Useful if you need to execute
-   * view logic after all currently queued view updates have completed.
+   * Schedule a block to be executed on the UI thread. Useful if you need to execute view logic
+   * after all currently queued view updates have completed.
    *
    * @param block that contains UI logic you want to execute.
-   *
-   * Usage Example:
-
-   UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-   uiManager.addUIBlock(new UIBlock() {
-     public void execute (NativeViewHierarchyManager nvhm) {
-       View view = nvhm.resolveView(tag);
-       // ...execute your code on View (e.g. snapshot the view)
-     }
-   });
-     */
+   *     <p>Usage Example:
+   *     <p>UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+   *     uiManager.addUIBlock(new UIBlock() { public void execute (NativeViewHierarchyManager nvhm)
+   *     { View view = nvhm.resolveView(tag); // ...execute your code on View (e.g. snapshot the
+   *     view) } });
+   */
   public void addUIBlock(UIBlock block) {
     mUIImplementation.addUIBlock(block);
   }
 
   /**
-   * Schedule a block to be executed on the UI thread. Useful if you need to execute
-   * view logic before all currently queued view updates have completed.
+   * Schedule a block to be executed on the UI thread. Useful if you need to execute view logic
+   * before all currently queued view updates have completed.
    *
    * @param block that contains UI logic you want to execute.
    */
@@ -755,12 +765,10 @@ public void removeUIManagerListener(UIManagerModuleListener listener) {
   }
 
   /**
-   * Given a reactTag from a component, find its root node tag, if possible.
-   * Otherwise, this will return 0. If the reactTag belongs to a root node, this
-   * will return the same reactTag.
+   * Given a reactTag from a component, find its root node tag, if possible. Otherwise, this will
+   * return 0. If the reactTag belongs to a root node, this will return the same reactTag.
    *
    * @param reactTag the component tag
-   *
    * @return the rootTag
    */
   public int resolveRootTagFromReactTag(int reactTag) {
@@ -777,15 +785,24 @@ public void invalidateNodeLayout(int tag) {
       return;
     }
     node.dirty();
+    mUIImplementation.dispatchViewUpdates(-1);
   }
 
   /**
    * Updates the styles of the {@link ReactShadowNode} based on the Measure specs received by
    * parameters.
    */
-  public void updateRootLayoutSpecs(int rootViewTag, int widthMeasureSpec, int heightMeasureSpec) {
-    mUIImplementation.updateRootView(rootViewTag, widthMeasureSpec, heightMeasureSpec);
-    mUIImplementation.dispatchViewUpdates(-1);
+  public void updateRootLayoutSpecs(
+      final int rootViewTag, final int widthMeasureSpec, final int heightMeasureSpec) {
+    ReactApplicationContext reactApplicationContext = getReactApplicationContext();
+    reactApplicationContext.runOnNativeModulesQueueThread(
+        new GuardedRunnable(reactApplicationContext) {
+          @Override
+          public void runGuarded() {
+            mUIImplementation.updateRootView(rootViewTag, widthMeasureSpec, heightMeasureSpec);
+            mUIImplementation.dispatchViewUpdates(-1);
+          }
+        });
   }
 
   /** Listener that drops the CSSNode pool on low memory when the app is backgrounded. */
@@ -799,11 +816,9 @@ public void onTrimMemory(int level) {
     }
 
     @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-    }
+    public void onConfigurationChanged(Configuration newConfig) {}
 
     @Override
-    public void onLowMemory() {
-    }
+    public void onLowMemory() {}
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
index 1eea5018a8dfc5..36c3162cb77b52 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -35,7 +35,7 @@
                 "phasedRegistrationNames",
                 MapBuilder.of("bubbled", "onSelect", "captured", "onSelectCapture")))
         .put(
-            TouchEventType.START.getJSEventName(),
+            TouchEventType.getJSEventName(TouchEventType.START),
             MapBuilder.of(
                 "phasedRegistrationNames",
                 MapBuilder.of(
@@ -44,7 +44,7 @@
                     "captured",
                     "onTouchStartCapture")))
         .put(
-            TouchEventType.MOVE.getJSEventName(),
+            TouchEventType.getJSEventName(TouchEventType.MOVE),
             MapBuilder.of(
                 "phasedRegistrationNames",
                 MapBuilder.of(
@@ -53,7 +53,7 @@
                     "captured",
                     "onTouchMoveCapture")))
         .put(
-            TouchEventType.END.getJSEventName(),
+            TouchEventType.getJSEventName(TouchEventType.END),
             MapBuilder.of(
                 "phasedRegistrationNames",
                 MapBuilder.of(
@@ -62,7 +62,7 @@
                     "captured",
                     "onTouchEndCapture")))
         .put(
-            TouchEventType.CANCEL.getJSEventName(),
+            TouchEventType.getJSEventName(TouchEventType.CANCEL),
             MapBuilder.of(
                 "phasedRegistrationNames",
                 MapBuilder.of(
@@ -134,6 +134,8 @@ public static Map<String, Object> getConstants() {
       MapBuilder.of(
           "typeWindowStateChanged",
           AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED,
+          "typeViewFocused",
+          AccessibilityEvent.TYPE_VIEW_FOCUSED,
           "typeViewClicked",
           AccessibilityEvent.TYPE_VIEW_CLICKED));
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
index beb067f1313ab0..8e993c1935cfe5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,7 @@
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
 
 import com.facebook.react.common.MapBuilder;
-import com.facebook.systrace.Systrace;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.systrace.SystraceMessage;
 import java.util.List;
 import java.util.Map;
@@ -28,14 +28,17 @@
   /**
    * Generates a lazy discovery enabled version of {@link UIManagerModule} constants. It only
    * contains a list of view manager names, so that JS side is aware of the managers there are.
-   * Actual ViewManager instantiation happens when {@code UIManager.SpecificViewManager} call happens.
-   * The View Manager is then registered on the JS side with the help of
-   * {@code UIManagerModule.getConstantsForViewManager}.
+   * Actual ViewManager instantiation happens when
+   * {@code UIManager.getViewManagerConfig('SpecificViewManager')} call happens. The View Manager is then
+   * registered on the JS side with the help of {@code UIManagerModule.getConstantsForViewManager}.
    */
   /* package */ static Map<String, Object> createConstants(
       UIManagerModule.ViewManagerResolver resolver) {
     Map<String, Object> constants = UIManagerModuleConstants.getConstants();
-    constants.put("ViewManagerNames", resolver.getViewManagerNames());
+    if (!ReactFeatureFlags.lazilyLoadViewManagers) {
+      constants.put("ViewManagerNames", resolver.getViewManagerNames());
+    }
+    constants.put("LazyViewManagersEnabled", true);
     return constants;
   }
 
@@ -99,7 +102,7 @@
           constants.put(viewManagerName, viewManagerConstants);
         }
       } finally {
-        Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+        SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
       }
     }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java
index 46e5807a3b1466..e6d5c840016328 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
index 783110b96af626..80f447d836a5b3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -556,6 +556,22 @@ public void execute() {
     }
   }
 
+  private final class LayoutUpdateFinishedOperation implements UIOperation {
+
+    private final ReactShadowNode mNode;
+    private final UIImplementation.LayoutUpdateListener mListener;
+
+    private LayoutUpdateFinishedOperation(ReactShadowNode node, UIImplementation.LayoutUpdateListener listener) {
+      mNode = node;
+      mListener = listener;
+    }
+
+    @Override
+    public void execute() {
+      mListener.onLayoutUpdated(mNode);
+    }
+  }
+
   private class UIBlockOperation implements UIOperation {
     private final UIBlock mBlock;
     public UIBlockOperation (UIBlock block) {
@@ -829,6 +845,10 @@ public void enqueueSendAccessibilityEvent(int tag, int eventType) {
     mOperations.add(new SendAccessibilityEvent(tag, eventType));
   }
 
+  public void enqueueLayoutUpdateFinished(ReactShadowNode node, UIImplementation.LayoutUpdateListener listener) {
+    mOperations.add(new LayoutUpdateFinishedOperation(node, listener));
+  }
+
   public void enqueueUIBlock(UIBlock block) {
     mOperations.add(new UIBlockOperation(block));
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
index c242d7c310ddf5..685da777a72bd5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
index 0ccacd7f5dab7e..5583e2e9702116 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
index b96562ed1713a4..457fd227b569fa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
index 017fb5764e7237..d210d63e2d161b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,16 +7,10 @@
 
 package com.facebook.react.uimanager;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.WeakHashMap;
-
 import android.view.View;
 import android.view.ViewGroup;
-
+import java.util.List;
+import java.util.WeakHashMap;
 import javax.annotation.Nullable;
 
 /**
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java
index 6c0ae3dd62d40d..2825dd5764202d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
index 1895adc1ad17b1..4abd015ebe0c7d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,9 @@
 import android.view.View;
 import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.touch.JSResponderHandler;
 import com.facebook.react.touch.ReactInterceptingViewGroup;
 import com.facebook.react.uimanager.annotations.ReactProp;
@@ -202,4 +204,23 @@ public void receiveCommand(T root, int commandId, @Nullable ReadableArray args)
   public Map<String, String> getNativeProps() {
     return ViewManagerPropertyUpdater.getNativeProps(getClass(), getShadowNodeClass());
   }
+
+  /**
+   *
+   */
+  public @Nullable Object updateLocalData(T view, ReactStylesDiffMap props, ReactStylesDiffMap localData) {
+    return null;
+  }
+
+  public float[] measure(
+      ReactContext context,
+      T view,
+      ReadableNativeMap localData,
+      ReadableNativeMap props,
+      float width,
+      int widthMode,
+      float height,
+      int heightMode) {
+    return null;
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.java
index b64606acd4d870..7bea9928a7cf96 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
index 7e71b566b5799d..b657eb5918c0e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
index 2c4098b0d71a74..98428f40b9ff92 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 58e67ccb752434..7b38c54997fed8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java
index e4c259197ff21f..5b235cb4bf2c19 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 435a4533962fca..79fad4e0ffe535 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "annotations",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactProp.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactProp.java
index 15ac3306534a00..3a57c3198916eb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactProp.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactProp.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropGroup.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropGroup.java
index ff1689840bac2d..fb623dd50c0a2a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropGroup.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropertyHolder.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropertyHolder.java
index cfe591a9dc5335..7b6476187db5cb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropertyHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropertyHolder.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 2e8df3aca77ea3..0da530277723cd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "common",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/MeasureSpecProvider.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/MeasureSpecProvider.java
index 69fef4693d2e15..fc9a8fb322c738 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/MeasureSpecProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/MeasureSpecProvider.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/SizeMonitoringFrameLayout.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/SizeMonitoringFrameLayout.java
index f7dd744c4b11b2..819753ca4db01f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/SizeMonitoringFrameLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/SizeMonitoringFrameLayout.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/UIManagerType.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/UIManagerType.java
index 44a2e8b8f62a5a..65bed816ad9223 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/UIManagerType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/UIManagerType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.java
index ef679635efbbc1..c84d265afbbd6c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java
index c1ac00488f3906..ff695b8db11a32 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BatchEventDispatchedListener.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BatchEventDispatchedListener.java
new file mode 100644
index 00000000000000..f7ce2baccf9e9d
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BatchEventDispatchedListener.java
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * 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;
+
+public interface BatchEventDispatchedListener {
+
+  /**
+   * Called after a batch of low priority events has been dispatched.
+   */
+  void onBatchEventDispatched();
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.java
index 2b7600f00a98fb..9462bcf6264913 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 68d07f3f87887a..8d5b3aaa97cc52 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
index 37fcadda30ad1b..f8506c8aad7602 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.Nullable;
@@ -90,6 +91,7 @@ public int compare(Event lhs, Event rhs) {
   private final DispatchEventsRunnable mDispatchEventsRunnable = new DispatchEventsRunnable();
   private final ArrayList<Event> mEventStaging = new ArrayList<>();
   private final ArrayList<EventDispatcherListener> mListeners = new ArrayList<>();
+  private final List<BatchEventDispatchedListener> mPostEventDispatchListeners = new ArrayList<>();
   private final ScheduleDispatchFrameCallback mCurrentFrameCallback =
     new ScheduleDispatchFrameCallback();
   private final AtomicInteger mHasDispatchScheduledCount = new AtomicInteger();
@@ -149,6 +151,14 @@ 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() {
     mCurrentFrameCallback.maybePostFromNonUI();
@@ -355,6 +365,9 @@ public void run() {
             event.dispatch(mReactEventEmitter);
             event.dispose();
           }
+          for (BatchEventDispatchedListener listener : mPostEventDispatchListeners) {
+            listener.onBatchEventDispatched();
+          }
           clearEventsToDispatch();
           mEventCookieToLastEventIdx.clear();
         }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherListener.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherListener.java
index acf018bec5d78f..524b39ecb63041 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherListener.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java
index 41328fd24c7493..1604b951aa3dc2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
index a46d0b3ea8988d..e3e9a03fcb7258 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.java
index 64aac3f795fcc4..61e3e95cd4f58c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,7 +9,6 @@
 
 import static com.facebook.react.uimanager.events.TouchesHelper.TARGET_KEY;
 
-import android.util.Log;
 import android.util.SparseArray;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -17,8 +16,6 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.common.ViewUtil;
-import java.io.Closeable;
-import java.io.IOException;
 import javax.annotation.Nullable;
 
 public class ReactEventEmitter implements RCTEventEmitter {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
index 1d16c159523231..617b9bc9839ada 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -117,7 +117,7 @@ public void onDispose() {
 
   @Override
   public String getEventName() {
-    return Assertions.assertNotNull(mTouchEventType).getJSEventName();
+    return TouchEventType.getJSEventName(Assertions.assertNotNull(mTouchEventType));
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java
index 3ead8fc7bfe4f3..79e8b7bf1ca4a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java
index 6d6cac7b6cf0ed..04439c41269fed 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,18 +11,23 @@
  * Touch event types that JS module RCTEventEmitter can understand
  */
 public enum TouchEventType {
-  START("topTouchStart"),
-  END("topTouchEnd"),
-  MOVE("topTouchMove"),
-  CANCEL("topTouchCancel");
+  START,
+  END,
+  MOVE,
+  CANCEL;
 
-  private final String mJSEventName;
-
-  TouchEventType(String jsEventName) {
-    mJSEventName = jsEventName;
-  }
-
-  public String getJSEventName() {
-    return mJSEventName;
+  public static String getJSEventName(TouchEventType type) {
+    switch (type) {
+      case START:
+        return "topTouchStart";
+      case END:
+        return "topTouchEnd";
+      case MOVE:
+        return "topTouchMove";
+      case CANCEL:
+        return "topTouchCancel";
+      default:
+        throw new IllegalArgumentException("Unexpected type " + type);
+    }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
index 59212aa830d361..878bb5a3dc7fb9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -104,7 +104,7 @@ public static void sendTouchEvent(
     }
 
     rctEventEmitter.receiveTouches(
-        type.getJSEventName(),
+        TouchEventType.getJSEventName(type),
         pointers,
         changedIndices);
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.java
index 499057316069ba..ca9bb385324f8b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AnimatedPropertyType.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AnimatedPropertyType.java
index 78e6a2b01fc039..a8e569fbe91c19 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AnimatedPropertyType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AnimatedPropertyType.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -10,28 +10,23 @@
  * view creation.
  */
 /* package */ enum AnimatedPropertyType {
-  OPACITY("opacity"),
-  SCALE_X("scaleX"),
-  SCALE_Y("scaleY"),
-  SCALE_XY("scaleXY");
-
-  private final String mName;
-
-  private AnimatedPropertyType(String name) {
-    mName = name;
-  }
+  OPACITY,
+  SCALE_X,
+  SCALE_Y,
+  SCALE_XY;
 
   public static AnimatedPropertyType fromString(String name) {
-    for (AnimatedPropertyType property : AnimatedPropertyType.values()) {
-      if (property.toString().equalsIgnoreCase(name)) {
-        return property;
-      }
+    switch (name) {
+      case "opacity":
+        return OPACITY;
+      case "scaleX":
+        return SCALE_X;
+      case "scaleY":
+        return SCALE_Y;
+      case "scaleXY":
+        return SCALE_XY;
+      default:
+        throw new IllegalArgumentException("Unsupported animated property: " + name);
     }
-    throw new IllegalArgumentException("Unsupported animated property : " + name);
-  }
-
-  @Override
-  public String toString() {
-    return mName;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.java
index 32c2c48fd7f6d7..0c586fb5ba2f43 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/InterpolatorType.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/InterpolatorType.java
index 2f4d54b16d7d3b..9334ab28acfc1d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/InterpolatorType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/InterpolatorType.java
@@ -1,37 +1,36 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its 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.layoutanimation;
 
+import java.util.Locale;
+
 /**
  * Enum representing the different interpolators that can be used in layout animation configuration.
  */
 /* package */ enum InterpolatorType {
-  LINEAR("linear"),
-  EASE_IN("easeIn"),
-  EASE_OUT("easeOut"),
-  EASE_IN_EASE_OUT("easeInEaseOut"),
-  SPRING("spring");
-
-  private final String mName;
-
-  private InterpolatorType(String name) {
-    mName = name;
-  }
+  LINEAR,
+  EASE_IN,
+  EASE_OUT,
+  EASE_IN_EASE_OUT,
+  SPRING;
 
   public static InterpolatorType fromString(String name) {
-    for (InterpolatorType type : InterpolatorType.values()) {
-      if (type.toString().equalsIgnoreCase(name)) {
-        return type;
-      }
+    switch (name.toLowerCase(Locale.US)) {
+      case "linear":
+        return LINEAR;
+      case "easein":
+        return EASE_IN;
+      case "easeout":
+        return EASE_OUT;
+      case "easeineaseout":
+        return EASE_IN_EASE_OUT;
+      case "spring":
+        return SPRING;
+      default:
+        throw new IllegalArgumentException("Unsupported interpolation type : " + name);
     }
-    throw new IllegalArgumentException("Unsupported interpolation type : " + name);
-  }
-
-  @Override
-  public String toString() {
-    return mName;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java
index 62568dcc4fbbec..2f08da20ecae2b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -46,19 +46,19 @@ public void initializeFromConfig(final @Nullable ReadableMap config) {
 
     mShouldAnimateLayout = false;
     int globalDuration = config.hasKey("duration") ? config.getInt("duration") : 0;
-    if (config.hasKey(LayoutAnimationType.CREATE.toString())) {
+    if (config.hasKey(LayoutAnimationType.toString(LayoutAnimationType.CREATE))) {
       mLayoutCreateAnimation.initializeFromConfig(
-          config.getMap(LayoutAnimationType.CREATE.toString()), globalDuration);
+          config.getMap(LayoutAnimationType.toString(LayoutAnimationType.CREATE)), globalDuration);
       mShouldAnimateLayout = true;
     }
-    if (config.hasKey(LayoutAnimationType.UPDATE.toString())) {
+    if (config.hasKey(LayoutAnimationType.toString(LayoutAnimationType.UPDATE))) {
       mLayoutUpdateAnimation.initializeFromConfig(
-          config.getMap(LayoutAnimationType.UPDATE.toString()), globalDuration);
+          config.getMap(LayoutAnimationType.toString(LayoutAnimationType.UPDATE)), globalDuration);
       mShouldAnimateLayout = true;
     }
-    if (config.hasKey(LayoutAnimationType.DELETE.toString())) {
+    if (config.hasKey(LayoutAnimationType.toString(LayoutAnimationType.DELETE))) {
       mLayoutDeleteAnimation.initializeFromConfig(
-          config.getMap(LayoutAnimationType.DELETE.toString()), globalDuration);
+          config.getMap(LayoutAnimationType.toString(LayoutAnimationType.DELETE)), globalDuration);
       mShouldAnimateLayout = true;
     }
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationListener.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationListener.java
index be181bbc55cc82..328e0dc6eebfe5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationListener.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.java
index 23f325226f576a..253faa2ec5f460 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -9,18 +9,20 @@
  * Enum representing the different animation type that can be specified in layout animation config.
  */
 /* package */ enum LayoutAnimationType {
-  CREATE("create"),
-  UPDATE("update"),
-  DELETE("delete");
+  CREATE,
+  UPDATE,
+  DELETE;
 
-  private final String mName;
-
-  private LayoutAnimationType(String name) {
-    mName = name;
-  }
-
-  @Override
-  public String toString() {
-    return mName;
+  public static String toString(LayoutAnimationType type) {
+    switch (type) {
+      case CREATE:
+        return "create";
+      case UPDATE:
+        return "update";
+      case DELETE:
+        return "delete";
+      default:
+        throw new IllegalArgumentException("Unsupported LayoutAnimationType: " + type);
+    }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.java
index 07040597f6f4d5..9259142e956650 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.java
index 5d507c3dedb948..e4db29c7be3938 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutHandlingAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutHandlingAnimation.java
index 53a8863059e802..7021d6978f056e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutHandlingAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutHandlingAnimation.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.java
index 0c8477270c78c7..2bd025db96d3eb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java
index 71d5aa7b5d9bd0..053598f977daa9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.java
index 1f742f2a012645..f1d3c691fea7b6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.java
index 4340625b5b4881..b83f0974d566ca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 72c763fb906554..b00295716e6572 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "util",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java
index c1e10388223f17..84a98b1f7f8ccf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/util/BUCK b/ReactAndroid/src/main/java/com/facebook/react/util/BUCK
index 73bc3fe411b366..7f700ab80a797f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/util/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/util/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "util",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java b/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java
index 7a3d5f02e0dac3..2e1dfa2d159b92 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
index fdb9f53b301869..9c97a61277bd76 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -28,11 +28,6 @@ public class ARTGroupShadowNode extends ARTVirtualNode {
 
   public ARTGroupShadowNode() { }
 
-  public ARTGroupShadowNode(ARTGroupShadowNode node) {
-    super(node);
-    this.mClipping = new RectF(node.mClipping);
-  }
-
   @ReactProp(name = "clipping")
   public void setClipping(@Nullable ReadableArray clippingDims) {
     float[] clippingData = PropHelper.toFloatArray(clippingDims);
@@ -42,11 +37,6 @@ public void setClipping(@Nullable ReadableArray clippingDims) {
     }
   }
 
-  @Override
-  protected ReactShadowNodeImpl copy() {
-    return new ARTGroupShadowNode(this);
-  }
-
   @Override
   public boolean isVirtual() {
     return true;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupViewManager.java
index c164ebda5c128d..e80835607b5332 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupViewManager.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java
index bb98853f652f7a..2db28aa30f84db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
index d4bc72e284f425..5cd54338bd1203 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -60,22 +60,6 @@ public class ARTShapeShadowNode extends ARTVirtualNode {
 
   public ARTShapeShadowNode() { }
 
-  public ARTShapeShadowNode(ARTShapeShadowNode node) {
-    super(node);
-    mPath = new Path(node.mPath);
-    mStrokeColor = copyArray(node.mStrokeColor);
-    mBrushData = copyArray(node.mBrushData);
-    mStrokeDash = copyArray(node.mStrokeDash);
-    mStrokeWidth = node.mStrokeWidth;
-    mStrokeCap = node.mStrokeCap;
-    mStrokeJoin = node.mStrokeJoin;
-  }
-
-  @Override
-  protected ARTShapeShadowNode copy() {
-    return new ARTShapeShadowNode(this);
-  }
-
   @ReactProp(name = "d")
   public void setShapePath(@Nullable ReadableArray shapePath) {
     float[] pathData = PropHelper.toFloatArray(shapePath);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeViewManager.java
index 5c2c8a938a6b4a..d980eaac68d4b2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeViewManager.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java
index 93f2c21eb1aacd..190cbe74606dbc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java
index 24787ef84a5364..c3f2d3c780a12d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java
index 429812e1991627..7e20931a8f714a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
index accb79e4ef8323..c5e60563a73c37 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -42,17 +42,6 @@ public class ARTTextShadowNode extends ARTShapeShadowNode {
 
   public ARTTextShadowNode() { }
 
-  public ARTTextShadowNode(ARTTextShadowNode node) {
-    super(node);
-    mTextAlignment = node.mTextAlignment;
-    mFrame = node.mFrame; // copy reference as mFrame is already immutable
-  }
-
-  @Override
-  protected ARTShapeShadowNode copy() {
-    return new ARTTextShadowNode(this);
-  }
-
   @ReactProp(name = "frame")
   public void setFrame(@Nullable ReadableMap frame) {
     mFrame = frame;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextViewManager.java
index a697c31ae6fc1f..5b82b13d879868 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextViewManager.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
index 158afd16eac943..cb1a304fe9ff8e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -37,13 +37,6 @@ public ARTVirtualNode() {
     mScale = DisplayMetricsHolder.getWindowDisplayMetrics().density;
   }
 
-  protected ARTVirtualNode(ARTVirtualNode artVirtualNode) {
-    super(artVirtualNode);
-    mScale = artVirtualNode.mScale;
-    mOpacity = artVirtualNode.mOpacity;
-    mMatrix = new Matrix(artVirtualNode.mMatrix);
-  }
-
   @Override
   public boolean isVirtual() {
     return true;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK
index dcdd2f51cc84d5..23b3b7ce773e86 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "art",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java
index b841cf856b1eea..8c4b03f58bce93 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK
index 7bf08765acca49..1973543c07d584 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "checkbox",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java
index 98c0b67aa42400..136512b31a006b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java
index 0f41725efdb64b..fa2cffc8afa1a3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java
index c520f2fc8f5aee..fcff4e6f2eb081 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 223f3cb2f00584..d78d4b99697f90 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "common",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/common/ViewHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/common/ViewHelper.java
index 0c5bf42e1bede6..b827ff629db4c1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/common/ViewHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/common/ViewHelper.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 18b5c8d3febbc8..3fb17b776428a0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "drawer",
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 acd637a7166e98..0de813610437d0 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
index 61139f8a01d24b..55ab481d130120 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
index 4f51b7f596bf47..9580733e8a8f44 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
index 471cd079dad652..abbcc115602ac3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
index ca4260e44f9335..84b4aee192b28a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
index 41682e17f6eb65..96472f1f3fc4bd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 f3b7d905472b4e..fe352c0f29812f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 IMAGE_EVENT_FILES = [
     "ImageLoadEvent.java",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/GlobalImageLoadListener.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/GlobalImageLoadListener.java
index 842bb60da66bcd..f547ec7d69bf4e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/GlobalImageLoadListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/GlobalImageLoadListener.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
index 2c85c4ad7abb2b..b897aac09b23de 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java
index 98fb2fe7151c2d..52edd666570954 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java
index 3f98058feedd0c..a04b2adf67801d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/MultiPostprocessor.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/MultiPostprocessor.java
index 03ad027c2618b2..e1df87fcb7aca0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/MultiPostprocessor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/MultiPostprocessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
index 2565e2294ef1c6..251cfe02dc4718 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -109,7 +109,7 @@ public void setBorderColor(ReactImageView view, @Nullable Integer borderColor) {
     }
   }
 
-  @ReactProp(name = "overlayColor")
+  @ReactProp(name = "overlayColor", customType = "Color")
   public void setOverlayColor(ReactImageView view, @Nullable Integer overlayColor) {
     if (overlayColor == null) {
       view.setOverlayColor(Color.TRANSPARENT);
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 91817b955b21ea..ff720bd8156dec 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
@@ -1,6 +1,6 @@
 
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -71,6 +71,9 @@ 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];
 
   /*
@@ -339,7 +342,10 @@ public void setResizeMethod(ImageResizeMethod resizeMethod) {
 
   public void setSource(@Nullable ReadableArray sources) {
     mSources.clear();
-    if (sources != null && sources.size() != 0) {
+    if (sources == null || sources.size() == 0) {
+      ImageSource imageSource = new ImageSource(getContext(), REMOTE_TRANSPARENT_BITMAP_URI);
+      mSources.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);
@@ -573,9 +579,9 @@ private boolean isTiled() {
   private void setSourceImage() {
     mImageSource = null;
     if (mSources.isEmpty()) {
-      return;
-    }
-    if (hasMultipleSources()) {
+      ImageSource imageSource = new ImageSource(getContext(), REMOTE_TRANSPARENT_BITMAP_URI);
+      mSources.add(imageSource);
+    } else if (hasMultipleSources()) {
       MultiSourceResult multiSource =
         MultiSourceHelper.getBestSourceForSize(getWidth(), getHeight(), mSources);
       mImageSource = multiSource.getBestResult();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.java
index 96640d044d5a14..3a512dbb55ddda 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 98227e605a5a32..ab328b40c0f327 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "imagehelper",
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 116ef13bb92f7b..748247785d6356 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java
index d01b314e83681a..f71ea562de148b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
index de962cecab2312..724db8c376d145 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 8765148822cfc7..b2d013012e69bb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "modal",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.java
index cecde6218046c0..8b5ee7fd1f3344 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
index 5b63f107dd6b0e..0e0fd429a3f61e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -23,15 +23,6 @@ class ModalHostShadowNode extends LayoutShadowNode {
 
   public ModalHostShadowNode() {}
 
-  private ModalHostShadowNode(ModalHostShadowNode node) {
-    super(node);
-  }
-
-  @Override
-  protected ModalHostShadowNode copy() {
-    return new ModalHostShadowNode(this);
-  }
-
   /**
    * We need to set the styleWidth and styleHeight of the one child (represented by the <View/>
    * within the <RCTModalHostView/> in Modal.js. This needs to fill the entire window.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
index 16df07953b8c2b..b34d63ace09d24 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 ab0491fe4619fd..ff3408a375a03a 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
index ec3129dc8d069d..e8154261b1c0e1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
index 6e76cb71e66fac..4a89bc8243633a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK
index a558b5f5101cc6..2b9cfcc3f7e7e2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "picker",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
index 9d0f6c9371a428..ff62484683e4d7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
index e099e467de8962..4f2d54b40b9287 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
index cb0ee6d4d781ba..4f38fab0109f7b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
index a8b3fa7d118929..db26da8e0a28e6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
index 91b15a94539f49..e50b7b3ad50ef0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 83b2f43751daeb..54afb8816c9e3c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "progressbar",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.java b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.java
index e1d8f6fe0b58e6..2aa39dc8bb8bd5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
index d18466e58af9c7..e6cb2adceae637 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,23 +7,19 @@
 
 package com.facebook.react.views.progressbar;
 
-import com.facebook.react.uimanager.ReactShadowNodeImpl;
-import javax.annotation.Nullable;
-
-import java.util.HashSet;
-import java.util.Set;
-
 import android.util.SparseIntArray;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
-
-import com.facebook.yoga.YogaMeasureMode;
-import com.facebook.yoga.YogaMeasureFunction;
-import com.facebook.yoga.YogaNode;
-import com.facebook.yoga.YogaMeasureOutput;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.yoga.YogaMeasureFunction;
+import com.facebook.yoga.YogaMeasureMode;
+import com.facebook.yoga.YogaMeasureOutput;
+import com.facebook.yoga.YogaNode;
+import java.util.HashSet;
+import java.util.Set;
+import javax.annotation.Nullable;
 
 /**
  * Node responsible for holding the style of the ProgressBar, see under
@@ -45,36 +41,10 @@ public ProgressBarShadowNode() {
     initMeasureFunction();
   }
 
-  public ProgressBarShadowNode(ProgressBarShadowNode node) {
-    super(node);
-    mWidth = node.mWidth.clone();
-    mHeight = node.mHeight.clone();
-    mMeasured = new HashSet<>(node.mMeasured);
-  }
-
-  @Override
-  public ReactShadowNodeImpl mutableCopyWithNewChildren(long instanceHandle) {
-    ProgressBarShadowNode node = (ProgressBarShadowNode) super.mutableCopyWithNewChildren(instanceHandle);
-    node.initMeasureFunction();
-    return node;
-  }
-
   private void initMeasureFunction() {
     setMeasureFunction(this);
   }
 
-  @Override
-  public ReactShadowNodeImpl mutableCopy(long instanceHandle) {
-    ProgressBarShadowNode node = (ProgressBarShadowNode) super.mutableCopy(instanceHandle);
-    node.initMeasureFunction();
-    return node;
-  }
-
-  @Override
-  public ProgressBarShadowNode copy() {
-    return new ProgressBarShadowNode(this);
-  }
-
   public @Nullable String getStyle() {
     return mStyle;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java
index e35eafe1efd9e0..26e4a5c3b021ca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 247fa4a207e9b7..2a72452d0580a8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "scroll",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java
index 2ce0ae2d5baa8f..607c396833de75 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java
index b8d0c11158de37..6b90c839b2feb2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java
index bcda656077c606..f387fba4c1795e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -14,11 +14,13 @@
 public class ReactHorizontalScrollContainerView extends ViewGroup {
 
   private int mLayoutDirection;
+  private int mCurrentWidth;
 
   public ReactHorizontalScrollContainerView(Context context) {
     super(context);
     mLayoutDirection =
         I18nUtil.getInstance().isRTL(context) ? LAYOUT_DIRECTION_RTL : LAYOUT_DIRECTION_LTR;
+    mCurrentWidth = 0;
   }
 
   @Override
@@ -32,12 +34,12 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
       setLeft(newLeft);
       setRight(newRight);
 
-      // Fix the ScrollX position when using RTL language
-      int offsetX = computeHorizontalScrollRange() - getScrollX();
-
       // Call with the present values in order to re-layout if necessary
       HorizontalScrollView parent = (HorizontalScrollView) getParent();
+      // Fix the ScrollX position when using RTL language
+      int offsetX = parent.getScrollX() + getWidth() - mCurrentWidth;
       parent.scrollTo(offsetX, parent.getScrollY());
     }
+    mCurrentWidth = getWidth();
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java
index 284f41451f5fae..180fb35d6dcd53 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 90b9d1fc4d3a9c..bf6c3bd51a1554 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,22 +11,32 @@
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
 import android.graphics.drawable.LayerDrawable;
+import android.graphics.Rect;
+import android.hardware.SensorManager;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.text.TextUtilsCompat;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewConfiguration;
 import android.widget.HorizontalScrollView;
+import android.widget.OverScroller;
+
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.uimanager.events.NativeGestureUtil;
 import com.facebook.react.uimanager.MeasureSpecAssertions;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
-import com.facebook.react.uimanager.events.NativeGestureUtil;
+import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.views.view.ReactViewBackgroundManager;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Locale;
 import javax.annotation.Nullable;
 
 /**
@@ -36,11 +46,17 @@
 public class ReactHorizontalScrollView extends HorizontalScrollView implements
     ReactClippingViewGroup {
 
+  private static @Nullable Field sScrollerField;
+  private static boolean sTriedToGetScrollerField = false;
+
   private final OnScrollDispatchHelper mOnScrollDispatchHelper = new OnScrollDispatchHelper();
+  private final @Nullable OverScroller mScroller;
   private final VelocityHelper mVelocityHelper = new VelocityHelper();
+  private final Rect mRect = new Rect();
 
   private boolean mActivelyScrolling;
   private @Nullable Rect mClippingRect;
+  private @Nullable String mOverflow = ViewProps.HIDDEN;
   private boolean mDragging;
   private boolean mPagingEnabled = false;
   private @Nullable Runnable mPostTouchRunnable;
@@ -52,6 +68,10 @@ public class ReactHorizontalScrollView extends HorizontalScrollView implements
   private @Nullable Drawable mEndBackground;
   private int mEndFillColor = Color.TRANSPARENT;
   private int mSnapInterval = 0;
+  private float mDecelerationRate = 0.985f;
+  private @Nullable List<Integer> mSnapOffsets;
+  private boolean mSnapToStart = true;
+  private boolean mSnapToEnd = true;
   private ReactViewBackgroundManager mReactBackgroundManager;
 
   public ReactHorizontalScrollView(Context context) {
@@ -62,6 +82,47 @@ public ReactHorizontalScrollView(Context context, @Nullable FpsListener fpsListe
     super(context);
     mReactBackgroundManager = new ReactViewBackgroundManager(this);
     mFpsListener = fpsListener;
+
+    mScroller = getOverScrollerFromParent();
+  }
+
+  @Nullable
+  private OverScroller getOverScrollerFromParent() {
+    OverScroller scroller;
+
+    if (!sTriedToGetScrollerField) {
+      sTriedToGetScrollerField = true;
+      try {
+        sScrollerField = HorizontalScrollView.class.getDeclaredField("mScroller");
+        sScrollerField.setAccessible(true);
+      } catch (NoSuchFieldException e) {
+        Log.w(
+          ReactConstants.TAG,
+          "Failed to get mScroller field for HorizontalScrollView! " +
+            "This app will exhibit the bounce-back scrolling bug :(");
+      }
+    }
+
+    if (sScrollerField != null) {
+      try {
+        Object scrollerValue = sScrollerField.get(this);
+        if (scrollerValue instanceof OverScroller) {
+          scroller = (OverScroller) scrollerValue;
+        } else {
+          Log.w(
+            ReactConstants.TAG,
+            "Failed to cast mScroller field in HorizontalScrollView (probably due to OEM changes to AOSP)! " +
+              "This app will exhibit the bounce-back scrolling bug :(");
+          scroller = null;
+        }
+      } catch (IllegalAccessException e) {
+        throw new RuntimeException("Failed to get mScroller from HorizontalScrollView!", e);
+      }
+    } else {
+      scroller = null;
+    }
+
+    return scroller;
   }
 
   public void setScrollPerfTag(@Nullable String scrollPerfTag) {
@@ -94,14 +155,54 @@ public void setPagingEnabled(boolean pagingEnabled) {
     mPagingEnabled = pagingEnabled;
   }
 
+  public void setDecelerationRate(float decelerationRate) {
+    mDecelerationRate = decelerationRate;
+
+    if (mScroller != null) {
+      mScroller.setFriction(1.0f - mDecelerationRate);
+    }
+  }
+
   public void setSnapInterval(int snapInterval) {
     mSnapInterval = snapInterval;
   }
 
+  public void setSnapOffsets(List<Integer> snapOffsets) {
+    mSnapOffsets = snapOffsets;
+  }
+
+  public void setSnapToStart(boolean snapToStart) {
+    mSnapToStart = snapToStart;
+  }
+
+  public void setSnapToEnd(boolean snapToEnd) {
+    mSnapToEnd = snapToEnd;
+  }
+
   public void flashScrollIndicators() {
     awakenScrollBars();
   }
 
+  public void setOverflow(String overflow) {
+    mOverflow = overflow;
+    invalidate();
+  }
+
+  @Override
+  protected void onDraw(Canvas canvas) {
+    getDrawingRect(mRect);
+
+    switch (mOverflow) {
+      case ViewProps.VISIBLE:
+        break;
+      default:
+        canvas.clipRect(mRect);
+        break;
+    }
+
+    super.onDraw(canvas);
+  }
+
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     MeasureSpecAssertions.assertExplicitMeasureSpec(widthMeasureSpec, heightMeasureSpec);
@@ -186,7 +287,34 @@ public boolean onTouchEvent(MotionEvent ev) {
   @Override
   public void fling(int velocityX) {
     if (mPagingEnabled) {
-      smoothScrollToPage(velocityX);
+      flingAndSnap(velocityX);
+    } else if (mScroller != null) {
+      // FB SCROLLVIEW CHANGE
+
+      // We provide our own version of fling that uses a different call to the standard OverScroller
+      // which takes into account the possibility of adding new content while the ScrollView is
+      // animating. Because we give essentially no max X for the fling, the fling will continue as long
+      // as there is content. See #onOverScrolled() to see the second part of this change which properly
+      // aborts the scroller animation when we get to the bottom of the ScrollView content.
+
+      int scrollWindowWidth = getWidth() - getPaddingStart() - getPaddingEnd();
+
+      mScroller.fling(
+        getScrollX(), // startX
+        getScrollY(), // startY
+        velocityX, // velocityX
+        0, // velocityY
+        0, // minX
+        Integer.MAX_VALUE, // maxX
+        0, // minY
+        0, // maxY
+        scrollWindowWidth / 2, // overX
+        0 // overY
+      );
+
+      ViewCompat.postInvalidateOnAnimation(this);
+
+      // END FB SCROLLVIEW CHANGE
     } else {
       super.fling(velocityX);
     }
@@ -243,6 +371,28 @@ public void setEndFillColor(int color) {
     }
   }
 
+  @Override
+  protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) {
+    if (mScroller != null) {
+      // FB SCROLLVIEW CHANGE
+
+      // This is part two of the reimplementation of fling to fix the bounce-back bug. See #fling() for
+      // more information.
+
+      if (!mScroller.isFinished() && mScroller.getCurrX() != mScroller.getFinalX()) {
+        int scrollRange = computeHorizontalScrollRange() - getWidth();
+        if (scrollX >= scrollRange) {
+          mScroller.abortAnimation();
+          scrollX = scrollRange;
+        }
+      }
+
+      // END FB SCROLLVIEW CHANGE
+    }
+
+    super.onOverScrolled(scrollX, scrollY, clampedX, clampedY);
+  }
+
   private void enableFpsListener() {
     if (isScrollPerfLoggingEnabled()) {
       Assertions.assertNotNull(mFpsListener);
@@ -282,7 +432,7 @@ public void draw(Canvas canvas) {
    * runnable that checks if we scrolled in the last frame and if so assumes we are still scrolling.
    */
   private void handlePostTouchScrolling(int velocityX, int velocityY) {
-    // If we aren't going to do anything (send events or snap to page), we can early out.
+    // If we aren't going to do anything (send events or snap to page), we can early exit out.
     if (!mSendMomentumEvents && !mPagingEnabled && !isScrollPerfLoggingEnabled()) {
       return;
     }
@@ -315,7 +465,7 @@ public void run() {
             // Only if we have pagingEnabled and we have not snapped to the page do we
             // need to continue checking for the scroll.  And we cause that scroll by asking for it
             mSnappingToPage = true;
-            smoothScrollToPage(0);
+            flingAndSnap(0);
             ViewCompat.postOnAnimationDelayed(ReactHorizontalScrollView.this,
               this,
               ReactScrollViewHelper.MOMENTUM_DELAY);
@@ -334,22 +484,209 @@ public void run() {
       ReactScrollViewHelper.MOMENTUM_DELAY);
   }
 
+  private int predictFinalScrollPosition(int velocityX) {
+    // ScrollView can *only* scroll for 250ms when using smoothScrollTo and there's
+    // no way to customize the scroll duration. So, we create a temporary OverScroller
+    // so we can predict where a fling would land and snap to nearby that point.
+    OverScroller scroller = new OverScroller(getContext());
+    scroller.setFriction(1.0f - mDecelerationRate);
+
+    // predict where a fling would end up so we can scroll to the nearest snap offset
+    int maximumOffset = Math.max(0, computeHorizontalScrollRange() - getWidth());
+    int width = getWidth() - getPaddingStart() - getPaddingEnd();
+    scroller.fling(
+      getScrollX(), // startX
+      getScrollY(), // startY
+      velocityX, // velocityX
+      0, // velocityY
+      0, // minX
+      maximumOffset, // maxX
+      0, // minY
+      0, // maxY
+      width/2, // overX
+      0 // overY
+    );
+    return scroller.getFinalX();
+  }
+
   /**
-   * This will smooth scroll us to the nearest page boundary
-   * It currently just looks at where the content is relative to the page and slides to the nearest
-   * page.  It is intended to be run after we are done scrolling, and handling any momentum
-   * scrolling.
+   * This will smooth scroll us to the nearest snap offset point
+   * It currently just looks at where the content is and slides to the nearest point.
+   * It is intended to be run after we are done scrolling, and handling any momentum scrolling.
    */
-  private void smoothScrollToPage(int velocity) {
-    int width = getSnapInterval();
-    int currentX = getScrollX();
-    // TODO (t11123799) - Should we do anything beyond linear accounting of the velocity
-    int predictedX = currentX + velocity;
-    int page = currentX / width;
-    if (predictedX > page * width + width / 2) {
-      page = page + 1;
-    }
-    smoothScrollTo(page * width, getScrollY());
+  private void smoothScrollAndSnap(int velocity) {
+    double interval = (double) getSnapInterval();
+    double currentOffset = (double) getScrollX();
+    double targetOffset = (double) predictFinalScrollPosition(velocity);
+
+    int previousPage = (int) Math.floor(currentOffset / interval);
+    int nextPage = (int) Math.ceil(currentOffset / interval);
+    int currentPage = (int) Math.round(currentOffset / interval);
+    int targetPage = (int) Math.round(targetOffset / interval);
+
+    if (velocity > 0 && nextPage == previousPage) {
+      nextPage ++;
+    } else if (velocity < 0 && previousPage == nextPage) {
+      previousPage --;
+    }
+
+    if (
+      // if scrolling towards next page
+      velocity > 0 &&
+      // and the middle of the page hasn't been crossed already
+      currentPage < nextPage &&
+      // and it would have been crossed after flinging
+      targetPage > previousPage
+    ) {
+      currentPage = nextPage;
+    }
+    else if (
+      // if scrolling towards previous page
+      velocity < 0 &&
+      // and the middle of the page hasn't been crossed already
+      currentPage > previousPage &&
+      // and it would have been crossed after flinging
+      targetPage < nextPage
+    ) {
+      currentPage = previousPage;
+    }
+
+    targetOffset = currentPage * interval;
+    if (targetOffset != currentOffset) {
+      mActivelyScrolling = true;
+      smoothScrollTo((int) targetOffset, getScrollY());
+    }
+  }
+
+  private void flingAndSnap(int velocityX) {
+    if (getChildCount() <= 0) {
+      return;
+    }
+
+    // pagingEnabled only allows snapping one interval at a time
+    if (mSnapInterval == 0 && mSnapOffsets == null) {
+      smoothScrollAndSnap(velocityX);
+      return;
+    }
+
+    int maximumOffset = Math.max(0, computeHorizontalScrollRange() - getWidth());
+    int targetOffset = predictFinalScrollPosition(velocityX);
+    int smallerOffset = 0;
+    int largerOffset = maximumOffset;
+    int firstOffset = 0;
+    int lastOffset = maximumOffset;
+    int width = getWidth() - getPaddingStart() - getPaddingEnd();
+
+    // offsets are from the right edge in RTL layouts
+    boolean isRTL = TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL;
+    if (isRTL) {
+      targetOffset = maximumOffset - targetOffset;
+      velocityX = -velocityX;
+    }
+
+    // get the nearest snap points to the target offset
+    if (mSnapOffsets != null) {
+      firstOffset = mSnapOffsets.get(0);
+      lastOffset = mSnapOffsets.get(mSnapOffsets.size() - 1);
+
+      for (int i = 0; i < mSnapOffsets.size(); i ++) {
+        int offset = mSnapOffsets.get(i);
+
+        if (offset <= targetOffset) {
+          if (targetOffset - offset < targetOffset - smallerOffset) {
+            smallerOffset = offset;
+          }
+        }
+
+        if (offset >= targetOffset) {
+          if (offset - targetOffset < largerOffset - targetOffset) {
+            largerOffset = offset;
+          }
+        }
+      }
+    } else {
+      double interval = (double) getSnapInterval();
+      double ratio = (double) targetOffset / interval;
+      smallerOffset = (int) (Math.floor(ratio) * interval);
+      largerOffset = Math.min((int) (Math.ceil(ratio) * interval), maximumOffset);
+    }
+
+    // Calculate the nearest offset
+    int nearestOffset = targetOffset - smallerOffset < largerOffset - targetOffset
+      ? smallerOffset
+      : largerOffset;
+
+    // if scrolling after the last snap offset and snapping to the
+    // end of the list is disabled, then we allow free scrolling
+    int currentOffset = getScrollX();
+    if (isRTL) {
+      currentOffset = maximumOffset - currentOffset;
+    }
+    if (!mSnapToEnd && targetOffset >= lastOffset) {
+      if (currentOffset >= lastOffset) {
+        // free scrolling
+      } else {
+        // snap to end
+        targetOffset = lastOffset;
+      }
+    } else if (!mSnapToStart && targetOffset <= firstOffset) {
+      if (currentOffset <= firstOffset) {
+        // free scrolling
+      } else {
+        // snap to beginning
+        targetOffset = firstOffset;
+      }
+    } else if (velocityX > 0) {
+      // when snapping velocity can feel sluggish for slow swipes
+      velocityX += (int) ((largerOffset - targetOffset) * 10.0);
+
+      targetOffset = largerOffset;
+    } else if (velocityX < 0) {
+      // when snapping velocity can feel sluggish for slow swipes
+      velocityX -= (int) ((targetOffset - smallerOffset) * 10.0);
+
+      targetOffset = smallerOffset;
+    } else {
+      targetOffset = nearestOffset;
+    }
+
+    // Make sure the new offset isn't out of bounds
+    targetOffset = Math.min(Math.max(0, targetOffset), maximumOffset);
+
+    if (isRTL) {
+      targetOffset = maximumOffset - targetOffset;
+      velocityX = -velocityX;
+    }
+
+    // smoothScrollTo will always scroll over 250ms which is often *waaay*
+    // too short and will cause the scrolling to feel almost instant
+    // try to manually interact with OverScroller instead
+    // if velocity is 0 however, fling() won't work, so we want to use smoothScrollTo
+    if (mScroller != null) {
+      mActivelyScrolling = true;
+
+      mScroller.fling(
+        getScrollX(), // startX
+        getScrollY(), // startY
+        // velocity = 0 doesn't work with fling() so we pretend there's a reasonable
+        // initial velocity going on when a touch is released without any movement
+        velocityX != 0 ? velocityX : targetOffset - getScrollX(), // velocityX
+        0, // velocityY
+        // setting both minX and maxX to the same value will guarantee that we scroll to it
+        // but using the standard fling-style easing rather than smoothScrollTo's 250ms animation
+        targetOffset, // minX
+        targetOffset, // maxX
+        0, // minY
+        0, // maxY
+        // we only want to allow overscrolling if the final offset is at the very edge of the view
+        (targetOffset == 0 || targetOffset == maximumOffset) ? width / 2 : 0, // overX
+        0 // overY
+      );
+
+      postInvalidateOnAnimation();
+    } else {
+      smoothScrollTo(targetOffset, getScrollY());
+    }
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
index e6536a6e53eb76..b3980da125ce36 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -24,6 +24,8 @@
 import com.facebook.react.uimanager.annotations.ReactPropGroup;
 import com.facebook.yoga.YogaConstants;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.annotation.Nullable;
 
 /**
@@ -73,6 +75,11 @@ public void setShowsHorizontalScrollIndicator(ReactHorizontalScrollView view, bo
     view.setHorizontalScrollBarEnabled(value);
   }
 
+  @ReactProp(name = "decelerationRate")
+  public void setDecelerationRate(ReactHorizontalScrollView view, float decelerationRate) {
+    view.setDecelerationRate(decelerationRate);
+  }
+
   @ReactProp(name = "snapToInterval")
   public void setSnapToInterval(ReactHorizontalScrollView view, float snapToInterval) {
     // snapToInterval needs to be exposed as a float because of the Javascript interface.
@@ -80,6 +87,26 @@ public void setSnapToInterval(ReactHorizontalScrollView view, float snapToInterv
     view.setSnapInterval((int) (snapToInterval * screenDisplayMetrics.density));
   }
 
+  @ReactProp(name = "snapToOffsets")
+  public void setSnapToOffsets(ReactHorizontalScrollView view, @Nullable ReadableArray snapToOffsets) {
+    DisplayMetrics screenDisplayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics();
+    List<Integer> offsets = new ArrayList<Integer>();
+    for (int i = 0; i < snapToOffsets.size(); i++) {
+      offsets.add((int) (snapToOffsets.getDouble(i) * screenDisplayMetrics.density));
+    }
+    view.setSnapOffsets(offsets);
+  }
+
+  @ReactProp(name = "snapToStart")
+  public void setSnapToStart(ReactHorizontalScrollView view, boolean snapToStart) {
+    view.setSnapToStart(snapToStart);
+  }
+
+  @ReactProp(name = "snapToEnd")
+  public void setSnapToEnd(ReactHorizontalScrollView view, boolean snapToEnd) {
+    view.setSnapToEnd(snapToEnd);
+  }
+
   @ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)
   public void setRemoveClippedSubviews(ReactHorizontalScrollView view, boolean removeClippedSubviews) {
     view.setRemoveClippedSubviews(removeClippedSubviews);
@@ -223,4 +250,9 @@ public void setBorderColor(ReactHorizontalScrollView view, int index, Integer co
     float alphaComponent = color == null ? YogaConstants.UNDEFINED : (float) ((int)color >>> 24);
     view.setBorderColor(SPACING_TYPES[index], rgbComponent, alphaComponent);
   }
+
+  @ReactProp(name = "overflow")
+  public void setOverflow(ReactHorizontalScrollView view, @Nullable String overflow) {
+    view.setOverflow(overflow);
+  }
 }
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 57b401cd6fbf5c..f10bd47ebbebb1 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,15 +20,19 @@
 import android.view.ViewGroup;
 import android.widget.OverScroller;
 import android.widget.ScrollView;
+
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.uimanager.events.NativeGestureUtil;
 import com.facebook.react.uimanager.MeasureSpecAssertions;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
-import com.facebook.react.uimanager.events.NativeGestureUtil;
+import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.views.view.ReactViewBackgroundManager;
+
 import java.lang.reflect.Field;
+import java.util.List;
 import javax.annotation.Nullable;
 
 /**
@@ -49,10 +53,12 @@ public class ReactScrollView extends ScrollView implements ReactClippingViewGrou
   private final VelocityHelper mVelocityHelper = new VelocityHelper();
   private final Rect mRect = new Rect(); // for reuse to avoid allocation
 
+  private boolean mActivelyScrolling;
   private @Nullable Rect mClippingRect;
-  private boolean mDoneFlinging;
+  private @Nullable String mOverflow = ViewProps.HIDDEN;
   private boolean mDragging;
-  private boolean mFlinging;
+  private boolean mPagingEnabled = false;
+  private @Nullable Runnable mPostTouchRunnable;
   private boolean mRemoveClippedSubviews;
   private boolean mScrollEnabled = true;
   private boolean mSendMomentumEvents;
@@ -60,6 +66,11 @@ public class ReactScrollView extends ScrollView implements ReactClippingViewGrou
   private @Nullable String mScrollPerfTag;
   private @Nullable Drawable mEndBackground;
   private int mEndFillColor = Color.TRANSPARENT;
+  private int mSnapInterval = 0;
+  private float mDecelerationRate = 0.985f;
+  private @Nullable List<Integer> mSnapOffsets;
+  private boolean mSnapToStart = true;
+  private boolean mSnapToEnd = true;
   private View mContentView;
   private ReactViewBackgroundManager mReactBackgroundManager;
 
@@ -128,10 +139,43 @@ public void setScrollEnabled(boolean scrollEnabled) {
     mScrollEnabled = scrollEnabled;
   }
 
+  public void setPagingEnabled(boolean pagingEnabled) {
+    mPagingEnabled = pagingEnabled;
+  }
+
+  public void setDecelerationRate(float decelerationRate) {
+    mDecelerationRate = decelerationRate;
+
+    if (mScroller != null) {
+      mScroller.setFriction(1.0f - mDecelerationRate);
+    }
+  }
+
+  public void setSnapInterval(int snapInterval) {
+    mSnapInterval = snapInterval;
+  }
+
+  public void setSnapOffsets(List<Integer> snapOffsets) {
+    mSnapOffsets = snapOffsets;
+  }
+
+  public void setSnapToStart(boolean snapToStart) {
+    mSnapToStart = snapToStart;
+  }
+
+  public void setSnapToEnd(boolean snapToEnd) {
+    mSnapToEnd = snapToEnd;
+  }
+
   public void flashScrollIndicators() {
     awakenScrollBars();
   }
 
+  public void setOverflow(String overflow) {
+    mOverflow = overflow;
+    invalidate();
+  }
+
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     MeasureSpecAssertions.assertExplicitMeasureSpec(widthMeasureSpec, heightMeasureSpec);
@@ -167,15 +211,13 @@ protected void onAttachedToWindow() {
   protected void onScrollChanged(int x, int y, int oldX, int oldY) {
     super.onScrollChanged(x, y, oldX, oldY);
 
+    mActivelyScrolling = true;
+
     if (mOnScrollDispatchHelper.onScrollChanged(x, y)) {
       if (mRemoveClippedSubviews) {
         updateClippingRect();
       }
 
-      if (mFlinging) {
-        mDoneFlinging = false;
-      }
-
       ReactScrollViewHelper.emitScrollEvent(
         this,
         mOnScrollDispatchHelper.getXFlingVelocity(),
@@ -216,12 +258,16 @@ public boolean onTouchEvent(MotionEvent ev) {
     mVelocityHelper.calculateVelocity(ev);
     int action = ev.getAction() & MotionEvent.ACTION_MASK;
     if (action == MotionEvent.ACTION_UP && mDragging) {
+      float velocityX = mVelocityHelper.getXVelocity();
+      float velocityY = mVelocityHelper.getYVelocity();
       ReactScrollViewHelper.emitScrollEndDragEvent(
         this,
-        mVelocityHelper.getXVelocity(),
-        mVelocityHelper.getYVelocity());
+        velocityX,
+        velocityY);
       mDragging = false;
-      disableFpsListener();
+      // 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
+      handlePostTouchScrolling(Math.round(velocityX), Math.round(velocityY));
     }
 
     return super.onTouchEvent(ev);
@@ -263,7 +309,9 @@ public void getClippingRect(Rect outClippingRect) {
 
   @Override
   public void fling(int velocityY) {
-    if (mScroller != null) {
+    if (mPagingEnabled) {
+      flingAndSnap(velocityY);
+    } else if (mScroller != null) {
       // FB SCROLLVIEW CHANGE
 
       // We provide our own version of fling that uses a different call to the standard OverScroller
@@ -275,16 +323,17 @@ public void fling(int velocityY) {
       int scrollWindowHeight = getHeight() - getPaddingBottom() - getPaddingTop();
 
       mScroller.fling(
-        getScrollX(),
-        getScrollY(),
-        0,
-        velocityY,
-        0,
-        0,
-        0,
-        Integer.MAX_VALUE,
-        0,
-        scrollWindowHeight / 2);
+        getScrollX(), // startX
+        getScrollY(), // startY
+        0, // velocityX
+        velocityY, // velocityY
+        0, // minX
+        0, // maxX
+        0, // minY
+        Integer.MAX_VALUE, // maxY
+        0, // overX
+        scrollWindowHeight / 2 // overY
+      );
 
       ViewCompat.postInvalidateOnAnimation(this);
 
@@ -292,29 +341,7 @@ public void fling(int velocityY) {
     } else {
       super.fling(velocityY);
     }
-
-    if (mSendMomentumEvents || isScrollPerfLoggingEnabled()) {
-      mFlinging = true;
-      enableFpsListener();
-      ReactScrollViewHelper.emitScrollMomentumBeginEvent(this, 0, velocityY);
-      Runnable r = new Runnable() {
-        @Override
-        public void run() {
-          if (mDoneFlinging) {
-            mFlinging = false;
-            disableFpsListener();
-            ReactScrollViewHelper.emitScrollMomentumEndEvent(ReactScrollView.this);
-          } else {
-            mDoneFlinging = true;
-            ViewCompat.postOnAnimationDelayed(
-                ReactScrollView.this,
-                this,
-                ReactScrollViewHelper.MOMENTUM_DELAY);
-          }
-        }
-      };
-      ViewCompat.postOnAnimationDelayed(this, r, ReactScrollViewHelper.MOMENTUM_DELAY);
-    }
+    handlePostTouchScrolling(0, velocityY);
   }
 
   private void enableFpsListener() {
@@ -353,10 +380,274 @@ public void draw(Canvas canvas) {
       }
     }
     getDrawingRect(mRect);
-    canvas.clipRect(mRect);
+
+    switch (mOverflow) {
+      case ViewProps.VISIBLE:
+        break;
+      default:
+        canvas.clipRect(mRect);
+        break;
+    }
+
     super.draw(canvas);
   }
 
+  /**
+   * This handles any sort of scrolling that may occur after a touch is finished.  This may be
+   * momentum scrolling (fling) or because you have pagingEnabled on the scroll view.  Because we
+   * don't get any events from Android about this lifecycle, we do all our detection by creating a
+   * runnable that checks if we scrolled in the last frame and if so assumes we are still scrolling.
+   */
+  private void handlePostTouchScrolling(int velocityX, int velocityY) {
+    // If we aren't going to do anything (send events or snap to page), we can early exit out.
+    if (!mSendMomentumEvents && !mPagingEnabled && !isScrollPerfLoggingEnabled()) {
+      return;
+    }
+
+    // Check if we are already handling this which may occur if this is called by both the touch up
+    // and a fling call
+    if (mPostTouchRunnable != null) {
+      return;
+    }
+
+    if (mSendMomentumEvents) {
+      enableFpsListener();
+      ReactScrollViewHelper.emitScrollMomentumBeginEvent(this, velocityX, velocityY);
+    }
+
+    mActivelyScrolling = false;
+    mPostTouchRunnable = new Runnable() {
+
+      private boolean mSnappingToPage = false;
+
+      @Override
+      public void run() {
+        if (mActivelyScrolling) {
+          // We are still scrolling so we just post to check again a frame later
+          mActivelyScrolling = false;
+          ViewCompat.postOnAnimationDelayed(ReactScrollView.this,
+            this,
+            ReactScrollViewHelper.MOMENTUM_DELAY);
+        } else {
+          if (mPagingEnabled && !mSnappingToPage) {
+            // Only if we have pagingEnabled and we have not snapped to the page do we
+            // need to continue checking for the scroll.  And we cause that scroll by asking for it
+            mSnappingToPage = true;
+            flingAndSnap(0);
+            ViewCompat.postOnAnimationDelayed(ReactScrollView.this,
+              this,
+              ReactScrollViewHelper.MOMENTUM_DELAY);
+          } else {
+            if (mSendMomentumEvents) {
+              ReactScrollViewHelper.emitScrollMomentumEndEvent(ReactScrollView.this);
+            }
+            ReactScrollView.this.mPostTouchRunnable = null;
+            disableFpsListener();
+          }
+        }
+      }
+    };
+    ViewCompat.postOnAnimationDelayed(ReactScrollView.this,
+      mPostTouchRunnable,
+      ReactScrollViewHelper.MOMENTUM_DELAY);
+  }
+
+  private int predictFinalScrollPosition(int velocityY) {
+    // ScrollView can *only* scroll for 250ms when using smoothScrollTo and there's
+    // no way to customize the scroll duration. So, we create a temporary OverScroller
+    // so we can predict where a fling would land and snap to nearby that point.
+    OverScroller scroller = new OverScroller(getContext());
+    scroller.setFriction(1.0f - mDecelerationRate);
+
+    // predict where a fling would end up so we can scroll to the nearest snap offset
+    int maximumOffset = getMaxScrollY();
+    int height = getHeight() - getPaddingBottom() - getPaddingTop();
+    scroller.fling(
+      getScrollX(), // startX
+      getScrollY(), // startY
+      0, // velocityX
+      velocityY, // velocityY
+      0, // minX
+      0, // maxX
+      0, // minY
+      maximumOffset, // maxY
+      0, // overX
+      height/2 // overY
+    );
+    return scroller.getFinalY();
+  }
+
+  /**
+   * This will smooth scroll us to the nearest snap offset point
+   * It currently just looks at where the content is and slides to the nearest point.
+   * It is intended to be run after we are done scrolling, and handling any momentum scrolling.
+   */
+  private void smoothScrollAndSnap(int velocity) {
+    double interval = (double) getSnapInterval();
+    double currentOffset = (double) getScrollY();
+    double targetOffset = (double) predictFinalScrollPosition(velocity);
+
+    int previousPage = (int) Math.floor(currentOffset / interval);
+    int nextPage = (int) Math.ceil(currentOffset / interval);
+    int currentPage = (int) Math.round(currentOffset / interval);
+    int targetPage = (int) Math.round(targetOffset / interval);
+
+    if (velocity > 0 && nextPage == previousPage) {
+      nextPage ++;
+    } else if (velocity < 0 && previousPage == nextPage) {
+      previousPage --;
+    }
+
+    if (
+      // if scrolling towards next page
+      velocity > 0 &&
+      // and the middle of the page hasn't been crossed already
+      currentPage < nextPage &&
+      // and it would have been crossed after flinging
+      targetPage > previousPage
+    ) {
+      currentPage = nextPage;
+    }
+    else if (
+      // if scrolling towards previous page
+      velocity < 0 &&
+      // and the middle of the page hasn't been crossed already
+      currentPage > previousPage &&
+      // and it would have been crossed after flinging
+      targetPage < nextPage
+    ) {
+      currentPage = previousPage;
+    }
+
+    targetOffset = currentPage * interval;
+    if (targetOffset != currentOffset) {
+      mActivelyScrolling = true;
+      smoothScrollTo(getScrollX(), (int) targetOffset);
+    }
+  }
+
+  private void flingAndSnap(int velocityY) {
+    if (getChildCount() <= 0) {
+      return;
+    }
+
+    // pagingEnabled only allows snapping one interval at a time
+    if (mSnapInterval == 0 && mSnapOffsets == null) {
+      smoothScrollAndSnap(velocityY);
+      return;
+    }
+
+    int maximumOffset = getMaxScrollY();
+    int targetOffset = predictFinalScrollPosition(velocityY);
+    int smallerOffset = 0;
+    int largerOffset = maximumOffset;
+    int firstOffset = 0;
+    int lastOffset = maximumOffset;
+    int height = getHeight() - getPaddingBottom() - getPaddingTop();
+
+    // get the nearest snap points to the target offset
+    if (mSnapOffsets != null) {
+      firstOffset = mSnapOffsets.get(0);
+      lastOffset = mSnapOffsets.get(mSnapOffsets.size() - 1);
+
+      for (int i = 0; i < mSnapOffsets.size(); i ++) {
+        int offset = mSnapOffsets.get(i);
+
+        if (offset <= targetOffset) {
+          if (targetOffset - offset < targetOffset - smallerOffset) {
+            smallerOffset = offset;
+          }
+        }
+
+        if (offset >= targetOffset) {
+          if (offset - targetOffset < largerOffset - targetOffset) {
+            largerOffset = offset;
+          }
+        }
+      }
+    } else {
+      double interval = (double) getSnapInterval();
+      double ratio = (double) targetOffset / interval;
+      smallerOffset = (int) (Math.floor(ratio) * interval);
+      largerOffset = Math.min((int) (Math.ceil(ratio) * interval), maximumOffset);
+    }
+
+    // Calculate the nearest offset
+    int nearestOffset = targetOffset - smallerOffset < largerOffset - targetOffset
+      ? smallerOffset
+      : largerOffset;
+
+    // if scrolling after the last snap offset and snapping to the
+    // end of the list is disabled, then we allow free scrolling
+    if (!mSnapToEnd && targetOffset >= lastOffset) {
+      if (getScrollY() >= lastOffset) {
+        // free scrolling
+      } else {
+        // snap to end
+        targetOffset = lastOffset;
+      }
+    } else if (!mSnapToStart && targetOffset <= firstOffset) {
+      if (getScrollY() <= firstOffset) {
+        // free scrolling
+      } else {
+        // snap to beginning
+        targetOffset = firstOffset;
+      }
+    } else if (velocityY > 0) {
+      // when snapping velocity can feel sluggish for slow swipes
+      velocityY += (int) ((largerOffset - targetOffset) * 10.0);
+
+      targetOffset = largerOffset;
+    } else if (velocityY < 0) {
+      // when snapping velocity can feel sluggish for slow swipes
+      velocityY -= (int) ((targetOffset - smallerOffset) * 10.0);
+
+      targetOffset = smallerOffset;
+    } else {
+      targetOffset = nearestOffset;
+    }
+
+    // Make sure the new offset isn't out of bounds
+    targetOffset = Math.min(Math.max(0, targetOffset), maximumOffset);
+
+    // smoothScrollTo will always scroll over 250ms which is often *waaay*
+    // too short and will cause the scrolling to feel almost instant
+    // try to manually interact with OverScroller instead
+    // if velocity is 0 however, fling() won't work, so we want to use smoothScrollTo
+    if (mScroller != null) {
+      mActivelyScrolling = true;
+
+      mScroller.fling(
+        getScrollX(), // startX
+        getScrollY(), // startY
+        // velocity = 0 doesn't work with fling() so we pretend there's a reasonable
+        // initial velocity going on when a touch is released without any movement
+        0, // velocityX
+        velocityY != 0 ? velocityY : targetOffset - getScrollY(), // velocityY
+        0, // minX
+        0, // maxX
+        // setting both minY and maxY to the same value will guarantee that we scroll to it
+        // but using the standard fling-style easing rather than smoothScrollTo's 250ms animation
+        targetOffset, // minY
+        targetOffset, // maxY
+        0, // overX
+        // we only want to allow overscrolling if the final offset is at the very edge of the view
+        (targetOffset == 0 || targetOffset == maximumOffset) ? height / 2 : 0 // overY
+      );
+
+      postInvalidateOnAnimation();
+    } else {
+      smoothScrollTo(getScrollX(), targetOffset);
+    }
+  }
+
+  private int getSnapInterval() {
+    if (mSnapInterval != 0) {
+      return mSnapInterval;
+    }
+    return getHeight();
+  }
+
   public void setEndFillColor(int color) {
     if (color != mEndFillColor) {
       mEndFillColor = color;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java
index 7eaa06386d5b71..eb5989be48c68c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 9d6f51d058c9c4..1e8cdae053f427 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
index df520b5e4669f4..772241317d3508 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,10 +10,12 @@
 import android.annotation.TargetApi;
 import android.graphics.Color;
 import android.support.v4.view.ViewCompat;
+import android.util.DisplayMetrics;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
 import com.facebook.react.uimanager.Spacing;
@@ -24,13 +26,15 @@
 import com.facebook.react.uimanager.annotations.ReactPropGroup;
 import com.facebook.yoga.YogaConstants;
 
-import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
+import javax.annotation.Nullable;
 
 /**
  * View manager for {@link ReactScrollView} components.
  *
- * <p>Note that {@link ReactScrollView} and {@link ReactHorizontalScrollView} are exposed to JS
+ * <p>Note that {@link ReactScrollView} and {@link ReactScrollView} are exposed to JS
  * as a single ScrollView component, configured via the {@code horizontal} boolean property.
  */
 @TargetApi(11)
@@ -75,6 +79,38 @@ public void setShowsVerticalScrollIndicator(ReactScrollView view, boolean value)
     view.setVerticalScrollBarEnabled(value);
   }
 
+  @ReactProp(name = "decelerationRate")
+  public void setDecelerationRate(ReactScrollView view, float decelerationRate) {
+    view.setDecelerationRate(decelerationRate);
+  }
+
+  @ReactProp(name = "snapToInterval")
+  public void setSnapToInterval(ReactScrollView view, float snapToInterval) {
+    // snapToInterval needs to be exposed as a float because of the Javascript interface.
+    DisplayMetrics screenDisplayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics();
+    view.setSnapInterval((int) (snapToInterval * screenDisplayMetrics.density));
+  }
+
+  @ReactProp(name = "snapToOffsets")
+  public void setSnapToOffsets(ReactScrollView view, @Nullable ReadableArray snapToOffsets) {
+    DisplayMetrics screenDisplayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics();
+    List<Integer> offsets = new ArrayList<Integer>();
+    for (int i = 0; i < snapToOffsets.size(); i++) {
+      offsets.add((int) (snapToOffsets.getDouble(i) * screenDisplayMetrics.density));
+    }
+    view.setSnapOffsets(offsets);
+  }
+
+  @ReactProp(name = "snapToStart")
+  public void setSnapToStart(ReactScrollView view, boolean snapToStart) {
+    view.setSnapToStart(snapToStart);
+  }
+
+  @ReactProp(name = "snapToEnd")
+  public void setSnapToEnd(ReactScrollView view, boolean snapToEnd) {
+    view.setSnapToEnd(snapToEnd);
+  }
+
   @ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)
   public void setRemoveClippedSubviews(ReactScrollView view, boolean removeClippedSubviews) {
     view.setRemoveClippedSubviews(removeClippedSubviews);
@@ -105,6 +141,11 @@ public void setScrollPerfTag(ReactScrollView view, @Nullable String scrollPerfTa
     view.setScrollPerfTag(scrollPerfTag);
   }
 
+  @ReactProp(name = "pagingEnabled")
+  public void setPagingEnabled(ReactScrollView view, boolean pagingEnabled) {
+    view.setPagingEnabled(pagingEnabled);
+  }
+
   /**
    * When set, fills the rest of the scrollview with a color to avoid setting a background and
    * creating unnecessary overdraw.
@@ -204,6 +245,11 @@ public void setBorderColor(ReactScrollView view, int index, Integer color) {
     view.setBorderColor(SPACING_TYPES[index], rgbComponent, alphaComponent);
   }
 
+  @ReactProp(name = "overflow")
+  public void setOverflow(ReactScrollView view, @Nullable String overflow) {
+    view.setOverflow(overflow);
+  }
+
   @Override
   public void scrollToEnd(
       ReactScrollView scrollView,
@@ -225,11 +271,11 @@ public void scrollToEnd(
 
   public static Map<String, Object> createExportedCustomDirectEventTypeConstants() {
     return MapBuilder.<String, Object>builder()
-        .put(ScrollEventType.SCROLL.getJSEventName(), MapBuilder.of("registrationName", "onScroll"))
-        .put(ScrollEventType.BEGIN_DRAG.getJSEventName(), MapBuilder.of("registrationName", "onScrollBeginDrag"))
-        .put(ScrollEventType.END_DRAG.getJSEventName(), MapBuilder.of("registrationName", "onScrollEndDrag"))
-        .put(ScrollEventType.MOMENTUM_BEGIN.getJSEventName(), MapBuilder.of("registrationName", "onMomentumScrollBegin"))
-        .put(ScrollEventType.MOMENTUM_END.getJSEventName(), MapBuilder.of("registrationName", "onMomentumScrollEnd"))
+        .put(ScrollEventType.getJSEventName(ScrollEventType.SCROLL), MapBuilder.of("registrationName", "onScroll"))
+        .put(ScrollEventType.getJSEventName(ScrollEventType.BEGIN_DRAG), MapBuilder.of("registrationName", "onScrollBeginDrag"))
+        .put(ScrollEventType.getJSEventName(ScrollEventType.END_DRAG), MapBuilder.of("registrationName", "onScrollEndDrag"))
+        .put(ScrollEventType.getJSEventName(ScrollEventType.MOMENTUM_BEGIN), MapBuilder.of("registrationName", "onMomentumScrollBegin"))
+        .put(ScrollEventType.getJSEventName(ScrollEventType.MOMENTUM_END), MapBuilder.of("registrationName", "onMomentumScrollEnd"))
         .build();
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
index bf3da944d4773e..cdc129a8ff23df 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -100,7 +100,7 @@ private void init(
 
   @Override
   public String getEventName() {
-    return Assertions.assertNotNull(mScrollEventType).getJSEventName();
+    return ScrollEventType.getJSEventName(Assertions.assertNotNull(mScrollEventType));
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java
index 5a3810d035b3a9..d51de786174e71 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,19 +11,26 @@
  * Scroll event types that JS module RCTEventEmitter can understand
  */
 public enum ScrollEventType {
-  BEGIN_DRAG("topScrollBeginDrag"),
-  END_DRAG("topScrollEndDrag"),
-  SCROLL("topScroll"),
-  MOMENTUM_BEGIN("topMomentumScrollBegin"),
-  MOMENTUM_END("topMomentumScrollEnd");
+  BEGIN_DRAG,
+  END_DRAG,
+  SCROLL,
+  MOMENTUM_BEGIN,
+  MOMENTUM_END;
 
-  private final String mJSEventName;
-
-  ScrollEventType(String jsEventName) {
-    mJSEventName = jsEventName;
-  }
-
-  public String getJSEventName() {
-    return mJSEventName;
+  public static String getJSEventName(ScrollEventType type) {
+    switch (type) {
+      case BEGIN_DRAG:
+        return "topScrollBeginDrag";
+      case END_DRAG:
+        return "topScrollEndDrag";
+      case SCROLL:
+        return "topScroll";
+      case MOMENTUM_BEGIN:
+        return "topMomentumScrollBegin";
+      case MOMENTUM_END:
+        return "topMomentumScrollEnd";
+      default:
+        throw new IllegalArgumentException("Unsupported ScrollEventType: " + type);
+    }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java
index 5972b25632a189..8260fa675cecf3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 a034f695b5d64d..50e606647ea0da 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "slider",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java
index 644be5c0bfc6cc..5d2e39bbcdd233 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 dabb326a530407..504da715584d3d 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
index 4111ce3b2ea61c..d4736a17f544c9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -51,36 +51,10 @@ private ReactSliderShadowNode() {
       initMeasureFunction();
     }
 
-    private ReactSliderShadowNode(ReactSliderShadowNode node) {
-      super(node);
-      mWidth = node.mWidth;
-      mHeight = node.mHeight;
-      mMeasured = node.mMeasured;
-    }
-
     private void initMeasureFunction() {
       setMeasureFunction(this);
     }
 
-    @Override
-    public ReactShadowNodeImpl mutableCopy(long instanceHandle) {
-      ReactSliderShadowNode reactShadowNode = (ReactSliderShadowNode) super.mutableCopy(instanceHandle);
-      reactShadowNode.initMeasureFunction();
-      return reactShadowNode;
-    }
-
-    @Override
-    public ReactShadowNodeImpl mutableCopyWithNewChildren(long instanceHandle) {
-      ReactSliderShadowNode reactShadowNode = (ReactSliderShadowNode) super.mutableCopyWithNewChildren(instanceHandle);
-      reactShadowNode.initMeasureFunction();
-      return reactShadowNode;
-    }
-
-    @Override
-    protected ReactSliderShadowNode copy() {
-      return new ReactSliderShadowNode(this);
-    }
-
     @Override
     public long measure(
         YogaNode node,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
index 37553abaf22c2b..5534b3b55f4d97 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 af67f891b3a49a..6bc4c1ae773d7a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "swiperefresh",
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 2512b2b21c415e..adc43971ccea8f 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
index c03b4a11dc3858..dc3cfb9c2054e6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
index ab551d9436cc58..637e717d7f41c4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 1bafa2f20020a7..cb5257ca5fe519 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "switchview",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
index 3c9dc82b848a5e..7dd9f3d0e19a0c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
index 75dfe794499e32..019a7b7291dad4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
index 0d802c13c45bcf..1f7808c1b4365d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -44,36 +44,10 @@ private ReactSwitchShadowNode() {
       initMeasureFunction();
     }
 
-    private ReactSwitchShadowNode(ReactSwitchShadowNode node) {
-      super(node);
-      mWidth = node.mWidth;
-      mHeight = node.mHeight;
-      mMeasured = node.mMeasured;
-    }
-
     private void initMeasureFunction() {
       setMeasureFunction(this);
     }
 
-    @Override
-    public ReactShadowNodeImpl mutableCopy(long instanceHandle) {
-      ReactSwitchShadowNode reactShadowNode = (ReactSwitchShadowNode) super.mutableCopy(instanceHandle);
-      reactShadowNode.initMeasureFunction();
-      return reactShadowNode;
-    }
-
-    @Override
-    public ReactShadowNodeImpl mutableCopyWithNewChildren(long instanceHandle) {
-      ReactSwitchShadowNode reactShadowNode = (ReactSwitchShadowNode) super.mutableCopyWithNewChildren(instanceHandle);
-      reactShadowNode.initMeasureFunction();
-      return reactShadowNode;
-    }
-
-    @Override
-    protected ReactSwitchShadowNode copy() {
-      return new ReactSwitchShadowNode(this);
-    }
-
     @Override
     public long measure(
         YogaNode node,
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 1b5c6c6fff7d3f..a4b6e0c3bab668 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "text",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
index d41338ccd93664..699e406bf19eec 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
index ed72dfa9b13d5e..2205a04b673505 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
index 127e3ab82d4d4f..9330243de9e9f3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -114,6 +114,7 @@ private static void apply(
     } else {
       paint.setTypeface(Typeface.defaultFromStyle(want));
     }
+    paint.setSubpixelText(true);
   }
 
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomTextTransformSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomTextTransformSpan.java
new file mode 100644
index 00000000000000..20cc73cdad9b32
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomTextTransformSpan.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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.views.text;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.text.style.ReplacementSpan;
+import java.text.BreakIterator;
+
+public class CustomTextTransformSpan extends ReplacementSpan {
+
+  /**
+   * A {@link ReplacementSpan} that allows declarative changing of text casing.
+   * CustomTextTransformSpan will change e.g. "foo" to "FOO", when passed UPPERCASE.
+   *
+   * This needs to be a Span in order to achieve correctly nested transforms
+   * (for Text nodes within Text nodes, each with separate needed transforms)
+   */
+
+  private final TextTransform mTransform;
+
+  public CustomTextTransformSpan(TextTransform transform) {
+    mTransform = transform;
+  }
+
+  @Override
+  public void draw(Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, Paint paint) {
+    CharSequence transformedText = transformText(text);
+    canvas.drawText(transformedText, start, end, x, y, paint);
+  }
+
+	@Override
+  public int getSize(Paint paint, CharSequence text, int start, int end, Paint.FontMetricsInt fm) {
+    CharSequence transformedText = transformText(text);
+    return Math.round(paint.measureText(transformedText, start, end));
+  }
+
+  private CharSequence transformText(CharSequence text) {
+    CharSequence transformed;
+
+    switch(mTransform) {
+      case UPPERCASE:
+        transformed = (CharSequence) text.toString().toUpperCase();
+        break;
+      case LOWERCASE:
+       transformed = (CharSequence) text.toString().toLowerCase();
+       break;
+      case CAPITALIZE:
+       transformed = (CharSequence) capitalize(text.toString());
+       break;
+      default:
+        transformed = text;
+    }
+
+    return transformed;
+  }
+
+  private String capitalize(String text) {
+    BreakIterator wordIterator = BreakIterator.getWordInstance();
+    wordIterator.setText(text);
+
+    StringBuilder res = new StringBuilder(text.length());
+    int start = wordIterator.first();
+    for (int end = wordIterator.next(); end != BreakIterator.DONE; end = wordIterator.next()) {
+      String word = text.substring(start, end);
+      if (Character.isLetterOrDigit(word.charAt(0))) {
+        res.append(Character.toUpperCase(word.charAt(0)));
+        res.append(word.substring(1).toLowerCase());
+      } else {
+        res.append(word);
+      }
+      start = end;
+    }
+
+    return res.toString();
+  }
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java
index 92bfe2511aa566..9e248833d374bd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/FontMetricsUtil.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/FontMetricsUtil.java
new file mode 100644
index 00000000000000..419985323c3f2c
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/FontMetricsUtil.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * 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.views.text;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.text.Layout;
+import android.text.TextPaint;
+import android.util.DisplayMetrics;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+
+public class FontMetricsUtil {
+
+  private static final String CAP_HEIGHT_MEASUREMENT_TEXT = "T";
+  private static final String X_HEIGHT_MEASUREMENT_TEXT = "x";
+  private static final float AMPLIFICATION_FACTOR = 100;
+
+  public static WritableArray getFontMetrics(CharSequence text, Layout layout, TextPaint paint, Context context) {
+    DisplayMetrics dm = context.getResources().getDisplayMetrics();
+    WritableArray lines = Arguments.createArray();
+    // To calculate xHeight and capHeight we have to render an "x" and "T" and manually measure their height.
+    // In order to get more precision than Android offers, we blow up the text size by 100 and measure it.
+    // Luckily, text size affects rendering linearly, so we can do this trick.
+    TextPaint paintCopy = new TextPaint(paint);
+    paintCopy.setTextSize(paintCopy.getTextSize() * AMPLIFICATION_FACTOR);
+    Rect capHeightBounds = new Rect();
+    paintCopy.getTextBounds(CAP_HEIGHT_MEASUREMENT_TEXT, 0, CAP_HEIGHT_MEASUREMENT_TEXT.length(), capHeightBounds);
+    double capHeight = capHeightBounds.height() / AMPLIFICATION_FACTOR / dm.density;
+    Rect xHeightBounds = new Rect();
+    paintCopy.getTextBounds(X_HEIGHT_MEASUREMENT_TEXT, 0, X_HEIGHT_MEASUREMENT_TEXT.length(), xHeightBounds);
+    double xHeight = xHeightBounds.height() / AMPLIFICATION_FACTOR / dm.density;
+    for (int i = 0; i < layout.getLineCount(); i++) {
+      Rect bounds = new Rect();
+      layout.getLineBounds(i, bounds);
+      WritableMap line = Arguments.createMap();
+      line.putDouble("x", layout.getLineLeft(i) / dm.density);
+      line.putDouble("y", bounds.top / dm.density);
+      line.putDouble("width", layout.getLineWidth(i) / dm.density);
+      line.putDouble("height", bounds.height() / dm.density);
+      line.putDouble("descender", layout.getLineDescent(i) / dm.density);
+      line.putDouble("ascender", -layout.getLineAscent(i) / dm.density);
+      line.putDouble("baseline", layout.getLineBaseline(i) / dm.density);
+      line.putDouble("capHeight", capHeight);
+      line.putDouble("xHeight", xHeight);
+      line.putString(
+          "text", text.subSequence(layout.getLineStart(i), layout.getLineEnd(i)).toString());
+      lines.pushMap(line);
+    }
+    return lines;
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
index f6a8885d12f204..b1c68b987e9cdb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
@@ -1,11 +1,12 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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.views.text;
 
+import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.text.Layout;
@@ -52,6 +53,8 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode {
   public static final String PROP_SHADOW_RADIUS = "textShadowRadius";
   public static final String PROP_SHADOW_COLOR = "textShadowColor";
 
+  public static final String PROP_TEXT_TRANSFORM = "textTransform";
+
   public static final int DEFAULT_TEXT_SHADOW_COLOR = 0x55000000;
 
   private static class SetSpanOperation {
@@ -148,7 +151,10 @@ private static void buildSpannedFromShadowNode(
       if (textShadowNode.mIsLineThroughTextDecorationSet) {
         ops.add(new SetSpanOperation(start, end, new StrikethroughSpan()));
       }
-      if (textShadowNode.mTextShadowOffsetDx != 0 || textShadowNode.mTextShadowOffsetDy != 0) {
+      if ((textShadowNode.mTextShadowOffsetDx != 0
+        || textShadowNode.mTextShadowOffsetDy != 0
+        || textShadowNode.mTextShadowRadius != 0)
+        && Color.alpha(textShadowNode.mTextShadowColor) != 0) {
         ops.add(
             new SetSpanOperation(
                 start,
@@ -164,10 +170,22 @@ private static void buildSpannedFromShadowNode(
             new SetSpanOperation(
                 start, end, new CustomLineHeightSpan(textShadowNode.getEffectiveLineHeight())));
       }
+      if (textShadowNode.mTextTransform != TextTransform.UNSET) {
+        ops.add(
+          new SetSpanOperation(
+            start,
+            end,
+            new CustomTextTransformSpan(textShadowNode.mTextTransform)));
+      }
       ops.add(new SetSpanOperation(start, end, new ReactTagSpan(textShadowNode.getReactTag())));
     }
   }
 
+  protected int getDefaultFontSize() {
+    return mAllowFontScaling ? (int) Math.ceil(PixelUtil.toPixelFromSP(ViewDefaults.FONT_SIZE_SP))
+      : (int) Math.ceil(PixelUtil.toPixelFromDIP(ViewDefaults.FONT_SIZE_SP));
+  }
+
   protected static Spannable spannedFromShadowNode(
       ReactBaseTextShadowNode textShadowNode, String text) {
     SpannableStringBuilder sb = new SpannableStringBuilder();
@@ -186,10 +204,7 @@ protected static Spannable spannedFromShadowNode(
     }
 
     if (textShadowNode.mFontSize == UNSET) {
-      int defaultFontSize =
-          textShadowNode.mAllowFontScaling
-              ? (int) Math.ceil(PixelUtil.toPixelFromSP(ViewDefaults.FONT_SIZE_SP))
-              : (int) Math.ceil(PixelUtil.toPixelFromDIP(ViewDefaults.FONT_SIZE_SP));
+      int defaultFontSize = textShadowNode.getDefaultFontSize();
 
       ops.add(new SetSpanOperation(0, sb.length(), new AbsoluteSizeSpan(defaultFontSize)));
     }
@@ -251,6 +266,7 @@ private static int parseNumericFontWeight(String fontWeightString) {
   protected int mTextAlign = Gravity.NO_GRAVITY;
   protected int mTextBreakStrategy =
       (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) ? 0 : Layout.BREAK_STRATEGY_HIGH_QUALITY;
+  protected TextTransform mTextTransform = TextTransform.UNSET;
 
   protected float mTextShadowOffsetDx = 0;
   protected float mTextShadowOffsetDy = 0;
@@ -292,37 +308,6 @@ private static int parseNumericFontWeight(String fontWeightString) {
 
   public ReactBaseTextShadowNode() {}
 
-  public ReactBaseTextShadowNode(ReactBaseTextShadowNode node) {
-    super(node);
-    mLineHeight = node.mLineHeight;
-    mIsColorSet = node.mIsColorSet;
-    mAllowFontScaling = node.mAllowFontScaling;
-    mColor = node.mColor;
-    mIsBackgroundColorSet = node.mIsBackgroundColorSet;
-    mBackgroundColor = node.mBackgroundColor;
-
-    mNumberOfLines = node.mNumberOfLines;
-    mFontSize = node.mFontSize;
-    mFontSizeInput = node.mFontSizeInput;
-    mLineHeightInput = node.mLineHeightInput;
-    mTextAlign = node.mTextAlign;
-    mTextBreakStrategy = node.mTextBreakStrategy;
-
-    mTextShadowOffsetDx = node.mTextShadowOffsetDx;
-    mTextShadowOffsetDy = node.mTextShadowOffsetDy;
-    mTextShadowRadius = node.mTextShadowRadius;
-    mTextShadowColor = node.mTextShadowColor;
-
-    mIsUnderlineTextDecorationSet = node.mIsUnderlineTextDecorationSet;
-    mIsLineThroughTextDecorationSet = node.mIsLineThroughTextDecorationSet;
-    mIncludeFontPadding = node.mIncludeFontPadding;
-    mFontStyle = node.mFontStyle;
-    mFontWeight = node.mFontWeight;
-    mFontFamily = node.mFontFamily;
-    mContainsImages = node.mContainsImages;
-    mHeightOfTallestInlineImage = node.mHeightOfTallestInlineImage;
-  }
-
   // Returns a line height which takes into account the requested line height
   // and the height of the inline images.
   public float getEffectiveLineHeight() {
@@ -561,4 +546,20 @@ public void setTextShadowColor(int textShadowColor) {
       markUpdated();
     }
   }
+
+  @ReactProp(name = PROP_TEXT_TRANSFORM)
+  public void setTextTransform(@Nullable String textTransform) {
+    if (textTransform == null || "none".equals(textTransform)) {
+      mTextTransform = TextTransform.NONE;
+    } else if ("uppercase".equals(textTransform)) {
+      mTextTransform = TextTransform.UPPERCASE;
+    } else if ("lowercase".equals(textTransform)) {
+      mTextTransform = TextTransform.LOWERCASE;
+    } else if ("capitalize".equals(textTransform)) {
+      mTextTransform = TextTransform.CAPITALIZE;
+    } else {
+      throw new JSApplicationIllegalArgumentException("Invalid textTransform: " + textTransform);
+    }
+    markUpdated();
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
index 001cba18810f2b..41faa061a91333 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java
index ff994f98ce33e6..7a6a6af6d83e31 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
index 488abfe84c0651..aa389fdcf407af 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -24,16 +24,6 @@ public class ReactRawTextShadowNode extends ReactShadowNodeImpl {
 
   public ReactRawTextShadowNode() { }
 
-  private ReactRawTextShadowNode(ReactRawTextShadowNode node) {
-    super(node);
-    this.mText = node.mText;
-  }
-
-  @Override
-  protected ReactShadowNodeImpl copy() {
-    return new ReactRawTextShadowNode(this);
-  }
-
   @ReactProp(name = PROP_TEXT)
   public void setText(@Nullable String text) {
     mText = text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java
index 772adc7a9c0855..3ce01845189744 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
index 776bce7ccdc565..4ebfc827cce56c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
index 637767cb8d5311..83a436c46352e9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -23,8 +23,4 @@ public abstract class ReactTextInlineImageShadowNode extends LayoutShadowNode {
 
   public ReactTextInlineImageShadowNode() {}
 
-  protected ReactTextInlineImageShadowNode(ReactTextInlineImageShadowNode node) {
-    super(node);
-  }
-
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
index 1f4f52fd7bf85b..8b1ba78d131830 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,7 @@
 
 package com.facebook.react.views.text;
 
+import android.graphics.Rect;
 import android.os.Build;
 import android.text.BoringLayout;
 import android.text.Layout;
@@ -14,13 +15,19 @@
 import android.text.Spanned;
 import android.text.StaticLayout;
 import android.text.TextPaint;
+import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.widget.TextView;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.ReactShadowNodeImpl;
 import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.UIViewOperationQueue;
+import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaDirection;
 import com.facebook.yoga.YogaMeasureFunction;
@@ -44,6 +51,8 @@ public class ReactTextShadowNode extends ReactBaseTextShadowNode {
 
   private @Nullable Spannable mPreparedSpannableText;
 
+  private boolean mShouldNotifyOnTextLayout;
+
   private final YogaMeasureFunction mTextMeasureFunction =
       new YogaMeasureFunction() {
         @Override
@@ -55,6 +64,7 @@ public long measure(
             YogaMeasureMode heightMode) {
           // TODO(5578671): Handle text direction (see View#getTextDirectionHeuristic)
           TextPaint textPaint = sTextPaintInstance;
+          textPaint.setTextSize(mFontSize != UNSET ? mFontSize : getDefaultFontSize());
           Layout layout;
           Spanned text = Assertions.assertNotNull(
               mPreparedSpannableText,
@@ -66,6 +76,19 @@ public long measure(
           // technically, width should never be negative, but there is currently a bug in
           boolean unconstrainedWidth = widthMode == YogaMeasureMode.UNDEFINED || width < 0;
 
+          Layout.Alignment alignment = Layout.Alignment.ALIGN_NORMAL;
+          switch (getTextAlign()) {
+            case Gravity.LEFT:
+              alignment = Layout.Alignment.ALIGN_NORMAL;
+              break;
+            case Gravity.RIGHT:
+              alignment = Layout.Alignment.ALIGN_OPPOSITE;
+              break;
+            case Gravity.CENTER_HORIZONTAL:
+              alignment = Layout.Alignment.ALIGN_CENTER;
+              break;
+          }
+
           if (boring == null &&
               (unconstrainedWidth ||
                   (!YogaConstants.isUndefined(desiredWidth) && desiredWidth <= width))) {
@@ -78,13 +101,13 @@ public long measure(
                 text,
                 textPaint,
                 hintWidth,
-                Layout.Alignment.ALIGN_NORMAL,
+                alignment,
                 1.f,
                 0.f,
                 mIncludeFontPadding);
             } else {
               layout = StaticLayout.Builder.obtain(text, 0, text.length(), textPaint, hintWidth)
-                .setAlignment(Layout.Alignment.ALIGN_NORMAL)
+                .setAlignment(alignment)
                 .setLineSpacing(0.f, 1.f)
                 .setIncludePad(mIncludeFontPadding)
                 .setBreakStrategy(mTextBreakStrategy)
@@ -99,7 +122,7 @@ public long measure(
                 text,
                 textPaint,
                 boring.width,
-                Layout.Alignment.ALIGN_NORMAL,
+                alignment,
                 1.f,
                 0.f,
                 boring,
@@ -112,13 +135,13 @@ public long measure(
                   text,
                   textPaint,
                   (int) width,
-                  Layout.Alignment.ALIGN_NORMAL,
+                  alignment,
                   1.f,
                   0.f,
                   mIncludeFontPadding);
             } else {
               layout = StaticLayout.Builder.obtain(text, 0, text.length(), textPaint, (int) width)
-                .setAlignment(Layout.Alignment.ALIGN_NORMAL)
+                .setAlignment(alignment)
                 .setLineSpacing(0.f, 1.f)
                 .setIncludePad(mIncludeFontPadding)
                 .setBreakStrategy(mTextBreakStrategy)
@@ -127,11 +150,18 @@ public long measure(
             }
           }
 
-          if (mNumberOfLines != UNSET &&
-              mNumberOfLines < layout.getLineCount()) {
-            return YogaMeasureOutput.make(
-                layout.getWidth(),
-                layout.getLineBottom(mNumberOfLines - 1));
+          if (mShouldNotifyOnTextLayout) {
+            WritableArray lines =
+              FontMetricsUtil.getFontMetrics(text, layout, sTextPaintInstance, getThemedContext());
+            WritableMap event = Arguments.createMap();
+            event.putArray("lines", lines);
+            getThemedContext()
+                .getJSModule(RCTEventEmitter.class)
+                .receiveEvent(getReactTag(), "topTextLayout", event);
+          }
+
+          if (mNumberOfLines != UNSET && mNumberOfLines < layout.getLineCount()) {
+            return YogaMeasureOutput.make(layout.getWidth(), layout.getLineBottom(mNumberOfLines - 1));
           } else {
             return YogaMeasureOutput.make(layout.getWidth(), layout.getHeight());
           }
@@ -142,36 +172,12 @@ public ReactTextShadowNode() {
     initMeasureFunction();
   }
 
-  private ReactTextShadowNode(ReactTextShadowNode node) {
-    super(node);
-    this.mPreparedSpannableText = node.mPreparedSpannableText;
-  }
-
   private void initMeasureFunction() {
     if (!isVirtual()) {
       setMeasureFunction(mTextMeasureFunction);
     }
   }
 
-  @Override
-  protected LayoutShadowNode copy() {
-    return new ReactTextShadowNode(this);
-  }
-
-  @Override
-  public ReactShadowNodeImpl mutableCopy(long instanceHandle) {
-    ReactTextShadowNode copy = (ReactTextShadowNode) super.mutableCopy(instanceHandle);
-    copy.initMeasureFunction();
-    return copy;
-  }
-
-  @Override
-  public ReactShadowNodeImpl mutableCopyWithNewChildren(long instanceHandle) {
-    ReactTextShadowNode copy = (ReactTextShadowNode) super.mutableCopyWithNewChildren(instanceHandle);
-    copy.initMeasureFunction();
-    return copy;
-  }
-
   // Return text alignment according to LTR or RTL style
   private int getTextAlign() {
     int textAlign = mTextAlign;
@@ -223,4 +229,9 @@ public void onCollectExtraUpdates(UIViewOperationQueue uiViewOperationQueue) {
       uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), reactTextUpdate);
     }
   }
+
+  @ReactProp(name = "onTextLayout")
+  public void setShouldNotifyOnTextLayout(boolean shouldNotifyOnTextLayout) {
+    mShouldNotifyOnTextLayout = shouldNotifyOnTextLayout;
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
index 964f92ed6a37dc..c31bb3c55ea52d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
index 226a5d4e0f4686..4c7023f07ea490 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,6 +11,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.Layout;
+import android.text.Spannable;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.view.Gravity;
@@ -36,6 +37,7 @@ public class ReactTextView extends TextView implements ReactCompoundView {
   private TextUtils.TruncateAt mEllipsizeLocation = TextUtils.TruncateAt.END;
 
   private ReactViewBackgroundManager mReactBackgroundManager;
+  private Spannable mSpanned;
 
   public ReactTextView(Context context) {
     super(context);
@@ -255,4 +257,12 @@ public void setBorderRadius(float borderRadius, int position) {
   public void setBorderStyle(@Nullable String style) {
     mReactBackgroundManager.setBorderStyle(style);
   }
+
+  public void setSpanned(Spannable spanned) {
+    mSpanned = spanned;
+  }
+
+  public Spannable getSpanned() {
+    return mSpanned;
+  }
 }
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 8b6578f38b9f9c..c2f4ed22bac658 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,10 +7,20 @@
 
 package com.facebook.react.views.text;
 
+import android.text.Layout;
 import android.text.Spannable;
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ThemedReactContext;
+import java.util.Map;
+import javax.annotation.Nullable;
+import com.facebook.yoga.YogaMeasureMode;
 
 /**
  * Concrete class for {@link ReactTextAnchorViewManager} which represents view managers of anchor
@@ -58,4 +68,59 @@ protected void onAfterUpdateTransaction(ReactTextView view) {
     super.onAfterUpdateTransaction(view);
     view.updateView();
   }
+
+  @Override
+  public Object updateLocalData(ReactTextView view, ReactStylesDiffMap props, ReactStylesDiffMap localData) {
+    ReadableMap attributedString = localData.getMap("attributedString");
+    ReadableArray fragments = attributedString.getArray("fragments");
+    String string = attributedString.getString("string");
+
+    Spannable spanned = TextLayoutManager.spannedFromTextFragments(view.getContext(),
+      fragments, string);
+    view.setSpanned(spanned);
+
+    TextAttributeProps textViewProps = new TextAttributeProps(props);
+
+    // TODO add textBreakStrategy prop into local Data
+    int textBreakStrategy = Layout.BREAK_STRATEGY_HIGH_QUALITY;
+
+    return
+      new ReactTextUpdate(
+        spanned,
+        -1,             // TODO add this into local Data?
+        false,          // TODO add this into local Data
+        textViewProps.getStartPadding(),
+        textViewProps.getTopPadding(),
+        textViewProps.getEndPadding(),
+        textViewProps.getBottomPadding(),
+        textViewProps.getTextAlign(),
+        textBreakStrategy
+      );
+  }
+
+  @Override
+  public @Nullable Map getExportedCustomDirectEventTypeConstants() {
+    return MapBuilder.of("topTextLayout", MapBuilder.of("registrationName", "onTextLayout"));
+  }
+
+  public float[] measure(
+    ReactContext context,
+    ReactTextView view,
+    ReadableNativeMap localData,
+    ReadableNativeMap props,
+    float width,
+    int widthMode,
+    float height,
+    int heightMode) {
+
+    // TODO: should widthMode and heightMode be a YogaMeasureMode?
+    return TextLayoutManager.measureText(context,
+      view,
+      localData,
+      props,
+      width,
+      YogaMeasureMode.fromInt(widthMode),
+      height,
+      YogaMeasureMode.fromInt(heightMode));
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java
index cfd6009b070892..094db58bb44477 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -17,12 +17,4 @@ public boolean isVirtual() {
 
   public ReactVirtualTextShadowNode() { }
 
-  private ReactVirtualTextShadowNode(ReactVirtualTextShadowNode node) {
-    super(node);
-  }
-
-  @Override
-  protected ReactVirtualTextShadowNode copy() {
-    return new ReactVirtualTextShadowNode(this);
-  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java
index 2df5718b5ad274..5fdee39cf4d488 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java
index 2b2dd1fa94b4c2..4eface3f68792c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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
new file mode 100644
index 00000000000000..fdb7bb5cb1a2e7
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java
@@ -0,0 +1,416 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * 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.views.text;
+
+import android.graphics.Typeface;
+import android.os.Build;
+import android.text.Layout;
+import android.view.Gravity;
+import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
+import com.facebook.react.uimanager.ViewProps;
+import com.facebook.yoga.YogaDirection;
+import javax.annotation.Nullable;
+
+public class TextAttributeProps {
+
+  private static final String INLINE_IMAGE_PLACEHOLDER = "I";
+  public static final int UNSET = -1;
+
+  private static final String PROP_SHADOW_OFFSET = "textShadowOffset";
+  private static final String PROP_SHADOW_OFFSET_WIDTH = "width";
+  private static final String PROP_SHADOW_OFFSET_HEIGHT = "height";
+  private static final String PROP_SHADOW_RADIUS = "textShadowRadius";
+  private static final String PROP_SHADOW_COLOR = "textShadowColor";
+
+  private static final String PROP_TEXT_TRANSFORM = "textTransform";
+
+  private static final int DEFAULT_TEXT_SHADOW_COLOR = 0x55000000;
+
+  protected float mLineHeight = Float.NaN;
+  protected float mLetterSpacing = Float.NaN;
+  protected boolean mIsColorSet = false;
+  protected boolean mAllowFontScaling = true;
+  protected int mColor;
+  protected boolean mIsBackgroundColorSet = false;
+  protected int mBackgroundColor;
+
+  protected int mNumberOfLines = UNSET;
+  protected int mFontSize = UNSET;
+  protected float mFontSizeInput = UNSET;
+  protected float mLineHeightInput = UNSET;
+  protected float mLetterSpacingInput = Float.NaN;
+  protected int mTextAlign = Gravity.NO_GRAVITY;
+  protected int mTextBreakStrategy =
+    (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) ? 0 : Layout.BREAK_STRATEGY_HIGH_QUALITY;
+  protected TextTransform mTextTransform = TextTransform.UNSET;
+
+  protected float mTextShadowOffsetDx = 0;
+  protected float mTextShadowOffsetDy = 0;
+  protected float mTextShadowRadius = 1;
+  protected int mTextShadowColor = DEFAULT_TEXT_SHADOW_COLOR;
+
+  protected boolean mIsUnderlineTextDecorationSet = false;
+  protected boolean mIsLineThroughTextDecorationSet = false;
+  protected boolean mIncludeFontPadding = true;
+
+  /**
+   * mFontStyle can be {@link Typeface#NORMAL} or {@link Typeface#ITALIC}.
+   * mFontWeight can be {@link Typeface#NORMAL} or {@link Typeface#BOLD}.
+   */
+  protected int mFontStyle = UNSET;
+
+  protected int mFontWeight = UNSET;
+  /**
+   * NB: If a font family is used that does not have a style in a certain Android version (ie.
+   * monospace bold pre Android 5.0), that style (ie. bold) will not be inherited by nested Text
+   * nodes. To retain that style, you have to add it to those nodes explicitly.
+   * Example, Android 4.4:
+   * <Text style={{fontFamily="serif" fontWeight="bold"}}>Bold Text</Text>
+   *   <Text style={{fontFamily="sans-serif"}}>Bold Text</Text>
+   *     <Text style={{fontFamily="serif}}>Bold Text</Text>
+   *
+   * <Text style={{fontFamily="monospace" fontWeight="bold"}}>Not Bold Text</Text>
+   *   <Text style={{fontFamily="sans-serif"}}>Not Bold Text</Text>
+   *     <Text style={{fontFamily="serif}}>Not Bold Text</Text>
+   *
+   * <Text style={{fontFamily="monospace" fontWeight="bold"}}>Not Bold Text</Text>
+   *   <Text style={{fontFamily="sans-serif" fontWeight="bold"}}>Bold Text</Text>
+   *     <Text style={{fontFamily="serif}}>Bold Text</Text>
+   */
+  protected @Nullable String mFontFamily = null;
+
+  protected boolean mContainsImages = false;
+  protected float mHeightOfTallestInlineImage = Float.NaN;
+
+  private final ReactStylesDiffMap mProps;
+
+
+  public TextAttributeProps(ReactStylesDiffMap props) {
+    mProps = props;
+    setNumberOfLines(getIntProp(ViewProps.NUMBER_OF_LINES, UNSET));
+    setLineHeight(getFloatProp(ViewProps.LINE_HEIGHT, UNSET));
+    setLetterSpacing(getFloatProp(ViewProps.LETTER_SPACING, Float.NaN));
+    setAllowFontScaling(getBooleanProp(ViewProps.ALLOW_FONT_SCALING, true));
+    setTextAlign(getStringProp(ViewProps.TEXT_ALIGN));
+    setFontSize(getFloatProp(ViewProps.FONT_SIZE, UNSET));
+    setColor(props.hasKey(ViewProps.COLOR) ? props.getInt(ViewProps.COLOR, 0) : null);
+    setColor(props.hasKey("foregroundColor") ? props.getInt("foregroundColor", 0) : null);
+    setBackgroundColor(props.hasKey(ViewProps.BACKGROUND_COLOR) ? props.getInt(ViewProps.BACKGROUND_COLOR, 0) : null);
+    setFontFamily(getStringProp(ViewProps.FONT_FAMILY));
+    setFontWeight(getStringProp(ViewProps.FONT_WEIGHT));
+    setFontStyle(getStringProp(ViewProps.FONT_STYLE));
+    setIncludeFontPadding(getBooleanProp(ViewProps.INCLUDE_FONT_PADDING, true));
+    setTextDecorationLine(getStringProp(ViewProps.TEXT_DECORATION_LINE));
+    setTextBreakStrategy(getStringProp(ViewProps.TEXT_BREAK_STRATEGY));
+    setTextShadowOffset(props.hasKey(PROP_SHADOW_OFFSET) ? props.getMap(PROP_SHADOW_OFFSET) : null);
+    setTextShadowRadius(getIntProp(PROP_SHADOW_RADIUS, 1));
+    setTextShadowColor(getIntProp(PROP_SHADOW_COLOR, DEFAULT_TEXT_SHADOW_COLOR));
+    setTextTransform(getStringProp(PROP_TEXT_TRANSFORM));
+  }
+
+  private boolean getBooleanProp(String name, boolean defaultValue) {
+    if (mProps.hasKey(name)) {
+      return mProps.getBoolean(name, defaultValue);
+    } else {
+      return defaultValue;
+    }
+  }
+
+  private String getStringProp(String name) {
+    if (mProps.hasKey(name)) {
+      return mProps.getString(name);
+    } else {
+      return null;
+    }
+  }
+
+  private int getIntProp(String name, int defaultvalue) {
+    if (mProps.hasKey(name)) {
+      return mProps.getInt(name, defaultvalue);
+    } else {
+      return defaultvalue;
+    }
+  }
+
+  private float getFloatProp(String name, float defaultvalue) {
+    if (mProps.hasKey(name)) {
+      return mProps.getFloat(name, defaultvalue);
+    } else {
+      return defaultvalue;
+    }
+  }
+
+  // Returns a line height which takes into account the requested line height
+  // and the height of the inline images.
+  public float getEffectiveLineHeight() {
+    boolean useInlineViewHeight =
+      !Float.isNaN(mLineHeight)
+        && !Float.isNaN(mHeightOfTallestInlineImage)
+        && mHeightOfTallestInlineImage > mLineHeight;
+    return useInlineViewHeight ? mHeightOfTallestInlineImage : mLineHeight;
+  }
+
+  // Return text alignment according to LTR or RTL style
+  public int getTextAlign() {
+    int textAlign = mTextAlign;
+    if (getLayoutDirection() == YogaDirection.RTL) {
+      if (textAlign == Gravity.RIGHT) {
+        textAlign = Gravity.LEFT;
+      } else if (textAlign == Gravity.LEFT) {
+        textAlign = Gravity.RIGHT;
+      }
+    }
+    return textAlign;
+  }
+
+  public void setNumberOfLines(int numberOfLines) {
+    mNumberOfLines = numberOfLines == 0 ? UNSET : numberOfLines;
+  }
+
+  public void setLineHeight(float lineHeight) {
+    mLineHeightInput = lineHeight;
+    if (lineHeight == UNSET) {
+      mLineHeight = Float.NaN;
+    } else {
+      mLineHeight =
+        mAllowFontScaling
+          ? PixelUtil.toPixelFromSP(lineHeight)
+          : PixelUtil.toPixelFromDIP(lineHeight);
+    }
+  }
+
+  public void setLetterSpacing(float letterSpacing) {
+    mLetterSpacingInput = letterSpacing;
+    mLetterSpacing = mAllowFontScaling
+      ? PixelUtil.toPixelFromSP(mLetterSpacingInput)
+      : PixelUtil.toPixelFromDIP(mLetterSpacingInput);
+  }
+
+  public void setAllowFontScaling(boolean allowFontScaling) {
+    if (allowFontScaling != mAllowFontScaling) {
+      mAllowFontScaling = allowFontScaling;
+      setFontSize(mFontSizeInput);
+      setLineHeight(mLineHeightInput);
+      setLetterSpacing(mLetterSpacingInput);
+    }
+  }
+
+  public void setTextAlign(@Nullable String textAlign) {
+    if (textAlign == null || "auto".equals(textAlign)) {
+      mTextAlign = Gravity.NO_GRAVITY;
+    } else if ("left".equals(textAlign)) {
+      mTextAlign = Gravity.LEFT;
+    } else if ("right".equals(textAlign)) {
+      mTextAlign = Gravity.RIGHT;
+    } else if ("center".equals(textAlign)) {
+      mTextAlign = Gravity.CENTER_HORIZONTAL;
+    } else if ("justify".equals(textAlign)) {
+      // Fallback gracefully for cross-platform compat instead of error
+      mTextAlign = Gravity.LEFT;
+    } else {
+      throw new JSApplicationIllegalArgumentException("Invalid textAlign: " + textAlign);
+    }
+  }
+
+  public void setFontSize(float fontSize) {
+    mFontSizeInput = fontSize;
+    if (fontSize != UNSET) {
+      fontSize =
+        mAllowFontScaling
+          ? (float) Math.ceil(PixelUtil.toPixelFromSP(fontSize))
+          : (float) Math.ceil(PixelUtil.toPixelFromDIP(fontSize));
+    }
+    mFontSize = (int) fontSize;
+  }
+
+  public void setColor(@Nullable Integer color) {
+    mIsColorSet = (color != null);
+    if (mIsColorSet) {
+      mColor = color;
+    }
+  }
+
+  public void setBackgroundColor(Integer color) {
+    //TODO: Don't apply background color to anchor TextView since it will be applied on the View directly
+    //if (!isVirtualAnchor()) {
+      mIsBackgroundColorSet = (color != null);
+      if (mIsBackgroundColorSet) {
+        mBackgroundColor = color;
+      }
+    //}
+  }
+
+  public void setFontFamily(@Nullable String fontFamily) {
+    mFontFamily = fontFamily;
+  }
+
+  /**
+   /* This code is duplicated in ReactTextInputManager
+   /* TODO: Factor into a common place they can both use
+   */
+  public void setFontWeight(@Nullable String fontWeightString) {
+    int fontWeightNumeric =
+      fontWeightString != null ? parseNumericFontWeight(fontWeightString) : -1;
+    int fontWeight = UNSET;
+    if (fontWeightNumeric >= 500 || "bold".equals(fontWeightString)) {
+      fontWeight = Typeface.BOLD;
+    } else if ("normal".equals(fontWeightString)
+      || (fontWeightNumeric != -1 && fontWeightNumeric < 500)) {
+      fontWeight = Typeface.NORMAL;
+    }
+    if (fontWeight != mFontWeight) {
+      mFontWeight = fontWeight;
+    }
+  }
+
+  /**
+   /* This code is duplicated in ReactTextInputManager
+   /* TODO: Factor into a common place they can both use
+   */
+  public void setFontStyle(@Nullable String fontStyleString) {
+    int fontStyle = UNSET;
+    if ("italic".equals(fontStyleString)) {
+      fontStyle = Typeface.ITALIC;
+    } else if ("normal".equals(fontStyleString)) {
+      fontStyle = Typeface.NORMAL;
+    }
+    if (fontStyle != mFontStyle) {
+      mFontStyle = fontStyle;
+    }
+  }
+
+  public void setIncludeFontPadding(boolean includepad) {
+    mIncludeFontPadding = includepad;
+  }
+
+  public void setTextDecorationLine(@Nullable String textDecorationLineString) {
+    mIsUnderlineTextDecorationSet = false;
+    mIsLineThroughTextDecorationSet = false;
+    if (textDecorationLineString != null) {
+      for (String textDecorationLineSubString : textDecorationLineString.split(" ")) {
+        if ("underline".equals(textDecorationLineSubString)) {
+          mIsUnderlineTextDecorationSet = true;
+        } else if ("line-through".equals(textDecorationLineSubString)) {
+          mIsLineThroughTextDecorationSet = true;
+        }
+      }
+    }
+  }
+
+  public void setTextBreakStrategy(@Nullable String textBreakStrategy) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+      return;
+    }
+
+    if (textBreakStrategy == null || "highQuality".equals(textBreakStrategy)) {
+      mTextBreakStrategy = Layout.BREAK_STRATEGY_HIGH_QUALITY;
+    } else if ("simple".equals(textBreakStrategy)) {
+      mTextBreakStrategy = Layout.BREAK_STRATEGY_SIMPLE;
+    } else if ("balanced".equals(textBreakStrategy)) {
+      mTextBreakStrategy = Layout.BREAK_STRATEGY_BALANCED;
+    } else {
+      throw new JSApplicationIllegalArgumentException(
+        "Invalid textBreakStrategy: " + textBreakStrategy);
+    }
+  }
+
+  public void setTextShadowOffset(ReadableMap offsetMap) {
+    mTextShadowOffsetDx = 0;
+    mTextShadowOffsetDy = 0;
+
+    if (offsetMap != null) {
+      if (offsetMap.hasKey(PROP_SHADOW_OFFSET_WIDTH)
+        && !offsetMap.isNull(PROP_SHADOW_OFFSET_WIDTH)) {
+        mTextShadowOffsetDx =
+          PixelUtil.toPixelFromDIP(offsetMap.getDouble(PROP_SHADOW_OFFSET_WIDTH));
+      }
+      if (offsetMap.hasKey(PROP_SHADOW_OFFSET_HEIGHT)
+        && !offsetMap.isNull(PROP_SHADOW_OFFSET_HEIGHT)) {
+        mTextShadowOffsetDy =
+          PixelUtil.toPixelFromDIP(offsetMap.getDouble(PROP_SHADOW_OFFSET_HEIGHT));
+      }
+    }
+  }
+
+  public void setTextShadowRadius(float textShadowRadius) {
+    if (textShadowRadius != mTextShadowRadius) {
+      mTextShadowRadius = textShadowRadius;
+    }
+  }
+
+  public void setTextShadowColor(int textShadowColor) {
+    if (textShadowColor != mTextShadowColor) {
+      mTextShadowColor = textShadowColor;
+
+    }
+  }
+
+  public void setTextTransform(@Nullable String textTransform) {
+    if (textTransform == null || "none".equals(textTransform)) {
+      mTextTransform = TextTransform.NONE;
+    } else if ("uppercase".equals(textTransform)) {
+      mTextTransform = TextTransform.UPPERCASE;
+    } else if ("lowercase".equals(textTransform)) {
+      mTextTransform = TextTransform.LOWERCASE;
+    } else if ("capitalize".equals(textTransform)) {
+      mTextTransform = TextTransform.CAPITALIZE;
+    } else {
+      throw new JSApplicationIllegalArgumentException("Invalid textTransform: " + textTransform);
+    }
+  }
+
+  /**
+   * Return -1 if the input string is not a valid numeric fontWeight (100, 200, ..., 900), otherwise
+   * return the weight.
+   *
+   * This code is duplicated in ReactTextInputManager
+   * TODO: Factor into a common place they can both use
+   */
+  private static int parseNumericFontWeight(String fontWeightString) {
+    // This should be much faster than using regex to verify input and Integer.parseInt
+    return fontWeightString.length() == 3
+      && fontWeightString.endsWith("00")
+      && fontWeightString.charAt(0) <= '9'
+      && fontWeightString.charAt(0) >= '1'
+      ? 100 * (fontWeightString.charAt(0) - '0')
+      : -1;
+  }
+
+  //TODO remove this from here
+  private YogaDirection getLayoutDirection() {
+    return YogaDirection.LTR;
+  }
+
+  public float getBottomPadding() {
+    // TODO convert into constants
+    return getFloatProp("bottomPadding", 0f);
+  }
+
+  public float getLeftPadding() {
+    return getFloatProp("leftPadding", 0f);
+  }
+
+  public float getStartPadding() {
+    return getFloatProp("startPadding", 0f);
+  }
+
+  public float getEndPadding() {
+    return getFloatProp("endPadding", 0f);
+  }
+
+  public float getTopPadding() {
+    return getFloatProp("topPadding", 0f);
+  }
+
+  public float getRightPadding() {
+    return getFloatProp("rightPadding", 0f);
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java
index db620cb6157cb6..18a971e77ce06c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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
new file mode 100644
index 00000000000000..69990f087497fe
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
@@ -0,0 +1,335 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * 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.views.text;
+
+import static com.facebook.react.views.text.TextAttributeProps.UNSET;
+
+import android.content.Context;
+import android.os.Build;
+import android.text.BoringLayout;
+import android.text.Layout;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.StaticLayout;
+import android.text.TextPaint;
+import android.text.style.AbsoluteSizeSpan;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StrikethroughSpan;
+import android.text.style.UnderlineSpan;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableNativeMap;
+import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
+import com.facebook.yoga.YogaConstants;
+import com.facebook.yoga.YogaMeasureMode;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Class responsible of creating {@link Spanned} object for the JS representation of Text
+ */
+public class TextLayoutManager {
+
+  // It's important to pass the ANTI_ALIAS_FLAG flag to the constructor rather than setting it
+  // later by calling setFlags. This is because the latter approach triggers a bug on Android 4.4.2.
+  // The bug is that unicode emoticons aren't measured properly which causes text to be clipped.
+  private static final TextPaint sTextPaintInstance = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
+
+  private static void buildSpannedFromShadowNode(
+    Context context,
+    ReadableArray fragments,
+    SpannableStringBuilder sb,
+    List<SetSpanOperation> ops) {
+
+    for (int i = 0, length = fragments.size(); i < length; i++) {
+      ReadableMap fragment = fragments.getMap(i);
+      int start = sb.length();
+
+      //ReactRawText
+      sb.append(fragment.getString("string"));
+
+// TODO: add support for TextInlineImage and BaseText
+//      if (child instanceof ReactRawTextShadowNode) {
+//        sb.append(((ReactRawTextShadowNode) child).getText());
+//      } else if (child instanceof ReactBaseTextShadowNode) {
+//        buildSpannedFromShadowNode((ReactBaseTextShadowNode) child, sb, ops);
+//      } else if (child instanceof ReactTextInlineImageShadowNode) {
+//        // We make the image take up 1 character in the span and put a corresponding character into
+//        // the text so that the image doesn't run over any following text.
+//        sb.append(INLINE_IMAGE_PLACEHOLDER);
+//        ops.add(
+//          new SetSpanOperation(
+//            sb.length() - INLINE_IMAGE_PLACEHOLDER.length(),
+//            sb.length(),
+//            ((ReactTextInlineImageShadowNode) child).buildInlineImageSpan()));
+//      } else {
+//        throw new IllegalViewOperationException(
+//          "Unexpected view type nested under text node: " + child.getClass());
+//      }
+
+      TextAttributeProps textAttributes = new TextAttributeProps(new ReactStylesDiffMap(fragment.getMap("textAttributes")));
+      int end = sb.length();
+      if (end >= start) {
+        if (textAttributes.mIsColorSet) {
+          ops.add(new SetSpanOperation(start, end, new ForegroundColorSpan(textAttributes.mColor)));
+        }
+        if (textAttributes.mIsBackgroundColorSet) {
+          ops.add(
+            new SetSpanOperation(
+              start, end, new BackgroundColorSpan(textAttributes.mBackgroundColor)));
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+          if (!Float.isNaN(textAttributes.mLetterSpacing)) {
+            ops.add(new SetSpanOperation(
+              start,
+              end,
+              new CustomLetterSpacingSpan(textAttributes.mLetterSpacing)));
+          }
+        }
+        if (textAttributes.mFontSize != UNSET) {
+          ops.add(
+            new SetSpanOperation(
+              start, end, new AbsoluteSizeSpan((int) (textAttributes.mFontSize))));
+        }
+        if (textAttributes.mFontStyle != UNSET
+          || textAttributes.mFontWeight != UNSET
+          || textAttributes.mFontFamily != null) {
+          ops.add(
+            new SetSpanOperation(
+              start,
+              end,
+              new CustomStyleSpan(
+                textAttributes.mFontStyle,
+                textAttributes.mFontWeight,
+                textAttributes.mFontFamily,
+                context.getAssets())));
+        }
+        if (textAttributes.mIsUnderlineTextDecorationSet) {
+          ops.add(new SetSpanOperation(start, end, new UnderlineSpan()));
+        }
+        if (textAttributes.mIsLineThroughTextDecorationSet) {
+          ops.add(new SetSpanOperation(start, end, new StrikethroughSpan()));
+        }
+        if (textAttributes.mTextShadowOffsetDx != 0 || textAttributes.mTextShadowOffsetDy != 0) {
+          ops.add(
+            new SetSpanOperation(
+              start,
+              end,
+              new ShadowStyleSpan(
+                textAttributes.mTextShadowOffsetDx,
+                textAttributes.mTextShadowOffsetDy,
+                textAttributes.mTextShadowRadius,
+                textAttributes.mTextShadowColor)));
+        }
+        if (!Float.isNaN(textAttributes.getEffectiveLineHeight())) {
+          ops.add(
+            new SetSpanOperation(
+              start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
+        }
+        if (textAttributes.mTextTransform != TextTransform.UNSET && textAttributes.mTextTransform != TextTransform.NONE) {
+          ops.add(
+            new SetSpanOperation(
+              start,
+              end,
+              new CustomTextTransformSpan(textAttributes.mTextTransform)));
+        }
+
+        int reactTag = fragment.getInt("reactTag");
+        ops.add(new SetSpanOperation(start, end, new ReactTagSpan(reactTag)));
+      }
+    }
+  }
+
+  protected static Spannable spannedFromTextFragments(
+    Context context,
+    ReadableArray fragments, String text) {
+    SpannableStringBuilder sb = new SpannableStringBuilder();
+
+    // TODO(5837930): Investigate whether it's worth optimizing this part and do it if so
+
+    // The {@link SpannableStringBuilder} implementation require setSpan operation to be called
+    // up-to-bottom, otherwise all the spannables that are withing the region for which one may set
+    // a new spannable will be wiped out
+    List<SetSpanOperation> ops = new ArrayList<>();
+
+    buildSpannedFromShadowNode(context, fragments, sb, ops);
+
+    // TODO: add support for AllowScaling in C++
+//    if (textShadowNode.mFontSize == UNSET) {
+//      int defaultFontSize =
+//        textShadowNode.mAllowFontScaling
+//          ? (int) Math.ceil(PixelUtil.toPixelFromSP(ViewDefaults.FONT_SIZE_SP))
+//          : (int) Math.ceil(PixelUtil.toPixelFromDIP(ViewDefaults.FONT_SIZE_SP));
+//
+//      ops.add(new SetSpanOperation(0, sb.length(), new AbsoluteSizeSpan(defaultFontSize)));
+//    }
+//
+//    textShadowNode.mContainsImages = false;
+//    textShadowNode.mHeightOfTallestInlineImage = Float.NaN;
+
+    // While setting the Spans on the final text, we also check whether any of them are images.
+    int priority = 0;
+    for (SetSpanOperation op : ops) {
+// TODO: add support for TextInlineImage in C++
+//      if (op.what instanceof TextInlineImageSpan) {
+//        int height = ((TextInlineImageSpan) op.what).getHeight();
+//        textShadowNode.mContainsImages = true;
+//        if (Float.isNaN(textShadowNode.mHeightOfTallestInlineImage)
+//          || height > textShadowNode.mHeightOfTallestInlineImage) {
+//          textShadowNode.mHeightOfTallestInlineImage = height;
+//        }
+//      }
+
+      // Actual order of calling {@code execute} does NOT matter,
+      // but the {@code priority} DOES matter.
+      op.execute(sb, priority);
+      priority++;
+    }
+
+    return sb;
+  }
+
+  public static float[] measureText(
+    ReactContext context,
+    ReactTextView view,
+    ReadableNativeMap attributedString,
+    ReadableNativeMap paragraphAttributes,
+    float width,
+    YogaMeasureMode widthYogaMeasureMode,
+    float height,
+    YogaMeasureMode heightYogaMeasureMode) {
+
+    // TODO(5578671): Handle text direction (see View#getTextDirectionHeuristic)
+    TextPaint textPaint = sTextPaintInstance;
+    Layout layout;
+
+    Spannable preparedSpannableText = view == null ? null : view.getSpanned();
+
+    // TODO add these props to paragraph attributes
+    int textBreakStrategy = Layout.BREAK_STRATEGY_HIGH_QUALITY;
+    boolean includeFontPadding = true;
+
+    if (preparedSpannableText == null) {
+      preparedSpannableText = spannedFromTextFragments(context, attributedString.getArray("fragments"), attributedString.getString("string"));
+    }
+
+    if (preparedSpannableText == null) {
+      throw new IllegalStateException("Spannable element has not been prepared in onBeforeLayout");
+    }
+    Spanned text = preparedSpannableText;
+    BoringLayout.Metrics boring = BoringLayout.isBoring(text, textPaint);
+    float desiredWidth = boring == null ?
+      Layout.getDesiredWidth(text, textPaint) : Float.NaN;
+
+    // technically, width should never be negative, but there is currently a bug in
+    boolean unconstrainedWidth = widthYogaMeasureMode == YogaMeasureMode.UNDEFINED || width < 0;
+
+    if (boring == null &&
+      (unconstrainedWidth ||
+        (!YogaConstants.isUndefined(desiredWidth) && desiredWidth <= width))) {
+      // Is used when the width is not known and the text is not boring, ie. if it contains
+      // unicode characters.
+
+      int hintWidth = (int) Math.ceil(desiredWidth);
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+        layout = new StaticLayout(
+          text,
+          textPaint,
+          hintWidth,
+          Layout.Alignment.ALIGN_NORMAL,
+          1.f,
+          0.f,
+          includeFontPadding);
+      } else {
+        layout = StaticLayout.Builder.obtain(text, 0, text.length(), textPaint, hintWidth)
+          .setAlignment(Layout.Alignment.ALIGN_NORMAL)
+          .setLineSpacing(0.f, 1.f)
+          .setIncludePad(includeFontPadding)
+          .setBreakStrategy(textBreakStrategy)
+          .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
+          .build();
+      }
+
+    } else if (boring != null && (unconstrainedWidth || boring.width <= width)) {
+      // Is used for single-line, boring text when the width is either unknown or bigger
+      // than the width of the text.
+      layout = BoringLayout.make(
+        text,
+        textPaint,
+        boring.width,
+        Layout.Alignment.ALIGN_NORMAL,
+        1.f,
+        0.f,
+        boring,
+        includeFontPadding);
+    } else {
+      // Is used for multiline, boring text and the width is known.
+
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+        layout = new StaticLayout(
+          text,
+          textPaint,
+          (int) width,
+          Layout.Alignment.ALIGN_NORMAL,
+          1.f,
+          0.f,
+          includeFontPadding);
+      } else {
+        layout = StaticLayout.Builder.obtain(text, 0, text.length(), textPaint, (int) width)
+          .setAlignment(Layout.Alignment.ALIGN_NORMAL)
+          .setLineSpacing(0.f, 1.f)
+          .setIncludePad(includeFontPadding)
+          .setBreakStrategy(textBreakStrategy)
+          .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
+          .build();
+      }
+    }
+
+    int maximumNumberOfLines = paragraphAttributes.hasKey("maximumNumberOfLines") ? paragraphAttributes.getInt("maximumNumberOfLines") : UNSET;
+
+    width = layout.getWidth();
+    if (maximumNumberOfLines != UNSET
+      && maximumNumberOfLines != 0
+      && maximumNumberOfLines < layout.getLineCount()) {
+      height = layout.getLineBottom(maximumNumberOfLines - 1);
+    } else {
+      height = layout.getHeight();
+    }
+
+    return new float[] { PixelUtil.toSPFromPixel(width), PixelUtil.toSPFromPixel(height) };
+  }
+
+  private static class SetSpanOperation {
+    protected int start, end;
+    protected Object what;
+
+    SetSpanOperation(int start, int end, Object what) {
+      this.start = start;
+      this.end = end;
+      this.what = what;
+    }
+
+    public void execute(SpannableStringBuilder sb, int priority) {
+      // All spans will automatically extend to the right of the text, but not the left - except
+      // for spans that start at the beginning of the text.
+      int spanFlags = Spannable.SPAN_EXCLUSIVE_INCLUSIVE;
+      if (start == 0) {
+        spanFlags = Spannable.SPAN_INCLUSIVE_INCLUSIVE;
+      }
+
+      spanFlags &= ~Spannable.SPAN_PRIORITY;
+      spanFlags |= (priority << Spannable.SPAN_PRIORITY_SHIFT) & Spannable.SPAN_PRIORITY;
+
+      sb.setSpan(what, start, end, spanFlags);
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextTransform.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextTransform.java
new file mode 100644
index 00000000000000..5209b2a579e0a3
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextTransform.java
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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.views.text;
+
+/**
+ * Types of text transforms for CustomTextTransformSpan
+ */
+public enum TextTransform { NONE, UPPERCASE, LOWERCASE, CAPITALIZE, UNSET };
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 a070c342416453..17b9ed51457178 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
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "frescosupport",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
index 301174772eac6f..9a065eb203f0c8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -50,22 +50,6 @@ public FrescoBasedReactTextInlineImageShadowNode(
     mCallerContext = callerContext;
   }
 
-  private FrescoBasedReactTextInlineImageShadowNode(FrescoBasedReactTextInlineImageShadowNode node) {
-    super(node);
-    mHeaders = node.mHeaders; // mHeaders is immutable
-    mWidth = node.mWidth;
-    mHeight = node.mHeight;
-    mTintColor = node.mTintColor;
-    mDraweeControllerBuilder = node.mDraweeControllerBuilder;
-    mCallerContext = node.mCallerContext;
-    mUri = node.mUri;
-  }
-
-  @Override
-  protected FrescoBasedReactTextInlineImageShadowNode copy() {
-    return new FrescoBasedReactTextInlineImageShadowNode(this);
-  }
-
   @ReactProp(name = "src")
   public void setSource(@Nullable ReadableArray sources) {
     final String source =
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java
index 08d3ed9d2f7692..30dd1bb63a8e2e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java
index ca1ee0baba1350..7d6c9f989589d0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 bd919beae90211..3c29c2262fcb4f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "textinput",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java
index e02a8c9e0969b0..b2b94dd41b18b6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
index e9cf4fffe7acae..9c3ef1c0d33a15 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 fb4a4d9cfc174e..c8d2f05c5b57cf 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
index 26bead54761d65..23e9888315a55d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
index 7ecb6ef86d50a4..46e3012f00002a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
index bb15cc6ed47fa3..92ebd12915878a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
index 812bea17461d6d..c8afefd9e45133 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
index 2df3a8380a91db..143e7e4d897dc6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
index 883069b0e97e6d..5be8f9e3eb0668 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
index f3530d0e3df53e..388aa65d500662 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java
index ce7b2725bb690b..8d7392ea99c728 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -21,11 +21,13 @@ public final class ReactTextInputLocalData {
   private final int mMaxLines;
   private final int mInputType;
   private final int mBreakStrategy;
+  private final  CharSequence mPlaceholder;
 
   public ReactTextInputLocalData(EditText editText) {
     mText = new SpannableStringBuilder(editText.getText());
     mTextSize = editText.getTextSize();
     mInputType = editText.getInputType();
+    mPlaceholder = editText.getHint();
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
       mMinLines = editText.getMinLines();
@@ -48,8 +50,9 @@ public void apply(EditText editText) {
     editText.setMinLines(mMinLines);
     editText.setMaxLines(mMaxLines);
     editText.setInputType(mInputType);
+    editText.setHint(mPlaceholder);
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
       editText.setBreakStrategy(mBreakStrategy);
     }
   }
-}
+}
\ No newline at end of file
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 3ee99b6c84c64e..1b6d1e83767d44 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -159,7 +159,7 @@ public Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
   @Override
   public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
     return MapBuilder.<String, Object>builder()
-        .put(ScrollEventType.SCROLL.getJSEventName(), MapBuilder.of("registrationName", "onScroll"))
+        .put(ScrollEventType.getJSEventName(ScrollEventType.SCROLL), MapBuilder.of("registrationName", "onScroll"))
         .build();
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
index f34e342a518fd4..1ab8c077e45b22 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
index 28c559afbc12de..c009dfbcc65bf9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -41,9 +41,11 @@ public class ReactTextInputShadowNode extends ReactBaseTextShadowNode
   private @Nullable ReactTextInputLocalData mLocalData;
 
   @VisibleForTesting public static final String PROP_TEXT = "text";
+  @VisibleForTesting public static final String PROP_PLACEHOLDER = "placeholder";
 
   // Represents the {@code text} property only, not possible nested content.
   private @Nullable String mText = null;
+  private @Nullable String mPlaceholder = null;
 
   public ReactTextInputShadowNode() {
     mTextBreakStrategy = (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) ?
@@ -52,44 +54,10 @@ public ReactTextInputShadowNode() {
     initMeasureFunction();
   }
 
-  private ReactTextInputShadowNode(ReactTextInputShadowNode node) {
-    super(node);
-    mMostRecentEventCount = node.mMostRecentEventCount;
-    mText = node.mText;
-    mLocalData = node.mLocalData;
-  }
-
-  @Override
-  protected ReactTextInputShadowNode copy() {
-    return new ReactTextInputShadowNode(this);
-  }
-
-  @Override
-  public ReactTextInputShadowNode mutableCopy(long instanceHandle) {
-    ReactTextInputShadowNode node = (ReactTextInputShadowNode) super.mutableCopy(instanceHandle);
-    node.initMeasureFunction();
-    ThemedReactContext themedContext = getThemedContext();
-    if (themedContext != null) {
-      node.setThemedContext(themedContext);
-    }
-    return node;
-  }
-
   private void initMeasureFunction() {
     setMeasureFunction(this);
   }
 
-  @Override
-  public ReactTextInputShadowNode mutableCopyWithNewChildren(long instanceHandle) {
-    ReactTextInputShadowNode node = (ReactTextInputShadowNode) super.mutableCopyWithNewChildren(instanceHandle);
-    node.initMeasureFunction();
-    ThemedReactContext themedContext = getThemedContext();
-    if (themedContext != null) {
-      node.setThemedContext(themedContext);
-    }
-    return node;
-  }
-
   @Override
   public void setThemedContext(ThemedReactContext themedContext) {
     super.setThemedContext(themedContext);
@@ -148,8 +116,9 @@ public long measure(
       }
     }
 
-
-    editText.measure(
+     // make sure the placeholder content is also being measured
+     editText.setHint(getPlaceholder());
+     editText.measure(
         MeasureUtil.getMeasureSpec(width, widthMode),
         MeasureUtil.getMeasureSpec(height, heightMode));
 
@@ -193,6 +162,16 @@ public void setText(@Nullable String text) {
     return mText;
   }
 
+  @ReactProp(name = PROP_PLACEHOLDER)
+  public void setPlaceholder(@Nullable String placeholder) {
+    mPlaceholder = placeholder;
+    markUpdated();
+  }
+
+  public @Nullable String getPlaceholder() {
+    return mPlaceholder;
+  }
+
   @Override
   public void setTextBreakStrategy(@Nullable String textBreakStrategy) {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
index e0819785034b60..b75146c6e110c9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java
index 079d8555428d09..5902cc082b0897 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java
index 0ac6d0e5cbfcdb..13bbdd20b4a79d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK
index 4cc9bccd712546..76dd4b1d4b2765 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "toolbar",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
index 7d8a5f5dadcf88..b673abd96049ba 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
index e0526dc159f898..ca8c8ebe12a5f2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java
index 99cca31692fcdc..d15d9ba96a4cd7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java
index 6b88f2dee676a0..9025178c050e1f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 601614384b9636..a7b4d74e8b01e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "view",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java
index 1e57cc8e793ad1..5b4bd245a6e523 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.java
index 6f764282e7e16c..44cdf5f2ccec80 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
index 2675c10d2790a8..49205f95388a4d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 1a31a0cc38bd37..430c5895bd156a 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -53,14 +53,13 @@ public class ReactViewBackgroundDrawable extends Drawable {
   // 0 == 0x00000000, all bits set to 0.
   private static final int ALL_BITS_UNSET = 0;
 
-
-  private static enum BorderStyle {
+  private enum BorderStyle {
     SOLID,
     DASHED,
     DOTTED;
 
-    public @Nullable PathEffect getPathEffect(float borderWidth) {
-      switch (this) {
+    public static @Nullable PathEffect getPathEffect(BorderStyle style, float borderWidth) {
+      switch (style) {
         case SOLID:
           return null;
 
@@ -958,7 +957,7 @@ public float getBorderWidthOrDefaultTo(final float defaultValue, final int spaci
    */
   private void updatePathEffect() {
     mPathEffectForBorderStyle = mBorderStyle != null
-        ? mBorderStyle.getPathEffect(getFullBorderWidth())
+        ? BorderStyle.getPathEffect(mBorderStyle, getFullBorderWidth())
         : null;
 
     mPaint.setPathEffect(mPathEffectForBorderStyle);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java
index 95fe29f7970bb2..fd9db9afea24df 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
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 e8afaa93574538..a3a189dc1bb088 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -49,11 +49,6 @@ public class ReactViewGroup extends ViewGroup implements
     ReactInterceptingViewGroup, ReactClippingViewGroup, ReactPointerEventsView, ReactHitSlopView,
     ReactZIndexedViewGroup {
 
-  /**
-   * Kill switch to make overflow hidden by default. This flag will eventually be removed.
-   */
-  public static boolean sDefaultOverflowHidden;
-
   private static final int ARRAY_CAPACITY_INCREMENT = 12;
   private static final int DEFAULT_BACKGROUND_COLOR = Color.TRANSPARENT;
   private static final LayoutParams sDefaultLayoutParam = new ViewGroup.LayoutParams(0, 0);
@@ -115,13 +110,12 @@ public void onLayoutChange(
   private final ViewGroupDrawingOrderHelper mDrawingOrderHelper;
   private @Nullable Path mPath;
   private int mLayoutDirection;
+  private float mBackfaceOpacity = 1.f;
+  private String mBackfaceVisibility = "visible";
 
   public ReactViewGroup(Context context) {
     super(context);
-    // TODO: Remove this check after a couple public releases.
-    if (!sDefaultOverflowHidden) {
-      setClipChildren(false);
-    }
+    setClipChildren(false);
     mDrawingOrderHelper = new ViewGroupDrawingOrderHelper(this);
   }
 
@@ -652,6 +646,10 @@ public void setOverflow(String overflow) {
     invalidate();
   }
 
+  public @Nullable String getOverflow() {
+    return mOverflow;
+  }
+
   /**
    * Set the background for the view or remove the background. It calls {@link
    * #setBackground(Drawable)} or {@link #setBackgroundDrawable(Drawable)} based on the sdk version.
@@ -841,4 +839,36 @@ private void dispatchOverflowDraw(Canvas canvas) {
       }
     }
   }
+
+  public void setOpacityIfPossible(float opacity) {
+    mBackfaceOpacity = opacity;
+    setBackfaceVisibilityDependantOpacity();
+  }
+
+  public void setBackfaceVisibility(String backfaceVisibility) {
+    mBackfaceVisibility = backfaceVisibility;
+    setBackfaceVisibilityDependantOpacity();
+  }
+
+  public void setBackfaceVisibilityDependantOpacity() {
+    boolean isBackfaceVisible = mBackfaceVisibility.equals("visible");
+
+    if (isBackfaceVisible) {
+      setAlpha(mBackfaceOpacity);
+      return;
+    }
+
+    float rotationX = getRotationX();
+    float rotationY = getRotationY();
+
+    boolean isFrontfaceVisible = (rotationX >= -90.f && rotationX < 90.f) &&
+      (rotationY >= -90.f && rotationY < 90.f);
+
+    if (isFrontfaceVisible) {
+      setAlpha(mBackfaceOpacity);
+      return;
+    }
+
+    setAlpha(0);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
index b4eb587049bd9e..eb0e35f5ad846b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -203,6 +203,22 @@ public void setOverflow(ReactViewGroup view, String overflow) {
     view.setOverflow(overflow);
   }
 
+  @ReactProp(name = "backfaceVisibility")
+  public void setBackfaceVisibility(ReactViewGroup view, String backfaceVisibility) {
+    view.setBackfaceVisibility(backfaceVisibility);
+  }
+
+  @Override
+  public void setOpacity(ReactViewGroup view, float opacity) {
+    view.setOpacityIfPossible(opacity);
+  }
+
+  @Override
+  public void setTransform(ReactViewGroup view, ReadableArray matrix) {
+    super.setTransform(view, matrix);
+    view.setBackfaceVisibilityDependantOpacity();
+  }
+
   @Override
   public String getName() {
     return REACT_CLASS;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK
index 829b41901e0a91..953bdc042a049a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "viewpager",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java
index 2d4dc97c884fa0..a7ac123e61780f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java
index 49ba9f322d8f8c..295165da2a5059 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java
index 773c31bedbeea8..ed8e3c4bdd4854 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
index 48b5f1a6194956..5f88a97750e246 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java
index 65d676ac91591e..8cb802f18dd560 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/webview/BUCK
index e2f8331fb95073..5e8a0cc8333e64 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "webview",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
index 6bcc4e1857fc09..cbeaa014da415f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,20 +8,8 @@
 package com.facebook.react.views.webview;
 
 import android.annotation.TargetApi;
-import android.content.Context;
-import com.facebook.react.uimanager.UIManagerModule;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.regex.Pattern;
-import javax.annotation.Nullable;
-
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Picture;
@@ -52,6 +40,7 @@
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.ContentSizeChangeEvent;
 import com.facebook.react.uimanager.events.Event;
@@ -61,10 +50,14 @@
 import com.facebook.react.views.webview.events.TopLoadingStartEvent;
 import com.facebook.react.views.webview.events.TopMessageEvent;
 import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.regex.Pattern;
 import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -139,10 +132,10 @@ public void onPageStarted(WebView webView, String url, Bitmap favicon) {
       mLastLoadFailed = false;
 
       dispatchEvent(
-          webView,
-          new TopLoadingStartEvent(
-              webView.getId(),
-              createWebViewEvent(webView, url)));
+        webView,
+        new TopLoadingStartEvent(
+          webView.getId(),
+          createWebViewEvent(webView, url)));
     }
 
     @Override
@@ -152,7 +145,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
       // url blacklisting
       if (mUrlPrefixesForDefaultIntent != null && mUrlPrefixesForDefaultIntent.size() > 0) {
         ArrayList<Object> urlPrefixesForDefaultIntent =
-            mUrlPrefixesForDefaultIntent.toArrayList();
+          mUrlPrefixesForDefaultIntent.toArrayList();
         for (Object urlPrefix : urlPrefixesForDefaultIntent) {
           if (url.startsWith((String) urlPrefix)) {
             launchIntent(view.getContext(), url);
@@ -195,10 +188,10 @@ private boolean shouldHandleURL(List<Pattern> originWhitelist, String url) {
 
     @Override
     public void onReceivedError(
-        WebView webView,
-        int errorCode,
-        String description,
-        String failingUrl) {
+      WebView webView,
+      int errorCode,
+      String description,
+      String failingUrl) {
       super.onReceivedError(webView, errorCode, description, failingUrl);
       mLastLoadFailed = true;
 
@@ -211,16 +204,16 @@ public void onReceivedError(
       eventData.putString("description", description);
 
       dispatchEvent(
-          webView,
-          new TopLoadingErrorEvent(webView.getId(), eventData));
+        webView,
+        new TopLoadingErrorEvent(webView.getId(), eventData));
     }
 
     protected void emitFinishEvent(WebView webView, String url) {
       dispatchEvent(
-          webView,
-          new TopLoadingFinishEvent(
-              webView.getId(),
-              createWebViewEvent(webView, url)));
+        webView,
+        new TopLoadingFinishEvent(
+          webView.getId(),
+          createWebViewEvent(webView, url)));
     }
 
     protected WritableMap createWebViewEvent(WebView webView, String url) {
@@ -325,11 +318,25 @@ public void setMessagingEnabled(boolean enabled) {
       }
     }
 
+    protected void evaluateJavascriptWithFallback(String script) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+        evaluateJavascript(script, null);
+        return;
+      }
+
+      try {
+        loadUrl("javascript:" + URLEncoder.encode(script, "UTF-8"));
+      } catch (UnsupportedEncodingException e) {
+        // UTF-8 should always be supported
+        throw new RuntimeException(e);
+      }
+    }
+
     public void callInjectedJavaScript() {
       if (getSettings().getJavaScriptEnabled() &&
-          injectedJS != null &&
-          !TextUtils.isEmpty(injectedJS)) {
-        loadUrl("javascript:(function() {\n" + injectedJS + ";\n})();");
+        injectedJS != null &&
+        !TextUtils.isEmpty(injectedJS)) {
+        evaluateJavascriptWithFallback("(function() {\n" + injectedJS + ";\n})();");
       }
     }
 
@@ -348,12 +355,12 @@ public void onReceiveValue(String value) {
           });
         }
 
-        loadUrl("javascript:(" +
+        evaluateJavascriptWithFallback("(" +
           "window.originalPostMessage = window.postMessage," +
           "window.postMessage = function(data) {" +
-            BRIDGE_NAME + ".postMessage(String(data));" +
+          BRIDGE_NAME + ".postMessage(String(data));" +
           "}" +
-        ")");
+          ")");
       }
     }
 
@@ -423,8 +430,8 @@ public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermiss
 
     // Fixes broken full-screen modals/galleries due to body height being 0.
     webView.setLayoutParams(
-            new LayoutParams(LayoutParams.MATCH_PARENT,
-                LayoutParams.MATCH_PARENT));
+      new LayoutParams(LayoutParams.MATCH_PARENT,
+        LayoutParams.MATCH_PARENT));
 
     setGeolocationEnabled(webView, false);
     if (ReactBuildConfig.DEBUG && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -496,7 +503,7 @@ public void setSource(WebView view, @Nullable ReadableMap source) {
         String html = source.getString("html");
         if (source.hasKey("baseUrl")) {
           view.loadDataWithBaseURL(
-              source.getString("baseUrl"), html, HTML_MIME_TYPE, HTML_ENCODING, null);
+            source.getString("baseUrl"), html, HTML_MIME_TYPE, HTML_ENCODING, null);
         } else {
           view.loadData(html, HTML_MIME_TYPE, HTML_ENCODING);
         }
@@ -510,7 +517,7 @@ public void setSource(WebView view, @Nullable ReadableMap source) {
         }
         if (source.hasKey("method")) {
           String method = source.getString("method");
-          if (method.equals(HTTP_METHOD_POST)) {
+          if (method.equalsIgnoreCase(HTTP_METHOD_POST)) {
             byte[] postData = null;
             if (source.hasKey("body")) {
               String body = source.getString("body");
@@ -573,14 +580,21 @@ public void setMixedContentMode(WebView view, @Nullable String mixedContentMode)
 
   @ReactProp(name = "urlPrefixesForDefaultIntent")
   public void setUrlPrefixesForDefaultIntent(
-      WebView view,
-      @Nullable ReadableArray urlPrefixesForDefaultIntent) {
+    WebView view,
+    @Nullable ReadableArray urlPrefixesForDefaultIntent) {
     ReactWebViewClient client = ((ReactWebView) view).getReactWebViewClient();
     if (client != null && urlPrefixesForDefaultIntent != null) {
       client.setUrlPrefixesForDefaultIntent(urlPrefixesForDefaultIntent);
     }
   }
 
+  @ReactProp(name = "allowFileAccess")
+  public void setAllowFileAccess(
+    WebView view,
+    @Nullable Boolean allowFileAccess) {
+    view.getSettings().setAllowFileAccess(allowFileAccess != null && allowFileAccess);
+  }
+
   @ReactProp(name = "geolocationEnabled")
   public void setGeolocationEnabled(
     WebView view,
@@ -611,13 +625,13 @@ protected void addEventEmitters(ThemedReactContext reactContext, WebView view) {
   @Override
   public @Nullable Map<String, Integer> getCommandsMap() {
     return MapBuilder.of(
-        "goBack", COMMAND_GO_BACK,
-        "goForward", COMMAND_GO_FORWARD,
-        "reload", COMMAND_RELOAD,
-        "stopLoading", COMMAND_STOP_LOADING,
-        "postMessage", COMMAND_POST_MESSAGE,
-        "injectJavaScript", COMMAND_INJECT_JAVASCRIPT
-      );
+      "goBack", COMMAND_GO_BACK,
+      "goForward", COMMAND_GO_FORWARD,
+      "reload", COMMAND_RELOAD,
+      "stopLoading", COMMAND_STOP_LOADING,
+      "postMessage", COMMAND_POST_MESSAGE,
+      "injectJavaScript", COMMAND_INJECT_JAVASCRIPT
+    );
   }
 
   @Override
@@ -637,25 +651,27 @@ public void receiveCommand(WebView root, int commandId, @Nullable ReadableArray
         break;
       case COMMAND_POST_MESSAGE:
         try {
+          ReactWebView reactWebView = (ReactWebView) root;
           JSONObject eventInitDict = new JSONObject();
           eventInitDict.put("data", args.getString(0));
-          root.loadUrl("javascript:(function () {" +
+          reactWebView.evaluateJavascriptWithFallback("(function () {" +
             "var event;" +
             "var data = " + eventInitDict.toString() + ";" +
             "try {" +
-              "event = new MessageEvent('message', data);" +
+            "event = new MessageEvent('message', data);" +
             "} catch (e) {" +
-              "event = document.createEvent('MessageEvent');" +
-              "event.initMessageEvent('message', true, true, data.data, data.origin, data.lastEventId, data.source);" +
+            "event = document.createEvent('MessageEvent');" +
+            "event.initMessageEvent('message', true, true, data.data, data.origin, data.lastEventId, data.source);" +
             "}" +
             "document.dispatchEvent(event);" +
-          "})();");
+            "})();");
         } catch (JSONException e) {
           throw new RuntimeException(e);
         }
         break;
       case COMMAND_INJECT_JAVASCRIPT:
-        root.loadUrl("javascript:" + args.getString(0));
+        ReactWebView reactWebView = (ReactWebView) root;
+        reactWebView.evaluateJavascriptWithFallback(args.getString(0));
         break;
     }
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java
index 9e6d594ccd30a4..198fad85fb8938 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java
index 02336a418eb74c..86e1aa058935a1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java
index 088a512606757d..dd12aa877b8096 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java
index 154415d5eaa690..28aae57e5989fd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java
index 75c26a9346d922..c2f43673b4e01e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/BUCK b/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
index 873913277cd367..21006f1842c39a 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
 
 rn_android_library(
     name = "systrace",
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java b/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
index c3576f0b49c20a..8a458482552f09 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java b/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
index 03dec5938b9318..448d972780e219 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/TraceListener.java b/ReactAndroid/src/main/java/com/facebook/systrace/TraceListener.java
index 27fe3441b5ed96..7c217a22613b69 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/TraceListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/TraceListener.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
index 5687ab9d0a0279..6a84ffaf894e59 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java
index 20feae330e7013..0a4dba13334164 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
index 128f532850894f..b8312bd458873a 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
@@ -8,7 +8,6 @@
 package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.soloader.SoLoader;
 
 @DoNotStrip
 public class YogaConfig {
@@ -16,7 +15,7 @@ public class YogaConfig {
   public static int SPACING_TYPE = 1;
 
   static {
-      SoLoader.loadLibrary("yoga");
+      YogaJNI.init();
   }
 
   long mNativePointer;
@@ -54,6 +53,11 @@ public void setUseWebDefaults(boolean useWebDefaults) {
     jni_YGConfigSetUseWebDefaults(mNativePointer, useWebDefaults);
   }
 
+  private native void jni_YGConfigSetPrintTreeFlag(long nativePointer, boolean enable);
+  public void setPrintTreeFlag(boolean enable) {
+    jni_YGConfigSetPrintTreeFlag(mNativePointer, enable);
+  }
+
   private native void jni_YGConfigSetPointScaleFactor(long nativePointer, float pixelsInPoint);
   public void setPointScaleFactor(float pixelsInPoint) {
     jni_YGConfigSetPointScaleFactor(mNativePointer, pixelsInPoint);
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
index 68c5c982069b41..10f152d48b0d80 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
index 3a950e014dbc3f..42f1ce76707890 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
index ccd46e84a62112..78d377d833f488 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
index 75c2b687d93f52..df7bff2fafd90a 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
index 36a893f66cb68c..8d7d1b685f6755 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
index 790bd0566e6ec1..82f2db94a331f8 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
index 5c66d92fc4fc49..3d31caa219e8a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaJNI.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJNI.java
new file mode 100644
index 00000000000000..deccbcf5d58f87
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJNI.java
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) Facebook, Inc. and its 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.yoga;
+
+import com.facebook.soloader.SoLoader;
+
+public class YogaJNI {
+
+  // Known constants. 1-3 used in previous experiments. Do not reuse.
+  public static int JNI_FAST_CALLS = 4;
+
+  // set before loading any other Yoga code
+  public static boolean useFastCall = false;
+
+  private static native void jni_bindNativeMethods(boolean useFastCall);
+
+  static boolean init() {
+    if (SoLoader.loadLibrary("yoga")) {
+      jni_bindNativeMethods(useFastCall);
+      return true;
+    }
+
+    return false;
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
index 13d3a0014574c7..521dad288625e9 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
index 0cf7f70c37f248..e6a9498e9a783e 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java
index 6d1a6a1e9dc472..4f617004b96b7c 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java
index cc54caeca7fce2..1e116424fdc6f0 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
index 5cfc24a4b3220e..7b24c26f9638ea 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java
index e68af410dd58eb..9dfe4639d3de90 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
index 1565d4bbdd35d0..282931dc8a462c 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -1,15 +1,13 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  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.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.soloader.SoLoader;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -18,7 +16,7 @@
 public class YogaNode implements Cloneable {
 
   static {
-      SoLoader.loadLibrary("yoga");
+      YogaJNI.init();
   }
 
   /**
@@ -97,17 +95,27 @@ public YogaNode(YogaConfig config) {
     }
   }
 
-  private native void jni_YGNodeFree(long nativePointer);
   @Override
   protected void finalize() throws Throwable {
     try {
-      jni_YGNodeFree(mNativePointer);
+      freeNatives();
     } finally {
       super.finalize();
     }
   }
 
-  private native void jni_YGNodeReset(long nativePointer);
+  private static native void jni_YGNodeFree(long nativePointer);
+
+  /* frees the native underlying YGNode. Useful for testing. */
+  public void freeNatives() {
+    if (mNativePointer > 0) {
+      long nativePointer = mNativePointer;
+      mNativePointer = 0;
+      jni_YGNodeFree(nativePointer);
+    }
+  }
+
+  private static native void jni_YGNodeReset(long nativePointer);
   public void reset() {
     mEdgeSetFlag = 0;
     mHasSetPosition = false;
@@ -150,7 +158,7 @@ public YogaNode getChildAt(int i) {
     return mChildren.get(i);
   }
 
-  private native void jni_YGNodeInsertChild(long nativePointer, long childPointer, int index);
+  private static native void jni_YGNodeInsertChild(long nativePointer, long childPointer, int index);
   public void addChildAt(YogaNode child, int i) {
     if (child.mOwner != null) {
       throw new IllegalStateException("Child already has a parent, it must be removed first.");
@@ -164,7 +172,7 @@ public void addChildAt(YogaNode child, int i) {
     jni_YGNodeInsertChild(mNativePointer, child.mNativePointer, i);
   }
 
-  private native void jni_YGNodeInsertSharedChild(long nativePointer, long childPointer, int index);
+  private static native void jni_YGNodeInsertSharedChild(long nativePointer, long childPointer, int index);
 
   public void addSharedChildAt(YogaNode child, int i) {
     if (mChildren == null) {
@@ -175,7 +183,7 @@ public void addSharedChildAt(YogaNode child, int i) {
     jni_YGNodeInsertSharedChild(mNativePointer, child.mNativePointer, i);
   }
 
-  private native void jni_YGNodeSetOwner(long nativePointer, long newOwnerNativePointer);
+  private static native void jni_YGNodeSetOwner(long nativePointer, long newOwnerNativePointer);
 
   private native long jni_YGNodeClone(long nativePointer, Object newNode);
 
@@ -187,7 +195,7 @@ public YogaNode clone() {
 
       if (mChildren != null) {
         for (YogaNode child : mChildren) {
-          child.jni_YGNodeSetOwner(child.mNativePointer, 0);
+          YogaNode.jni_YGNodeSetOwner(child.mNativePointer, 0);
           child.mOwner = null;
         }
       }
@@ -222,14 +230,14 @@ public YogaNode cloneWithNewChildren() {
     }
   }
 
-  private native void jni_YGNodeClearChildren(long nativePointer);
+  private static native void jni_YGNodeClearChildren(long nativePointer);
 
   private void clearChildren() {
     mChildren = null;
     jni_YGNodeClearChildren(mNativePointer);
   }
 
-  private native void jni_YGNodeRemoveChild(long nativePointer, long childPointer);
+  private static native void jni_YGNodeRemoveChild(long nativePointer, long childPointer);
   public YogaNode removeChildAt(int i) {
     if (mChildren == null) {
       throw new IllegalStateException(
@@ -265,7 +273,7 @@ public int indexOf(YogaNode child) {
     return mChildren == null ? -1 : mChildren.indexOf(child);
   }
 
-  private native void jni_YGNodeCalculateLayout(long nativePointer, float width, float height);
+  private static native void jni_YGNodeCalculateLayout(long nativePointer, float width, float height);
   public void calculateLayout(float width, float height) {
     jni_YGNodeCalculateLayout(mNativePointer, width, height);
   }
@@ -274,23 +282,23 @@ public boolean hasNewLayout() {
     return mHasNewLayout;
   }
 
-  private native void jni_YGNodeMarkDirty(long nativePointer);
+  private static native void jni_YGNodeMarkDirty(long nativePointer);
   public void dirty() {
     jni_YGNodeMarkDirty(mNativePointer);
   }
 
-  private native void jni_YGNodeMarkDirtyAndPropogateToDescendants(long nativePointer);
+  private static native void jni_YGNodeMarkDirtyAndPropogateToDescendants(long nativePointer);
 
   public void dirtyAllDescendants() {
     jni_YGNodeMarkDirtyAndPropogateToDescendants(mNativePointer);
   }
 
-  private native boolean jni_YGNodeIsDirty(long nativePointer);
+  private static native boolean jni_YGNodeIsDirty(long nativePointer);
   public boolean isDirty() {
     return jni_YGNodeIsDirty(mNativePointer);
   }
 
-  private native void jni_YGNodeCopyStyle(long dstNativePointer, long srcNativePointer);
+  private static native void jni_YGNodeCopyStyle(long dstNativePointer, long srcNativePointer);
   public void copyStyle(YogaNode srcNode) {
     jni_YGNodeCopyStyle(mNativePointer, srcNode.mNativePointer);
   }
@@ -299,147 +307,147 @@ public void markLayoutSeen() {
     mHasNewLayout = false;
   }
 
-  private native int jni_YGNodeStyleGetDirection(long nativePointer);
+  private static native int jni_YGNodeStyleGetDirection(long nativePointer);
   public YogaDirection getStyleDirection() {
     return YogaDirection.fromInt(jni_YGNodeStyleGetDirection(mNativePointer));
   }
 
-  private native void jni_YGNodeStyleSetDirection(long nativePointer, int direction);
+  private static native void jni_YGNodeStyleSetDirection(long nativePointer, int direction);
   public void setDirection(YogaDirection direction) {
     jni_YGNodeStyleSetDirection(mNativePointer, direction.intValue());
   }
 
-  private native int jni_YGNodeStyleGetFlexDirection(long nativePointer);
+  private static native int jni_YGNodeStyleGetFlexDirection(long nativePointer);
   public YogaFlexDirection getFlexDirection() {
     return YogaFlexDirection.fromInt(jni_YGNodeStyleGetFlexDirection(mNativePointer));
   }
 
-  private native void jni_YGNodeStyleSetFlexDirection(long nativePointer, int flexDirection);
+  private static native void jni_YGNodeStyleSetFlexDirection(long nativePointer, int flexDirection);
   public void setFlexDirection(YogaFlexDirection flexDirection) {
     jni_YGNodeStyleSetFlexDirection(mNativePointer, flexDirection.intValue());
   }
 
-  private native int jni_YGNodeStyleGetJustifyContent(long nativePointer);
+  private static native int jni_YGNodeStyleGetJustifyContent(long nativePointer);
   public YogaJustify getJustifyContent() {
     return YogaJustify.fromInt(jni_YGNodeStyleGetJustifyContent(mNativePointer));
   }
 
-  private native void jni_YGNodeStyleSetJustifyContent(long nativePointer, int justifyContent);
+  private static native void jni_YGNodeStyleSetJustifyContent(long nativePointer, int justifyContent);
   public void setJustifyContent(YogaJustify justifyContent) {
     jni_YGNodeStyleSetJustifyContent(mNativePointer, justifyContent.intValue());
   }
 
-  private native int jni_YGNodeStyleGetAlignItems(long nativePointer);
+  private static native int jni_YGNodeStyleGetAlignItems(long nativePointer);
   public YogaAlign getAlignItems() {
     return YogaAlign.fromInt(jni_YGNodeStyleGetAlignItems(mNativePointer));
   }
 
-  private native void jni_YGNodeStyleSetAlignItems(long nativePointer, int alignItems);
+  private static native void jni_YGNodeStyleSetAlignItems(long nativePointer, int alignItems);
   public void setAlignItems(YogaAlign alignItems) {
     jni_YGNodeStyleSetAlignItems(mNativePointer, alignItems.intValue());
   }
 
-  private native int jni_YGNodeStyleGetAlignSelf(long nativePointer);
+  private static native int jni_YGNodeStyleGetAlignSelf(long nativePointer);
   public YogaAlign getAlignSelf() {
     return YogaAlign.fromInt(jni_YGNodeStyleGetAlignSelf(mNativePointer));
   }
 
-  private native void jni_YGNodeStyleSetAlignSelf(long nativePointer, int alignSelf);
+  private static native void jni_YGNodeStyleSetAlignSelf(long nativePointer, int alignSelf);
   public void setAlignSelf(YogaAlign alignSelf) {
     jni_YGNodeStyleSetAlignSelf(mNativePointer, alignSelf.intValue());
   }
 
-  private native int jni_YGNodeStyleGetAlignContent(long nativePointer);
+  private static native int jni_YGNodeStyleGetAlignContent(long nativePointer);
   public YogaAlign getAlignContent() {
     return YogaAlign.fromInt(jni_YGNodeStyleGetAlignContent(mNativePointer));
   }
 
-  private native void jni_YGNodeStyleSetAlignContent(long nativePointer, int alignContent);
+  private static native void jni_YGNodeStyleSetAlignContent(long nativePointer, int alignContent);
   public void setAlignContent(YogaAlign alignContent) {
     jni_YGNodeStyleSetAlignContent(mNativePointer, alignContent.intValue());
   }
 
-  private native int jni_YGNodeStyleGetPositionType(long nativePointer);
+  private static native int jni_YGNodeStyleGetPositionType(long nativePointer);
   public YogaPositionType getPositionType() {
     return YogaPositionType.fromInt(jni_YGNodeStyleGetPositionType(mNativePointer));
   }
 
-  private native void jni_YGNodeStyleSetPositionType(long nativePointer, int positionType);
+  private static native void jni_YGNodeStyleSetPositionType(long nativePointer, int positionType);
   public void setPositionType(YogaPositionType positionType) {
     jni_YGNodeStyleSetPositionType(mNativePointer, positionType.intValue());
   }
 
-  private native void jni_YGNodeStyleSetFlexWrap(long nativePointer, int wrapType);
+  private static native void jni_YGNodeStyleSetFlexWrap(long nativePointer, int wrapType);
   public void setWrap(YogaWrap flexWrap) {
     jni_YGNodeStyleSetFlexWrap(mNativePointer, flexWrap.intValue());
   }
 
-  private native int jni_YGNodeStyleGetOverflow(long nativePointer);
+  private static native int jni_YGNodeStyleGetOverflow(long nativePointer);
   public YogaOverflow getOverflow() {
     return YogaOverflow.fromInt(jni_YGNodeStyleGetOverflow(mNativePointer));
   }
 
-  private native void jni_YGNodeStyleSetOverflow(long nativePointer, int overflow);
+  private static native void jni_YGNodeStyleSetOverflow(long nativePointer, int overflow);
   public void setOverflow(YogaOverflow overflow) {
     jni_YGNodeStyleSetOverflow(mNativePointer, overflow.intValue());
   }
 
-  private native int jni_YGNodeStyleGetDisplay(long nativePointer);
+  private static native int jni_YGNodeStyleGetDisplay(long nativePointer);
   public YogaDisplay getDisplay() {
     return YogaDisplay.fromInt(jni_YGNodeStyleGetDisplay(mNativePointer));
   }
 
-  private native void jni_YGNodeStyleSetDisplay(long nativePointer, int display);
+  private static native void jni_YGNodeStyleSetDisplay(long nativePointer, int display);
   public void setDisplay(YogaDisplay display) {
     jni_YGNodeStyleSetDisplay(mNativePointer, display.intValue());
   }
 
-  private native void jni_YGNodeStyleSetFlex(long nativePointer, float flex);
+  private static native void jni_YGNodeStyleSetFlex(long nativePointer, float flex);
   public void setFlex(float flex) {
     jni_YGNodeStyleSetFlex(mNativePointer, flex);
   }
 
-  private native float jni_YGNodeStyleGetFlexGrow(long nativePointer);
+  private static native float jni_YGNodeStyleGetFlexGrow(long nativePointer);
   public float getFlexGrow() {
     return jni_YGNodeStyleGetFlexGrow(mNativePointer);
   }
 
-  private native void jni_YGNodeStyleSetFlexGrow(long nativePointer, float flexGrow);
+  private static native void jni_YGNodeStyleSetFlexGrow(long nativePointer, float flexGrow);
   public void setFlexGrow(float flexGrow) {
     jni_YGNodeStyleSetFlexGrow(mNativePointer, flexGrow);
   }
 
-  private native float jni_YGNodeStyleGetFlexShrink(long nativePointer);
+  private static native float jni_YGNodeStyleGetFlexShrink(long nativePointer);
   public float getFlexShrink() {
     return jni_YGNodeStyleGetFlexShrink(mNativePointer);
   }
 
-  private native void jni_YGNodeStyleSetFlexShrink(long nativePointer, float flexShrink);
+  private static native void jni_YGNodeStyleSetFlexShrink(long nativePointer, float flexShrink);
   public void setFlexShrink(float flexShrink) {
     jni_YGNodeStyleSetFlexShrink(mNativePointer, flexShrink);
   }
 
-  private native Object jni_YGNodeStyleGetFlexBasis(long nativePointer);
+  private static native Object jni_YGNodeStyleGetFlexBasis(long nativePointer);
   public YogaValue getFlexBasis() {
     return (YogaValue) jni_YGNodeStyleGetFlexBasis(mNativePointer);
   }
 
-  private native void jni_YGNodeStyleSetFlexBasis(long nativePointer, float flexBasis);
+  private static native void jni_YGNodeStyleSetFlexBasis(long nativePointer, float flexBasis);
   public void setFlexBasis(float flexBasis) {
     jni_YGNodeStyleSetFlexBasis(mNativePointer, flexBasis);
   }
 
-  private native void jni_YGNodeStyleSetFlexBasisPercent(long nativePointer, float percent);
+  private static native void jni_YGNodeStyleSetFlexBasisPercent(long nativePointer, float percent);
   public void setFlexBasisPercent(float percent) {
     jni_YGNodeStyleSetFlexBasisPercent(mNativePointer, percent);
   }
 
-  private native void jni_YGNodeStyleSetFlexBasisAuto(long nativePointer);
+  private static native void jni_YGNodeStyleSetFlexBasisAuto(long nativePointer);
   public void setFlexBasisAuto() {
     jni_YGNodeStyleSetFlexBasisAuto(mNativePointer);
   }
 
-  private native Object jni_YGNodeStyleGetMargin(long nativePointer, int edge);
+  private static native Object jni_YGNodeStyleGetMargin(long nativePointer, int edge);
   public YogaValue getMargin(YogaEdge edge) {
     if (!((mEdgeSetFlag & MARGIN) == MARGIN)) {
       return YogaValue.UNDEFINED;
@@ -447,25 +455,25 @@ public YogaValue getMargin(YogaEdge edge) {
     return (YogaValue) jni_YGNodeStyleGetMargin(mNativePointer, edge.intValue());
   }
 
-  private native void jni_YGNodeStyleSetMargin(long nativePointer, int edge, float margin);
+  private static native void jni_YGNodeStyleSetMargin(long nativePointer, int edge, float margin);
   public void setMargin(YogaEdge edge, float margin) {
     mEdgeSetFlag |= MARGIN;
     jni_YGNodeStyleSetMargin(mNativePointer, edge.intValue(), margin);
   }
 
-  private native void jni_YGNodeStyleSetMarginPercent(long nativePointer, int edge, float percent);
+  private static native void jni_YGNodeStyleSetMarginPercent(long nativePointer, int edge, float percent);
   public void setMarginPercent(YogaEdge edge, float percent) {
     mEdgeSetFlag |= MARGIN;
     jni_YGNodeStyleSetMarginPercent(mNativePointer, edge.intValue(), percent);
   }
 
-  private native void jni_YGNodeStyleSetMarginAuto(long nativePointer, int edge);
+  private static native void jni_YGNodeStyleSetMarginAuto(long nativePointer, int edge);
   public void setMarginAuto(YogaEdge edge) {
     mEdgeSetFlag |= MARGIN;
     jni_YGNodeStyleSetMarginAuto(mNativePointer, edge.intValue());
   }
 
-  private native Object jni_YGNodeStyleGetPadding(long nativePointer, int edge);
+  private static native Object jni_YGNodeStyleGetPadding(long nativePointer, int edge);
   public YogaValue getPadding(YogaEdge edge) {
     if (!((mEdgeSetFlag & PADDING) == PADDING)) {
       return YogaValue.UNDEFINED;
@@ -473,19 +481,19 @@ public YogaValue getPadding(YogaEdge edge) {
     return (YogaValue) jni_YGNodeStyleGetPadding(mNativePointer, edge.intValue());
   }
 
-  private native void jni_YGNodeStyleSetPadding(long nativePointer, int edge, float padding);
+  private static native void jni_YGNodeStyleSetPadding(long nativePointer, int edge, float padding);
   public void setPadding(YogaEdge edge, float padding) {
     mEdgeSetFlag |= PADDING;
     jni_YGNodeStyleSetPadding(mNativePointer, edge.intValue(), padding);
   }
 
-  private native void jni_YGNodeStyleSetPaddingPercent(long nativePointer, int edge, float percent);
+  private static native void jni_YGNodeStyleSetPaddingPercent(long nativePointer, int edge, float percent);
   public void setPaddingPercent(YogaEdge edge, float percent) {
     mEdgeSetFlag |= PADDING;
     jni_YGNodeStyleSetPaddingPercent(mNativePointer, edge.intValue(), percent);
   }
 
-  private native float jni_YGNodeStyleGetBorder(long nativePointer, int edge);
+  private static native float jni_YGNodeStyleGetBorder(long nativePointer, int edge);
   public float getBorder(YogaEdge edge) {
     if (!((mEdgeSetFlag & BORDER) == BORDER)) {
       return YogaConstants.UNDEFINED;
@@ -493,13 +501,13 @@ public float getBorder(YogaEdge edge) {
     return jni_YGNodeStyleGetBorder(mNativePointer, edge.intValue());
   }
 
-  private native void jni_YGNodeStyleSetBorder(long nativePointer, int edge, float border);
+  private static native void jni_YGNodeStyleSetBorder(long nativePointer, int edge, float border);
   public void setBorder(YogaEdge edge, float border) {
     mEdgeSetFlag |= BORDER;
     jni_YGNodeStyleSetBorder(mNativePointer, edge.intValue(), border);
   }
 
-  private native Object jni_YGNodeStyleGetPosition(long nativePointer, int edge);
+  private static native Object jni_YGNodeStyleGetPosition(long nativePointer, int edge);
   public YogaValue getPosition(YogaEdge edge) {
     if (!mHasSetPosition) {
       return YogaValue.UNDEFINED;
@@ -507,124 +515,124 @@ public YogaValue getPosition(YogaEdge edge) {
     return (YogaValue) jni_YGNodeStyleGetPosition(mNativePointer, edge.intValue());
   }
 
-  private native void jni_YGNodeStyleSetPosition(long nativePointer, int edge, float position);
+  private static native void jni_YGNodeStyleSetPosition(long nativePointer, int edge, float position);
   public void setPosition(YogaEdge edge, float position) {
     mHasSetPosition = true;
     jni_YGNodeStyleSetPosition(mNativePointer, edge.intValue(), position);
   }
 
-  private native void jni_YGNodeStyleSetPositionPercent(long nativePointer, int edge, float percent);
+  private static native void jni_YGNodeStyleSetPositionPercent(long nativePointer, int edge, float percent);
   public void setPositionPercent(YogaEdge edge, float percent) {
     mHasSetPosition = true;
     jni_YGNodeStyleSetPositionPercent(mNativePointer, edge.intValue(), percent);
   }
 
-  private native Object jni_YGNodeStyleGetWidth(long nativePointer);
+  private static native Object jni_YGNodeStyleGetWidth(long nativePointer);
   public YogaValue getWidth() {
     return (YogaValue) jni_YGNodeStyleGetWidth(mNativePointer);
   }
 
-  private native void jni_YGNodeStyleSetWidth(long nativePointer, float width);
+  private static native void jni_YGNodeStyleSetWidth(long nativePointer, float width);
   public void setWidth(float width) {
     jni_YGNodeStyleSetWidth(mNativePointer, width);
   }
 
-  private native void jni_YGNodeStyleSetWidthPercent(long nativePointer, float percent);
+  private static native void jni_YGNodeStyleSetWidthPercent(long nativePointer, float percent);
   public void setWidthPercent(float percent) {
     jni_YGNodeStyleSetWidthPercent(mNativePointer, percent);
   }
 
-  private native void jni_YGNodeStyleSetWidthAuto(long nativePointer);
+  private static native void jni_YGNodeStyleSetWidthAuto(long nativePointer);
   public void setWidthAuto() {
     jni_YGNodeStyleSetWidthAuto(mNativePointer);
   }
 
-  private native Object jni_YGNodeStyleGetHeight(long nativePointer);
+  private static native Object jni_YGNodeStyleGetHeight(long nativePointer);
   public YogaValue getHeight() {
     return (YogaValue) jni_YGNodeStyleGetHeight(mNativePointer);
   }
 
-  private native void jni_YGNodeStyleSetHeight(long nativePointer, float height);
+  private static native void jni_YGNodeStyleSetHeight(long nativePointer, float height);
   public void setHeight(float height) {
     jni_YGNodeStyleSetHeight(mNativePointer, height);
   }
 
-  private native void jni_YGNodeStyleSetHeightPercent(long nativePointer, float percent);
+  private static native void jni_YGNodeStyleSetHeightPercent(long nativePointer, float percent);
   public void setHeightPercent(float percent) {
     jni_YGNodeStyleSetHeightPercent(mNativePointer, percent);
   }
 
-  private native void jni_YGNodeStyleSetHeightAuto(long nativePointer);
+  private static native void jni_YGNodeStyleSetHeightAuto(long nativePointer);
   public void setHeightAuto() {
     jni_YGNodeStyleSetHeightAuto(mNativePointer);
   }
 
-  private native Object jni_YGNodeStyleGetMinWidth(long nativePointer);
+  private static native Object jni_YGNodeStyleGetMinWidth(long nativePointer);
   public YogaValue getMinWidth() {
     return (YogaValue) jni_YGNodeStyleGetMinWidth(mNativePointer);
   }
 
-  private native void jni_YGNodeStyleSetMinWidth(long nativePointer, float minWidth);
+  private static native void jni_YGNodeStyleSetMinWidth(long nativePointer, float minWidth);
   public void setMinWidth(float minWidth) {
     jni_YGNodeStyleSetMinWidth(mNativePointer, minWidth);
   }
 
-  private native void jni_YGNodeStyleSetMinWidthPercent(long nativePointer, float percent);
+  private static native void jni_YGNodeStyleSetMinWidthPercent(long nativePointer, float percent);
   public void setMinWidthPercent(float percent) {
     jni_YGNodeStyleSetMinWidthPercent(mNativePointer, percent);
   }
 
-  private native Object jni_YGNodeStyleGetMinHeight(long nativePointer);
+  private static native Object jni_YGNodeStyleGetMinHeight(long nativePointer);
   public YogaValue getMinHeight() {
     return (YogaValue) jni_YGNodeStyleGetMinHeight(mNativePointer);
   }
 
-  private native void jni_YGNodeStyleSetMinHeight(long nativePointer, float minHeight);
+  private static native void jni_YGNodeStyleSetMinHeight(long nativePointer, float minHeight);
   public void setMinHeight(float minHeight) {
     jni_YGNodeStyleSetMinHeight(mNativePointer, minHeight);
   }
 
-  private native void jni_YGNodeStyleSetMinHeightPercent(long nativePointer, float percent);
+  private static native void jni_YGNodeStyleSetMinHeightPercent(long nativePointer, float percent);
   public void setMinHeightPercent(float percent) {
     jni_YGNodeStyleSetMinHeightPercent(mNativePointer, percent);
   }
 
-  private native Object jni_YGNodeStyleGetMaxWidth(long nativePointer);
+  private static native Object jni_YGNodeStyleGetMaxWidth(long nativePointer);
   public YogaValue getMaxWidth() {
     return (YogaValue) jni_YGNodeStyleGetMaxWidth(mNativePointer);
   }
 
-  private native void jni_YGNodeStyleSetMaxWidth(long nativePointer, float maxWidth);
+  private static native void jni_YGNodeStyleSetMaxWidth(long nativePointer, float maxWidth);
   public void setMaxWidth(float maxWidth) {
     jni_YGNodeStyleSetMaxWidth(mNativePointer, maxWidth);
   }
 
-  private native void jni_YGNodeStyleSetMaxWidthPercent(long nativePointer, float percent);
+  private static native void jni_YGNodeStyleSetMaxWidthPercent(long nativePointer, float percent);
   public void setMaxWidthPercent(float percent) {
     jni_YGNodeStyleSetMaxWidthPercent(mNativePointer, percent);
   }
 
-  private native Object jni_YGNodeStyleGetMaxHeight(long nativePointer);
+  private static native Object jni_YGNodeStyleGetMaxHeight(long nativePointer);
   public YogaValue getMaxHeight() {
     return (YogaValue) jni_YGNodeStyleGetMaxHeight(mNativePointer);
   }
 
-  private native void jni_YGNodeStyleSetMaxHeight(long nativePointer, float maxheight);
+  private static native void jni_YGNodeStyleSetMaxHeight(long nativePointer, float maxheight);
   public void setMaxHeight(float maxheight) {
     jni_YGNodeStyleSetMaxHeight(mNativePointer, maxheight);
   }
 
-  private native void jni_YGNodeStyleSetMaxHeightPercent(long nativePointer, float percent);
+  private static native void jni_YGNodeStyleSetMaxHeightPercent(long nativePointer, float percent);
   public void setMaxHeightPercent(float percent) {
     jni_YGNodeStyleSetMaxHeightPercent(mNativePointer, percent);
   }
 
-  private native float jni_YGNodeStyleGetAspectRatio(long nativePointer);
+  private static native float jni_YGNodeStyleGetAspectRatio(long nativePointer);
   public float getAspectRatio() {
     return jni_YGNodeStyleGetAspectRatio(mNativePointer);
   }
 
-  private native void jni_YGNodeStyleSetAspectRatio(long nativePointer, float aspectRatio);
+  private static native void jni_YGNodeStyleSetAspectRatio(long nativePointer, float aspectRatio);
   public void setAspectRatio(float aspectRatio) {
     jni_YGNodeStyleSetAspectRatio(mNativePointer, aspectRatio);
   }
@@ -710,7 +718,7 @@ public YogaDirection getLayoutDirection() {
     return YogaDirection.fromInt(mLayoutDirection);
   }
 
-  private native void jni_YGNodeSetHasMeasureFunc(long nativePointer, boolean hasMeasureFunc);
+  private static native void jni_YGNodeSetHasMeasureFunc(long nativePointer, boolean hasMeasureFunc);
   public void setMeasureFunction(YogaMeasureFunction measureFunction) {
     mMeasureFunction = measureFunction;
     jni_YGNodeSetHasMeasureFunc(mNativePointer, measureFunction != null);
@@ -735,7 +743,7 @@ public final long measure(float width, int widthMode, float height, int heightMo
         YogaMeasureMode.fromInt(heightMode));
   }
 
-  private native void jni_YGNodeSetHasBaselineFunc(long nativePointer, boolean hasMeasureFunc);
+  private static native void jni_YGNodeSetHasBaselineFunc(long nativePointer, boolean hasMeasureFunc);
   public void setBaselineFunction(YogaBaselineFunction baselineFunction) {
     mBaselineFunction = baselineFunction;
     jni_YGNodeSetHasBaselineFunc(mNativePointer, baselineFunction != null);
@@ -758,7 +766,7 @@ public Object getData() {
     return mData;
   }
 
-  private native void jni_YGNodePrint(long nativePointer);
+  private static native void jni_YGNodePrint(long nativePointer);
 
   /**
    * Use the set logger (defaults to adb log) to print out the styles, children, and computed
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeCloneFunction.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeCloneFunction.java
index ccf7f5c5c6590a..53a8feef2b84ae 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeCloneFunction.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeCloneFunction.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2017-present, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeProperties.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeProperties.java
deleted file mode 100644
index fbad2ea26e522f..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeProperties.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  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.yoga;
-
-public interface YogaNodeProperties {
-
-  YogaNodeProperties clone(YogaNode node);
-
-  long getNativePointer();
-
-  void onAfterCalculateLayout();
-
-  void reset();
-
-  boolean hasNewLayout();
-
-  boolean isDirty();
-
-  void markLayoutSeen();
-
-  YogaDirection getStyleDirection();
-
-  void setDirection(YogaDirection direction);
-
-  YogaFlexDirection getFlexDirection();
-
-  void setFlexDirection(YogaFlexDirection flexDirection);
-
-  YogaJustify getJustifyContent();
-
-  void setJustifyContent(YogaJustify justifyContent);
-
-  YogaAlign getAlignItems();
-
-  void setAlignItems(YogaAlign alignItems);
-
-  YogaAlign getAlignSelf();
-
-  void setAlignSelf(YogaAlign alignSelf);
-
-  YogaAlign getAlignContent();
-
-  void setAlignContent(YogaAlign alignContent);
-
-  YogaPositionType getPositionType();
-
-  void setPositionType(YogaPositionType positionType);
-
-  void setWrap(YogaWrap flexWrap);
-
-  YogaOverflow getOverflow();
-
-  void setOverflow(YogaOverflow overflow);
-
-  YogaDisplay getDisplay();
-
-  void setDisplay(YogaDisplay display);
-
-  void setFlex(float flex);
-
-  float getFlexGrow();
-
-  void setFlexGrow(float flexGrow);
-
-  float getFlexShrink();
-
-  void setFlexShrink(float flexShrink);
-
-  YogaValue getFlexBasis();
-
-  void setFlexBasis(float flexBasis);
-
-  void setFlexBasisPercent(float percent);
-
-  void setFlexBasisAuto();
-
-  YogaValue getMargin(YogaEdge edge);
-
-  void setMargin(YogaEdge edge, float margin);
-
-  void setMarginPercent(YogaEdge edge, float percent);
-
-  void setMarginAuto(YogaEdge edge);
-
-  YogaValue getPadding(YogaEdge edge);
-
-  void setPadding(YogaEdge edge, float padding);
-
-  void setPaddingPercent(YogaEdge edge, float percent);
-
-  float getBorder(YogaEdge edge);
-
-  void setBorder(YogaEdge edge, float border);
-
-  YogaValue getPosition(YogaEdge edge);
-
-  void setPosition(YogaEdge edge, float position);
-
-  void setPositionPercent(YogaEdge edge, float percent);
-
-  YogaValue getWidth();
-
-  void setWidth(float width);
-
-  void setWidthPercent(float percent);
-
-  void setWidthAuto();
-
-  YogaValue getHeight();
-
-  void setHeight(float height);
-
-  void setHeightPercent(float percent);
-
-  void setHeightAuto();
-
-  YogaValue getMinWidth();
-
-  void setMinWidth(float minWidth);
-
-  void setMinWidthPercent(float percent);
-
-  YogaValue getMinHeight();
-
-  void setMinHeight(float minHeight);
-
-  void setMinHeightPercent(float percent);
-
-  YogaValue getMaxWidth();
-
-  void setMaxWidth(float maxWidth);
-
-  void setMaxWidthPercent(float percent);
-
-  YogaValue getMaxHeight();
-
-  void setMaxHeight(float maxheight);
-
-  void setMaxHeightPercent(float percent);
-
-  float getAspectRatio();
-
-  void setAspectRatio(float aspectRatio);
-
-  float getLayoutX();
-
-  float getLayoutY();
-
-  float getLayoutWidth();
-
-  float getLayoutHeight();
-
-  boolean getDoesLegacyStretchFlagAffectsLayout();
-
-  float getLayoutMargin(YogaEdge edge);
-
-  float getLayoutPadding(YogaEdge edge);
-
-  float getLayoutBorder(YogaEdge edge);
-
-  YogaDirection getLayoutDirection();
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
index 7eb7246c5bac12..c9dd58de491757 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
index 85bc8b20a79ad4..3003451f84e4a4 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
index 17073f47154483..ecdcb950177169 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
index 3b59960dfcc089..226c1a2a68d2e2 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
index e4002dd09ab6fb..76c406769f768e 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java
index c0bb6e224aeb13..1eeb0f03f46f45 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
@@ -33,7 +33,9 @@ public boolean equals(Object other) {
     if (other instanceof YogaValue) {
       final YogaValue otherValue = (YogaValue) other;
       if (unit == otherValue.unit) {
-        return unit == YogaUnit.UNDEFINED || Float.compare(value, otherValue.value) == 0;
+        return unit == YogaUnit.UNDEFINED
+            || unit == YogaUnit.AUTO
+            || Float.compare(value, otherValue.value) == 0;
       }
     }
     return false;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
index 3c10dd3aed6a4f..170019738af4c8 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/Application.mk b/ReactAndroid/src/main/jni/Application.mk
index 4f1b600b595b2e..0e3d85e32dd6c3 100644
--- a/ReactAndroid/src/main/jni/Application.mk
+++ b/ReactAndroid/src/main/jni/Application.mk
@@ -1,15 +1,29 @@
 APP_BUILD_SCRIPT := Android.mk
 
-APP_ABI := armeabi-v7a x86
+APP_ABI := armeabi-v7a x86 arm64-v8a x86_64
 APP_PLATFORM := android-16
 
 APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
-NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(THIRD_PARTY_NDK_DIR)$(HOST_DIRSEP)$(REACT_COMMON_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)first-party
+# What is NDK_MODULE_PATH?
+#   This is comparable to the PATH environment variable in Linux. The purpose
+#   of NDK_MODULE_PATH is to provide a list of directories that contain modules
+#   we want ndk-build to compile.
+#
+# What is HOST_DIRSEP?
+#   In PATH, the directories are separated by a ':'.
+#   In NDK_MODULE_PATH, the directories are separated by $(HOST_DIRSEP).
+#
+# Where are APP_MK_DIR, THIRD_PARTY_NDK_DIR, etc. defined?
+#   The directories inside NDK_MODULE_PATH (ex: APP_MK_DIR, THIRD_PARTY_NDK_DIR,
+#   etc.) are defined inside build.gradle.
+NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(THIRD_PARTY_NDK_DIR)$(HOST_DIRSEP)$(REACT_COMMON_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)first-party$(HOST_DIRSEP)$(REACT_SRC_DIR)
 
 APP_STL := gnustl_shared
 
 # Make sure every shared lib includes a .note.gnu.build-id header
+APP_CFLAGS := -Wall -Werror
+APP_CPPFLAGS := -std=c++1y
 APP_LDFLAGS := -Wl,--build-id
 
-NDK_TOOLCHAIN_VERSION := 4.8
+NDK_TOOLCHAIN_VERSION := 4.9
diff --git a/ReactAndroid/src/main/jni/first-party/fb/Android.mk b/ReactAndroid/src/main/jni/first-party/fb/Android.mk
index 4540eef1d60210..bd0b6cf1cb5e9d 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/Android.mk
+++ b/ReactAndroid/src/main/jni/first-party/fb/Android.mk
@@ -24,7 +24,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 
 LOCAL_CFLAGS := -DLOG_TAG=\"libfb\" -DDISABLE_CPUCAP -DDISABLE_XPLAT -fexceptions -frtti
-LOCAL_CFLAGS += -Wall -Werror
 # include/utils/threads.h has unused parameters
 LOCAL_CFLAGS += -Wno-unused-parameter
 ifeq ($(TOOLCHAIN_PERMISSIVE),true)
@@ -32,11 +31,6 @@ ifeq ($(TOOLCHAIN_PERMISSIVE),true)
 endif
 LOCAL_CFLAGS += -DHAVE_POSIX_CLOCKS
 
-CXX11_FLAGS := -std=gnu++11
-LOCAL_CFLAGS += $(CXX11_FLAGS)
-
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
-
 LOCAL_LDLIBS := -llog -ldl -landroid
 LOCAL_EXPORT_LDLIBS := -llog
 
diff --git a/ReactAndroid/src/main/jni/first-party/fb/BUCK b/ReactAndroid/src/main/jni/first-party/fb/BUCK
index c25f868d73eaf6..b955749c89bcfc 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/fb/BUCK
@@ -1,27 +1,30 @@
-load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "JNI_TARGET", "cxx_library", "subdir_glob")
+load("//tools/build_defs/oss:rn_defs.bzl", "JNI_TARGET", "oss_cxx_library", "subdir_glob")
 
 # This target is only used in open source
-if IS_OSS_BUILD:
-    cxx_library(
-        name = "jni",
-        soname = "libfb.$(ext)",
-        srcs = glob(["*.cpp", "jni/*.cpp", "lyra/*.cpp"]),
-        header_namespace = "",
-        compiler_flags = [
-            "-fno-omit-frame-pointer",
-            "-fexceptions",
-            "-Wall",
-            "-Werror",
-            "-std=c++11",
-            "-DDISABLE_CPUCAP",
-            "-DDISABLE_XPLAT",
-        ],
-        exported_headers = subdir_glob([
-            ("include", "fb/**/*.h"),
-            ("include", "jni/*.h"),
-        ]),
-        deps = [
-            JNI_TARGET,
-        ],
-        visibility = ["PUBLIC"],
-    )
+oss_cxx_library(
+    name = "jni",
+    srcs = glob([
+        "*.cpp",
+        "jni/*.cpp",
+        "lyra/*.cpp",
+    ]),
+    header_namespace = "",
+    exported_headers = subdir_glob([
+        ("include", "fb/**/*.h"),
+        ("include", "jni/*.h"),
+    ]),
+    compiler_flags = [
+        "-fno-omit-frame-pointer",
+        "-fexceptions",
+        "-Wall",
+        "-Werror",
+        "-std=c++11",
+        "-DDISABLE_CPUCAP",
+        "-DDISABLE_XPLAT",
+    ],
+    soname = "libfb.$(ext)",
+    visibility = ["PUBLIC"],
+    deps = [
+        JNI_TARGET,
+    ],
+)
diff --git a/ReactAndroid/src/main/jni/first-party/fb/assert.cpp b/ReactAndroid/src/main/jni/first-party/fb/assert.cpp
index d39c29e45cc176..dd64bebc717f41 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/assert.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/assert.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h
index 5f231cb7c8f20f..164288b42fa653 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Build.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Build.h
index 394f9d6e134635..b218a285ad9b6c 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Build.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Build.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h
index 1fafba36ae85e9..01afe983edf6a2 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h
index 319e96ecb08628..ef798b5d7c6b5f 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h
index 92b45406f3c471..cc23ee71b0456b 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
index ee19960fa3547d..e39bd0264808fd 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
index c5ecc2fedce515..566e02cd48ba9b 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h
index 1b868c44fe61dc..675950fcb3df7e 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h
index ea0c3f65edb258..a6b747f7f08400 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h
index e67aa1641313bb..49e4f502a4a3f7 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h
index 595bfacfe6d108..58f4c9346bc018 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h
index 2f160839f5b44b..3218de8b6ddf31 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h
index a7775db6d2efb7..0a6e85217d7970 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h
index 726a25333f0ced..4505842c6c26b6 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h
index 147f885684af3d..a3d19d6ea96395 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h
index abfe45ce0d0514..169c621f2cee53 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -235,11 +235,18 @@ class FBEXPORT JClass : public JavaClass<JClass, JObject, jclass> {
   ///     makeNativeMethod("nativeMethodWithExplicitDescriptor",
   ///                      "(Lcom/facebook/example/MyClass;)V",
   ///                      methodWithExplicitDescriptor),
+  ///     makeCriticalNativeMethod("criticalNativeMethodWithAutomaticDescriptor",
+  ///                              criticalNativeMethodWithAutomaticDescriptor),
+  ///     makeCriticalNativeMethod("criticalNativeMethodWithExplicitDescriptor",
+  ///                              "(IIF)Z",
+  ///                              criticalNativeMethodWithExplicitDescriptor),
   ///  });
   ///
   /// By default, C++ exceptions raised will be converted to Java exceptions.
   /// To avoid this and get the "standard" JNI behavior of a crash when a C++
   /// exception is crashing out of the JNI method, declare the method noexcept.
+  /// This does NOT apply to critical native methods, where exceptions causes
+  /// a crash.
   void registerNatives(std::initializer_list<NativeMethod> methods);
 
   /// Check to see if the class is assignable from another class
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h
index 689b9be3463ac0..213ec5c7125775 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h
index 74c752a0785ec7..9b52183a9e2186 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h
index 7ca5016a80dc67..fba774b675c3d3 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h
index c056e16af15695..8e7083c8f92ce9 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h
index 0da2c36237d0bb..1fae26fb21efec 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h
index 1bb61199fbf0a9..6bcf9641207214 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JWeakReference.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JWeakReference.h
index 941bc3b0d428ca..f235980ace8714 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JWeakReference.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JWeakReference.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h
index 60dfee44d34ff2..833acc04b022c8 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h
index ad44470a86fb06..e3c33921ce4e65 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -53,6 +53,7 @@ struct ArgsArraySetter<idx, Arg, Args...> {
 template <int idx>
 struct ArgsArraySetter<idx> {
   static void set(alias_ref<JArrayClass<jobject>::javaobject> array) {
+    (void)array;
   }
 };
 
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h
index e9717bf7fd8bb3..ec5eb6ef17f288 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/MetaConvert.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/MetaConvert.h
index 7750304bd65685..763b8e78f59fdf 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/MetaConvert.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/MetaConvert.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h
index 0502e36b5a1139..015c42e5ab3cc5 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReadableByteChannel.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReadableByteChannel.h
index f895a3e6ff6573..69b8f2aae31488 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReadableByteChannel.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReadableByteChannel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h
index b78f66040230dd..f3303078b0407c 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h
index a971263ad0d9c2..7ccdc5dbd687e9 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h
index 58ce511d50e56e..78b4f3273b97d0 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h
index fc6c689ea40b77..53d4f4488d2b49 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h
index 39cc71a2498c6d..109b8cd46606f3 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h
index ce0636e014747b..e08533c52c5336 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -142,6 +142,25 @@ inline std::string makeDescriptor(R (C::*)(Args... args)) {
   return jmethod_traits_from_cxx<R(Args...)>::descriptor();
 }
 
+template<typename R, typename ...Args>
+template<R(*func)(Args...)>
+JNI_ENTRY_POINT R CriticalMethod<R(*)(Args...)>::call(alias_ref<jclass>, Args... args) {
+  static_assert(
+    IsJniPrimitive<R>() || std::is_void<R>(),
+    "Critical Native Methods may only return primitive JNI types, or void.");
+  static_assert(
+    AreJniPrimitives<Args...>(),
+    "Critical Native Methods may only use primitive JNI types as parameters");
+
+  return func(std::forward<Args>(args)...);
+}
+
+template<typename R, typename ...Args>
+template<R(*func)(Args...)>
+inline std::string CriticalMethod<R(*)(Args...)>::desc() {
+  return makeDescriptor(call<func>);
+}
+
 }
 
 }}
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h
index cae1ab48b82376..344f336f8c908c 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -44,6 +44,18 @@ std::string makeDescriptor(R (*func)(alias_ref<C>, Args... args));
 template<typename R, typename C, typename... Args>
 std::string makeDescriptor(R (C::*method0)(Args... args));
 
+template<typename F>
+struct CriticalMethod;
+
+template<typename R, typename ...Args>
+struct CriticalMethod<R(*)(Args...)> {
+  template<R(*func)(Args...)>
+  static R call(alias_ref<jclass>, Args... args);
+
+  template<R(*func)(Args...)>
+  inline static std::string desc();
+};
+
 }
 
 // We have to use macros here, because the func needs to be used
@@ -66,6 +78,35 @@ std::string makeDescriptor(R (C::*method0)(Args... args));
 #define makeNativeMethodN(a, b, c, count, ...) makeNativeMethod ## count
 #define makeNativeMethod(...) makeNativeMethodN(__VA_ARGS__, 3, 2)(__VA_ARGS__)
 
+
+// FAST CALLS / CRITICAL CALLS
+// Android up to and including v7 supports "fast calls" by prefixing the method
+// signature with an exclamation mark.
+// Android v8+ supports fast calls by annotating methods:
+// https://source.android.com/devices/tech/dalvik/improvements#faster-native-methods
+
+// prefixes a JNI method signature as android "fast call".
+#if defined(__ANDROID__) && defined(FBJNI_WITH_FAST_CALLS)
+#define FBJNI_PREFIX_FAST_CALL(desc) (std::string{"!"} + desc)
+#else
+#define FBJNI_PREFIX_FAST_CALL(desc) (desc)
+#endif
+
+#define makeCriticalNativeMethod3(name, desc, func) \
+  makeNativeMethod3(                                \
+    name,                                           \
+    FBJNI_PREFIX_FAST_CALL(desc),                   \
+    ::facebook::jni::detail::CriticalMethod<decltype(&func)>::call<&func>)
+
+#define makeCriticalNativeMethod2(name, func)                                \
+  makeCriticalNativeMethod3(                                                 \
+    name,                                                                    \
+    ::facebook::jni::detail::CriticalMethod<decltype(&func)>::desc<&func>(), \
+    func)
+
+#define makeCriticalNativeMethodN(a, b, c, count, ...) makeCriticalNativeMethod ## count
+#define makeCriticalNativeMethod(...) makeCriticalNativeMethodN(__VA_ARGS__, 3, 2)(__VA_ARGS__)
+
 }}
 
 #include "Registration-inl.h"
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h
index 36c8bec15dae27..e8dff3be74d6d8 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -69,6 +69,25 @@ constexpr bool IsJniPrimitive() {
   return is_jni_primitive<T>::value;
 }
 
+/// Metafunction to determine whether a series of types are all primitive JNI types.
+template<typename ...Ts>
+struct are_jni_primitives;
+
+template<typename T, typename ...Ts>
+struct are_jni_primitives<T, Ts...> :
+  std::integral_constant<bool,
+    is_jni_primitive<T>::value && are_jni_primitives<Ts...>::value> {};
+
+template<>
+struct are_jni_primitives<> : std::integral_constant<bool, true> {};
+
+/// Helper to simplify use of are_jni_primitives
+template<typename ...Ts>
+constexpr bool AreJniPrimitives() {
+  return are_jni_primitives<Ts...>::value;
+}
+
+
 /// Metafunction to determine whether a type is a JNI array of primitives or not
 template <typename T>
 struct is_jni_primitive_array :
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/lyra.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/lyra.h
index 38bca5ef7f8eec..9b4f705cf4ba8f 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/lyra.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/lyra.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h
index 5dbc03126ad1c9..283f0fac991b25 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h
index 41152f5d171ede..819f7193accd59 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h
index 6c14b50c159b7f..098d5ddcaba188 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h
index ae59441babdb1a..8a8d32062b3240 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h
index 20c275e2de2ca6..15624bb5e19da1 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h
index 509405b31a8b22..c20cb28cb023a5 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h
index 531f26ef8efc73..03aad078a41489 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h
index 9d07ef6441cff8..be3a5df086712c 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h
index 8b91cba35e2061..1b19418e525482 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h
index 898f91e9eb804c..7b1df7c8bfa2e6 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h
index 93912f4a0a59a0..cabf657272da17 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp
index 8060930275c5d8..6ef586a0e18cbd 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp
index ee958bf57157ee..1d4bfc558c7bd1 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp
index eae5c73ebc8be8..81975215d244cf 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp
index 783f468c4de3f9..326e114b20de7f 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp
index dfcf858fd16da5..5fc9a1bc6614f3 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp
index 7679d09404b825..11477d0eeff2e8 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp
index 228621cbd90f43..ebd8c879fcde54 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/ReadableByteChannel.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/ReadableByteChannel.cpp
index 9c67df3fa923a3..ac25174d4ab2d7 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/ReadableByteChannel.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/ReadableByteChannel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp
index 37160cdd1bb1e4..d41010f81e298f 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp
index dfaa02f6c76fd2..bdf3f24d2adf30 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/android/CpuCapabilities.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/android/CpuCapabilities.cpp
index 18974660f699e2..b0361e97b9bbf5 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/android/CpuCapabilities.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/android/CpuCapabilities.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp
index 7d3fc5716d12bd..0af62c90ba8659 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp
index b455ad845199a3..b62f64cf65ba22 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/java/BUCK b/ReactAndroid/src/main/jni/first-party/fb/jni/java/BUCK
index 8b2cb7b5941abe..addc23b95f5a9b 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/java/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/java/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_java_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_java_library")
 
 rn_java_library(
     name = "java",
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java
index 6308d5dc269310..16766cc0648939 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java
index 942a617148a629..865246e584345e 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java b/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java
index 902159d9fcdf99..de34f2814b3d33 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp
index b6ad635450cdf1..86dbbc57e1572c 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/log.cpp b/ReactAndroid/src/main/jni/first-party/fb/log.cpp
index b6baa2dad22b67..7d2a70df03d3fa 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/log.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/log.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/lyra/lyra.cpp b/ReactAndroid/src/main/jni/first-party/fb/lyra/lyra.cpp
index 4e1f2e9240aa4a..4058b6f4a70538 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/lyra/lyra.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/lyra/lyra.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fb/onload.cpp b/ReactAndroid/src/main/jni/first-party/fb/onload.cpp
index 0594526d38167a..158d88328c0065 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/onload.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/onload.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk b/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk
index 6d08079a7ebc7b..17e352bccb82b4 100644
--- a/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk
+++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk
@@ -8,12 +8,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_CFLAGS := -fexceptions -fno-omit-frame-pointer
-LOCAL_CFLAGS += -Wall -Werror
-
-CXX11_FLAGS := -std=gnu++11
-LOCAL_CFLAGS += $(CXX11_FLAGS)
-
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
 
 LOCAL_LDLIBS := -llog
 
diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
index b38194f8d0963b..fdbcf95fdbf457 100644
--- a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "GLOG_DEP", "cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "GLOG_DEP", "cxx_library")
 
 cxx_library(
     name = "fbgloginit",
diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h b/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h
index 18d591ee49aecf..354a62f47cf46b 100644
--- a/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h
+++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp b/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp
index 614cc881d7a970..176b9cb098d15b 100644
--- a/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK b/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
index 79f4fce30259ce..a0144cc50f7efa 100644
--- a/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
@@ -1,6 +1,6 @@
-load("//ReactNative:DEFS.bzl", "cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "cxx_library")
 
-# Copyright (c) 2014-present, Facebook, Inc.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h b/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h
index 166908733ef313..34d46448fbbc71 100644
--- a/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h
+++ b/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk b/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk
index 908cd43e6a3771..22fe6854de8657 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk
@@ -9,10 +9,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/jni
 
-LOCAL_CFLAGS += -Wall -Werror -fvisibility=hidden -fexceptions -frtti -O3
-CXX11_FLAGS := -std=c++11
-LOCAL_CFLAGS += $(CXX11_FLAGS)
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
+LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti -O3
 
 LOCAL_LDLIBS += -landroid -llog
 LOCAL_STATIC_LIBRARIES := libyogacore
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/BUCK b/ReactAndroid/src/main/jni/first-party/yogajni/BUCK
index 2bf3af1fb2f156..fa379d22d67fa6 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/BUCK
@@ -1,23 +1,22 @@
-load("//ReactNative:DEFS.bzl", "FBJNI_TARGET", "IS_OSS_BUILD", "cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "FBJNI_TARGET", "oss_cxx_library")
 
 # This target is only used in open source
-if IS_OSS_BUILD:
-    cxx_library(
-        name = "jni",
-        soname = "libyoga.$(ext)",
-        srcs = glob(["jni/*.cpp"]),
-        header_namespace = "",
-        compiler_flags = [
-            "-fno-omit-frame-pointer",
-            "-fexceptions",
-            "-Wall",
-            "-Werror",
-            "-O3",
-            "-std=c++11",
-        ],
-        deps = [
-            "//ReactCommon/yoga:yoga",
-            FBJNI_TARGET,
-        ],
-        visibility = ["PUBLIC"],
-    )
+oss_cxx_library(
+    name = "jni",
+    srcs = glob(["jni/*.cpp"]),
+    header_namespace = "",
+    compiler_flags = [
+        "-fno-omit-frame-pointer",
+        "-fexceptions",
+        "-Wall",
+        "-Werror",
+        "-O3",
+        "-std=c++11",
+    ],
+    soname = "libyoga.$(ext)",
+    visibility = ["PUBLIC"],
+    deps = [
+        "//ReactCommon/yoga:yoga",
+        FBJNI_TARGET,
+    ],
+)
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
index 0b5520558a188c..d785465690fc0c 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
@@ -303,10 +303,7 @@ jlong jni_YGNodeNewWithConfig(alias_ref<jobject> thiz, jlong configPointer) {
   return reinterpret_cast<jlong>(node);
 }
 
-void jni_YGNodeSetOwner(
-    alias_ref<jobject> thiz,
-    jlong nativePointer,
-    jlong newOwnerNativePointer) {
+void jni_YGNodeSetOwner(jlong nativePointer, jlong newOwnerNativePointer) {
   const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
   const YGNodeRef newOwnerNode = _jlong2YGNodeRef(newOwnerNativePointer);
 
@@ -323,18 +320,21 @@ jlong jni_YGNodeClone(
   return reinterpret_cast<jlong>(clonedYogaNode);
 }
 
-void jni_YGNodeFree(alias_ref<jobject> thiz, jlong nativePointer) {
+void jni_YGNodeFree(jlong nativePointer) {
+  if (nativePointer == 0) {
+    return;
+  }
   const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
   delete YGNodeJobject(node);
   YGNodeFree(node);
 }
 
-void jni_YGNodeClearChildren(alias_ref<jobject> thiz, jlong nativePointer) {
+void jni_YGNodeClearChildren(jlong nativePointer) {
   const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
   node->clearChildren();
 }
 
-void jni_YGNodeReset(alias_ref<jobject> thiz, jlong nativePointer) {
+void jni_YGNodeReset(jlong nativePointer) {
   const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
   void* context = node->getContext();
   YGNodeReset(node);
@@ -342,7 +342,7 @@ void jni_YGNodeReset(alias_ref<jobject> thiz, jlong nativePointer) {
   node->setPrintFunc(YGPrint);
 }
 
-void jni_YGNodePrint(alias_ref<jobject> thiz, jlong nativePointer) {
+void jni_YGNodePrint(jlong nativePointer) {
   const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
   YGNodePrint(
       node,
@@ -351,7 +351,6 @@ void jni_YGNodePrint(alias_ref<jobject> thiz, jlong nativePointer) {
 }
 
 void jni_YGNodeInsertChild(
-    alias_ref<jobject>,
     jlong nativePointer,
     jlong childPointer,
     jint index) {
@@ -360,7 +359,6 @@ void jni_YGNodeInsertChild(
 }
 
 void jni_YGNodeInsertSharedChild(
-    alias_ref<jobject>,
     jlong nativePointer,
     jlong childPointer,
     jint index) {
@@ -368,16 +366,13 @@ void jni_YGNodeInsertSharedChild(
       _jlong2YGNodeRef(nativePointer), _jlong2YGNodeRef(childPointer), index);
 }
 
-void jni_YGNodeRemoveChild(
-    alias_ref<jobject>,
-    jlong nativePointer,
-    jlong childPointer) {
+void jni_YGNodeRemoveChild(jlong nativePointer, jlong childPointer) {
   YGNodeRemoveChild(
       _jlong2YGNodeRef(nativePointer), _jlong2YGNodeRef(childPointer));
 }
 
 void jni_YGNodeCalculateLayout(
-    alias_ref<jobject>,
+    alias_ref<jclass>,
     jlong nativePointer,
     jfloat width,
     jfloat height) {
@@ -390,40 +385,31 @@ void jni_YGNodeCalculateLayout(
   YGTransferLayoutOutputsRecursive(root);
 }
 
-void jni_YGNodeMarkDirty(alias_ref<jobject>, jlong nativePointer) {
+void jni_YGNodeMarkDirty(jlong nativePointer) {
   YGNodeMarkDirty(_jlong2YGNodeRef(nativePointer));
 }
 
-void jni_YGNodeMarkDirtyAndPropogateToDescendants(
-    alias_ref<jobject>,
-    jlong nativePointer) {
+void jni_YGNodeMarkDirtyAndPropogateToDescendants(jlong nativePointer) {
   YGNodeMarkDirtyAndPropogateToDescendants(_jlong2YGNodeRef(nativePointer));
 }
 
-jboolean jni_YGNodeIsDirty(alias_ref<jobject>, jlong nativePointer) {
+jboolean jni_YGNodeIsDirty(jlong nativePointer) {
   return (jboolean)_jlong2YGNodeRef(nativePointer)->isDirty();
 }
 
-void jni_YGNodeSetHasMeasureFunc(
-    alias_ref<jobject>,
-    jlong nativePointer,
-    jboolean hasMeasureFunc) {
+void jni_YGNodeSetHasMeasureFunc(jlong nativePointer, jboolean hasMeasureFunc) {
   _jlong2YGNodeRef(nativePointer)
       ->setMeasureFunc(hasMeasureFunc ? YGJNIMeasureFunc : nullptr);
 }
 
 void jni_YGNodeSetHasBaselineFunc(
-    alias_ref<jobject>,
     jlong nativePointer,
     jboolean hasBaselineFunc) {
   _jlong2YGNodeRef(nativePointer)
       ->setBaseLineFunc(hasBaselineFunc ? YGJNIBaselineFunc : nullptr);
 }
 
-void jni_YGNodeCopyStyle(
-    alias_ref<jobject>,
-    jlong dstNativePointer,
-    jlong srcNativePointer) {
+void jni_YGNodeCopyStyle(jlong dstNativePointer, jlong srcNativePointer) {
   YGNodeCopyStyle(
       _jlong2YGNodeRef(dstNativePointer), _jlong2YGNodeRef(srcNativePointer));
 }
@@ -436,87 +422,81 @@ struct JYogaValue : public JavaClass<JYogaValue> {
   }
 };
 
-#define YG_NODE_JNI_STYLE_PROP(javatype, type, name)                           \
-  javatype jni_YGNodeStyleGet##name(alias_ref<jobject>, jlong nativePointer) { \
-    return (javatype)YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer));    \
-  }                                                                            \
-                                                                               \
-  void jni_YGNodeStyleSet##name(                                               \
-      alias_ref<jobject>, jlong nativePointer, javatype value) {               \
-    YGNodeStyleSet##name(                                                      \
-        _jlong2YGNodeRef(nativePointer), static_cast<type>(value));            \
+#define YG_NODE_JNI_STYLE_PROP(javatype, type, name)                        \
+  javatype jni_YGNodeStyleGet##name(jlong nativePointer) {                  \
+    return (javatype)YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer)); \
+  }                                                                         \
+                                                                            \
+  void jni_YGNodeStyleSet##name(jlong nativePointer, javatype value) {      \
+    YGNodeStyleSet##name(                                                   \
+        _jlong2YGNodeRef(nativePointer), static_cast<type>(value));         \
   }
 
-#define YG_NODE_JNI_STYLE_UNIT_PROP(name)                            \
-  local_ref<jobject> jni_YGNodeStyleGet##name(                       \
-      alias_ref<jobject>, jlong nativePointer) {                     \
-    return JYogaValue::create(                                       \
-        YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer)));      \
-  }                                                                  \
-                                                                     \
-  void jni_YGNodeStyleSet##name(                                     \
-      alias_ref<jobject>, jlong nativePointer, jfloat value) {       \
-    YGNodeStyleSet##name(                                            \
-        _jlong2YGNodeRef(nativePointer), static_cast<float>(value)); \
-  }                                                                  \
-                                                                     \
-  void jni_YGNodeStyleSet##name##Percent(                            \
-      alias_ref<jobject>, jlong nativePointer, jfloat value) {       \
-    YGNodeStyleSet##name##Percent(                                   \
-        _jlong2YGNodeRef(nativePointer), static_cast<float>(value)); \
+#define YG_NODE_JNI_STYLE_UNIT_PROP(name)                                     \
+  local_ref<jobject> jni_YGNodeStyleGet##name(                                \
+      alias_ref<jobject>, jlong nativePointer) {                              \
+    return JYogaValue::create(                                                \
+        YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer)));               \
+  }                                                                           \
+                                                                              \
+  void jni_YGNodeStyleSet##name(jlong nativePointer, jfloat value) {          \
+    YGNodeStyleSet##name(                                                     \
+        _jlong2YGNodeRef(nativePointer), static_cast<float>(value));          \
+  }                                                                           \
+                                                                              \
+  void jni_YGNodeStyleSet##name##Percent(jlong nativePointer, jfloat value) { \
+    YGNodeStyleSet##name##Percent(                                            \
+        _jlong2YGNodeRef(nativePointer), static_cast<float>(value));          \
   }
 
 #define YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(name)                   \
   YG_NODE_JNI_STYLE_UNIT_PROP(name)                              \
-  void jni_YGNodeStyleSet##name##Auto(                           \
-      alias_ref<jobject>, jlong nativePointer) {                 \
+  void jni_YGNodeStyleSet##name##Auto(jlong nativePointer) {     \
     YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer)); \
   }
 
-#define YG_NODE_JNI_STYLE_EDGE_PROP(javatype, type, name)                   \
-  javatype jni_YGNodeStyleGet##name(                                        \
-      alias_ref<jobject>, jlong nativePointer, jint edge) {                 \
-    return (javatype)YGNodeStyleGet##name(                                  \
-        _jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge));        \
-  }                                                                         \
-                                                                            \
-  void jni_YGNodeStyleSet##name(                                            \
-      alias_ref<jobject>, jlong nativePointer, jint edge, javatype value) { \
-    YGNodeStyleSet##name(                                                   \
-        _jlong2YGNodeRef(nativePointer),                                    \
-        static_cast<YGEdge>(edge),                                          \
-        static_cast<type>(value));                                          \
+#define YG_NODE_JNI_STYLE_EDGE_PROP(javatype, type, name)             \
+  javatype jni_YGNodeStyleGet##name(jlong nativePointer, jint edge) { \
+    return (javatype)YGNodeStyleGet##name(                            \
+        _jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge));  \
+  }                                                                   \
+                                                                      \
+  void jni_YGNodeStyleSet##name(                                      \
+      jlong nativePointer, jint edge, javatype value) {               \
+    YGNodeStyleSet##name(                                             \
+        _jlong2YGNodeRef(nativePointer),                              \
+        static_cast<YGEdge>(edge),                                    \
+        static_cast<type>(value));                                    \
   }
 
-#define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name)                            \
-  local_ref<jobject> jni_YGNodeStyleGet##name(                            \
-      alias_ref<jobject>, jlong nativePointer, jint edge) {               \
-    return JYogaValue::create(YGNodeStyleGet##name(                       \
-        _jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge)));     \
-  }                                                                       \
-                                                                          \
-  void jni_YGNodeStyleSet##name(                                          \
-      alias_ref<jobject>, jlong nativePointer, jint edge, jfloat value) { \
-    YGNodeStyleSet##name(                                                 \
-        _jlong2YGNodeRef(nativePointer),                                  \
-        static_cast<YGEdge>(edge),                                        \
-        static_cast<float>(value));                                       \
-  }                                                                       \
-                                                                          \
-  void jni_YGNodeStyleSet##name##Percent(                                 \
-      alias_ref<jobject>, jlong nativePointer, jint edge, jfloat value) { \
-    YGNodeStyleSet##name##Percent(                                        \
-        _jlong2YGNodeRef(nativePointer),                                  \
-        static_cast<YGEdge>(edge),                                        \
-        static_cast<float>(value));                                       \
+#define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name)                        \
+  local_ref<jobject> jni_YGNodeStyleGet##name(                        \
+      alias_ref<jobject>, jlong nativePointer, jint edge) {           \
+    return JYogaValue::create(YGNodeStyleGet##name(                   \
+        _jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge))); \
+  }                                                                   \
+                                                                      \
+  void jni_YGNodeStyleSet##name(                                      \
+      jlong nativePointer, jint edge, jfloat value) {                 \
+    YGNodeStyleSet##name(                                             \
+        _jlong2YGNodeRef(nativePointer),                              \
+        static_cast<YGEdge>(edge),                                    \
+        static_cast<float>(value));                                   \
+  }                                                                   \
+                                                                      \
+  void jni_YGNodeStyleSet##name##Percent(                             \
+      jlong nativePointer, jint edge, jfloat value) {                 \
+    YGNodeStyleSet##name##Percent(                                    \
+        _jlong2YGNodeRef(nativePointer),                              \
+        static_cast<YGEdge>(edge),                                    \
+        static_cast<float>(value));                                   \
   }
 
-#define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(name)                  \
-  YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name)                             \
-  void jni_YGNodeStyleSet##name##Auto(                               \
-      alias_ref<jobject>, jlong nativePointer, jint edge) {          \
-    YGNodeStyleSet##name##Auto(                                      \
-        _jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge)); \
+#define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(name)                     \
+  YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name)                                \
+  void jni_YGNodeStyleSet##name##Auto(jlong nativePointer, jint edge) { \
+    YGNodeStyleSet##name##Auto(                                         \
+        _jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge));    \
   }
 
 YG_NODE_JNI_STYLE_PROP(jint, YGDirection, Direction);
@@ -530,10 +510,7 @@ YG_NODE_JNI_STYLE_PROP(jint, YGWrap, FlexWrap);
 YG_NODE_JNI_STYLE_PROP(jint, YGOverflow, Overflow);
 YG_NODE_JNI_STYLE_PROP(jint, YGDisplay, Display);
 
-void jni_YGNodeStyleSetFlex(
-    alias_ref<jobject>,
-    jlong nativePointer,
-    jfloat value) {
+void jni_YGNodeStyleSetFlex(jlong nativePointer, jfloat value) {
   YGNodeStyleSetFlex(
       _jlong2YGNodeRef(nativePointer), static_cast<float>(value));
 }
@@ -595,6 +572,14 @@ void jni_YGConfigSetUseWebDefaults(
   YGConfigSetUseWebDefaults(config, useWebDefaults);
 }
 
+void jni_YGConfigSetPrintTreeFlag(
+    alias_ref<jobject>,
+    jlong nativePointer,
+    jboolean enable) {
+  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
+  YGConfigSetPrintTreeFlag(config, enable);
+}
+
 void jni_YGConfigSetPointScaleFactor(
     alias_ref<jobject>,
     jlong nativePointer,
@@ -657,112 +642,135 @@ void jni_YGConfigSetLogger(
   }
 }
 
-jint jni_YGNodeGetInstanceCount(alias_ref<jclass> clazz) {
+jint jni_YGNodeGetInstanceCount() {
   return YGNodeGetInstanceCount();
 }
 
 #define YGMakeNativeMethod(name) makeNativeMethod(#name, name)
+#define YGRealMakeCriticalNativeMethod(name) \
+  makeCriticalNativeMethod(#name, name)
+#define YGWrapCriticalNativeMethodForRegularCall(name) \
+  makeNativeMethod(                                    \
+      #name,                                           \
+      ::facebook::jni::detail::CriticalMethod<decltype(&name)>::call<&name>)
+
+#define YGRegisterNatives(YGMakeCriticalNativeMethod)                        \
+  registerNatives(                                                           \
+      "com/facebook/yoga/YogaNode",                                          \
+      {                                                                      \
+          YGMakeNativeMethod(jni_YGNodeNew),                                 \
+          YGMakeNativeMethod(jni_YGNodeNewWithConfig),                       \
+          YGMakeCriticalNativeMethod(jni_YGNodeFree),                        \
+          YGMakeCriticalNativeMethod(jni_YGNodeReset),                       \
+          YGMakeCriticalNativeMethod(jni_YGNodeClearChildren),               \
+          YGMakeCriticalNativeMethod(jni_YGNodeInsertChild),                 \
+          YGMakeCriticalNativeMethod(jni_YGNodeInsertSharedChild),           \
+          YGMakeCriticalNativeMethod(jni_YGNodeRemoveChild),                 \
+          YGMakeNativeMethod(jni_YGNodeCalculateLayout),                     \
+          YGMakeCriticalNativeMethod(jni_YGNodeMarkDirty),                   \
+          YGMakeCriticalNativeMethod(                                        \
+              jni_YGNodeMarkDirtyAndPropogateToDescendants),                 \
+          YGMakeCriticalNativeMethod(jni_YGNodeIsDirty),                     \
+          YGMakeCriticalNativeMethod(jni_YGNodeSetHasMeasureFunc),           \
+          YGMakeCriticalNativeMethod(jni_YGNodeSetHasBaselineFunc),          \
+          YGMakeCriticalNativeMethod(jni_YGNodeCopyStyle),                   \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetDirection),           \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetDirection),           \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexDirection),       \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexDirection),       \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetJustifyContent),      \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetJustifyContent),      \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetAlignItems),          \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetAlignItems),          \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetAlignSelf),           \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetAlignSelf),           \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetAlignContent),        \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetAlignContent),        \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetPositionType),        \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPositionType),        \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexWrap),            \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetOverflow),            \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetOverflow),            \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetDisplay),             \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetDisplay),             \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlex),                \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexGrow),            \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexGrow),            \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexShrink),          \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexShrink),          \
+          YGMakeNativeMethod(jni_YGNodeStyleGetFlexBasis),                   \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexBasis),           \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexBasisPercent),    \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexBasisAuto),       \
+          YGMakeNativeMethod(jni_YGNodeStyleGetMargin),                      \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMargin),              \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMarginPercent),       \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMarginAuto),          \
+          YGMakeNativeMethod(jni_YGNodeStyleGetPadding),                     \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPadding),             \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPaddingPercent),      \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetBorder),              \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetBorder),              \
+          YGMakeNativeMethod(jni_YGNodeStyleGetPosition),                    \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPosition),            \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPositionPercent),     \
+          YGMakeNativeMethod(jni_YGNodeStyleGetWidth),                       \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetWidth),               \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetWidthPercent),        \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetWidthAuto),           \
+          YGMakeNativeMethod(jni_YGNodeStyleGetHeight),                      \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetHeight),              \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetHeightPercent),       \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetHeightAuto),          \
+          YGMakeNativeMethod(jni_YGNodeStyleGetMinWidth),                    \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinWidth),            \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinWidthPercent),     \
+          YGMakeNativeMethod(jni_YGNodeStyleGetMinHeight),                   \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinHeight),           \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinHeightPercent),    \
+          YGMakeNativeMethod(jni_YGNodeStyleGetMaxWidth),                    \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxWidth),            \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxWidthPercent),     \
+          YGMakeNativeMethod(jni_YGNodeStyleGetMaxHeight),                   \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxHeight),           \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxHeightPercent),    \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleGetAspectRatio),         \
+          YGMakeCriticalNativeMethod(jni_YGNodeStyleSetAspectRatio),         \
+          YGMakeCriticalNativeMethod(jni_YGNodeGetInstanceCount),            \
+          YGMakeCriticalNativeMethod(jni_YGNodePrint),                       \
+          YGMakeNativeMethod(jni_YGNodeClone),                               \
+          YGMakeCriticalNativeMethod(jni_YGNodeSetOwner),                    \
+      });                                                                    \
+  registerNatives(                                                           \
+      "com/facebook/yoga/YogaConfig",                                        \
+      {                                                                      \
+          YGMakeNativeMethod(jni_YGConfigNew),                               \
+          YGMakeNativeMethod(jni_YGConfigFree),                              \
+          YGMakeNativeMethod(jni_YGConfigSetExperimentalFeatureEnabled),     \
+          YGMakeNativeMethod(jni_YGConfigSetUseWebDefaults),                 \
+          YGMakeNativeMethod(jni_YGConfigSetPrintTreeFlag),                  \
+          YGMakeNativeMethod(jni_YGConfigSetPointScaleFactor),               \
+          YGMakeNativeMethod(jni_YGConfigSetUseLegacyStretchBehaviour),      \
+          YGMakeNativeMethod(jni_YGConfigSetLogger),                         \
+          YGMakeNativeMethod(jni_YGConfigSetHasCloneNodeFunc),               \
+          YGMakeNativeMethod(                                                \
+              jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour), \
+      });
+
+void jni_bindNativeMethods(alias_ref<jclass>, jboolean useFastCall) {
+  if (useFastCall) {
+    YGRegisterNatives(YGRealMakeCriticalNativeMethod);
+  } else {
+    YGRegisterNatives(YGWrapCriticalNativeMethodForRegularCall);
+  }
+}
 
 jint JNI_OnLoad(JavaVM* vm, void*) {
   return initialize(vm, [] {
     registerNatives(
-        "com/facebook/yoga/YogaNode",
-        {
-            YGMakeNativeMethod(jni_YGNodeNew),
-            YGMakeNativeMethod(jni_YGNodeNewWithConfig),
-            YGMakeNativeMethod(jni_YGNodeFree),
-            YGMakeNativeMethod(jni_YGNodeReset),
-            YGMakeNativeMethod(jni_YGNodeClearChildren),
-            YGMakeNativeMethod(jni_YGNodeInsertChild),
-            YGMakeNativeMethod(jni_YGNodeInsertSharedChild),
-            YGMakeNativeMethod(jni_YGNodeRemoveChild),
-            YGMakeNativeMethod(jni_YGNodeCalculateLayout),
-            YGMakeNativeMethod(jni_YGNodeMarkDirty),
-            YGMakeNativeMethod(jni_YGNodeMarkDirtyAndPropogateToDescendants),
-            YGMakeNativeMethod(jni_YGNodeIsDirty),
-            YGMakeNativeMethod(jni_YGNodeSetHasMeasureFunc),
-            YGMakeNativeMethod(jni_YGNodeSetHasBaselineFunc),
-            YGMakeNativeMethod(jni_YGNodeCopyStyle),
-            YGMakeNativeMethod(jni_YGNodeStyleGetDirection),
-            YGMakeNativeMethod(jni_YGNodeStyleSetDirection),
-            YGMakeNativeMethod(jni_YGNodeStyleGetFlexDirection),
-            YGMakeNativeMethod(jni_YGNodeStyleSetFlexDirection),
-            YGMakeNativeMethod(jni_YGNodeStyleGetJustifyContent),
-            YGMakeNativeMethod(jni_YGNodeStyleSetJustifyContent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetAlignItems),
-            YGMakeNativeMethod(jni_YGNodeStyleSetAlignItems),
-            YGMakeNativeMethod(jni_YGNodeStyleGetAlignSelf),
-            YGMakeNativeMethod(jni_YGNodeStyleSetAlignSelf),
-            YGMakeNativeMethod(jni_YGNodeStyleGetAlignContent),
-            YGMakeNativeMethod(jni_YGNodeStyleSetAlignContent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetPositionType),
-            YGMakeNativeMethod(jni_YGNodeStyleSetPositionType),
-            YGMakeNativeMethod(jni_YGNodeStyleSetFlexWrap),
-            YGMakeNativeMethod(jni_YGNodeStyleGetOverflow),
-            YGMakeNativeMethod(jni_YGNodeStyleSetOverflow),
-            YGMakeNativeMethod(jni_YGNodeStyleGetDisplay),
-            YGMakeNativeMethod(jni_YGNodeStyleSetDisplay),
-            YGMakeNativeMethod(jni_YGNodeStyleSetFlex),
-            YGMakeNativeMethod(jni_YGNodeStyleGetFlexGrow),
-            YGMakeNativeMethod(jni_YGNodeStyleSetFlexGrow),
-            YGMakeNativeMethod(jni_YGNodeStyleGetFlexShrink),
-            YGMakeNativeMethod(jni_YGNodeStyleSetFlexShrink),
-            YGMakeNativeMethod(jni_YGNodeStyleGetFlexBasis),
-            YGMakeNativeMethod(jni_YGNodeStyleSetFlexBasis),
-            YGMakeNativeMethod(jni_YGNodeStyleSetFlexBasisPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleSetFlexBasisAuto),
-            YGMakeNativeMethod(jni_YGNodeStyleGetMargin),
-            YGMakeNativeMethod(jni_YGNodeStyleSetMargin),
-            YGMakeNativeMethod(jni_YGNodeStyleSetMarginPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleSetMarginAuto),
-            YGMakeNativeMethod(jni_YGNodeStyleGetPadding),
-            YGMakeNativeMethod(jni_YGNodeStyleSetPadding),
-            YGMakeNativeMethod(jni_YGNodeStyleSetPaddingPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetBorder),
-            YGMakeNativeMethod(jni_YGNodeStyleSetBorder),
-            YGMakeNativeMethod(jni_YGNodeStyleGetPosition),
-            YGMakeNativeMethod(jni_YGNodeStyleSetPosition),
-            YGMakeNativeMethod(jni_YGNodeStyleSetPositionPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetWidth),
-            YGMakeNativeMethod(jni_YGNodeStyleSetWidth),
-            YGMakeNativeMethod(jni_YGNodeStyleSetWidthPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleSetWidthAuto),
-            YGMakeNativeMethod(jni_YGNodeStyleGetHeight),
-            YGMakeNativeMethod(jni_YGNodeStyleSetHeight),
-            YGMakeNativeMethod(jni_YGNodeStyleSetHeightPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleSetHeightAuto),
-            YGMakeNativeMethod(jni_YGNodeStyleGetMinWidth),
-            YGMakeNativeMethod(jni_YGNodeStyleSetMinWidth),
-            YGMakeNativeMethod(jni_YGNodeStyleSetMinWidthPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetMinHeight),
-            YGMakeNativeMethod(jni_YGNodeStyleSetMinHeight),
-            YGMakeNativeMethod(jni_YGNodeStyleSetMinHeightPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetMaxWidth),
-            YGMakeNativeMethod(jni_YGNodeStyleSetMaxWidth),
-            YGMakeNativeMethod(jni_YGNodeStyleSetMaxWidthPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetMaxHeight),
-            YGMakeNativeMethod(jni_YGNodeStyleSetMaxHeight),
-            YGMakeNativeMethod(jni_YGNodeStyleSetMaxHeightPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetAspectRatio),
-            YGMakeNativeMethod(jni_YGNodeStyleSetAspectRatio),
-            YGMakeNativeMethod(jni_YGNodeGetInstanceCount),
-            YGMakeNativeMethod(jni_YGNodePrint),
-            YGMakeNativeMethod(jni_YGNodeClone),
-            YGMakeNativeMethod(jni_YGNodeSetOwner),
-        });
-    registerNatives(
-        "com/facebook/yoga/YogaConfig",
+        "com/facebook/yoga/YogaJNI",
         {
-            YGMakeNativeMethod(jni_YGConfigNew),
-            YGMakeNativeMethod(jni_YGConfigFree),
-            YGMakeNativeMethod(jni_YGConfigSetExperimentalFeatureEnabled),
-            YGMakeNativeMethod(jni_YGConfigSetUseWebDefaults),
-            YGMakeNativeMethod(jni_YGConfigSetPointScaleFactor),
-            YGMakeNativeMethod(jni_YGConfigSetUseLegacyStretchBehaviour),
-            YGMakeNativeMethod(jni_YGConfigSetLogger),
-            YGMakeNativeMethod(jni_YGConfigSetHasCloneNodeFunc),
-            YGMakeNativeMethod(
-                jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour),
+            YGMakeNativeMethod(jni_bindNativeMethods),
         });
   });
 }
diff --git a/ReactAndroid/src/main/jni/prebuilt/BUCK b/ReactAndroid/src/main/jni/prebuilt/BUCK
index c35807a9513ad1..9be266bd8929b2 100644
--- a/ReactAndroid/src/main/jni/prebuilt/BUCK
+++ b/ReactAndroid/src/main/jni/prebuilt/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_prebuilt_aar", "rn_prebuilt_native_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar", "rn_prebuilt_native_library")
 # Temp workaround to get the build working e2e, Gradle builds them for us
 
 rn_prebuilt_native_library(
diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk
index 9e7dcb7a39b8d5..d76dd0fc2052db 100644
--- a/ReactAndroid/src/main/jni/react/jni/Android.mk
+++ b/ReactAndroid/src/main/jni/react/jni/Android.mk
@@ -2,50 +2,61 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := reactnativejni
-
-LOCAL_SRC_FILES := \
-  AndroidJSCFactory.cpp \
-  CatalystInstanceImpl.cpp \
-  CxxModuleWrapper.cpp \
-  JavaModuleWrapper.cpp \
-  JReactMarker.cpp \
-  JMessageQueueThread.cpp \
-  JSCPerfLogging.cpp \
-  JSLoader.cpp \
-  JSLogging.cpp \
-  JniJSModulesUnbundle.cpp \
-  MethodInvoker.cpp \
-  ModuleRegistryBuilder.cpp \
-  NativeArray.cpp \
-  NativeCommon.cpp \
-  NativeDeltaClient.cpp \
-  NativeMap.cpp \
-  OnLoad.cpp \
-  ProxyExecutor.cpp \
-  ReadableNativeArray.cpp \
-  ReadableNativeMap.cpp \
-  WritableNativeArray.cpp \
-  WritableNativeMap.cpp \
-
+# Include . in the header search path for all source files in this module.
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+# Include ./../../ in the header search path for modules that depend on
+# reactnativejni. This will allow external modules to require this module's
+# headers using #include <react/jni/<header>.h>, assuming:
+#   .     == jni
+#   ./../ == react
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../..
 
-LOCAL_CFLAGS += -Wall -Werror -fvisibility=hidden -fexceptions -frtti
-CXX11_FLAGS := -std=c++11
-LOCAL_CFLAGS += $(CXX11_FLAGS)
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
+LOCAL_CFLAGS += -fexceptions -frtti
 
 LOCAL_LDLIBS += -landroid
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libjsc libglog_init libyoga libprivatedata
+
+# The dynamic libraries (.so files) that this module depends on.
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libjsc libglog_init libyoga
+
+# The static libraries (.a files) that this module depends on.
 LOCAL_STATIC_LIBRARIES := libreactnative
 
+# Name of this module.
+#
+# Other modules can depend on this one by adding libreactnativejni to their
+# LOCAL_SHARED_LIBRARIES variable.
+LOCAL_MODULE := reactnativejni
+
+# Compile all local c++ files.
+LOCAL_SRC_FILES := $(wildcard *.cpp)
+
+# Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,cxxreact)
-$(call import-module,privatedata)
-$(call import-module,fb)
-$(call import-module,fbgloginit)
+# Compile the c++ dependencies required for ReactAndroid
+#
+# How does the import-module function work?
+#   For each $(call import-module,<module-dir>), you search the directories in
+#   NDK_MODULE_PATH. (This variable is defined in Application.mk). If you find a
+#   <module-dir>/Android.mk you in a directory <dir>, you run:
+#   include <dir>/<module-dir>/Android.mk
+#
+# What does it mean to include an Android.mk file?
+#   Whenever you encounter an include <dir>/<module-dir>/Android.mk, you
+#   tell andorid-ndk to compile the module in <dir>/<module-dir> according
+#   to the specification inside <dir>/<module-dir>/Android.mk.
 $(call import-module,folly)
+$(call import-module,fb)
 $(call import-module,jsc)
+$(call import-module,fbgloginit)
 $(call import-module,yogajni)
+$(call import-module,cxxreact)
+$(call import-module,jsi)
+$(call import-module,jsiexecutor)
+
+# TODO(ramanpreet):
+#   Why doesn't this import-module call generate a jscexecutor.so file?
+# $(call import-module,jscexecutor)
+
+include $(REACT_SRC_DIR)/jscexecutor/Android.mk
diff --git a/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.cpp b/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.cpp
deleted file mode 100644
index 7b20f4caab3296..00000000000000
--- a/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include <cxxreact/JSCExecutor.h>
-
-#include <string>
-
-#include <cxxreact/Platform.h>
-#include <fb/fbjni.h>
-#include <folly/Conv.h>
-#include <folly/dynamic.h>
-#include <folly/Memory.h>
-#include <jschelpers/JSCHelpers.h>
-
-#include "JSCPerfLogging.h"
-#include "JSLogging.h"
-#include "JReactMarker.h"
-
-using namespace facebook::jni;
-
-namespace facebook {
-namespace react {
-
-namespace {
-
-ExceptionHandling::ExtractedEror extractJniError(const std::exception& ex, const char *context) {
-  auto jniEx = dynamic_cast<const jni::JniException *>(&ex);
-  if (!jniEx) {
-    return {};
-  }
-
-  auto stackTrace = jniEx->getThrowable()->getStackTrace();
-  std::ostringstream stackStr;
-  for (int i = 0, count = stackTrace->size(); i < count; ++i) {
-    auto frame = stackTrace->getElement(i);
-
-    auto methodName = folly::to<std::string>(frame->getClassName(), ".",
-      frame->getMethodName());
-
-    // Cut off stack traces at the Android looper, to keep them simple
-    if (methodName == "android.os.Looper.loop") {
-      break;
-    }
-
-    stackStr << std::move(methodName) << '@' << frame->getFileName();
-    if (frame->getLineNumber() > 0) {
-      stackStr << ':' << frame->getLineNumber();
-    }
-    stackStr << std::endl;
-  }
-
-  auto msg = folly::to<std::string>("Java exception in '", context, "'\n\n", jniEx->what());
-  return {.message = msg, .stack = stackStr.str()};
-}
-
-JSValueRef nativePerformanceNow(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[], JSValueRef *exception) {
-  static const int64_t NANOSECONDS_IN_SECOND = 1000000000LL;
-  static const int64_t NANOSECONDS_IN_MILLISECOND = 1000000LL;
-
-  // Since SystemClock.uptimeMillis() is commonly used for performance measurement in Java
-  // and uptimeMillis() internally uses clock_gettime(CLOCK_MONOTONIC),
-  // we use the same API here.
-  // We need that to make sure we use the same time system on both JS and Java sides.
-  // Links to the source code:
-  // https://android.googlesource.com/platform/frameworks/native/+/jb-mr1-release/libs/utils/SystemClock.cpp
-  // https://android.googlesource.com/platform/system/core/+/master/libutils/Timers.cpp
-  struct timespec now;
-  clock_gettime(CLOCK_MONOTONIC, &now);
-  int64_t nano = now.tv_sec * NANOSECONDS_IN_SECOND + now.tv_nsec;
-  return Value::makeNumber(ctx, (nano / (double)NANOSECONDS_IN_MILLISECOND));
-}
-
-JSValueRef nativeLoggingHook(
-  JSContextRef ctx,
-  JSObjectRef function,
-  JSObjectRef thisObject,
-  size_t argumentCount,
-  const JSValueRef arguments[],
-  JSValueRef* exception) {
-  android_LogPriority logLevel = ANDROID_LOG_DEBUG;
-  if (argumentCount > 1) {
-    int level = (int)Value(ctx, arguments[1]).asNumber();
-    // The lowest log level we get from JS is 0. We shift and cap it to be
-    // in the range the Android logging method expects.
-    logLevel = std::min(
-      static_cast<android_LogPriority>(level + ANDROID_LOG_DEBUG),
-      ANDROID_LOG_FATAL);
-  }
-  if (argumentCount > 0) {
-    String message = Value(ctx, arguments[0]).toString();
-    reactAndroidLoggingHook(message.str(), logLevel);
-  }
-  return Value::makeUndefined(ctx);
-}
-
-}
-
-namespace detail {
-
-void injectJSCExecutorAndroidPlatform() {
-  // Inject some behavior into react/
-  JReactMarker::setLogPerfMarkerIfNeeded();
-  ExceptionHandling::platformErrorExtractor = extractJniError;
-  JSCNativeHooks::loggingHook = nativeLoggingHook;
-  JSCNativeHooks::nowHook = nativePerformanceNow;
-  JSCNativeHooks::installPerfHooks = addNativePerfLoggingHooks;
-}
-
-}
-
-std::unique_ptr<JSExecutorFactory> makeAndroidJSCExecutorFactory(
-    const folly::dynamic& jscConfig) {
-  detail::injectJSCExecutorAndroidPlatform();
-  return folly::make_unique<JSCExecutorFactory>(std::move(jscConfig));
-}
-
-}
-}
diff --git a/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.h b/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.h
deleted file mode 100644
index 0e6a34b96e2827..00000000000000
--- a/ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <memory>
-#include <cxxreact/JSExecutor.h>
-
-namespace folly {
-
-class dynamic;
-
-}
-
-namespace facebook {
-namespace react {
-
-class JSExecutorFactory;
-
-namespace detail {
-
-// This is only exposed so instrumentation tests can call it.
-void injectJSCExecutorAndroidPlatform();
-
-}
-
-std::unique_ptr<JSExecutorFactory> makeAndroidJSCExecutorFactory(
-    const folly::dynamic& jscConfig);
-
-}
-}
diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK
index affc4b4e3c8eeb..c6bfc5cea0225e 100644
--- a/ReactAndroid/src/main/jni/react/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/jni/BUCK
@@ -1,7 +1,6 @@
-load("//ReactNative:DEFS.bzl", "ANDROID", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "FBJNI_TARGET", "IS_OSS_BUILD", "react_native_xplat_target", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "IS_OSS_BUILD", "react_native_xplat_dep", "react_native_xplat_target", "rn_xplat_cxx_library")
 
 EXPORTED_HEADERS = [
-    "AndroidJSCFactory.h",
     "CxxModuleWrapper.h",
     "CxxModuleWrapperBase.h",
     "CxxSharedModuleWrapper.h",
@@ -40,8 +39,6 @@ rn_xplat_cxx_library(
         "-Wno-inconsistent-missing-override",
     ],
     fbandroid_allow_jni_merging = True,
-    fbandroid_deps = ANDROID_JSC_DEPS,
-    fbobjc_deps = APPLE_JSC_DEPS,
     platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNativeJNI\"",
@@ -54,11 +51,13 @@ rn_xplat_cxx_library(
     ],
     deps = ([
         "xplat//third-party/linker_lib:android",
+        "xplat//third-party/linker_lib:atomic",
         "xplat//folly:molly",
         "fbandroid//xplat/fbgloginit:fbgloginit",
         "xplat//fbsystrace:fbsystrace",
         react_native_xplat_target("cxxreact:bridge"),
         react_native_xplat_target("cxxreact:module"),
+        react_native_xplat_dep("jsi:jsi"),
         FBJNI_TARGET,
     ]) if not IS_OSS_BUILD else [],
 )
diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
index 10a3fb8268237f..d5acc2367ff39c 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -42,7 +42,6 @@ namespace {
 
 class Exception : public jni::JavaClass<Exception> {
  public:
-  static auto constexpr kJavaDescriptor = "Ljava/lang/Exception;";
 };
 
 class JInstanceCallback : public InstanceCallback {
diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
index fcd7aef70209f9..005c6ac979279c 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp b/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp
index b9205cc6ae5f40..4da868a2f291c4 100644
--- a/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h b/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h
index 0055965c6cb4b4..10eeb59312bad6 100644
--- a/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h
+++ b/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapperBase.h b/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapperBase.h
index 128135453595f2..b774775dbcd120 100644
--- a/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapperBase.h
+++ b/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapperBase.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/CxxSharedModuleWrapper.h b/ReactAndroid/src/main/jni/react/jni/CxxSharedModuleWrapper.h
index 53f8b653c2d4c1..23ded88b7ceb49 100644
--- a/ReactAndroid/src/main/jni/react/jni/CxxSharedModuleWrapper.h
+++ b/ReactAndroid/src/main/jni/react/jni/CxxSharedModuleWrapper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JCallback.h b/ReactAndroid/src/main/jni/react/jni/JCallback.h
index 00502ab56b0beb..5e4de6671c7ae4 100644
--- a/ReactAndroid/src/main/jni/react/jni/JCallback.h
+++ b/ReactAndroid/src/main/jni/react/jni/JCallback.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JInspector.cpp b/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
index 0f1b5593ad2cd4..3b48d46b5d4e05 100644
--- a/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JInspector.h b/ReactAndroid/src/main/jni/react/jni/JInspector.h
index a199989c998dfc..67e512c5bf23d9 100644
--- a/ReactAndroid/src/main/jni/react/jni/JInspector.h
+++ b/ReactAndroid/src/main/jni/react/jni/JInspector.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp b/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp
index 614f2fc95f8a2c..65924c37e1ad14 100644
--- a/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -8,11 +8,10 @@
 #include <condition_variable>
 #include <mutex>
 
+#include <fb/fbjni.h>
 #include <fb/log.h>
 #include <folly/Memory.h>
-#include <fb/fbjni.h>
-
-#include <jschelpers/JSCHelpers.h>
+#include <jsi/jsi.h>
 
 #include "JNativeRunnable.h"
 
@@ -35,8 +34,10 @@ std::function<void()> wrapRunnable(std::function<void()>&& runnable) {
   return [runnable=std::move(runnable)] {
     try {
       runnable();
-    } catch (const JSException& ex) {
-      throwNewJavaException(JavaJSException::create(ex.what(), ex.getStack().c_str(), ex).get());
+    } catch (const jsi::JSError& ex) {
+      throwNewJavaException(
+          JavaJSException::create(ex.getMessage().c_str(), ex.getStack().c_str(), ex)
+          .get());
     }
   };
 }
diff --git a/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h b/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h
index 604429671c0b03..c25b87b1ee3977 100644
--- a/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h
+++ b/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JNativeRunnable.h b/ReactAndroid/src/main/jni/react/jni/JNativeRunnable.h
index 53a973e85a61bb..015d6b416b1771 100644
--- a/ReactAndroid/src/main/jni/react/jni/JNativeRunnable.h
+++ b/ReactAndroid/src/main/jni/react/jni/JNativeRunnable.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp b/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp
index ead1c689d121ef..4f4589795beeb3 100644
--- a/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -53,6 +53,12 @@ void JReactMarker::logPerfMarker(const ReactMarker::ReactMarkerId markerId, cons
     case ReactMarker::NATIVE_MODULE_SETUP_STOP:
       JReactMarker::logMarker("NATIVE_MODULE_SETUP_END", tag);
       break;
+    case ReactMarker::REGISTER_JS_SEGMENT_START:
+      JReactMarker::logMarker("REGISTER_JS_SEGMENT_START", tag);
+      break;
+    case ReactMarker::REGISTER_JS_SEGMENT_STOP:
+      JReactMarker::logMarker("REGISTER_JS_SEGMENT_STOP", tag);
+      break;
     case ReactMarker::NATIVE_REQUIRE_START:
     case ReactMarker::NATIVE_REQUIRE_STOP:
       // These are not used on Android.
diff --git a/ReactAndroid/src/main/jni/react/jni/JReactMarker.h b/ReactAndroid/src/main/jni/react/jni/JReactMarker.h
index f9e6d27d168519..6d12e50c99d0a0 100644
--- a/ReactAndroid/src/main/jni/react/jni/JReactMarker.h
+++ b/ReactAndroid/src/main/jni/react/jni/JReactMarker.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JSCPerfLogging.cpp b/ReactAndroid/src/main/jni/react/jni/JSCPerfLogging.cpp
deleted file mode 100644
index 6516932e196163..00000000000000
--- a/ReactAndroid/src/main/jni/react/jni/JSCPerfLogging.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "JSCPerfLogging.h"
-
-#include <jschelpers/JSCHelpers.h>
-
-#include <fb/log.h>
-#include <fb/fbjni.h>
-
-using namespace facebook::jni;
-
-namespace facebook { namespace react {
-
-struct JQuickPerformanceLogger : JavaClass<JQuickPerformanceLogger> {
-  static auto constexpr kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLogger;";
-
-  void markerStart(int markerId, int instanceKey, long timestamp) {
-    static auto markerStartMethod =
-      javaClassStatic()->getMethod<void(jint, jint, jlong)>("markerStart");
-    markerStartMethod(self(), markerId, instanceKey, timestamp);
-  }
-
-  void markerEnd(int markerId, int instanceKey, short actionId, long timestamp) {
-    static auto markerEndMethod =
-      javaClassStatic()->getMethod<void(jint, jint, jshort, jlong)>("markerEnd");
-    markerEndMethod(self(), markerId, instanceKey, actionId, timestamp);
-  }
-
-  void markerTag(int markerId, int instanceKey, alias_ref<jstring> tag) {
-    static auto markerTagMethod =
-      javaClassStatic()->getMethod<void(jint, jint, alias_ref<jstring>)>("markerTag");
-    markerTagMethod(self(), markerId, instanceKey, tag);
-  }
-
-  void markerAnnotate(
-      int markerId,
-      int instanceKey,
-      alias_ref<jstring> key,
-      alias_ref<jstring> value) {
-    static auto markerAnnotateMethod = javaClassStatic()->
-      getMethod<void(jint, jint, alias_ref<jstring>, alias_ref<jstring>)>("markerAnnotate");
-    markerAnnotateMethod(self(), markerId, instanceKey, key, value);
-  }
-
-  void markerNote(int markerId, int instanceKey, short actionId, long timestamp) {
-    static auto markerNoteMethod =
-      javaClassStatic()->getMethod<void(jint, jint, jshort, jlong)>("markerNote");
-    markerNoteMethod(self(), markerId, instanceKey, actionId, timestamp);
-  }
-
-  void markerCancel(int markerId, int instanceKey) {
-    static auto markerCancelMethod =
-      javaClassStatic()->getMethod<void(jint, jint)>("markerCancel");
-    markerCancelMethod(self(), markerId, instanceKey);
-  }
-
-  int64_t currentMonotonicTimestamp() {
-    static auto currentTimestampMethod =
-      javaClassStatic()->getMethod<jlong()>("currentMonotonicTimestamp");
-    return currentTimestampMethod(self());
-  }
-
-  void markerPoint(int markerId, alias_ref<jstring> name, int instanceKey) {
-    static auto markerPointMethod =
-      javaClassStatic()->getMethod<void(jint, jint, alias_ref<jstring>)>("markerPoint");
-    markerPointMethod(self(), markerId, instanceKey, name);
-  }
-};
-
-struct JQuickPerformanceLoggerProvider : JavaClass<JQuickPerformanceLoggerProvider> {
-  static auto constexpr kJavaDescriptor = "Lcom/facebook/quicklog/QuickPerformanceLoggerProvider;";
-
-  static alias_ref<JQuickPerformanceLogger::javaobject> get() {
-    static auto getQPLInstMethod =
-      javaClassStatic()->getStaticMethod<JQuickPerformanceLogger::javaobject()>("getQPLInstance");
-    static auto logger = make_global(getQPLInstMethod(javaClassStatic()));
-    return logger;
-  }
-};
-
-static bool isReady() {
-  static bool ready = false;
-  if (!ready) {
-    try {
-      // TODO: findClassStatic only does the lookup once. If we can't find
-      // QuickPerformanceLoggerProvider the first time we call this, we will always fail here.
-      findClassStatic("com/facebook/quicklog/QuickPerformanceLoggerProvider");
-    } catch(...) {
-      // Swallow this exception - we don't want to crash the app, an error is enough.
-      FBLOGE("Calling QPL from JS before class has been loaded in Java. Ignored.");
-      return false;
-    }
-    if (JQuickPerformanceLoggerProvider::get()) {
-      ready = true;
-    } else {
-      FBLOGE("Calling QPL from JS before it has been initialized in Java. Ignored.");
-      return false;
-    }
-  }
-  return ready;
-}
-
-// After having read the implementation of PNaN that is returned from JSValueToNumber, and some
-// more material on how NaNs are constructed, I think this is the most consistent way to verify
-// NaN with how we generate it.
-// Once the integration completes, I'll play around with it some more and potentially change this
-// implementation to use std::isnan() if it is exactly commensurate with our usage.
-static bool isNan(double value) {
-  return (value != value);
-}
-
-static double grabDouble(
-    JSContextRef ctx,
-    const JSValueRef arguments[],
-    size_t argumentIndex,
-    JSValueRef* exception) {
-  return JSValueToNumber(ctx, arguments[argumentIndex], exception);
-}
-
-// Safely translates JSValues to an array of doubles.
-static bool grabDoubles(
-    size_t targetsCount,
-    double targets[],
-    JSContextRef ctx,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  if (argumentCount < targetsCount) {
-    return false;
-  }
-  for (size_t i = 0 ; i < targetsCount ; i++) {
-    targets[i] = grabDouble(ctx, arguments, i, exception);
-    if (isNan(targets[i])) {
-      return false;
-    }
-  }
-  return true;
-}
-
-static local_ref<jstring> getJStringFromJSValueRef(JSContextRef ctx, JSValueRef ref) {
-    JSStringRef jsStringRef = JSValueToStringCopy(ctx, ref, nullptr);
-    const JSChar* chars = JSStringGetCharactersPtr(jsStringRef);
-    const size_t length = JSStringGetLength(jsStringRef);
-    local_ref<jstring> returnStr = adopt_local(Environment::current()->NewString(chars, length));
-    JSStringRelease(jsStringRef);
-    return returnStr;
-}
-
-static JSValueRef nativeQPLMarkerStart(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  double targets[3];
-  if (isReady() && grabDoubles(3, targets, ctx, argumentCount, arguments, exception)) {
-    int32_t markerId = (int32_t) targets[0];
-    int32_t instanceKey = (int32_t) targets[1];
-    int64_t timestamp = (int64_t) targets[2];
-    JQuickPerformanceLoggerProvider::get()->markerStart(markerId, instanceKey, timestamp);
-  }
-  return JSValueMakeUndefined(ctx);
-}
-
-static JSValueRef nativeQPLMarkerEnd(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  double targets[4];
-  if (isReady() && grabDoubles(4, targets, ctx, argumentCount, arguments, exception)) {
-    int32_t markerId = (int32_t) targets[0];
-    int32_t instanceKey = (int32_t) targets[1];
-    int16_t actionId = (int16_t) targets[2];
-    int64_t timestamp = (int64_t) targets[3];
-    JQuickPerformanceLoggerProvider::get()->markerEnd(markerId, instanceKey, actionId, timestamp);
-  }
-  return JSValueMakeUndefined(ctx);
-}
-
-static JSValueRef nativeQPLMarkerTag(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  double targets[2];
-  if (isReady() && grabDoubles(2, targets, ctx, argumentCount, arguments, exception)) {
-    int32_t markerId = (int32_t) targets[0];
-    int32_t instanceKey = (int32_t) targets[1];
-    local_ref<jstring> tag = getJStringFromJSValueRef(ctx, arguments[2]);
-    JQuickPerformanceLoggerProvider::get()->markerTag(markerId, instanceKey, tag);
-  }
-  return JSValueMakeUndefined(ctx);
-}
-
-static JSValueRef nativeQPLMarkerAnnotate(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  double targets[2];
-  if (isReady() && grabDoubles(2, targets, ctx, argumentCount, arguments, exception)) {
-    int32_t markerId = (int32_t) targets[0];
-    int32_t instanceKey = (int32_t) targets[1];
-    local_ref<jstring> key = getJStringFromJSValueRef(ctx, arguments[2]);
-    local_ref<jstring> value = getJStringFromJSValueRef(ctx, arguments[3]);
-    JQuickPerformanceLoggerProvider::get()->markerAnnotate(markerId, instanceKey, key, value);
-  }
-  return JSValueMakeUndefined(ctx);
-}
-
-static JSValueRef nativeQPLMarkerNote(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  double targets[4];
-  if (isReady() && grabDoubles(4, targets, ctx, argumentCount, arguments, exception)) {
-    int32_t markerId = (int32_t) targets[0];
-    int32_t instanceKey = (int32_t) targets[1];
-    int16_t actionId = (int16_t) targets[2];
-    int64_t timestamp = (int64_t) targets[3];
-    JQuickPerformanceLoggerProvider::get()->markerNote(markerId, instanceKey, actionId, timestamp);
-  }
-  return JSValueMakeUndefined(ctx);
-}
-
-static JSValueRef nativeQPLMarkerCancel(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  double targets[2];
-  if (isReady() && grabDoubles(2, targets, ctx, argumentCount, arguments, exception)) {
-    int32_t markerId = (int32_t) targets[0];
-    int32_t instanceKey = (int32_t) targets[1];
-    JQuickPerformanceLoggerProvider::get()->markerCancel(markerId, instanceKey);
-  }
-  return JSValueMakeUndefined(ctx);
-}
-
-static JSValueRef nativeQPLTimestamp(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  if (!isReady()) {
-    return JSValueMakeNumber(ctx, 0);
-  }
-  int64_t timestamp = JQuickPerformanceLoggerProvider::get()->currentMonotonicTimestamp();
-  // Since this is monotonic time, I assume the 52 bits of mantissa are enough in the double value.
-  return JSValueMakeNumber(ctx, timestamp);
-}
-
-static JSValueRef nativeQPLMarkerPoint(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  if (isReady() && argumentCount == 4) {
-    double markerIdArgument = grabDouble(ctx, arguments, 0, exception);
-    double instanceKeyArgument = grabDouble(ctx, arguments, 2, exception);
-    if (isNan(markerIdArgument) || isNan(instanceKeyArgument)) {
-      return JSValueMakeUndefined(ctx);
-    }
-
-    int32_t markerId = (int32_t) markerIdArgument;
-    local_ref<jstring> name = getJStringFromJSValueRef(ctx, arguments[1]);
-    int32_t instanceKey = (int32_t) instanceKeyArgument;
-    // timestamp is not used as QuickPerformanceLogger::markerPoint with all
-    // params is missing
-    JQuickPerformanceLoggerProvider::get()->markerPoint(markerId, name, instanceKey);
-  }
-  return JSValueMakeUndefined(ctx);
-}
-
-void addNativePerfLoggingHooks(JSGlobalContextRef ctx) {
-  installGlobalFunction(ctx, "nativeQPLMarkerStart", nativeQPLMarkerStart);
-  installGlobalFunction(ctx, "nativeQPLMarkerEnd", nativeQPLMarkerEnd);
-  installGlobalFunction(ctx, "nativeQPLMarkerTag", nativeQPLMarkerTag);
-  installGlobalFunction(ctx, "nativeQPLMarkerAnnotate", nativeQPLMarkerAnnotate);
-  installGlobalFunction(ctx, "nativeQPLMarkerNote", nativeQPLMarkerNote);
-  installGlobalFunction(ctx, "nativeQPLMarkerCancel", nativeQPLMarkerCancel);
-  installGlobalFunction(ctx, "nativeQPLTimestamp", nativeQPLTimestamp);
-  installGlobalFunction(ctx, "nativeQPLMarkerPoint", nativeQPLMarkerPoint);
-}
-
-} }
diff --git a/ReactAndroid/src/main/jni/react/jni/JSCPerfLogging.h b/ReactAndroid/src/main/jni/react/jni/JSCPerfLogging.h
deleted file mode 100644
index 43805243af2c59..00000000000000
--- a/ReactAndroid/src/main/jni/react/jni/JSCPerfLogging.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <JavaScriptCore/JSContextRef.h>
-
-namespace facebook {
-namespace react {
-
-void addNativePerfLoggingHooks(JSGlobalContextRef ctx);
-
-} }
diff --git a/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp b/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp
index 2f435dfda93242..6e68981608eb76 100644
--- a/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JSLoader.h b/ReactAndroid/src/main/jni/react/jni/JSLoader.h
index 543534a9707b33..20f35bbd33e66d 100644
--- a/ReactAndroid/src/main/jni/react/jni/JSLoader.h
+++ b/ReactAndroid/src/main/jni/react/jni/JSLoader.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp b/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp
index bb3762bf06c142..c6993f59427119 100644
--- a/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JSLogging.h b/ReactAndroid/src/main/jni/react/jni/JSLogging.h
index 173b4745ccd55b..222952e27c9b00 100644
--- a/ReactAndroid/src/main/jni/react/jni/JSLogging.h
+++ b/ReactAndroid/src/main/jni/react/jni/JSLogging.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp b/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp
index 4d7e52e4945cf9..632c2201aee19f 100644
--- a/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h b/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h
index cdd081b69d4f01..56ce28d7d45c75 100644
--- a/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h
+++ b/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JavaScriptExecutorHolder.h b/ReactAndroid/src/main/jni/react/jni/JavaScriptExecutorHolder.h
index 7f7141716ede6d..ed9e4b41aeaaa2 100644
--- a/ReactAndroid/src/main/jni/react/jni/JavaScriptExecutorHolder.h
+++ b/ReactAndroid/src/main/jni/react/jni/JavaScriptExecutorHolder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp b/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp
index 643ef80d2f6125..57b1fe69af972d 100644
--- a/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h b/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h
index 17fcd2d6742ed1..86385432c877b4 100644
--- a/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h
+++ b/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/MethodInvoker.cpp b/ReactAndroid/src/main/jni/react/jni/MethodInvoker.cpp
index 4abba9308cf7e3..9be87fc9957c05 100644
--- a/ReactAndroid/src/main/jni/react/jni/MethodInvoker.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/MethodInvoker.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -49,6 +49,22 @@ jdouble extractDouble(const folly::dynamic& value) {
   }
 }
 
+jint extractInteger(const folly::dynamic& value) {
+  // The logic here is taken from convertDynamicIfIntegral, but the
+  // return type and exception are different.
+  if (value.isInt()) {
+    return value.getInt();
+  }
+  double dbl = value.getDouble();
+  jint result = static_cast<jint>(dbl);
+  if (dbl != result) {
+    throw std::invalid_argument(
+      folly::to<std::string>(
+        "Tried to convert jint argument, but got a non-integral double: ", dbl));
+  }
+  return result;
+}
+
 local_ref<JCxxCallbackImpl::jhybridobject> extractCallback(std::weak_ptr<Instance>& instance, const folly::dynamic& value) {
   if (value.isNull()) {
     return local_ref<JCxxCallbackImpl::jhybridobject>(nullptr);
@@ -101,10 +117,10 @@ jvalue extract(std::weak_ptr<Instance>& instance, char type, dynamic_iterator& i
       value.l = JBoolean::valueOf(static_cast<jboolean>(arg.getBool())).release();
       break;
     case 'i':
-      value.i = static_cast<jint>(arg.getInt());
+      value.i = extractInteger(arg);
       break;
     case 'I':
-      value.l = JInteger::valueOf(static_cast<jint>(arg.getInt())).release();
+      value.l = JInteger::valueOf(extractInteger(arg)).release();
       break;
     case 'f':
       value.f = static_cast<jfloat>(extractDouble(arg));
diff --git a/ReactAndroid/src/main/jni/react/jni/MethodInvoker.h b/ReactAndroid/src/main/jni/react/jni/MethodInvoker.h
index e86ebe1be77db5..386a4bce795b08 100644
--- a/ReactAndroid/src/main/jni/react/jni/MethodInvoker.h
+++ b/ReactAndroid/src/main/jni/react/jni/MethodInvoker.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp b/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp
index e902f603729232..12a7f5a68234ae 100644
--- a/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.h b/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.h
index b179c5ba44e3e4..10f7189bd0a114 100644
--- a/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.h
+++ b/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/NativeArray.cpp b/ReactAndroid/src/main/jni/react/jni/NativeArray.cpp
index 2c6bc8f1d56be3..22783fbbee0da0 100644
--- a/ReactAndroid/src/main/jni/react/jni/NativeArray.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/NativeArray.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/NativeArray.h b/ReactAndroid/src/main/jni/react/jni/NativeArray.h
index 54efd849ec0a95..6fa9ddf5be7c98 100644
--- a/ReactAndroid/src/main/jni/react/jni/NativeArray.h
+++ b/ReactAndroid/src/main/jni/react/jni/NativeArray.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp b/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp
index fd46ea949ee57b..01f5e676f7e74e 100644
--- a/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/NativeCommon.h b/ReactAndroid/src/main/jni/react/jni/NativeCommon.h
index 738edb0975476c..227e43fe5d5987 100644
--- a/ReactAndroid/src/main/jni/react/jni/NativeCommon.h
+++ b/ReactAndroid/src/main/jni/react/jni/NativeCommon.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/NativeDeltaClient.cpp b/ReactAndroid/src/main/jni/react/jni/NativeDeltaClient.cpp
index cb7d10fafda477..5a9c007bb24f01 100644
--- a/ReactAndroid/src/main/jni/react/jni/NativeDeltaClient.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/NativeDeltaClient.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/NativeDeltaClient.h b/ReactAndroid/src/main/jni/react/jni/NativeDeltaClient.h
index 957465d7fdb1ff..a991e3a2c03ad3 100644
--- a/ReactAndroid/src/main/jni/react/jni/NativeDeltaClient.h
+++ b/ReactAndroid/src/main/jni/react/jni/NativeDeltaClient.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/NativeMap.cpp b/ReactAndroid/src/main/jni/react/jni/NativeMap.cpp
index c8c948cd440efa..78b8d1f75aa8ee 100644
--- a/ReactAndroid/src/main/jni/react/jni/NativeMap.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/NativeMap.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/NativeMap.h b/ReactAndroid/src/main/jni/react/jni/NativeMap.h
index 7089b6d9fbe520..9c2762c2c26760 100644
--- a/ReactAndroid/src/main/jni/react/jni/NativeMap.h
+++ b/ReactAndroid/src/main/jni/react/jni/NativeMap.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp
index 75f1300f921f4c..20b134a5c84375 100644
--- a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -9,7 +9,6 @@
 #include <fb/glog_init.h>
 #include <fb/log.h>
 
-#include "AndroidJSCFactory.h"
 #include "CatalystInstanceImpl.h"
 #include "CxxModuleWrapper.h"
 #include "JavaScriptExecutorHolder.h"
@@ -30,27 +29,6 @@ namespace react {
 
 namespace {
 
-// TODO: can we avoid these wrapper classes, and instead specialize the logic in CatalystInstanceImpl
-class JSCJavaScriptExecutorHolder : public HybridClass<JSCJavaScriptExecutorHolder,
-                                                       JavaScriptExecutorHolder> {
- public:
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/JSCJavaScriptExecutor;";
-
-  static local_ref<jhybriddata> initHybrid(alias_ref<jclass>, ReadableNativeMap* jscConfig) {
-    return makeCxxInstance(makeAndroidJSCExecutorFactory(jscConfig->consume()));
-  }
-
-  static void registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JSCJavaScriptExecutorHolder::initHybrid),
-    });
-  }
-
- private:
-  friend HybridBase;
-  using HybridBase::HybridBase;
-};
-
 struct JavaJSExecutor : public JavaClass<JavaJSExecutor> {
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/JavaJSExecutor;";
 };
@@ -83,7 +61,6 @@ class ProxyJavaScriptExecutorHolder : public HybridClass<ProxyJavaScriptExecutor
 extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   return initialize(vm, [] {
     gloginit::initialize();
-    JSCJavaScriptExecutorHolder::registerNatives();
     ProxyJavaScriptExecutorHolder::registerNatives();
     CatalystInstanceImpl::registerNatives();
     CxxModuleWrapperBase::registerNatives();
diff --git a/ReactAndroid/src/main/jni/react/jni/OnLoad.h b/ReactAndroid/src/main/jni/react/jni/OnLoad.h
index 18682b92560467..d36242e032a5bf 100644
--- a/ReactAndroid/src/main/jni/react/jni/OnLoad.h
+++ b/ReactAndroid/src/main/jni/react/jni/OnLoad.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp
index 1a030f5d4d24b2..9832e22f0978a0 100644
--- a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h
index 5e1b1b786876c7..94f4f4fcca41e3 100644
--- a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h
+++ b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp b/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp
index 008738f6af2a67..41f6f2471d2d5e 100644
--- a/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -113,7 +113,7 @@ local_ref<JArrayClass<jobject>> ReadableNativeArray::importTypeArray() {
   jint size = array_.size();
   auto jarray = JArrayClass<jobject>::newArray(size);
   for (jint i = 0; i < size; i++) {
-    jarray->setElement(i, ReadableNativeArray::getType(i).release());
+    jarray->setElement(i, ReadableNativeArray::getType(i).get());
   }
   return jarray;
 }
diff --git a/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h b/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h
index e15cae21dbdb0d..f0edbf5d06bd48 100644
--- a/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h
+++ b/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h
@@ -1,4 +1,7 @@
- // Copyright 2004-present Facebook. All Rights Reserved.
+//  Copyright (c) Facebook, Inc. and its 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
 
diff --git a/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp b/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp
index 5c91620ac55051..8d395b3b0929b4 100644
--- a/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h b/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h
index 7258adaaeace8b..d754aceef08e98 100644
--- a/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h
+++ b/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp b/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp
index 20510758b8a4b3..6b7dd0bc6edb79 100644
--- a/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.h b/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.h
index 23dea3eb9fe419..75c9f22749b532 100644
--- a/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.h
+++ b/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp b/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp
index f33dcd131796ca..26548e29f5b02f 100644
--- a/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.h b/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.h
index 3373350266e644..fe1964146b8008 100644
--- a/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.h
+++ b/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/react/perftests/BUCK b/ReactAndroid/src/main/jni/react/perftests/BUCK
index 35b3b1970f51dd..82d64840c981be 100644
--- a/ReactAndroid/src/main/jni/react/perftests/BUCK
+++ b/ReactAndroid/src/main/jni/react/perftests/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "ANDROID", "react_native_xplat_target", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "react_native_xplat_target", "rn_xplat_cxx_library")
 
 rn_xplat_cxx_library(
     name = "perftests",
diff --git a/ReactAndroid/src/main/jni/react/perftests/OnLoad.cpp b/ReactAndroid/src/main/jni/react/perftests/OnLoad.cpp
index b4d5f7d028b396..50d18b4c01fe7f 100644
--- a/ReactAndroid/src/main/jni/react/perftests/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/react/perftests/OnLoad.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/main/jni/third-party/android-ndk/BUCK b/ReactAndroid/src/main/jni/third-party/android-ndk/BUCK
deleted file mode 100644
index dc57bd80dc852f..00000000000000
--- a/ReactAndroid/src/main/jni/third-party/android-ndk/BUCK
+++ /dev/null
@@ -1,24 +0,0 @@
-# NOTE(agallagher): The platform should really be responsible for providing
-# this type of implicit dependency.  As it is now, we need to setup a dummy
-# rules to model the Android NDK's built in libraries.
-
-LIBS = (
-    "android",
-    "EGL",
-    "GLESv2",
-    "jnigraphics",
-    "log",
-    "z",
-)
-
-for lib in LIBS:
-    prebuilt_cxx_library(
-        name = lib,
-        header_only = True,
-        exported_platform_linker_flags = [
-            ("android.*", ["-l" + lib]),
-        ],
-        visibility = [
-            "PUBLIC",
-        ],
-    )
diff --git a/ReactAndroid/src/main/jni/third-party/boost/Android.mk b/ReactAndroid/src/main/jni/third-party/boost/Android.mk
index 35de5ae29b06d1..089e7d84b5a47a 100644
--- a/ReactAndroid/src/main/jni/third-party/boost/Android.mk
+++ b/ReactAndroid/src/main/jni/third-party/boost/Android.mk
@@ -3,8 +3,6 @@ include $(CLEAR_VARS)
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
-CXX11_FLAGS := -std=gnu++11
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
 
 LOCAL_MODULE    := boost
 
diff --git a/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk b/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk
index bf0fa7face0153..64f7e67e8ad51f 100644
--- a/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk
+++ b/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk
@@ -16,8 +16,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-CXX11_FLAGS := -std=c++11 -Wno-unused-variable -Wno-unused-local-typedefs
+CXX11_FLAGS := -Wno-unused-variable -Wno-unused-local-typedefs
 LOCAL_CFLAGS += $(CXX11_FLAGS)
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
 
-include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactAndroid/src/main/jni/third-party/folly/Android.mk b/ReactAndroid/src/main/jni/third-party/folly/Android.mk
index 5692613c8dd1fe..132a44247c2a6f 100644
--- a/ReactAndroid/src/main/jni/third-party/folly/Android.mk
+++ b/ReactAndroid/src/main/jni/third-party/folly/Android.mk
@@ -6,23 +6,19 @@ LOCAL_SRC_FILES:= \
 	folly/Unicode.cpp \
 	folly/Conv.cpp \
 	folly/Demangle.cpp \
-  folly/detail/MallocImpl.cpp \
-  folly/StringBase.cpp \
-  folly/dynamic.cpp \
+  	folly/detail/MallocImpl.cpp \
+  	folly/StringBase.cpp \
+  	folly/dynamic.cpp \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti
-LOCAL_CFLAGS += -Wall -Werror -std=c++11
 
-CXX11_FLAGS := -std=gnu++11
-LOCAL_CFLAGS += $(CXX11_FLAGS)
-
-FOLLY_FLAGS := -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1
+FOLLY_FLAGS := -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1
 LOCAL_CFLAGS += $(FOLLY_FLAGS)
 
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS) $(FOLLY_FLAGS)
+LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
 
 LOCAL_MODULE := libfolly_json
 
diff --git a/ReactAndroid/src/main/jni/third-party/glog/Android.mk b/ReactAndroid/src/main/jni/third-party/glog/Android.mk
index 01a14538c03843..a352ebd9451c15 100644
--- a/ReactAndroid/src/main/jni/third-party/glog/Android.mk
+++ b/ReactAndroid/src/main/jni/third-party/glog/Android.mk
@@ -16,7 +16,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.5/src/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.5/src/
 
 LOCAL_CFLAGS += \
-  -Wall \
   -Wwrite-strings \
   -Woverloaded-virtual \
   -Wno-sign-compare \
@@ -27,6 +26,6 @@ LOCAL_CFLAGS += \
   -D_END_GOOGLE_NAMESPACE_="}"
 
 
-LOCAL_MODULE    := glog
+LOCAL_MODULE := glog
 
 include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK b/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK
index 98e1cdf542da68..e8c4380c800a5f 100644
--- a/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK
+++ b/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "logging",
diff --git a/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK b/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK
index 768455a121428b..833276c6d04cf2 100644
--- a/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK
+++ b/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar")
 
 rn_android_library(
     name = "powermock",
diff --git a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK
index e81c585b889ea4..8e962c86b125c2 100644
--- a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK
+++ b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_android_prebuilt_aar", "rn_prebuilt_jar")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_android_prebuilt_aar", "rn_prebuilt_jar")
 
 rn_android_prebuilt_aar(
     name = "fresco-react-native",
@@ -8,8 +8,8 @@ rn_android_prebuilt_aar(
 
 remote_file(
     name = "fresco-binary-aar",
-    sha1 = "f4415e8676eef4d12fdc8ddbd784bb752cf0c5e3",
-    url = "mvn:com.facebook.fresco:fresco:aar:1.9.0",
+    sha1 = "076812472879be341f392c4aab469b8fdf8c6759",
+    url = "mvn:com.facebook.fresco:fresco:aar:1.10.0",
 )
 
 android_prebuilt_aar(
@@ -20,8 +20,8 @@ android_prebuilt_aar(
 
 remote_file(
     name = "drawee-binary-aar",
-    sha1 = "e0c3b0fa64fc7525f05a852476bc8723ae6ddc90",
-    url = "mvn:com.facebook.fresco:drawee:aar:1.9.0",
+    sha1 = "c1fef7cdc5f6e4fd7d7c58522075c6b66f46a52b",
+    url = "mvn:com.facebook.fresco:drawee:aar:1.10.0",
 )
 
 rn_android_library(
@@ -42,8 +42,8 @@ rn_android_prebuilt_aar(
 
 remote_file(
     name = "imagepipeline-base-aar",
-    sha1 = "8034e5c8a75385bd20e72ff51489b0673029fcf7",
-    url = "mvn:com.facebook.fresco:imagepipeline-base:aar:1.9.0",
+    sha1 = "56672fa5fa46bf4962adecc7c88a1544f5a20225",
+    url = "mvn:com.facebook.fresco:imagepipeline-base:aar:1.10.0",
 )
 
 rn_android_prebuilt_aar(
@@ -54,8 +54,8 @@ rn_android_prebuilt_aar(
 
 remote_file(
     name = "imagepipeline-aar",
-    sha1 = "8043733b1bf3713d3a3c7fc7896205c96c050fd7",
-    url = "mvn:com.facebook.fresco:imagepipeline:aar:1.9.0",
+    sha1 = "e317bdb7f18f0f4ac4f3ab5d3edb49fd09290a6f",
+    url = "mvn:com.facebook.fresco:imagepipeline:aar:1.10.0",
 )
 
 rn_prebuilt_jar(
@@ -78,8 +78,8 @@ android_prebuilt_aar(
 
 remote_file(
     name = "fbcore-aar",
-    sha1 = "fc3703511dc7b135bcd0e76d8015cdaf247b1760",
-    url = "mvn:com.facebook.fresco:fbcore:aar:1.9.0",
+    sha1 = "d79dbf5e47d6e528dd1f90170e0299c14d835ab8",
+    url = "mvn:com.facebook.fresco:fbcore:aar:1.10.0",
 )
 
 android_prebuilt_aar(
@@ -90,6 +90,6 @@ android_prebuilt_aar(
 
 remote_file(
     name = "imagepipeline-okhttp3-binary-aar",
-    sha1 = "4ac95941c1761a1ba5647ed551f7e47a5c417c7b",
-    url = "mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:1.9.0",
+    sha1 = "3429ffb776d7511d0f911fbe9efda4c73179d416",
+    url = "mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:1.10.0",
 )
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 3008da960a2329..5664b7dd7cf168 100644
--- a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
+++ b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
@@ -6,6 +6,6 @@ android_prebuilt_aar(
 
 remote_file(
     name = "soloader-binary-aar",
-    sha1 = "5f4b28f3c401f3d9bb2d081af08f6ce784a02da5",
-    url = "mvn:com.facebook.soloader:soloader:aar:0.3.0",
+    sha1 = "042357559a6c9313bdb9b1ba137a9df3b5365f35",
+    url = "mvn:com.facebook.soloader:soloader:aar:0.5.1",
 )
diff --git a/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK b/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK
deleted file mode 100644
index 60baf8edc408e8..00000000000000
--- a/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK
+++ /dev/null
@@ -1,34 +0,0 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_android_prebuilt_aar", "rn_prebuilt_jar")
-
-rn_android_library(
-    name = "textlayoutbuilder",
-    visibility = ["//ReactAndroid/..."],
-    exported_deps = [
-        ":staticlayoutproxy",
-        ":textlayoutbuilder-base",
-    ],
-)
-
-rn_android_prebuilt_aar(
-    name = "textlayoutbuilder-base",
-    aar = ":textlayoutbuilder-base-aar",
-    visibility = ["//ReactAndroid/..."],
-)
-
-remote_file(
-    name = "textlayoutbuilder-base-aar",
-    sha1 = "29bc8e5a1e2b33944b88277652ee83092ae1dbc0",
-    url = "mvn:com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:aar:1.0.0",
-)
-
-rn_prebuilt_jar(
-    name = "staticlayoutproxy",
-    binary_jar = ":staticlayoutproxy.jar",
-    visibility = ["//ReactAndroid/..."],
-)
-
-remote_file(
-    name = "staticlayoutproxy.jar",
-    sha1 = "f162442a19fff13995fbd51ba414d9ee05579080",
-    url = "mvn:com.facebook.fbui.textlayoutbuilder:staticlayout-proxy:jar:1.0",
-)
diff --git a/ReactAndroid/src/main/res/BUCK b/ReactAndroid/src/main/res/BUCK
index 00aac50e581045..afb0be006d627c 100644
--- a/ReactAndroid/src/main/res/BUCK
+++ b/ReactAndroid/src/main/res/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_target", "rn_android_resource")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_target", "rn_android_resource")
 
 rn_android_resource(
     name = "devsupport",
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-af/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-af/strings.xml
new file mode 100644
index 00000000000000..2ac5f222d3ddcf
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-af/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: af_ZA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ar/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ar/strings.xml
new file mode 100644
index 00000000000000..f493c38e051890
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ar/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ar_AR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-as/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-as/strings.xml
new file mode 100644
index 00000000000000..6f7fecbce1a5d7
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-as/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: as_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-az/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-az/strings.xml
new file mode 100644
index 00000000000000..ad4b43e7f07b06
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-az/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: az_AZ -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-bg/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-bg/strings.xml
new file mode 100644
index 00000000000000..0dbf0001273d9d
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-bg/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: bg_BG -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-bn/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-bn/strings.xml
new file mode 100644
index 00000000000000..4af0c011730c03
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-bn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: bn_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-bs/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-bs/strings.xml
new file mode 100644
index 00000000000000..83bfd3e44a5700
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-bs/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: bs_BA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ca/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ca/strings.xml
new file mode 100644
index 00000000000000..18a70667d257e2
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ca/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ca_ES -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-cb/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-cb/strings.xml
new file mode 100644
index 00000000000000..a936c2b60046d5
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-cb/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: cb_IQ -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-cs/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-cs/strings.xml
new file mode 100644
index 00000000000000..1d7a37be546f94
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-cs/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: cs_CZ -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-da/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-da/strings.xml
new file mode 100644
index 00000000000000..ee825766595051
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-da/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: da_DK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-de/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-de/strings.xml
new file mode 100644
index 00000000000000..e1b0f2a0868948
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-de/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: de_DE -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-el/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-el/strings.xml
new file mode 100644
index 00000000000000..53281c136f91aa
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-el/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: el_GR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-en-rGB/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-en-rGB/strings.xml
new file mode 100644
index 00000000000000..4ce9e91aec791f
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-en-rGB/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: en_GB -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-es-rES/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-es-rES/strings.xml
new file mode 100644
index 00000000000000..ee27f4a0f34130
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-es-rES/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: es_ES -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-es/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-es/strings.xml
new file mode 100644
index 00000000000000..228d615198d11e
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-es/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: es_LA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-et/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-et/strings.xml
new file mode 100644
index 00000000000000..ccb6ac6b138265
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-et/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: et_EE -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-fa/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-fa/strings.xml
new file mode 100644
index 00000000000000..d571b0a8e8a66e
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-fa/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fa_IR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-fb-rLS/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-fb-rLS/strings.xml
new file mode 100644
index 00000000000000..3e5736ed0a40d6
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-fb-rLS/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fb_LS -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-fb/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-fb/strings.xml
new file mode 100644
index 00000000000000..57006902eaa3be
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-fb/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fb_HA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-fi/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-fi/strings.xml
new file mode 100644
index 00000000000000..621122257609d8
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-fi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fi_FI -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-fr-rCA/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-fr-rCA/strings.xml
new file mode 100644
index 00000000000000..a91bb8ab1152b6
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-fr-rCA/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fr_CA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-fr/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-fr/strings.xml
new file mode 100644
index 00000000000000..56588926319f67
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-fr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fr_FR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-gu/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-gu/strings.xml
new file mode 100644
index 00000000000000..f3174fd2091212
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-gu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: gu_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-hi/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-hi/strings.xml
new file mode 100644
index 00000000000000..41f3ba790ab367
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-hi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: hi_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-hr/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-hr/strings.xml
new file mode 100644
index 00000000000000..0112dc17382391
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-hr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: hr_HR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-hu/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-hu/strings.xml
new file mode 100644
index 00000000000000..ca3ba7246645d7
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-hu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: hu_HU -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-in/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-in/strings.xml
new file mode 100644
index 00000000000000..dee75b1336ba11
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-in/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: id_ID -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-is/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-is/strings.xml
new file mode 100644
index 00000000000000..86daafa18f13c9
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-is/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: is_IS -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-it/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-it/strings.xml
new file mode 100644
index 00000000000000..eb0618ab43872e
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-it/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: it_IT -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-iw/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-iw/strings.xml
new file mode 100644
index 00000000000000..2ee633a590b3d4
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-iw/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: he_IL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ja/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ja/strings.xml
new file mode 100644
index 00000000000000..afe0efd6bc18c7
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ja/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ja_JP -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ka/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ka/strings.xml
new file mode 100644
index 00000000000000..a2d62ddd0301f7
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ka/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ka_GE -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-km/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-km/strings.xml
new file mode 100644
index 00000000000000..b9f9cb3c28f9de
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-km/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: km_KH -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-kn/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-kn/strings.xml
new file mode 100644
index 00000000000000..249740599094f2
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-kn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: kn_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ko/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ko/strings.xml
new file mode 100644
index 00000000000000..a06e326655cb42
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ko/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ko_KR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-lo/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-lo/strings.xml
new file mode 100644
index 00000000000000..72a0480d3d46ea
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-lo/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: lo_LA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-lt/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-lt/strings.xml
new file mode 100644
index 00000000000000..0a9ee397a3d843
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-lt/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: lt_LT -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-lv/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-lv/strings.xml
new file mode 100644
index 00000000000000..a617e2c5f6b15a
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-lv/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: lv_LV -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-mk/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-mk/strings.xml
new file mode 100644
index 00000000000000..b519c79b5d30a0
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-mk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: mk_MK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ml/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ml/strings.xml
new file mode 100644
index 00000000000000..0421596adc473a
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ml/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ml_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-mn/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-mn/strings.xml
new file mode 100644
index 00000000000000..d2249cef82b692
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-mn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: mn_MN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-mr/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-mr/strings.xml
new file mode 100644
index 00000000000000..06650b35cde3bf
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-mr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: mr_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ms/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ms/strings.xml
new file mode 100644
index 00000000000000..3254e7a4de1852
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ms/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ms_MY -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-my/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-my/strings.xml
new file mode 100644
index 00000000000000..35aed12121980e
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-my/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: my_MM -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-nb/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-nb/strings.xml
new file mode 100644
index 00000000000000..ab5d7818ff708a
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-nb/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: nb_NO -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ne/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ne/strings.xml
new file mode 100644
index 00000000000000..e986ad9ab7c83c
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ne/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ne_NP -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-nl/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-nl/strings.xml
new file mode 100644
index 00000000000000..dc4c14ae831434
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-nl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: nl_NL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-pa/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-pa/strings.xml
new file mode 100644
index 00000000000000..f1994ddd214354
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-pa/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pa_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-pl/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-pl/strings.xml
new file mode 100644
index 00000000000000..1f396b72c3f19f
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-pl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pl_PL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-pt-rPT/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-pt-rPT/strings.xml
new file mode 100644
index 00000000000000..2081dde129f293
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-pt-rPT/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pt_PT -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-pt/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-pt/strings.xml
new file mode 100644
index 00000000000000..ebe70acac7e0b2
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-pt/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pt_BR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-qz/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-qz/strings.xml
new file mode 100644
index 00000000000000..2bad18d0dfe269
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-qz/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: qz_MM -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ro/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ro/strings.xml
new file mode 100644
index 00000000000000..551623e97e361d
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ro/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ro_RO -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ru/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ru/strings.xml
new file mode 100644
index 00000000000000..38e533eaf81cab
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ru/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ru_RU -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-si/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-si/strings.xml
new file mode 100644
index 00000000000000..48b45a522bec6a
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-si/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: si_LK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-sk/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-sk/strings.xml
new file mode 100644
index 00000000000000..a7b69ad9337c3d
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-sk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sk_SK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-sl/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-sl/strings.xml
new file mode 100644
index 00000000000000..2fde2cc7cc9b96
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-sl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sl_SI -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-sn/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-sn/strings.xml
new file mode 100644
index 00000000000000..a585ebb08157d6
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-sn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sn_ZW -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-sq/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-sq/strings.xml
new file mode 100644
index 00000000000000..0004bf85b658a4
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-sq/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sq_AL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-sr/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-sr/strings.xml
new file mode 100644
index 00000000000000..44a106992d3ed8
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-sr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sr_RS -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-sv/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-sv/strings.xml
new file mode 100644
index 00000000000000..3b69b622d30a89
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-sv/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sv_SE -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-sw/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-sw/strings.xml
new file mode 100644
index 00000000000000..9a632fd5131307
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-sw/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sw_KE -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ta/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ta/strings.xml
new file mode 100644
index 00000000000000..4f2782cb2ea799
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ta/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ta_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-te/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-te/strings.xml
new file mode 100644
index 00000000000000..87a19868db8e0f
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-te/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: te_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-th/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-th/strings.xml
new file mode 100644
index 00000000000000..21c5c6becd58e6
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-th/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: th_TH -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-tl/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-tl/strings.xml
new file mode 100644
index 00000000000000..83fab2e66d3e6d
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-tl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: tl_PH -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-tr/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-tr/strings.xml
new file mode 100644
index 00000000000000..4b59dbd4bcbc8b
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-tr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: tr_TR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-uk/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-uk/strings.xml
new file mode 100644
index 00000000000000..ba21f8c7e73053
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-uk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: uk_UA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-ur/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-ur/strings.xml
new file mode 100644
index 00000000000000..20afa4784dcead
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-ur/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ur_PK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-vi/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-vi/strings.xml
new file mode 100644
index 00000000000000..d6f0df91310d87
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-vi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: vi_VN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-wo/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-wo/strings.xml
new file mode 100644
index 00000000000000..f052e42adf9a5b
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-wo/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: wo_SN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-zh-rCN/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-zh-rCN/strings.xml
new file mode 100644
index 00000000000000..d3c30bf0c25374
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-zh-rCN/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: zh_CN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-zh-rHK/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-zh-rHK/strings.xml
new file mode 100644
index 00000000000000..29bd2a96566a3e
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-zh-rHK/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: zh_HK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-zh-rTW/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-zh-rTW/strings.xml
new file mode 100644
index 00000000000000..2e57ad05c5952e
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-zh-rTW/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: zh_TW -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values-zu/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values-zu/strings.xml
new file mode 100644
index 00000000000000..cf05696f4b856e
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values-zu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: zu_ZA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values/ids.xml b/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
index 8ccd44d4b61302..dad133a6a06216 100644
--- a/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
+++ b/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
@@ -8,4 +8,11 @@
 
   <!-- tag is used to store the nativeID tag -->
   <item type="id" name="view_tag_instance_handle"/>
+
+  <!--tag is used to store accessibilityHint tag-->
+  <item type="id" name="accessibility_hint"/>
+
+  <!--tag is used to store accessibilityRole tag-->
+  <item type="id" name="accessibility_role"/>
+
 </resources>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values/strings.xml b/ReactAndroid/src/main/res/views/uimanager/values/strings.xml
new file mode 100644
index 00000000000000..60c9e805311896
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string
+    name="link_description"
+    translatable="false"
+    >Link</string>
+  <string
+    name="search_description"
+    translatable="false"
+    >Search Field</string>
+  <string
+    name="image_description"
+    translatable="false"
+    >Image</string>
+  <string
+    name="image_button_description"
+    translatable="false"
+    >Button, Image</string>
+  <string
+    name="adjustable_description"
+    translatable="false"
+    >Adjustable</string>
+</resources>
diff --git a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK
index cad12896cee525..80a5ef65b053f4 100644
--- a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK
+++ b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK
@@ -6,6 +6,6 @@ prebuilt_jar(
 
 remote_file(
     name = "support-annotations-binary.jar",
-    sha1 = "0814258103cf26a15fcc26ecce35f5b7d24b73f8",
-    url = "mvn:com.android.support:support-annotations:jar:26.1.0",
+    sha1 = "39ded76b5e1ce1c5b2688e1d25cdc20ecee32007",
+    url = "mvn:com.android.support:support-annotations:jar:27.1.1",
 )
diff --git a/ReactAndroid/src/main/third-party/android/support/BUCK b/ReactAndroid/src/main/third-party/android/support/BUCK
new file mode 100644
index 00000000000000..13e8bff7c29c38
--- /dev/null
+++ b/ReactAndroid/src/main/third-party/android/support/BUCK
@@ -0,0 +1,25 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_android_resource", "rn_prebuilt_jar")
+
+rn_android_library(
+    name = "support-v4",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        react_native_dep("third-party/android/support:support-v4"),
+    ],
+)
+
+rn_android_library(
+    name = "appcompat-v7",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        react_native_dep("third-party/android/support:support-v4"),
+    ],
+)
+
+# a fake genrule so that BUCK files in react native are preseable in fbsource
+genrule(
+    name = "appcompat-res-cmd",
+    out = ".",
+    bash = "ls",
+    visibility = ["PUBLIC"],
+)
diff --git a/ReactAndroid/src/main/third-party/android/support/v4/BUCK b/ReactAndroid/src/main/third-party/android/support/v4/BUCK
index e816510b9a807f..27aec407f2907b 100644
--- a/ReactAndroid/src/main/third-party/android/support/v4/BUCK
+++ b/ReactAndroid/src/main/third-party/android/support/v4/BUCK
@@ -5,6 +5,7 @@ android_library(
         ":android-lifecycle-common",
         ":android-lifecycle-core",
         ":android-lifecycle-runtime",
+        ":android-lifecycle-viewmodel",
         ":lib-support-v4-support-compat",
         ":lib-support-v4-support-core-ui",
         ":lib-support-v4-support-core-utils",
@@ -28,6 +29,11 @@ android_prebuilt_aar(
     aar = ":android-lifecycle-runtime-aar",
 )
 
+android_prebuilt_aar(
+    name = "android-lifecycle-viewmodel",
+    aar = ":android-lifecycle-viewmodel-aar",
+)
+
 android_prebuilt_aar(
     name = "lib-support-v4-support-compat",
     aar = ":lib-support-v4-support-compat-aar",
@@ -55,48 +61,54 @@ android_prebuilt_aar(
 
 remote_file(
     name = "android-lifecycle-runtime-aar",
-    sha1 = "30c60a8a357ee1321ffd0c9f08ef54b24045cd10",
-    url = "mvn:android.arch.lifecycle:runtime:aar:1.0.0",
+    sha1 = "95428e5f6bf6875a6a1125d2157c3836a1a837f5",
+    url = "mvn:android.arch.lifecycle:runtime:aar:1.1.0",
 )
 
 remote_file(
     name = "android-lifecycle-common.jar",
-    sha1 = "e414a4cb28434e25c4f6aa71426eb20cf4874ae9",
-    url = "mvn:android.arch.lifecycle:common:jar:1.0.0",
+    sha1 = "0edf3f7bfb84a7521d0599efa3b0113a0ee90f85",
+    url = "mvn:android.arch.lifecycle:common:jar:1.1.0",
 )
 
 remote_file(
     name = "android-lifecycle-core.jar",
-    sha1 = "a2d487452376193fc8c103dd2b9bd5f2b1b44563",
-    url = "mvn:android.arch.core:common:jar:1.0.0",
+    sha1 = "8007981f7d7540d89cd18471b8e5dcd2b4f99167",
+    url = "mvn:android.arch.core:common:jar:1.1.0",
+)
+
+remote_file(
+    name = "android-lifecycle-viewmodel-aar",
+    sha1 = "74ee369b874da61b5b81bebd7b8df0c2577309c8",
+    url = "mvn:android.arch.lifecycle:viewmodel:aar:1.1.0",
 )
 
 remote_file(
     name = "lib-support-v4-support-compat-aar",
-    sha1 = "1e1c8ffc01d277d8f01dfd11d5d2ce3a2af4b98c",
-    url = "mvn:com.android.support:support-compat:aar:26.1.0",
+    sha1 = "a55ad550d0b84c7fec7ecca012690636062c0e64",
+    url = "mvn:com.android.support:support-compat:aar:27.1.1",
 )
 
 remote_file(
     name = "lib-support-v4-support-core-utils-aar",
-    sha1 = "1bfaae21c4d5c5532c5e732071e9ce234cd58cff",
-    url = "mvn:com.android.support:support-core-utils:aar:26.1.0",
+    sha1 = "b3a7a4040fda0c5138dbc8c477103b6723b9dbe6",
+    url = "mvn:com.android.support:support-core-utils:aar:27.1.1",
 )
 
 remote_file(
     name = "lib-support-v4-support-core-ui-aar",
-    sha1 = "e306308d54052a1ded7bf9c2f5c2fdf5152a1f22",
-    url = "mvn:com.android.support:support-core-ui:aar:26.1.0",
+    sha1 = "f9acdb8a4c3a9fe883fd7fa5efd3f0426bb9dcda",
+    url = "mvn:com.android.support:support-core-ui:aar:27.1.1",
 )
 
 remote_file(
     name = "lib-support-v4-support-media-compat-aar",
-    sha1 = "09fb587f27cde19aa8f2e50c5c9ee645d9aec44d",
-    url = "mvn:com.android.support:support-media-compat:aar:26.1.0",
+    sha1 = "10e309e2cc22ff4cab30bd5f573e4bb30be707ad",
+    url = "mvn:com.android.support:support-media-compat:aar:27.1.1",
 )
 
 remote_file(
     name = "lib-support-v4-support-fragment-aar",
-    sha1 = "ddacf369bb98dd6558606558de8ddcd53895cf91",
-    url = "mvn:com.android.support:support-fragment:aar:26.1.0",
+    sha1 = "eb8053ebf038b7561c29e5e8964664fac05f375e",
+    url = "mvn:com.android.support:support-fragment:aar:27.1.1",
 )
diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK
index 1dda81db73235d..1feeab85b5f7b3 100644
--- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK
+++ b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_android_resource", "rn_prebuilt_jar")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_android_resource", "rn_prebuilt_jar")
 
 # This is a bit messy and hopefully a temporary thing
 # The problem is that Gradle extracts appcompat resources into app namespace, com.facebook.react
@@ -19,6 +19,7 @@ rn_android_library(
     ],
     exported_deps = [
         ":classes-for-react-native",
+        react_native_dep("third-party/android/support-annotations:android-support-annotations"),
     ],
 )
 
@@ -56,6 +57,6 @@ python_binary(
 
 remote_file(
     name = "appcompat-binary-aar",
-    sha1 = "da5771a9ac6e8f3a461360eed3c6f921dc7580fd",
-    url = "mvn:com.android.support:appcompat-v7:aar:26.1.0",
+    sha1 = "22b1ef4ff9ef1a3513c18eb132d597eac6ef1a86",
+    url = "mvn:com.android.support:appcompat-v7:aar:27.1.1",
 )
diff --git a/ReactAndroid/src/main/third-party/java/asm/BUCK b/ReactAndroid/src/main/third-party/java/asm/BUCK
index ab6a14a06d6c84..61ea0f616a2b47 100644
--- a/ReactAndroid/src/main/third-party/java/asm/BUCK
+++ b/ReactAndroid/src/main/third-party/java/asm/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar")
 
 rn_android_library(
     name = "asm",
diff --git a/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK b/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK
index c13c72c46d3b2c..dea24f803e4a36 100644
--- a/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK
+++ b/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_integration_tests_target")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_integration_tests_target")
 
 # this lib was compiled by buck version : 6cbf2709778ea352a169d1c84e3ef2894dfa39ec
 prebuilt_jar(
diff --git a/ReactAndroid/src/main/third-party/java/fest/BUCK b/ReactAndroid/src/main/third-party/java/fest/BUCK
index 49161934e04f77..888d63a22161bd 100644
--- a/ReactAndroid/src/main/third-party/java/fest/BUCK
+++ b/ReactAndroid/src/main/third-party/java/fest/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar")
 
 rn_android_library(
     name = "fest",
diff --git a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK
index 548d17fe77925a..48d34008ce742f 100644
--- a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK
+++ b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK
@@ -1,5 +1,11 @@
 prebuilt_jar(
     name = "infer-annotations",
-    binary_jar = "infer-annotations-4.0.jar",
+    binary_jar = ":infer-annotations.jar",
     visibility = ["//ReactAndroid/..."],
 )
+
+remote_file(
+    name = "infer-annotations.jar",
+    sha1 = "f514ff4ca022a579d9cf7524846988b646ae4491",
+    url = "mvn:com.facebook.infer.annotation:infer-annotation:jar:0.11.2",
+)
diff --git a/ReactAndroid/src/main/third-party/java/infer-annotations/infer-annotations-4.0.jar b/ReactAndroid/src/main/third-party/java/infer-annotations/infer-annotations-4.0.jar
deleted file mode 100644
index 418995d9a5df9f..00000000000000
Binary files a/ReactAndroid/src/main/third-party/java/infer-annotations/infer-annotations-4.0.jar and /dev/null differ
diff --git a/ReactAndroid/src/main/third-party/java/jsr-305/BUCK b/ReactAndroid/src/main/third-party/java/jsr-305/BUCK
index 4db6df5554c255..494c6479d213c9 100644
--- a/ReactAndroid/src/main/third-party/java/jsr-305/BUCK
+++ b/ReactAndroid/src/main/third-party/java/jsr-305/BUCK
@@ -6,6 +6,6 @@ prebuilt_jar(
 
 remote_file(
     name = "jsr305-binary.jar",
-    sha1 = "5871fb60dc68d67da54a663c3fd636a10a532948",
-    url = "mvn:com.google.code.findbugs:jsr305:jar:3.0.0",
+    sha1 = "25ea2e8b0c338a877313bd4672d3fe056ea78f0d",
+    url = "mvn:com.google.code.findbugs:jsr305:jar:3.0.2",
 )
diff --git a/ReactAndroid/src/main/third-party/java/junit/BUCK b/ReactAndroid/src/main/third-party/java/junit/BUCK
index f2f71cd046448f..39209726524b35 100644
--- a/ReactAndroid/src/main/third-party/java/junit/BUCK
+++ b/ReactAndroid/src/main/third-party/java/junit/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar")
 
 rn_android_library(
     name = "junit",
diff --git a/ReactAndroid/src/main/third-party/java/mockito/BUCK b/ReactAndroid/src/main/third-party/java/mockito/BUCK
index 06e0686fa0a03e..7eee994c6e5fa8 100644
--- a/ReactAndroid/src/main/third-party/java/mockito/BUCK
+++ b/ReactAndroid/src/main/third-party/java/mockito/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar")
 
 rn_android_library(
     name = "mockito",
@@ -17,8 +17,8 @@ rn_prebuilt_jar(
 
 remote_file(
     name = "mockito-binary.jar",
-    sha1 = "e8546f5bef4e061d8dd73895b4e8f40e3fe6effe",
-    url = "mvn:org.mockito:mockito-core:jar:1.10.19",
+    sha1 = "c54c55cae0f4742ad6bf8a1987ada35363f2c4e2",
+    url = "mvn:org.mockito:mockito-core:jar:2.19.1",
 )
 
 rn_prebuilt_jar(
diff --git a/ReactAndroid/src/main/third-party/java/okhttp/BUCK b/ReactAndroid/src/main/third-party/java/okhttp/BUCK
index 64dc55f36c99d2..db3a2a2affb310 100644
--- a/ReactAndroid/src/main/third-party/java/okhttp/BUCK
+++ b/ReactAndroid/src/main/third-party/java/okhttp/BUCK
@@ -6,8 +6,8 @@ prebuilt_jar(
 
 remote_file(
     name = "okhttp3-binary.jar",
-    sha1 = "7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e",
-    url = "mvn:com.squareup.okhttp3:okhttp:jar:3.10.0",
+    sha1 = "75966e05a49046ca2ae734e5626f28837a8d1e82",
+    url = "mvn:com.squareup.okhttp3:okhttp:jar:3.11.0",
 )
 
 prebuilt_jar(
@@ -18,6 +18,6 @@ prebuilt_jar(
 
 remote_file(
     name = "okhttp3-urlconnection-binary.jar",
-    sha1 = "ec614c05825ddd2267677a99f585d3913474b125",
-    url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.10.0",
+    sha1 = "54ec442e9c0fac51265110cf0cb44dfe5ad1ea05",
+    url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.11.0",
 )
diff --git a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK
index 1df19014bcd283..b29b1b7d316cb8 100644
--- a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK
+++ b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library", "rn_prebuilt_jar")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_prebuilt_jar")
 
 rn_android_library(
     name = "robolectric",
diff --git a/ReactAndroid/src/main/third-party/java/sqlite/BUCK b/ReactAndroid/src/main/third-party/java/sqlite/BUCK
index a739fae9f85a05..ff5c72cd36bcf5 100644
--- a/ReactAndroid/src/main/third-party/java/sqlite/BUCK
+++ b/ReactAndroid/src/main/third-party/java/sqlite/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_prebuilt_jar")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar")
 
 rn_android_library(
     name = "sqlite",
diff --git a/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK b/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK
index 4fd90a102b3720..eec98c1de7106d 100644
--- a/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "logging",
diff --git a/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java b/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java
index baf9b9913b8bc8..3e944404b7e034 100644
--- a/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java
+++ b/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/BUCK b/ReactAndroid/src/test/java/com/facebook/react/BUCK
index 3551cdbeb10804..3eecaae58b7f51 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
 
 rn_robolectric_test(
     name = "react",
diff --git a/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java b/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java
index f12b8b178c168e..643d003e5175be 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
index d706b9c79e647d..9debe317bb8c18 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK
index 4849a1659049ba..76d35a6ce1c914 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
 
 rn_robolectric_test(
     name = "animated",
diff --git a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
index 3c31cb1cf00c12..6e12db5c4153f4 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK
index 7a5779042234d9..62f5bd2dfa08e3 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_android_library", "rn_robolectric_test")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_android_library", "rn_robolectric_test")
 
 STANDARD_TEST_SRCS = [
     "*Test.java",
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java
index 637bd812b35c83..e48e7b20b37199 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -41,7 +41,7 @@ public class BaseJavaModuleTest {
   @Before
   public void setup() {
     ModuleHolder moduleHolder = new ModuleHolder(new MethodsModule());
-    mWrapper = new JavaModuleWrapper(null, MethodsModule.class, moduleHolder);
+    mWrapper = new JavaModuleWrapper(null, moduleHolder);
     mMethods = mWrapper.getMethodDescriptors();
     PowerMockito.mockStatic(SoLoader.class);
     mArguments = PowerMockito.mock(ReadableNativeArray.class);
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java
index 6b0a18177a1740..1fa1e4aa455db6 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/InstanceHandleHelper.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/InstanceHandleHelper.java
index bb47fd0dac3213..836ac568041842 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/InstanceHandleHelper.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/InstanceHandleHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java
index d2d95b197ae412..571b96900c1128 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java
index 353d743587d333..262c187b7e42de 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/ModuleSpecTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/ModuleSpecTest.java
deleted file mode 100644
index 4f01b2070ae051..00000000000000
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/ModuleSpecTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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.bridge;
-
-import com.facebook.react.common.build.ReactBuildConfig;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
-import org.powermock.modules.junit4.rule.PowerMockRule;
-import org.powermock.reflect.Whitebox;
-import org.robolectric.RobolectricTestRunner;
-
-import static org.fest.assertions.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "android.*"})
-@SuppressStaticInitializationFor("com.facebook.react.common.build.ReactBuildConfig")
-@PrepareForTest({ReactBuildConfig.class})
-@RunWith(RobolectricTestRunner.class)
-public class ModuleSpecTest {
-  @Rule
-  public PowerMockRule rule = new PowerMockRule();
-
-  @Test(expected = IllegalArgumentException.class)
-  public void testSimpleFailFast() {
-    Whitebox.setInternalState(ReactBuildConfig.class, "DEBUG", true);
-    ModuleSpec.simple(ComplexModule.class, mock(ReactApplicationContext.class));
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void testSimpleFailFastDefault() {
-    Whitebox.setInternalState(ReactBuildConfig.class, "DEBUG", true);
-    ModuleSpec.simple(ComplexModule.class);
-  }
-
-  @Test
-  public void testSimpleNoFailFastRelease() {
-    Whitebox.setInternalState(ReactBuildConfig.class, "DEBUG", false);
-    ModuleSpec.simple(ComplexModule.class, mock(ReactApplicationContext.class));
-  }
-
-  @Test(expected = RuntimeException.class)
-  public void testSimpleFailLateRelease() {
-    Whitebox.setInternalState(ReactBuildConfig.class, "DEBUG", false);
-    ModuleSpec spec = ModuleSpec.simple(ComplexModule.class, mock(ReactApplicationContext.class));
-    spec.getProvider().get();
-  }
-
-  @Test
-  public void testSimpleDefaultConstructor() {
-    Whitebox.setInternalState(ReactBuildConfig.class, "DEBUG", true);
-    ModuleSpec spec = ModuleSpec.simple(SimpleModule.class);
-    assertThat(spec.getProvider().get()).isInstanceOf(SimpleModule.class);
-  }
-
-  @Test
-  public void testSimpleContextConstructor() {
-    Whitebox.setInternalState(ReactBuildConfig.class, "DEBUG", true);
-    ReactApplicationContext context = mock(ReactApplicationContext.class);
-    ModuleSpec spec = ModuleSpec.simple(SimpleContextModule.class, context);
-
-    NativeModule module = spec.getProvider().get();
-    assertThat(module).isInstanceOf(SimpleContextModule.class);
-    SimpleContextModule contextModule = (SimpleContextModule) module;
-    assertThat(contextModule.getReactApplicationContext()).isSameAs(context);
-  }
-
-  public static class ComplexModule extends BaseJavaModule {
-
-    public ComplexModule(int a, int b) {
-    }
-
-    public String getName() {
-      return "ComplexModule";
-    }
-  }
-
-  public static class SimpleModule extends BaseJavaModule {
-
-    public String getName() {
-      return "SimpleModule";
-    }
-  }
-
-  public static class SimpleContextModule extends ReactContextBaseJavaModule {
-
-    public SimpleContextModule(ReactApplicationContext context) {
-      super(context);
-    }
-
-    public String getName() {
-      return "SimpleContextModule";
-    }
-  }
-}
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
index e35d7ea8f583a3..7722823038d921 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK
index 0b3fd967a29102..2bf74a64315a33 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
 
 rn_robolectric_test(
     name = "devsupport",
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
index 4763eabbed21a4..3b4a8a209baa82 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
index 04a947a346403e..311819523fe44e 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java
index 70b64184bcb504..9fc112b28791ad 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/test/java/com/facebook/react/fabric/BUCK
deleted file mode 100644
index 874e64a7ec8a7a..00000000000000
--- a/ReactAndroid/src/test/java/com/facebook/react/fabric/BUCK
+++ /dev/null
@@ -1,41 +0,0 @@
-load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
-
-if not IS_OSS_BUILD:
-    rn_robolectric_test(
-        name = "fabric",
-        srcs = glob(["**/*.java"]),
-        contacts = ["oncall+fbandroid_sheriff@xmail.facebook.com"],
-        resources = glob([
-            "**/*.txt",
-            "**/*.json",
-        ]),
-        visibility = [
-            "PUBLIC",
-        ],
-        deps = [
-            "xplat//yoga/java:java",
-            react_native_dep("third-party/java/assertj:assertj-core"),
-            react_native_dep("third-party/java/fest:fest"),
-            react_native_dep("third-party/java/fest:fest_android"),
-            react_native_dep("third-party/java/guava:guava"),
-            react_native_dep("third-party/java/jackson:jackson"),
-            react_native_dep("third-party/java/jsr-305:jsr-305"),
-            react_native_dep("third-party/java/jsr-330:jsr-330"),
-            react_native_dep("third-party/java/junit:junit"),
-            react_native_dep("third-party/java/mockito:mockito"),
-            react_native_dep("third-party/java/robolectric3/robolectric:robolectric"),
-            react_native_dep("libraries/fbcore/src/test/java/com/facebook/powermock:powermock"),
-            react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
-            react_native_dep("third-party/android/support/v4:lib-support-v4"),
-            react_native_target("java/com/facebook/react:react"),
-            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/fabric:fabric"),
-            react_native_target("java/com/facebook/react/modules/core:core"),
-            react_native_target("java/com/facebook/react/uimanager:uimanager"),
-            react_native_target("java/com/facebook/react/views/text:text"),
-            react_native_target("java/com/facebook/react/views/view:view"),
-            react_native_target("java/com/facebook/react/views/progressbar:progressbar"),
-            react_native_tests_target("java/com/facebook/react/bridge:testhelpers"),
-        ],
-    )
diff --git a/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricReconcilerTest.java b/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricReconcilerTest.java
deleted file mode 100644
index b627df9af6bcd9..00000000000000
--- a/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricReconcilerTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 static org.fest.assertions.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import com.facebook.react.bridge.CatalystInstance;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactTestHelper;
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.uimanager.NativeViewHierarchyManager;
-import com.facebook.react.uimanager.ReactShadowNode;
-import com.facebook.react.uimanager.ReactShadowNodeImpl;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIViewOperationQueue;
-import com.facebook.react.uimanager.ViewAtIndex;
-import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.uimanager.ViewManagerRegistry;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-/** Tests {@link FabricReconciler} */
-@RunWith(RobolectricTestRunner.class)
-public class FabricReconcilerTest {
-
-  private FabricReconciler mFabricReconciler;
-  private FabricUIManager mFabricUIManager;
-  private MockUIViewOperationQueue mMockUIViewOperationQueue;
-
-  @Before
-  public void setUp() {
-    CatalystInstance catalystInstance = ReactTestHelper.createMockCatalystInstance();
-    ReactApplicationContext reactContext =
-        new ReactApplicationContext(RuntimeEnvironment.application);
-    reactContext.initializeWithInstance(catalystInstance);
-    List<ViewManager> viewManagers = new ArrayList<>();
-    ViewManagerRegistry viewManagerRegistry = new ViewManagerRegistry(viewManagers);
-    JavaScriptContextHolder jsContext = mock(JavaScriptContextHolder.class);
-    EventDispatcher eventDispatcher = mock(EventDispatcher.class);
-    mFabricUIManager = new FabricUIManager(reactContext, viewManagerRegistry, jsContext, eventDispatcher);
-    mMockUIViewOperationQueue = new MockUIViewOperationQueue(reactContext);
-    mFabricReconciler = new FabricReconciler(mMockUIViewOperationQueue);
-  }
-
-  @Test
-  public void testSimpleHierarchy() {
-    ReactShadowNode parent = createNode(0);
-    ReactShadowNode child1 = createNode(1);
-    ReactShadowNode child2 = createNode(2);
-    addChildren(parent, child1, child2);
-
-    ReactShadowNode parentCloned = createNode(0);
-    ReactShadowNode child3 = createNode(3);
-    addChildren(parentCloned, child3, child2);
-
-    mFabricReconciler.manageChildren(parent, parentCloned);
-
-    List<ManageChildrenOperation> expectedOperations = new ArrayList<>();
-    expectedOperations.add(
-        new ManageChildrenOperation(
-            0,
-            new int[] {0, 1},
-            new ViewAtIndex[] {new ViewAtIndex(3, 0), new ViewAtIndex(2, 1)},
-            new int[] {1}));
-    assertThat(mMockUIViewOperationQueue.getOperations()).isEqualTo(expectedOperations);
-  }
-
-  @Test
-  public void testVirtualNodes() {
-    ReactShadowNode parent = createNode(0);
-    ReactShadowNode child1 = createVirtualNode(1);
-    ReactShadowNode child2 = createVirtualNode(2);
-    ReactShadowNode child3 = createVirtualNode(3);
-    addChildren(parent, child1, child2, child3);
-
-    ReactShadowNode parentCloned = createNode(0);
-    ReactShadowNode child4 = createVirtualNode(4);
-    addChildren(parentCloned, child1, child4, child3);
-
-    mFabricReconciler.manageChildren(parent, parentCloned);
-
-    List<ManageChildrenOperation> expectedOperations = new ArrayList<>();
-    assertThat(mMockUIViewOperationQueue.getOperations()).isEqualTo(expectedOperations);
-  }
-
-  private void addChildren(ReactShadowNode parent, ReactShadowNode... children) {
-    for (ReactShadowNode child : children) {
-      mFabricUIManager.appendChild(parent, child);
-    }
-  }
-
-  private static ReactShadowNode createNode(int tag) {
-    return createNode(tag, false);
-  }
-
-  private static ReactShadowNode createVirtualNode(int tag) {
-    return createNode(tag, true);
-  }
-
-  private static ReactShadowNode createNode(int tag, boolean virtual) {
-    ReactShadowNode node;
-    if (virtual) {
-      node = new VirtualReactShadowNode();
-    } else {
-      node = new ReactShadowNodeImpl();
-    }
-    node.setReactTag(tag);
-    node.setViewClassName("View");
-    node.setThemedContext(mock(ThemedReactContext.class));
-    return node;
-  }
-
-  private static class VirtualReactShadowNode extends ReactShadowNodeImpl {
-
-    VirtualReactShadowNode() {}
-
-    VirtualReactShadowNode(VirtualReactShadowNode original) {
-      super(original);
-    }
-
-    @Override
-    public boolean isVirtual() {
-      return true;
-    }
-
-    @Override
-    public ReactShadowNodeImpl copy() {
-      return new VirtualReactShadowNode(this);
-    }
-  }
-
-  private static class ManageChildrenOperation {
-    private int mTag;
-    private int[] mIndicesToRemove;
-    private ViewAtIndex[] mViewsToAdd;
-    private int[] mTagsToRemove;
-
-    private ManageChildrenOperation(
-        int tag, int[] indicesToRemove, ViewAtIndex[] viewsToAdd, int[] tagsToRemove) {
-      mTag = tag;
-      mIndicesToRemove = indicesToRemove;
-      mViewsToAdd = viewsToAdd;
-      mTagsToRemove = tagsToRemove;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (obj == null || obj.getClass() != getClass()) {
-        return false;
-      }
-      ManageChildrenOperation op = (ManageChildrenOperation) obj;
-      return mTag == op.mTag
-          && Arrays.equals(mIndicesToRemove, op.mIndicesToRemove)
-          && Arrays.equals(mViewsToAdd, op.mViewsToAdd)
-          && Arrays.equals(mTagsToRemove, op.mTagsToRemove);
-    }
-
-    @Override
-    public int hashCode() {
-      return Arrays.deepHashCode(new Object[] {mTag, mIndicesToRemove, mViewsToAdd, mTagsToRemove});
-    }
-
-    @Override
-    public String toString() {
-      return "ManageChildrenOperation \n\tindicesToRemove: "
-          + Arrays.toString(mIndicesToRemove)
-          + "\n\tviewsToAdd: "
-          + Arrays.toString(mViewsToAdd)
-          + "\n\ttagsToRemove: "
-          + Arrays.toString(mTagsToRemove);
-    }
-  }
-
-  private static class MockUIViewOperationQueue extends UIViewOperationQueue {
-
-    private List<ManageChildrenOperation> mOperations;
-
-    private MockUIViewOperationQueue(ReactApplicationContext context) {
-      super(context, mock(NativeViewHierarchyManager.class), 0);
-      mOperations = new ArrayList<>();
-    }
-
-    @Override
-    public void enqueueManageChildren(
-        int reactTag, int[] indicesToRemove, ViewAtIndex[] viewsToAdd, int[] tagsToDelete) {
-      mOperations.add(
-          new ManageChildrenOperation(reactTag, indicesToRemove, viewsToAdd, tagsToDelete));
-    }
-
-    public List<ManageChildrenOperation> getOperations() {
-      return Collections.unmodifiableList(mOperations);
-    }
-  }
-}
diff --git a/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.java b/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.java
deleted file mode 100644
index 93f601c5ffafbe..00000000000000
--- a/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.java
+++ /dev/null
@@ -1,336 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 static org.fest.assertions.api.Assertions.assertThat;
-import static com.facebook.react.bridge.InstanceHandleHelper.randomInstanceHandle;
-import static org.mockito.Mockito.mock;
-
-import com.facebook.react.ReactRootView;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactTestHelper;
-import com.facebook.react.bridge.ReadableNativeMap;
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.uimanager.ReactShadowNode;
-import com.facebook.react.uimanager.ReactShadowNodeImpl;
-import com.facebook.react.uimanager.Spacing;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.uimanager.ViewManagerRegistry;
-import com.facebook.react.views.progressbar.ProgressBarShadowNode;
-import com.facebook.react.views.text.ReactRawTextManager;
-import com.facebook.react.views.text.ReactRawTextShadowNode;
-import com.facebook.react.views.text.ReactTextViewManager;
-import com.facebook.react.views.view.ReactViewManager;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import org.fest.assertions.data.Offset;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-
-/** Tests {@link FabricUIManager} */
-@RunWith(RobolectricTestRunner.class)
-public class FabricUIManagerTest {
-
-  private FabricUIManager mFabricUIManager;
-  private ThemedReactContext mThemedReactContext;
-  private int mNextReactTag;
-
-  @Before
-  public void setUp() throws Exception {
-    mNextReactTag = 2;
-    ReactApplicationContext reactContext = new ReactApplicationContext(RuntimeEnvironment.application);
-    reactContext.initializeWithInstance(ReactTestHelper.createMockCatalystInstance());
-    mThemedReactContext = new ThemedReactContext(reactContext, reactContext);
-
-    List<ViewManager> viewManagers =
-        Arrays.<ViewManager>asList(
-            new ReactViewManager(), new ReactTextViewManager(), new ReactRawTextManager());
-    ViewManagerRegistry viewManagerRegistry = new ViewManagerRegistry(viewManagers);
-    JavaScriptContextHolder jsContext = mock(JavaScriptContextHolder.class);
-    EventDispatcher eventDispatcher = mock(EventDispatcher.class);
-    mFabricUIManager = new FabricUIManager(reactContext, viewManagerRegistry, jsContext, eventDispatcher);
-  }
-
-  @Test
-  public void testCreateNode() {
-    ReactRootView rootView =
-        new ReactRootView(RuntimeEnvironment.application.getApplicationContext());
-    int rootTag = mFabricUIManager.addRootView(rootView);
-    int reactTag = mNextReactTag++;
-    String viewClass = ReactViewManager.REACT_CLASS;
-    ReactShadowNode node =
-        mFabricUIManager.createNode(reactTag, viewClass, rootTag, null, randomInstanceHandle());
-
-    assertThat(reactTag).isEqualTo(node.getReactTag());
-    assertThat(viewClass).isEqualTo(node.getViewClass());
-    assertThat(rootTag).isEqualTo(rootTag);
-  }
-
-  @Test
-  public void testCreateMultpleRootViews() {
-    createAndRenderRootView();
-    createAndRenderRootView();
-  }
-
-  private int createAndRenderRootView() {
-    ReactRootView rootView =
-        new ReactRootView(RuntimeEnvironment.application.getApplicationContext());
-    int rootTag = mFabricUIManager.addRootView(rootView);
-    int reactTag = mNextReactTag++;
-    String viewClass = ReactViewManager.REACT_CLASS;
-    ReactShadowNode node =
-        mFabricUIManager.createNode(reactTag, viewClass, rootTag, null, randomInstanceHandle());
-
-    List<ReactShadowNode> childSet = mFabricUIManager.createChildSet(rootTag);
-    mFabricUIManager.appendChildToSet(childSet, node);
-    mFabricUIManager.completeRoot(rootTag, childSet);
-
-    return rootTag;
-  }
-
-  @Test
-  public void testCloneNode() {
-    ReactShadowNode node = createViewNode();
-    ReactShadowNode child = createViewNode();
-    node.addChildAt(child, 0);
-
-    ReactShadowNode clonedNode = mFabricUIManager.cloneNode(node);
-
-    assertThat(clonedNode).isNotSameAs(node);
-    assertThat(clonedNode.getOriginalReactShadowNode()).isSameAs(node);
-    assertSameFields(clonedNode, node);
-    assertSameChildren(clonedNode, node);
-    assertThat(clonedNode.getChildAt(0)).isEqualTo(child);
-  }
-
-  @Test
-  public void testDefaultSpacingCloning() {
-    ReactShadowNode node = createViewNode();
-    node.setDefaultPadding(Spacing.LEFT, 10);
-
-    ReactShadowNode clonedNode = mFabricUIManager.cloneNode(node);
-
-    node.setDefaultPadding(Spacing.LEFT, 20);
-    assertThat(clonedNode.getStylePadding(Spacing.LEFT).value).isEqualTo(10f, Offset.offset(0.01f));
-    assertThat(node.getStylePadding(Spacing.LEFT).value).isEqualTo(20f, Offset.offset(0.01f));
-  }
-
-  @Test
-  public void testCloneVirtualNode() {
-    ReactRawTextShadowNode node = new ReactRawTextShadowNode();
-    node.setText("test");
-    assertThat(node.isVirtual()).isTrue();
-
-    ReactRawTextShadowNode clonedNode = (ReactRawTextShadowNode) node.mutableCopy(randomInstanceHandle());
-
-    assertThat(clonedNode.getText()).isEqualTo("test");
-    assertThat(clonedNode).isNotEqualTo(node);
-  }
-
-  @Test
-  public void testLayoutProgressBarAfterClonning() {
-    ProgressBarShadowNode node = new ProgressBarShadowNode();
-    node.setThemedContext(mThemedReactContext);
-    ProgressBarShadowNode clone = (ProgressBarShadowNode) node.mutableCopy(randomInstanceHandle());
-    clone.calculateLayout();
-  }
-
-  @Test
-  public void testCloneNodeWithNewChildren() {
-    ReactShadowNode node = createViewNode();
-    ReactShadowNode child = createViewNode();
-    node.addChildAt(child, 0);
-
-    ReactShadowNode clonedNode = mFabricUIManager.cloneNodeWithNewChildren(node);
-
-    assertThat(clonedNode.getChildCount()).isZero();
-    assertSameFields(clonedNode, node);
-  }
-
-  @Test
-  public void testCloneNodeWithNewProps() {
-    ReactShadowNode node = createViewNode();
-    ReadableNativeMap props = null; // TODO(ayc): Figure out how to create a Native map from tests.
-
-    ReactShadowNode clonedNode = mFabricUIManager.cloneNodeWithNewProps(node, props);
-  }
-
-  @Test
-  public void testCloneNodeWithNewChildrenAndProps() {
-    ReactShadowNode node = createViewNode();
-    ReadableNativeMap props = null;
-
-    ReactShadowNode clonedNode = mFabricUIManager.cloneNodeWithNewChildrenAndProps(node, props);
-
-    assertThat(clonedNode.getChildCount()).isZero();
-  }
-
-  @Test
-  public void testAppendChild() {
-    ReactShadowNode node = createViewNode();
-    ReactShadowNode child = createViewNode();
-
-    mFabricUIManager.appendChild(node, child);
-
-    assertThat(node.getChildCount()).isEqualTo(1);
-    assertThat(node.getChildAt(0)).isEqualTo(child);
-  }
-
-  @Test
-  public void testCreateChildSet() {
-    List<ReactShadowNode> childSet = mFabricUIManager.createChildSet(0);
-
-    assertThat(childSet).isEmpty();
-  }
-
-  @Test
-  public void testAppendChildToSet() {
-    ReactShadowNode node = createViewNode();
-    List<ReactShadowNode> childSet = mFabricUIManager.createChildSet(0);
-
-    mFabricUIManager.appendChildToSet(childSet, node);
-
-    assertThat(childSet).hasSize(1);
-    assertThat(childSet).contains(node);
-  }
-
-  @Test(expected = AssertionError.class)
-  public void testCompleteRootBeforeAddRoot() {
-    mFabricUIManager.completeRoot(0, new ArrayList<ReactShadowNode>());
-  }
-
-  @Test
-  public void testCompleteRoot() {
-    ReactRootView rootView =
-        new ReactRootView(RuntimeEnvironment.application.getApplicationContext());
-    int rootTag = mFabricUIManager.addRootView(rootView);
-    List<ReactShadowNode> children = mFabricUIManager.createChildSet(rootTag);
-
-    mFabricUIManager.completeRoot(rootTag, children);
-  }
-
-  @Test
-  public void testSealReactShadowNode() {
-    ReactRootView rootView =
-      new ReactRootView(RuntimeEnvironment.application.getApplicationContext());
-    int rootTag = mFabricUIManager.addRootView(rootView);
-    String viewClass = ReactViewManager.REACT_CLASS;
-
-    ReactShadowNode container = mFabricUIManager.createNode(6, viewClass, rootTag, null, randomInstanceHandle());
-    List<ReactShadowNode> childSet = mFabricUIManager.createChildSet(rootTag);
-    mFabricUIManager.appendChildToSet(childSet, container);
-
-    assertThat(container.isSealed()).isFalse();
-
-    mFabricUIManager.completeRoot(rootTag, childSet);
-
-    assertThat(container.isSealed()).isTrue();
-  }
-
-  /**
-   * Tests that cloned text nodes will not share measure functions
-   */
-  @Test
-  public void testTextMutableClone() {
-    ReactRootView rootView =
-        new ReactRootView(RuntimeEnvironment.application.getApplicationContext());
-    int rootTag = mFabricUIManager.addRootView(rootView);
-    ReactShadowNode text =
-        mFabricUIManager.createNode(0, ReactTextViewManager.REACT_CLASS, rootTag, null, randomInstanceHandle());
-    assertThat(text.isMeasureDefined()).isTrue();
-
-    ReactShadowNode textCopy = text.mutableCopy(randomInstanceHandle());
-    assertThat(textCopy.isMeasureDefined()).isTrue();
-
-    textCopy.setStyleWidth(200);
-    text.onBeforeLayout();
-    text.calculateLayout();
-    textCopy.onBeforeLayout();
-    textCopy.calculateLayout();
-
-    assertThat(text.getLayoutWidth()).isNotEqualTo(textCopy.getLayoutWidth());
-  }
-
-  /**
-   * Verifies that the reconciliation phase will always set the originalNode field of every node in
-   * the tree to null once completeRoot has finished to prevent memory leaks.
-   */
-  @Test
-  public void testRemoveOriginalNodeReferences() {
-    ReactRootView rootView =
-        new ReactRootView(RuntimeEnvironment.application.getApplicationContext());
-    int rootTag = mFabricUIManager.addRootView(rootView);
-    String viewClass = ReactViewManager.REACT_CLASS;
-
-    ReactShadowNode aa = mFabricUIManager.createNode(2, viewClass, rootTag, null, randomInstanceHandle());
-    ReactShadowNode a = mFabricUIManager.createNode(3, viewClass, rootTag, null, randomInstanceHandle());
-    mFabricUIManager.appendChild(a, aa);
-    ReactShadowNode bb = mFabricUIManager.createNode(4, viewClass, rootTag, null, randomInstanceHandle());
-    ReactShadowNode b = mFabricUIManager.createNode(5, viewClass, rootTag, null, randomInstanceHandle());
-    mFabricUIManager.appendChild(b, bb);
-    ReactShadowNode container = mFabricUIManager.createNode(6, viewClass, rootTag, null, randomInstanceHandle());
-    mFabricUIManager.appendChild(container, a);
-    mFabricUIManager.appendChild(container, b);
-    List<ReactShadowNode> childSet = mFabricUIManager.createChildSet(rootTag);
-    mFabricUIManager.appendChildToSet(childSet, container);
-    mFabricUIManager.completeRoot(rootTag, childSet);
-
-    ReactShadowNode aaClone = mFabricUIManager.cloneNodeWithNewProps(aa, null);
-    ReactShadowNode aClone = mFabricUIManager.cloneNodeWithNewChildren(a);
-    mFabricUIManager.appendChild(aClone, aaClone);
-    ReactShadowNode containerClone = mFabricUIManager.cloneNodeWithNewChildren(container);
-    mFabricUIManager.appendChild(containerClone, b);
-    mFabricUIManager.appendChild(containerClone, aClone);
-    List<ReactShadowNode> childSet2 = mFabricUIManager.createChildSet(rootTag);
-    mFabricUIManager.appendChildToSet(childSet2, containerClone);
-    mFabricUIManager.completeRoot(rootTag, childSet2);
-
-    ReactShadowNode[] nodes =
-        new ReactShadowNode[] {aa, a, bb, b, container, aaClone, aClone, containerClone};
-
-    for (ReactShadowNode node : nodes) {
-      assertThat(node.getOriginalReactShadowNode()).isNull();
-    }
-  }
-
-  private void assertSameChildren(ReactShadowNode node1, ReactShadowNode node2) {
-    assertThat(node1.getChildCount()).isEqualTo(node2.getChildCount());
-    for (int i = 0; i < node1.getChildCount(); i++) {
-      assertThat(node1.getChildAt(i)).isEqualTo(node2.getChildAt(i));
-    }
-  }
-
-  private void assertSameFields(ReactShadowNode node1, ReactShadowNode node2) {
-    assertThat(node1.getReactTag()).isEqualTo(node2.getReactTag());
-    assertThat(node1.getViewClass()).isEqualTo(node2.getViewClass());
-    assertThat(node2.getParent()).isNull();
-    assertThat(node1.getThemedContext()).isEqualTo(node2.getThemedContext());
-    assertThat(node1.isVirtual()).isEqualTo(node2.isVirtual());
-    assertThat(node1.getLayoutDirection()).isEqualTo(node2.getLayoutDirection());
-    assertThat(node1.getLayoutHeight()).isEqualTo(node2.getLayoutHeight());
-    assertThat(node1.getLayoutWidth()).isEqualTo(node2.getLayoutWidth());
-    assertThat(node1.getLayoutX()).isEqualTo(node2.getLayoutX());
-    assertThat(node1.getLayoutY()).isEqualTo(node2.getLayoutY());
-    for (int spacingType = Spacing.LEFT; spacingType <= Spacing.ALL; spacingType++) {
-      assertThat(node1.getStylePadding(spacingType)).isEqualTo(node2.getStylePadding(spacingType));
-    }
-    assertThat(node1.getStyleWidth()).isEqualTo(node2.getStyleWidth());
-    assertThat(node1.getStyleHeight()).isEqualTo(node2.getStyleHeight());
-  }
-
-  private ReactShadowNode createViewNode() {
-    ReactShadowNode node = new ReactShadowNodeImpl();
-    node.setViewClassName(ReactViewManager.REACT_CLASS);
-    node.setThemedContext(mThemedReactContext);
-    return node;
-  }
-}
diff --git a/ReactAndroid/src/test/java/com/facebook/react/fabric/ReactShadowNodeTest.java b/ReactAndroid/src/test/java/com/facebook/react/fabric/ReactShadowNodeTest.java
deleted file mode 100644
index 68881c7f445323..00000000000000
--- a/ReactAndroid/src/test/java/com/facebook/react/fabric/ReactShadowNodeTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 com.facebook.react.uimanager.ReactShadowNodeImpl;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-/** Tests {@link ReactShadowNode} */
-@RunWith(RobolectricTestRunner.class)
-public class ReactShadowNodeTest {
-
-  @Test(expected = AssertionError.class)
-  public void testClonedInstance() {
-    TestReactShadowNode node = new TestReactShadowNode();
-    node.mutableCopy(node.getInstanceHandle());
-  }
-
-  private static class TestReactShadowNode extends ReactShadowNodeImpl {}
-}
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
index e894c42db496c9..2206284f930891 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
 
 rn_robolectric_test(
     name = "modules",
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java
index 67283dc0e6e8b7..6aeac0445c7a5b 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java
index 1ed67fb9434acb..c220c6c7638dab 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
index a0d93c4db3bd3e..aa8fc484ff90c7 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
index 847c71954a75bb..d551959eed502c 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
index 456a108f346922..39a5cf76533be7 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java
index 09b2365513ec54..9b387cd60ec1b2 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/network/ReactCookieJarContainerTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/network/ReactCookieJarContainerTest.java
index b08e514e853d37..fc160f006c40bb 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/network/ReactCookieJarContainerTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/network/ReactCookieJarContainerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java
index 86f99cd9dc1928..cd505243f0a5b4 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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
index 472f9678f79008..8aa09ae99c5a72 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,13 +10,16 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Executor;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
+import android.os.AsyncTask;
 
 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.ReactTestHelper;
 import com.facebook.react.bridge.JavaOnlyArray;
@@ -35,6 +38,7 @@
 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.PrepareForTest;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -42,7 +46,7 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
+import org.robolectric.util.concurrent.RoboExecutorService;
 
 import static org.mockito.Mockito.mock;
 import static org.fest.assertions.api.Assertions.assertThat;
@@ -81,7 +85,10 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
      });
 
     // don't use Robolectric before initializing mocks
-    mStorage = new AsyncStorageModule(ReactTestHelper.createCatalystContextForTest());
+    mStorage = new AsyncStorageModule(
+        ReactTestHelper.createCatalystContextForTest(),
+        new RoboExecutorService()
+    );
     mEmptyArray = new JavaOnlyArray();
   }
 
@@ -104,7 +111,7 @@ public void testMultiSetMultiGet() {
 
     Callback setCallback = mock(Callback.class);
     mStorage.multiSet(keyValues, setCallback);
-    Mockito.verify(setCallback, Mockito.times(1)).invoke();
+    verify(setCallback, Mockito.times(1)).invoke();
 
     JavaOnlyArray keys = new JavaOnlyArray();
     keys.pushString(key1);
@@ -112,7 +119,7 @@ public void testMultiSetMultiGet() {
 
     Callback getCallback = mock(Callback.class);
     mStorage.multiGet(keys, getCallback);
-    Mockito.verify(getCallback, Mockito.times(1)).invoke(null, keyValues);
+    verify(getCallback, Mockito.times(1)).invoke(null, keyValues);
 
     keys.pushString(fakeKey);
     JavaOnlyArray row3 = new JavaOnlyArray();
@@ -122,7 +129,7 @@ public void testMultiSetMultiGet() {
 
     Callback getCallback2 = mock(Callback.class);
     mStorage.multiGet(keys, getCallback2);
-    Mockito.verify(getCallback2, Mockito.times(1)).invoke(null, keyValues);
+    verify(getCallback2, Mockito.times(1)).invoke(null, keyValues);
   }
 
   @Test
@@ -143,22 +150,22 @@ public void testMultiRemove() {
 
     Callback getCallback = mock(Callback.class);
     mStorage.multiRemove(keys, getCallback);
-    Mockito.verify(getCallback, Mockito.times(1)).invoke();
+    verify(getCallback, Mockito.times(1)).invoke();
 
     Callback getAllCallback = mock(Callback.class);
     mStorage.getAllKeys(getAllCallback);
-    Mockito.verify(getAllCallback, Mockito.times(1)).invoke(null, mEmptyArray);
+    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);
-    Mockito.verify(getCallback2, Mockito.times(1)).invoke();
+    verify(getCallback2, Mockito.times(1)).invoke();
 
     Callback getAllCallback2 = mock(Callback.class);
     mStorage.getAllKeys(getAllCallback2);
-    Mockito.verify(getAllCallback2, Mockito.times(1)).invoke(null, mEmptyArray);
+    verify(getAllCallback2, Mockito.times(1)).invoke(null, mEmptyArray);
   }
 
   @Test
@@ -175,7 +182,7 @@ public void testMultiMerge() throws Exception {
     {
       Callback callback = mock(Callback.class);
       mStorage.multiGet(getArray(mergeKey), callback);
-      Mockito.verify(callback, Mockito.times(1))
+      verify(callback, Mockito.times(1))
           .invoke(null, JavaOnlyArray.of(getArray(mergeKey, value.toString())));
     }
 
@@ -200,7 +207,7 @@ public void testMultiMerge() throws Exception {
     value.put("foo2", createJSONObject("key1", "val3", "key2", "val2"));
     Callback callback = mock(Callback.class);
     mStorage.multiGet(getArray(mergeKey), callback);
-    Mockito.verify(callback, Mockito.times(1))
+    verify(callback, Mockito.times(1))
         .invoke(null, JavaOnlyArray.of(getArray(mergeKey, value.toString())));
   }
 
@@ -219,18 +226,18 @@ public void testGetAllKeys() {
 
     Callback getAllCallback = mock(Callback.class);
     mStorage.getAllKeys(getAllCallback);
-    Mockito.verify(getAllCallback, Mockito.times(1)).invoke(null, storedKeys);
+    verify(getAllCallback, Mockito.times(1)).invoke(null, storedKeys);
 
     Callback getAllCallback2 = mock(Callback.class);
     mStorage.multiRemove(getArray(keys[0]), mock(Callback.class));
 
     mStorage.getAllKeys(getAllCallback2);
-    Mockito.verify(getAllCallback2, Mockito.times(1)).invoke(null, getArray(keys[1]));
+    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);
-    Mockito.verify(getAllCallback3, Mockito.times(1)).invoke(null, mEmptyArray);
+    verify(getAllCallback3, Mockito.times(1)).invoke(null, mEmptyArray);
   }
 
   @Test
@@ -242,11 +249,11 @@ public void testClear() {
 
     Callback clearCallback2 = mock(Callback.class);
     mStorage.clear(clearCallback2);
-    Mockito.verify(clearCallback2, Mockito.times(1)).invoke();
+    verify(clearCallback2, Mockito.times(1)).invoke();
 
     Callback getAllCallback2 = mock(Callback.class);
     mStorage.getAllKeys(getAllCallback2);
-    Mockito.verify(getAllCallback2, Mockito.times(1)).invoke(null, mEmptyArray);
+    verify(getAllCallback2, Mockito.times(1)).invoke(null, mEmptyArray);
   }
 
   @Test
@@ -339,4 +346,14 @@ private JavaOnlyArray getArray(String... values) {
     }
     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/modules/timing/TimingModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
index 91c6484846f449..e1c663507dc710 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/BUCK b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/BUCK
index 686a8ecf6c8016..18dec467c72f2c 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "react_native_target", "rn_robolectric_test")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_robolectric_test")
 
 rn_robolectric_test(
     name = "packagerconnection",
diff --git a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
index 6d14bef454fcb3..88f18c00467265 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK
index 608ba5605db235..917eef734d1504 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK
@@ -1,10 +1,11 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
 
 rn_robolectric_test(
     name = "uimanager",
     # TODO Disabled temporarily until Yoga linking is fixed t14964130
     # srcs = glob(['**/*.java']),
     srcs = [
+        "BaseViewManagerTest.java",
         "MatrixMathHelperTest.java",
         "SimpleViewPropertyTest.java",
     ],
@@ -16,6 +17,7 @@ rn_robolectric_test(
     deps = [
         YOGA_TARGET,
         react_native_dep("libraries/fbcore/src/test/java/com/facebook/powermock:powermock"),
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/fest:fest"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/java/junit:junit"),
@@ -32,6 +34,7 @@ rn_robolectric_test(
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/text:text"),
         react_native_target("java/com/facebook/react/views/view:view"),
+        react_native_target("res:uimanager"),
         react_native_tests_target("java/com/facebook/react/bridge:testhelpers"),
     ],
 )
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java
new file mode 100644
index 00000000000000..33bd58fef800d5
--- /dev/null
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 static org.mockito.Mockito.mock;
+
+import android.content.Context;
+import android.support.v4.view.ViewCompat;
+import com.facebook.react.uimanager.AccessibilityDelegateUtil.AccessibilityRole;
+import com.facebook.react.views.view.ReactViewGroup;
+import com.facebook.react.views.view.ReactViewManager;
+import com.facebook.react.R;
+import java.util.Locale;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricTestRunner;
+import static org.fest.assertions.api.Assertions.assertThat;
+
+@RunWith(RobolectricTestRunner.class)
+public class BaseViewManagerTest {
+
+  private BaseViewManager mViewManager;
+  private ReactViewGroup mView;
+
+  @Before
+  public void setUp() {
+    mViewManager = new ReactViewManager();
+    mView = new ReactViewGroup(RuntimeEnvironment.application);
+  }
+
+  @Test
+  public void testAccessibilityRoleNone() {
+    mViewManager.setAccessibilityRole(mView, "none");
+    assertThat(mView.getTag(R.id.accessibility_role)).isEqualTo(AccessibilityRole.NONE);
+  }
+
+  @Test
+  public void testAccessibilityRoleTurkish() {
+    Locale.setDefault(Locale.forLanguageTag("tr-TR"));
+    mViewManager.setAccessibilityRole(mView, "image");
+    assertThat(mView.getTag(R.id.accessibility_role)).isEqualTo(AccessibilityRole.IMAGE);
+  }
+}
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java
index 3d78d5cf43140a..48e63ea4e2a1e6 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java
index f989f62dd5c1ed..3e6f354e8bce32 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java
index d06f810e10b931..c3545c386b24f6 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java
index 1b84c06d9f0418..5c46a7fcdf5922 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java
index 799018bfa4600d..2b5701122091a1 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java
index 0120f7a0865106..736c23fc752076 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
index 0b3ac61dfe3317..73d8992037b0b9 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java
index 1435875650b0db..a9db7c27b7a9fa 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 b38ca784d90114..1922984a4a63ea 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/BUCK b/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/BUCK
new file mode 100644
index 00000000000000..0a10da27bc1b70
--- /dev/null
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/BUCK
@@ -0,0 +1,17 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
+
+rn_robolectric_test(
+    name = "layoutanimation",
+    srcs = glob(["**/*.java"]),
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        YOGA_TARGET,
+        react_native_dep("third-party/java/fest:fest"),
+        react_native_dep("third-party/java/junit:junit"),
+        react_native_dep("third-party/java/robolectric3/robolectric:robolectric"),
+        react_native_target("java/com/facebook/react/uimanager:uimanager"),
+    ],
+)
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/InterpolatorTypeTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/InterpolatorTypeTest.java
new file mode 100644
index 00000000000000..291d1c4facb4a8
--- /dev/null
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/InterpolatorTypeTest.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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.layoutanimation;
+
+import com.facebook.react.uimanager.layoutanimation.InterpolatorType;
+import java.util.Locale;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import static org.fest.assertions.api.Assertions.assertThat;
+
+@RunWith(RobolectricTestRunner.class)
+public class InterpolatorTypeTest {
+
+  @Test
+  public void testCamelCase() {
+    assertThat(InterpolatorType.fromString("linear")).isEqualTo(InterpolatorType.LINEAR);
+    assertThat(InterpolatorType.fromString("easeIn")).isEqualTo(InterpolatorType.EASE_IN);
+    assertThat(InterpolatorType.fromString("easeOut")).isEqualTo(InterpolatorType.EASE_OUT);
+    assertThat(InterpolatorType.fromString("easeInEaseOut")).isEqualTo(InterpolatorType.EASE_IN_EASE_OUT);
+    assertThat(InterpolatorType.fromString("spring")).isEqualTo(InterpolatorType.SPRING);
+  }
+
+  @Test
+  public void testOtherCases() {
+    assertThat(InterpolatorType.fromString("EASEIN")).isEqualTo(InterpolatorType.EASE_IN);
+    assertThat(InterpolatorType.fromString("easeout")).isEqualTo(InterpolatorType.EASE_OUT);
+    assertThat(InterpolatorType.fromString("easeineaseout")).isEqualTo(InterpolatorType.EASE_IN_EASE_OUT);
+  }
+
+  @Test
+  public void testLocales() {
+    Locale.setDefault(Locale.forLanguageTag("tr-TR"));
+    assertThat(InterpolatorType.fromString("easeInEaseOut")).isEqualTo(InterpolatorType.EASE_IN_EASE_OUT);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testInvalidInterpolatorTypes() throws IllegalArgumentException {
+    InterpolatorType.fromString("ease_in_ease_out");
+  }
+}
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK
index c50da6f542f4f8..de2c90b84f4083 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
 
 rn_robolectric_test(
     name = "views",
@@ -14,6 +14,7 @@ rn_robolectric_test(
         react_native_dep("libraries/fresco/fresco-react-native:fresco-react-native"),
         react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/fest:fest"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/java/junit:junit"),
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java
index 5bea9ba4d1fb33..12e5dc2e967864 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
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 2a1ee5755f813b..31299f46485c31 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java
index 628b43c7c3f611..321f79c81a418d 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java
index cb113637326ada..d4843406e088a7 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -36,6 +36,7 @@
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.views.text.ReactRawTextShadowNode;
 import com.facebook.react.views.view.ReactViewBackgroundDrawable;
+import com.facebook.react.views.text.CustomTextTransformSpan;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -341,6 +342,70 @@ public void testBackgroundColorStyleApplied() {
     assertThat(((ReactViewBackgroundDrawable) backgroundDrawable).getColor()).isEqualTo(Color.BLUE);
   }
 
+  @Test
+  public void testTextTransformNoneApplied() {
+    UIManagerModule uiManager = getUIManagerModule();
+
+    String testTextEntered = ".aa\tbb\t\tcc  dd EE \r\nZZ I like to eat apples. \n中文éé 我喜欢吃苹果。awdawd   ";
+    String testTextTransformed = testTextEntered;
+
+    ReactRootView rootView = createText(
+        uiManager,
+        JavaOnlyMap.of("textTransform", "none"),
+        JavaOnlyMap.of(ReactRawTextShadowNode.PROP_TEXT, testTextEntered));
+
+    TextView textView = (TextView) rootView.getChildAt(0);
+    assertThat(textView.getText().toString()).isEqualTo(testTextTransformed);
+  }
+
+  @Test
+  public void testTextTransformUppercaseApplied() {
+    UIManagerModule uiManager = getUIManagerModule();
+
+    String testTextEntered = ".aa\tbb\t\tcc  dd EE \r\nZZ I like to eat apples. \n中文éé 我喜欢吃苹果。awdawd   ";
+    String testTextTransformed = ".AA\tBB\t\tCC  DD EE \r\nZZ I LIKE TO EAT APPLES. \n中文ÉÉ 我喜欢吃苹果。AWDAWD   ";
+
+    ReactRootView rootView = createText(
+        uiManager,
+        JavaOnlyMap.of("textTransform", "uppercase"),
+        JavaOnlyMap.of(ReactRawTextShadowNode.PROP_TEXT, testTextEntered));
+
+    TextView textView = (TextView) rootView.getChildAt(0);
+    assertThat(textView.getText().toString()).isEqualTo(testTextTransformed);
+  }
+
+  @Test
+  public void testTextTransformLowercaseApplied() {
+    UIManagerModule uiManager = getUIManagerModule();
+
+    String testTextEntered = ".aa\tbb\t\tcc  dd EE \r\nZZ I like to eat apples. \n中文éé 我喜欢吃苹果。awdawd   ";
+    String testTextTransformed = ".aa\tbb\t\tcc  dd ee \r\nzz i like to eat apples. \n中文éé 我喜欢吃苹果。awdawd   ";
+
+    ReactRootView rootView = createText(
+        uiManager,
+        JavaOnlyMap.of("textTransform", "lowercase"),
+        JavaOnlyMap.of(ReactRawTextShadowNode.PROP_TEXT, testTextEntered));
+
+    TextView textView = (TextView) rootView.getChildAt(0);
+    assertThat(textView.getText().toString()).isEqualTo(testTextTransformed);
+  }
+
+  @Test
+  public void testTextTransformCapitalizeApplied() {
+    UIManagerModule uiManager = getUIManagerModule();
+
+    String testTextEntered = ".aa\tbb\t\tcc  dd EE \r\nZZ I like to eat apples. \n中文éé 我喜欢吃苹果。awdawd   ";
+    String testTextTransformed = ".Aa\tBb\t\tCc  Dd Ee \r\nZz I Like To Eat Apples. \n中文Éé 我喜欢吃苹果。Awdawd   ";
+
+    ReactRootView rootView = createText(
+        uiManager,
+        JavaOnlyMap.of("textTransform", "capitalize"),
+        JavaOnlyMap.of(ReactRawTextShadowNode.PROP_TEXT, testTextEntered));
+
+    TextView textView = (TextView) rootView.getChildAt(0);
+    assertThat(textView.getText().toString()).isEqualTo(testTextTransformed);
+  }
+
   // JELLY_BEAN is needed for TextView#getMaxLines(), which is OK, because in the actual code we
   // only use TextView#setMaxLines() which exists since API Level 1.
   @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
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 dc6a8dc10abddc..50fc92e218d3ed 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
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java
index c9794d7d00cfaf..db2bd13d1ad9d4 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java
index 335458952a13c1..9a813694e8b587 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactAndroid/src/test/java/org/mockito/configuration/BUCK b/ReactAndroid/src/test/java/org/mockito/configuration/BUCK
index 62bf397823503a..99bce2a385eb49 100644
--- a/ReactAndroid/src/test/java/org/mockito/configuration/BUCK
+++ b/ReactAndroid/src/test/java/org/mockito/configuration/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "configuration",
diff --git a/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java b/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java
index 427dd77b534134..6f48dee254c4bf 100644
--- a/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java
+++ b/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/.clang-format b/ReactCommon/.clang-format
new file mode 100644
index 00000000000000..34fb029ee3ce36
--- /dev/null
+++ b/ReactCommon/.clang-format
@@ -0,0 +1,87 @@
+---
+AccessModifierOffset: -1
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: true
+AlignOperands:   false
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit:       80
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ForEachMacros:   [ FOR_EACH_RANGE, FOR_EACH, ]
+IncludeCategories:
+  - Regex:           '^<.*\.h(pp)?>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
+IndentCaseLabels: true
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
diff --git a/ReactCommon/cxxreact/Android.mk b/ReactCommon/cxxreact/Android.mk
index d4b294fc17fef8..4a5a043733c4c4 100644
--- a/ReactCommon/cxxreact/Android.mk
+++ b/ReactCommon/cxxreact/Android.mk
@@ -4,28 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := reactnative
 
-LOCAL_SRC_FILES := \
-  CxxNativeModule.cpp \
-  Instance.cpp \
-  JSBigString.cpp \
-  JSBundleType.cpp \
-  JSCExecutor.cpp \
-  JSCLegacyTracing.cpp \
-  JSCMemory.cpp \
-  JSCNativeModules.cpp \
-  JSCPerfStats.cpp \
-  JSCSamplingProfiler.cpp \
-  JSCTracing.cpp \
-  JSCUtils.cpp \
-  JSDeltaBundleClient.cpp \
-	JSExecutor.cpp \
-  JSIndexedRAMBundle.cpp \
-  MethodCall.cpp \
-  ModuleRegistry.cpp \
-  NativeToJsBridge.cpp \
-  Platform.cpp \
-  RAMBundleRegistry.cpp \
-  ReactMarker.cpp \
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
@@ -33,13 +12,10 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
 
-LOCAL_CFLAGS += -Wall -Werror -fexceptions -frtti
-CXX11_FLAGS := -std=c++11
-LOCAL_CFLAGS += $(CXX11_FLAGS)
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
+LOCAL_CFLAGS += -fexceptions -frtti
 
-LOCAL_STATIC_LIBRARIES := jschelpers
-LOCAL_SHARED_LIBRARIES := libfb libfolly_json libjsc libglog
+LOCAL_STATIC_LIBRARIES := boost
+LOCAL_SHARED_LIBRARIES := jsinspector libfolly_json glog
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -47,6 +23,4 @@ $(call import-module,fb)
 $(call import-module,folly)
 $(call import-module,jsc)
 $(call import-module,glog)
-$(call import-module,jschelpers)
 $(call import-module,jsinspector)
-$(call import-module,privatedata)
diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index b24c56a3c8f1be..1d0c7f55d6ecd3 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -1,5 +1,5 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//ReactNative:DEFS.bzl", "ANDROID", "ANDROID_JSC_DEPS", "APPLE", "get_apple_compiler_flags", "APPLE_JSC_DEPS", "get_debug_preprocessor_flags", "IS_OSS_BUILD", "get_android_inspector_flags", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
+load("@fbsource//tools/build_defs:glob_defs.bzl", "subdir_glob")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "get_android_inspector_flags", "get_apple_compiler_flags", "get_apple_inspector_flags", "get_debug_preprocessor_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
 
 CXX_LIBRARY_COMPILER_FLAGS = [
     "-std=c++14",
@@ -80,11 +80,8 @@ CXXREACT_PUBLIC_HEADERS = [
     "CxxNativeModule.h",
     "Instance.h",
     "JSBundleType.h",
-    "JSExecutor.h",
-    "JSCExecutor.h",
-    "JSCNativeModules.h",
-    "JSCUtils.h",
     "JSDeltaBundleClient.h",
+    "JSExecutor.h",
     "JSIndexedRAMBundle.h",
     "JSModulesUnbundle.h",
     "MessageQueueThread.h",
@@ -92,7 +89,6 @@ CXXREACT_PUBLIC_HEADERS = [
     "ModuleRegistry.h",
     "NativeModule.h",
     "NativeToJsBridge.h",
-    "Platform.h",
     "RAMBundleRegistry.h",
     "ReactMarker.h",
     "RecoverableError.h",
@@ -125,18 +121,9 @@ rn_xplat_cxx_library(
         "-fexceptions",
         "-frtti",
     ],
-    fbandroid_deps = ANDROID_JSC_DEPS,
-    fbandroid_preprocessor_flags = get_android_inspector_flags() + [
-        "-DWITH_JSC_EXTRA_TRACING=1",
-        "-DWITH_JSC_MEMORY_PRESSURE=1",
-        "-DWITH_FB_MEMORY_PROFILING=1",
-    ],
+    fbandroid_preprocessor_flags = get_android_inspector_flags(),
     fbobjc_compiler_flags = get_apple_compiler_flags(),
-    fbobjc_deps = APPLE_JSC_DEPS,
     fbobjc_force_static = True,
-    fbobjc_frameworks = [
-        "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
-    ],
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
     force_static = True,
     macosx_tests_override = [],
@@ -156,12 +143,9 @@ rn_xplat_cxx_library(
         "xplat//folly:molly",
         ":jsbigstring",
         ":module",
-        react_native_xplat_target("jschelpers:jschelpers"),
         react_native_xplat_target("jsinspector:jsinspector"),
         react_native_xplat_target("microprofiler:microprofiler"),
         "xplat//folly:optional",
         "xplat//third-party/glog:glog",
-        react_native_xplat_target("jschelpers:jscinternalhelpers"),
-        react_native_xplat_target("privatedata:privatedata"),
     ],
 )
diff --git a/ReactCommon/cxxreact/CxxModule.h b/ReactCommon/cxxreact/CxxModule.h
index f31b20642590fe..f253c108c2eea7 100644
--- a/ReactCommon/cxxreact/CxxModule.h
+++ b/ReactCommon/cxxreact/CxxModule.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/CxxNativeModule.cpp b/ReactCommon/cxxreact/CxxNativeModule.cpp
index 757098e535e231..cca885fc576ea8 100644
--- a/ReactCommon/cxxreact/CxxNativeModule.cpp
+++ b/ReactCommon/cxxreact/CxxNativeModule.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/CxxNativeModule.h b/ReactCommon/cxxreact/CxxNativeModule.h
index b02dec1ce5deac..d28fac97f6dc86 100644
--- a/ReactCommon/cxxreact/CxxNativeModule.h
+++ b/ReactCommon/cxxreact/CxxNativeModule.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/Instance.cpp b/ReactCommon/cxxreact/Instance.cpp
index cc951813e716e7..a49f1d60d9f552 100644
--- a/ReactCommon/cxxreact/Instance.cpp
+++ b/ReactCommon/cxxreact/Instance.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/Instance.h b/ReactCommon/cxxreact/Instance.h
index 95f4b905a60b33..654fa929e9bf5b 100644
--- a/ReactCommon/cxxreact/Instance.h
+++ b/ReactCommon/cxxreact/Instance.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JSBigString.cpp b/ReactCommon/cxxreact/JSBigString.cpp
index dda34f084c20b4..e4b806f434cb5c 100644
--- a/ReactCommon/cxxreact/JSBigString.cpp
+++ b/ReactCommon/cxxreact/JSBigString.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JSBigString.h b/ReactCommon/cxxreact/JSBigString.h
index bac6fc03774cd1..8711107a0fe451 100644
--- a/ReactCommon/cxxreact/JSBigString.h
+++ b/ReactCommon/cxxreact/JSBigString.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JSBundleType.cpp b/ReactCommon/cxxreact/JSBundleType.cpp
index f74fa7d46fca74..f2b7a519a798fc 100644
--- a/ReactCommon/cxxreact/JSBundleType.cpp
+++ b/ReactCommon/cxxreact/JSBundleType.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JSBundleType.h b/ReactCommon/cxxreact/JSBundleType.h
index b6ed106ce2d17c..530456a98a7d90 100644
--- a/ReactCommon/cxxreact/JSBundleType.h
+++ b/ReactCommon/cxxreact/JSBundleType.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JSCExecutor.cpp b/ReactCommon/cxxreact/JSCExecutor.cpp
deleted file mode 100644
index 65ee3bdd80255a..00000000000000
--- a/ReactCommon/cxxreact/JSCExecutor.cpp
+++ /dev/null
@@ -1,786 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "JSCExecutor.h"
-
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <algorithm>
-#include <condition_variable>
-#include <mutex>
-#include <sstream>
-#include <string>
-#include <system_error>
-
-#include <arpa/inet.h>
-#include <folly/Conv.h>
-#include <folly/Exception.h>
-#include <folly/Memory.h>
-#include <folly/String.h>
-#include <folly/json.h>
-#include <glog/logging.h>
-#include <jschelpers/JSCHelpers.h>
-#include <jschelpers/Value.h>
-#include <jsinspector/InspectorInterfaces.h>
-
-#include "JSBigString.h"
-#include "JSBundleType.h"
-#include "JSCLegacyTracing.h"
-#include "JSCMemory.h"
-#include "JSCPerfStats.h"
-#include "JSCSamplingProfiler.h"
-#include "JSCTracing.h"
-#include "JSCUtils.h"
-#include "JSModulesUnbundle.h"
-#include "MessageQueueThread.h"
-#include "ModuleRegistry.h"
-#include "Platform.h"
-#include "RAMBundleRegistry.h"
-#include "RecoverableError.h"
-#include "SystraceSection.h"
-
-#if defined(WITH_FB_JSC_TUNING) && defined(__ANDROID__)
-#include <jsc_config_android.h>
-#endif
-
-namespace facebook {
-namespace react {
-
-namespace {
-
-template <JSValueRef (JSCExecutor::*method)(size_t, const JSValueRef[])>
-inline JSObjectCallAsFunctionCallback exceptionWrapMethod() {
-  struct funcWrapper {
-    static JSValueRef call(
-        JSContextRef ctx,
-        JSObjectRef function,
-        JSObjectRef thisObject,
-        size_t argumentCount,
-        const JSValueRef arguments[],
-        JSValueRef* exception) {
-      try {
-        auto executor = Object::getGlobalObject(ctx).getPrivate<JSCExecutor>();
-        if (executor &&
-            executor->getJavaScriptContext()) { // Executor not invalidated
-          return (executor->*method)(argumentCount, arguments);
-        }
-      } catch (...) {
-        *exception = translatePendingCppExceptionToJSError(ctx, function);
-      }
-      return Value::makeUndefined(ctx);
-    }
-  };
-
-  return &funcWrapper::call;
-}
-
-template <JSValueRef (
-    JSCExecutor::*method)(JSObjectRef object, JSStringRef propertyName)>
-inline JSObjectGetPropertyCallback exceptionWrapMethod() {
-  struct funcWrapper {
-    static JSValueRef call(
-        JSContextRef ctx,
-        JSObjectRef object,
-        JSStringRef propertyName,
-        JSValueRef* exception) {
-      try {
-        auto executor = Object::getGlobalObject(ctx).getPrivate<JSCExecutor>();
-        if (executor &&
-            executor->getJavaScriptContext()) { // Executor not invalidated
-          return (executor->*method)(object, propertyName);
-        }
-      } catch (...) {
-        *exception = translatePendingCppExceptionToJSError(ctx, object);
-      }
-      return Value::makeUndefined(ctx);
-    }
-  };
-
-  return &funcWrapper::call;
-}
-
-} // namespace
-
-#if DEBUG
-static JSValueRef nativeInjectHMRUpdate(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  String execJSString = Value(ctx, arguments[0]).toString();
-  String jsURL = Value(ctx, arguments[1]).toString();
-  evaluateScript(ctx, execJSString, jsURL);
-  return Value::makeUndefined(ctx);
-}
-#endif
-
-std::unique_ptr<JSExecutor> JSCExecutorFactory::createJSExecutor(
-    std::shared_ptr<ExecutorDelegate> delegate,
-    std::shared_ptr<MessageQueueThread> jsQueue) {
-  return folly::make_unique<JSCExecutor>(
-      delegate, jsQueue, m_jscConfig);
-}
-
-JSCExecutor::JSCExecutor(
-    std::shared_ptr<ExecutorDelegate> delegate,
-    std::shared_ptr<MessageQueueThread> messageQueueThread,
-    const folly::dynamic& jscConfig) throw(JSException)
-    : m_delegate(delegate),
-      m_messageQueueThread(messageQueueThread),
-      m_nativeModules(delegate ? delegate->getModuleRegistry() : nullptr),
-      m_jscConfig(jscConfig) {
-  initOnJSVMThread();
-
-  {
-    SystraceSection s("nativeModuleProxy object");
-    installGlobalProxy(
-        m_context,
-        "nativeModuleProxy",
-        exceptionWrapMethod<&JSCExecutor::getNativeModule>());
-  }
-}
-
-JSCExecutor::~JSCExecutor() {
-  CHECK(*m_isDestroyed)
-      << "JSCExecutor::destroy() must be called before its destructor!";
-}
-
-void JSCExecutor::destroy() {
-  *m_isDestroyed = true;
-  if (m_messageQueueThread.get()) {
-    m_messageQueueThread->runOnQueueSync([this]() { terminateOnJSVMThread(); });
-  } else {
-    terminateOnJSVMThread();
-  }
-}
-
-void JSCExecutor::setContextName(const std::string& name) {
-  String jsName = String(m_context, name.c_str());
-  JSC_JSGlobalContextSetName(m_context, jsName);
-}
-
-static bool canUseInspector(JSContextRef context) {
-#ifdef WITH_INSPECTOR
-#if defined(__APPLE__)
-  return isCustomJSCPtr(context); // WITH_INSPECTOR && Apple
-#else
-  return true; // WITH_INSPECTOR && Android
-#endif
-#else
-  return false; // !WITH_INSPECTOR
-#endif
-}
-
-static bool canUseSamplingProfiler(JSContextRef context) {
-#if defined(__APPLE__) || defined(WITH_JSC_EXTRA_TRACING)
-  return JSC_JSSamplingProfilerEnabled(context);
-#else
-  return false;
-#endif
-}
-
-void JSCExecutor::initOnJSVMThread() throw(JSException) {
-  SystraceSection s("JSCExecutor::initOnJSVMThread");
-
-#if defined(__APPLE__)
-  const bool useCustomJSC =
-      m_jscConfig.getDefault("UseCustomJSC", false).getBool();
-  if (useCustomJSC) {
-    JSC_configureJSCForIOS(true, toJson(m_jscConfig));
-  }
-#else
-  const bool useCustomJSC = false;
-#endif
-
-#if defined(WITH_FB_JSC_TUNING) && defined(__ANDROID__)
-  configureJSCForAndroid(m_jscConfig);
-#endif
-
-  // Create a custom global class, so we can store data in it later using
-  // JSObjectSetPrivate
-  JSClassRef globalClass = nullptr;
-  {
-    SystraceSection s_("JSClassCreate");
-    JSClassDefinition definition = kJSClassDefinitionEmpty;
-    definition.attributes |= kJSClassAttributeNoAutomaticPrototype;
-    globalClass = JSC_JSClassCreate(useCustomJSC, &definition);
-  }
-  {
-    SystraceSection s_("JSGlobalContextCreateInGroup");
-    m_context =
-        JSC_JSGlobalContextCreateInGroup(useCustomJSC, nullptr, globalClass);
-  }
-  JSC_JSClassRelease(useCustomJSC, globalClass);
-
-  // Add a pointer to ourselves so we can retrieve it later in our hooks
-  Object::getGlobalObject(m_context).setPrivate(this);
-
-  if (canUseInspector(m_context)) {
-    const std::string ownerId =
-        m_jscConfig.getDefault("OwnerIdentity", "unknown").getString();
-    const std::string appId =
-        m_jscConfig.getDefault("AppIdentity", "unknown").getString();
-    const std::string deviceId =
-        m_jscConfig.getDefault("DeviceIdentity", "unknown").getString();
-    auto checkIsInspectedRemote = [ownerId, appId, deviceId]() {
-      return isNetworkInspected(ownerId, appId, deviceId);
-    };
-
-    auto& globalInspector = facebook::react::getInspectorInstance();
-    JSC_JSGlobalContextEnableDebugger(
-        m_context, globalInspector, ownerId.c_str(), checkIsInspectedRemote);
-  }
-
-  installNativeHook<&JSCExecutor::nativeFlushQueueImmediate>(
-      "nativeFlushQueueImmediate");
-  installNativeHook<&JSCExecutor::nativeCallSyncHook>("nativeCallSyncHook");
-
-  installGlobalFunction(
-      m_context, "nativeLoggingHook", JSCNativeHooks::loggingHook);
-  installGlobalFunction(
-      m_context, "nativePerformanceNow", JSCNativeHooks::nowHook);
-
-#if DEBUG
-  installGlobalFunction(
-      m_context, "nativeInjectHMRUpdate", nativeInjectHMRUpdate);
-#endif
-
-  addNativeTracingHooks(m_context);
-  addNativeTracingLegacyHooks(m_context);
-  addJSCMemoryHooks(m_context);
-  addJSCPerfStatsHooks(m_context);
-
-  JSCNativeHooks::installPerfHooks(m_context);
-
-  if (canUseSamplingProfiler(m_context)) {
-    initSamplingProfilerOnMainJSCThread(m_context);
-  }
-}
-
-bool JSCExecutor::isNetworkInspected(
-    const std::string& owner,
-    const std::string& app,
-    const std::string& device) {
-#ifdef WITH_FB_DBG_ATTACH_BEFORE_EXEC
-  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;
-#else //! WITH_FB_DBG_ATTACH_BEFORE_EXEC
-  return false;
-#endif // WITH_FB_DBG_ATTACH_BEFORE_EXEC
-}
-
-void JSCExecutor::terminateOnJSVMThread() {
-  JSGlobalContextRef context = m_context;
-  m_context = nullptr;
-  Object::getGlobalObject(context).setPrivate(nullptr);
-  m_nativeModules.reset();
-
-  if (canUseInspector(context)) {
-    auto& globalInspector = facebook::react::getInspectorInstance();
-    JSC_JSGlobalContextDisableDebugger(context, globalInspector);
-  }
-
-  JSC_JSGlobalContextRelease(context);
-}
-
-#ifdef WITH_FBJSCEXTENSIONS
-static const char* explainLoadSourceStatus(JSLoadSourceStatus status) {
-  switch (status) {
-    case JSLoadSourceIsCompiled:
-      return "No error encountered during source load";
-
-    case JSLoadSourceErrorOnRead:
-      return "Error reading source";
-
-    case JSLoadSourceIsNotCompiled:
-      return "Source is not compiled";
-
-    case JSLoadSourceErrorVersionMismatch:
-      return "Source version not supported";
-
-    default:
-      return "Bad error code";
-  }
-}
-#endif
-
-// basename_r isn't in all iOS SDKs, so use this simple version instead.
-static std::string simpleBasename(const std::string& path) {
-  size_t pos = path.rfind("/");
-  return (pos != std::string::npos) ? path.substr(pos) : path;
-}
-
-void JSCExecutor::loadApplicationScript(
-    std::unique_ptr<const JSBigString> script,
-    std::string sourceURL) {
-  SystraceSection s(
-      "JSCExecutor::loadApplicationScript", "sourceURL", sourceURL);
-
-  std::string scriptName = simpleBasename(sourceURL);
-  ReactMarker::logTaggedMarker(
-      ReactMarker::RUN_JS_BUNDLE_START, scriptName.c_str());
-  String jsSourceURL(m_context, sourceURL.c_str());
-
-// TODO t15069155: reduce the number of overrides here
-#ifdef WITH_FBJSCEXTENSIONS
-  if (auto fileStr = dynamic_cast<const JSBigFileString*>(script.get())) {
-    JSContextLock lock(m_context);
-    JSLoadSourceStatus jsStatus;
-    auto bcSourceCode = JSCreateSourceCodeFromFile(
-        fileStr->fd(), jsSourceURL, nullptr, &jsStatus);
-
-    switch (jsStatus) {
-      case JSLoadSourceIsCompiled:
-        if (!bcSourceCode) {
-          throw std::runtime_error("Unexpected error opening compiled bundle");
-        }
-        evaluateSourceCode(m_context, bcSourceCode, jsSourceURL);
-
-        flush();
-
-        ReactMarker::logMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP);
-        ReactMarker::logTaggedMarker(
-            ReactMarker::RUN_JS_BUNDLE_STOP, scriptName.c_str());
-        return;
-
-      case JSLoadSourceErrorVersionMismatch:
-        throw RecoverableError(explainLoadSourceStatus(jsStatus));
-
-      case JSLoadSourceErrorOnRead:
-      case JSLoadSourceIsNotCompiled:
-        // Not bytecode, fall through.
-        break;
-    }
-  }
-#elif defined(__APPLE__)
-  BundleHeader header;
-  memcpy(
-      &header, script->c_str(), std::min(script->size(), sizeof(BundleHeader)));
-  auto scriptTag = parseTypeFromHeader(header);
-
-  if (scriptTag == ScriptTag::BCBundle) {
-    using file_ptr = std::unique_ptr<FILE, decltype(&fclose)>;
-    file_ptr source(fopen(sourceURL.c_str(), "r"), fclose);
-    int sourceFD = fileno(source.get());
-
-    JSValueRef jsError;
-    JSValueRef result = JSC_JSEvaluateBytecodeBundle(
-        m_context, NULL, sourceFD, jsSourceURL, &jsError);
-    if (result == nullptr) {
-      throw JSException(m_context, jsError, jsSourceURL);
-    }
-  } else
-#endif
-  {
-    String jsScript;
-    JSContextLock lock(m_context);
-    {
-      SystraceSection s_(
-          "JSCExecutor::loadApplicationScript-createExpectingAscii");
-      ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_START);
-      jsScript = adoptString(std::move(script));
-      ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_STOP);
-    }
-
-    SystraceSection s_("JSCExecutor::loadApplicationScript-evaluateScript");
-    evaluateScript(m_context, jsScript, jsSourceURL);
-  }
-
-  flush();
-
-  ReactMarker::logMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP);
-  ReactMarker::logTaggedMarker(
-      ReactMarker::RUN_JS_BUNDLE_STOP, scriptName.c_str());
-}
-
-void JSCExecutor::setBundleRegistry(
-    std::unique_ptr<RAMBundleRegistry> bundleRegistry) {
-  if (!m_bundleRegistry) {
-    installNativeHook<&JSCExecutor::nativeRequire>("nativeRequire");
-  }
-  m_bundleRegistry = std::move(bundleRegistry);
-}
-
-void JSCExecutor::registerBundle(
-    uint32_t bundleId,
-    const std::string& bundlePath) {
-  if (m_bundleRegistry) {
-    m_bundleRegistry->registerBundle(bundleId, bundlePath);
-  } else {
-    auto stPath = JSCExecutor::getSyntheticBundlePath(bundleId, bundlePath);
-    auto sourceUrlStr = String(m_context, stPath.c_str());
-    auto source = adoptString(JSBigFileString::fromPath(bundlePath));
-    evaluateScript(m_context, source, sourceUrlStr);
-  }
-}
-
-void JSCExecutor::bindBridge() throw(JSException) {
-  SystraceSection s("JSCExecutor::bindBridge");
-  std::call_once(m_bindFlag, [this] {
-    auto global = Object::getGlobalObject(m_context);
-    auto batchedBridgeValue = global.getProperty("__fbBatchedBridge");
-    if (batchedBridgeValue.isUndefined()) {
-      auto requireBatchedBridge =
-          global.getProperty("__fbRequireBatchedBridge");
-      if (!requireBatchedBridge.isUndefined()) {
-        batchedBridgeValue = requireBatchedBridge.asObject().callAsFunction({});
-      }
-      if (batchedBridgeValue.isUndefined()) {
-        throw JSException(
-            "Could not get BatchedBridge, make sure your bundle is packaged correctly");
-      }
-    }
-
-    auto batchedBridge = batchedBridgeValue.asObject();
-    m_callFunctionReturnFlushedQueueJS =
-        batchedBridge.getProperty("callFunctionReturnFlushedQueue").asObject();
-    m_invokeCallbackAndReturnFlushedQueueJS =
-        batchedBridge.getProperty("invokeCallbackAndReturnFlushedQueue")
-            .asObject();
-    m_flushedQueueJS = batchedBridge.getProperty("flushedQueue").asObject();
-    m_callFunctionReturnResultAndFlushedQueueJS =
-        batchedBridge.getProperty("callFunctionReturnResultAndFlushedQueue")
-            .asObject();
-  });
-}
-
-void JSCExecutor::callNativeModules(Value&& value) {
-  SystraceSection s("JSCExecutor::callNativeModules");
-  // If this fails, you need to pass a fully functional delegate with a
-  // module registry to the factory/ctor.
-  CHECK(m_delegate) << "Attempting to use native modules without a delegate";
-  try {
-    auto calls = value.toJSONString();
-    m_delegate->callNativeModules(*this, folly::parseJson(calls), true);
-  } catch (...) {
-    std::string message = "Error in callNativeModules()";
-    try {
-      message += ":" + value.toString().str();
-    } catch (...) {
-      // ignored
-    }
-    std::throw_with_nested(std::runtime_error(message));
-  }
-}
-
-void JSCExecutor::flush() {
-  SystraceSection s("JSCExecutor::flush");
-
-  if (m_flushedQueueJS) {
-    callNativeModules(m_flushedQueueJS->callAsFunction({}));
-    return;
-  }
-
-  // When a native module is called from JS, BatchedBridge.enqueueNativeCall()
-  // is invoked.  For that to work, require('BatchedBridge') has to be called,
-  // and when that happens, __fbBatchedBridge is set as a side effect.
-  auto global = Object::getGlobalObject(m_context);
-  auto batchedBridgeValue = global.getProperty("__fbBatchedBridge");
-  // So here, if __fbBatchedBridge doesn't exist, then we know no native calls
-  // have happened, and we were able to determine this without forcing
-  // BatchedBridge to be loaded as a side effect.
-  if (!batchedBridgeValue.isUndefined()) {
-    // If calls were made, we bind to the JS bridge methods, and use them to
-    // get the pending queue of native calls.
-    bindBridge();
-    callNativeModules(m_flushedQueueJS->callAsFunction({}));
-  } else if (m_delegate) {
-    // If we have a delegate, we need to call it; we pass a null list to
-    // callNativeModules, since we know there are no native calls, without
-    // calling into JS again.  If no calls were made and there's no delegate,
-    // nothing happens, which is correct.
-    callNativeModules(Value::makeNull(m_context));
-  }
-}
-
-void JSCExecutor::callFunction(
-    const std::string& moduleId,
-    const std::string& methodId,
-    const folly::dynamic& arguments) {
-  SystraceSection s("JSCExecutor::callFunction");
-  // This weird pattern is because Value is not default constructible.
-  // The lambda is inlined, so there's no overhead.
-  auto result = [&] {
-    JSContextLock lock(m_context);
-    try {
-      if (!m_callFunctionReturnResultAndFlushedQueueJS) {
-        bindBridge();
-      }
-      return m_callFunctionReturnFlushedQueueJS->callAsFunction(
-          {Value(m_context, String::createExpectingAscii(m_context, moduleId)),
-           Value(m_context, String::createExpectingAscii(m_context, methodId)),
-           Value::fromDynamic(m_context, std::move(arguments))});
-    } catch (...) {
-      std::throw_with_nested(
-          std::runtime_error("Error calling " + moduleId + "." + methodId));
-    }
-  }();
-  callNativeModules(std::move(result));
-}
-
-void JSCExecutor::invokeCallback(
-    const double callbackId,
-    const folly::dynamic& arguments) {
-  SystraceSection s("JSCExecutor::invokeCallback");
-  auto result = [&] {
-    JSContextLock lock(m_context);
-    try {
-      if (!m_invokeCallbackAndReturnFlushedQueueJS) {
-        bindBridge();
-      }
-      return m_invokeCallbackAndReturnFlushedQueueJS->callAsFunction(
-          {Value::makeNumber(m_context, callbackId),
-           Value::fromDynamic(m_context, std::move(arguments))});
-    } catch (...) {
-      std::throw_with_nested(std::runtime_error(
-          folly::to<std::string>("Error invoking callback ", callbackId)));
-    }
-  }();
-  callNativeModules(std::move(result));
-}
-
-void JSCExecutor::setGlobalVariable(
-    std::string propName,
-    std::unique_ptr<const JSBigString> jsonValue) {
-  try {
-    SystraceSection s("JSCExecutor::setGlobalVariable", "propName", propName);
-    auto valueToInject = Value::fromJSON(adoptString(std::move(jsonValue)));
-    Object::getGlobalObject(m_context).setProperty(
-        propName.c_str(), valueToInject);
-  } catch (...) {
-    std::throw_with_nested(
-        std::runtime_error("Error setting global variable: " + propName));
-  }
-}
-
-std::string JSCExecutor::getDescription() {
-#if defined(__APPLE__)
-  if (isCustomJSCPtr(m_context)) {
-    return "Custom JSC";
-  } else {
-    return "System JSC";
-  }
-#else
-  return "JSC";
-#endif
-}
-
-String JSCExecutor::adoptString(std::unique_ptr<const JSBigString> script) {
-#if defined(WITH_FBJSCEXTENSIONS)
-  const JSBigString* string = script.release();
-  auto jsString = JSStringCreateAdoptingExternal(
-      string->c_str(), string->size(), (void*)string, [](void* s) {
-        delete static_cast<JSBigString*>(s);
-      });
-  return String::adopt(m_context, jsString);
-#else
-  return script->isAscii()
-      ? String::createExpectingAscii(m_context, script->c_str(), script->size())
-      : String(m_context, script->c_str());
-#endif
-}
-
-void* JSCExecutor::getJavaScriptContext() {
-  return m_context;
-}
-
-bool JSCExecutor::isInspectable() {
-  return canUseInspector(m_context);
-}
-
-void JSCExecutor::handleMemoryPressure(int pressureLevel) {
-#ifdef WITH_JSC_MEMORY_PRESSURE
-  JSHandleMemoryPressure(
-      this, m_context, static_cast<JSMemoryPressure>(pressureLevel));
-#endif
-}
-
-void JSCExecutor::flushQueueImmediate(Value&& queue) {
-  auto queueStr = queue.toJSONString();
-  m_delegate->callNativeModules(*this, folly::parseJson(queueStr), false);
-}
-
-void JSCExecutor::loadModule(uint32_t bundleId, uint32_t moduleId) {
-  auto module = m_bundleRegistry->getModule(bundleId, moduleId);
-  auto sourceUrl = String::createExpectingAscii(m_context, module.name);
-  auto source = adoptString(
-      std::unique_ptr<JSBigString>(new JSBigStdString(module.code)));
-  evaluateScript(m_context, source, sourceUrl);
-}
-
-// Native JS hooks
-template <JSValueRef (JSCExecutor::*method)(size_t, const JSValueRef[])>
-void JSCExecutor::installNativeHook(const char* name) {
-  installGlobalFunction(m_context, name, exceptionWrapMethod<method>());
-}
-
-JSValueRef JSCExecutor::getNativeModule(
-    JSObjectRef object,
-    JSStringRef propertyName) {
-  if (JSC_JSStringIsEqualToUTF8CString(m_context, propertyName, "name")) {
-    return Value(m_context, String(m_context, "NativeModules"));
-  }
-
-  return m_nativeModules.getModule(m_context, propertyName);
-}
-
-JSValueRef JSCExecutor::nativeRequire(
-    size_t count,
-    const JSValueRef arguments[]) {
-  if (count > 2 || count == 0) {
-    throw std::invalid_argument("Got wrong number of args");
-  }
-
-  uint32_t moduleId =
-      folly::to<uint32_t>(Value(m_context, arguments[0]).getNumberOrThrow());
-  uint32_t bundleId = count == 2
-      ? folly::to<uint32_t>(Value(m_context, arguments[1]).getNumberOrThrow())
-      : 0;
-
-  ReactMarker::logMarker(ReactMarker::NATIVE_REQUIRE_START);
-  loadModule(bundleId, moduleId);
-  ReactMarker::logMarker(ReactMarker::NATIVE_REQUIRE_STOP);
-  return Value::makeUndefined(m_context);
-}
-
-JSValueRef JSCExecutor::nativeFlushQueueImmediate(
-    size_t argumentCount,
-    const JSValueRef arguments[]) {
-  if (argumentCount != 1) {
-    throw std::invalid_argument("Got wrong number of args");
-  }
-
-  flushQueueImmediate(Value(m_context, arguments[0]));
-  return Value::makeUndefined(m_context);
-}
-
-JSValueRef JSCExecutor::nativeCallSyncHook(
-    size_t argumentCount,
-    const JSValueRef arguments[]) {
-  if (argumentCount != 3) {
-    throw std::invalid_argument("Got wrong number of args");
-  }
-
-  unsigned int moduleId = Value(m_context, arguments[0]).asUnsignedInteger();
-  unsigned int methodId = Value(m_context, arguments[1]).asUnsignedInteger();
-  folly::dynamic args =
-      folly::parseJson(Value(m_context, arguments[2]).toJSONString());
-
-  if (!args.isArray()) {
-    throw std::invalid_argument(folly::to<std::string>(
-        "method parameters should be array, but are ", args.typeName()));
-  }
-
-  MethodCallResult result = m_delegate->callSerializableNativeHook(
-      *this, moduleId, methodId, std::move(args));
-  if (!result.hasValue()) {
-    return Value::makeUndefined(m_context);
-  }
-  return Value::fromDynamic(m_context, result.value());
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/cxxreact/JSCExecutor.h b/ReactCommon/cxxreact/JSCExecutor.h
deleted file mode 100644
index a52842b386d7be..00000000000000
--- a/ReactCommon/cxxreact/JSCExecutor.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <cstdint>
-#include <memory>
-#include <mutex>
-
-#include <cxxreact/JSCNativeModules.h>
-#include <cxxreact/JSExecutor.h>
-#include <folly/Optional.h>
-#include <folly/json.h>
-#include <jschelpers/JSCHelpers.h>
-#include <jschelpers/JavaScriptCore.h>
-#include <jschelpers/Value.h>
-#include <privatedata/PrivateDataBase.h>
-
-#ifndef RN_EXPORT
-#define RN_EXPORT __attribute__((visibility("default")))
-#endif
-
-namespace facebook {
-namespace react {
-
-class MessageQueueThread;
-class RAMBundleRegistry;
-
-class RN_EXPORT JSCExecutorFactory : public JSExecutorFactory {
-public:
-  JSCExecutorFactory(const folly::dynamic& jscConfig) :
-    m_jscConfig(jscConfig) {}
-  std::unique_ptr<JSExecutor> createJSExecutor(
-    std::shared_ptr<ExecutorDelegate> delegate,
-    std::shared_ptr<MessageQueueThread> jsQueue) override;
-private:
-  std::string m_cacheDir;
-  folly::dynamic m_jscConfig;
-};
-
-template<typename T>
-struct JSCValueEncoder {
-  // If you get a build error here, it means the compiler can't see the template instantation of toJSCValue
-  // applicable to your type.
-  static const Value toJSCValue(JSGlobalContextRef ctx, T&& value);
-};
-
-template<>
-struct JSCValueEncoder<folly::dynamic> {
-  static const Value toJSCValue(JSGlobalContextRef ctx, const folly::dynamic &&value) {
-    return Value::fromDynamic(ctx, value);
-  }
-};
-
-class RN_EXPORT JSCExecutor : public JSExecutor, public PrivateDataBase {
-public:
-  /**
-   * Must be invoked from thread this Executor will run on.
-   */
-  explicit JSCExecutor(std::shared_ptr<ExecutorDelegate> delegate,
-                       std::shared_ptr<MessageQueueThread> messageQueueThread,
-                       const folly::dynamic& jscConfig) throw(JSException);
-  ~JSCExecutor() override;
-
-  virtual void loadApplicationScript(
-    std::unique_ptr<const JSBigString> script,
-    std::string sourceURL) override;
-
-  virtual void setBundleRegistry(std::unique_ptr<RAMBundleRegistry> bundleRegistry) override;
-  virtual void registerBundle(uint32_t bundleId, const std::string& bundlePath) override;
-
-  virtual void callFunction(
-    const std::string& moduleId,
-    const std::string& methodId,
-    const folly::dynamic& arguments) override;
-
-  virtual void invokeCallback(
-    const double callbackId,
-    const folly::dynamic& arguments) override;
-
-  virtual void setGlobalVariable(
-    std::string propName,
-    std::unique_ptr<const JSBigString> jsonValue) override;
-
-  virtual std::string getDescription() override;
-
-  virtual void* getJavaScriptContext() override;
-
-  virtual bool isInspectable() override;
-
-  virtual void handleMemoryPressure(int pressureLevel) override;
-
-  virtual void destroy() override;
-
-  void setContextName(const std::string& name);
-
-private:
-  JSGlobalContextRef m_context;
-  std::shared_ptr<ExecutorDelegate> m_delegate;
-  std::shared_ptr<bool> m_isDestroyed = std::shared_ptr<bool>(new bool(false));
-  std::shared_ptr<MessageQueueThread> m_messageQueueThread;
-  std::unique_ptr<RAMBundleRegistry> m_bundleRegistry;
-  JSCNativeModules m_nativeModules;
-  folly::dynamic m_jscConfig;
-  std::once_flag m_bindFlag;
-
-  folly::Optional<Object> m_invokeCallbackAndReturnFlushedQueueJS;
-  folly::Optional<Object> m_callFunctionReturnFlushedQueueJS;
-  folly::Optional<Object> m_flushedQueueJS;
-  folly::Optional<Object> m_callFunctionReturnResultAndFlushedQueueJS;
-
-  void initOnJSVMThread() throw(JSException);
-  static bool isNetworkInspected(const std::string &owner, const std::string &app, const std::string &device);
-  void terminateOnJSVMThread();
-  void bindBridge() throw(JSException);
-  void callNativeModules(Value&&);
-  void flush();
-  void flushQueueImmediate(Value&&);
-  void loadModule(uint32_t bundleId, uint32_t moduleId);
-
-  String adoptString(std::unique_ptr<const JSBigString>);
-
-  template<JSValueRef (JSCExecutor::*method)(size_t, const JSValueRef[])>
-  void installNativeHook(const char* name);
-
-  JSValueRef getNativeModule(JSObjectRef object, JSStringRef propertyName);
-
-  JSValueRef nativeRequire(
-      size_t argumentCount,
-      const JSValueRef arguments[]);
-  JSValueRef nativeFlushQueueImmediate(
-      size_t argumentCount,
-      const JSValueRef arguments[]);
-  JSValueRef nativeCallSyncHook(
-      size_t argumentCount,
-      const JSValueRef arguments[]);
-};
-
-} }
diff --git a/ReactCommon/cxxreact/JSCLegacyTracing.cpp b/ReactCommon/cxxreact/JSCLegacyTracing.cpp
deleted file mode 100644
index 64d5803fb877c7..00000000000000
--- a/ReactCommon/cxxreact/JSCLegacyTracing.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "JSCLegacyTracing.h"
-
-#if defined(WITH_JSC_EXTRA_TRACING)
-
-#include <fbsystrace.h>
-#include <JavaScriptCore/API/JSProfilerPrivate.h>
-#include <jschelpers/JSCHelpers.h>
-#include <jschelpers/Value.h>
-
-static const char *ENABLED_FBSYSTRACE_PROFILE_NAME = "__fbsystrace__";
-
-using namespace facebook::react;
-
-static int64_t int64FromJSValue(JSContextRef ctx, JSValueRef value, JSValueRef* exception) {
-  return static_cast<int64_t>(JSC_JSValueToNumber(ctx, value, exception));
-}
-
-static JSValueRef nativeTraceBeginLegacy(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  if (FBSYSTRACE_LIKELY(argumentCount >= 1)) {
-    uint64_t tag = int64FromJSValue(ctx, arguments[0], exception);
-    if (!fbsystrace_is_tracing(tag)) {
-      return Value::makeUndefined(ctx);
-    }
-  }
-
-  JSStartProfiling(ctx, String(ctx, ENABLED_FBSYSTRACE_PROFILE_NAME), true);
-
-  return Value::makeUndefined(ctx);
-}
-
-static JSValueRef nativeTraceEndLegacy(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  if (FBSYSTRACE_LIKELY(argumentCount >= 1)) {
-    uint64_t tag = int64FromJSValue(ctx, arguments[0], exception);
-    if (!fbsystrace_is_tracing(tag)) {
-      return Value::makeUndefined(ctx);
-    }
-  }
-
-  JSEndProfiling(ctx, String(ctx, ENABLED_FBSYSTRACE_PROFILE_NAME));
-
-  return Value::makeUndefined(ctx);
-}
-
-#endif
-
-namespace facebook {
-namespace react {
-
-void addNativeTracingLegacyHooks(JSGlobalContextRef ctx) {
-#if defined(WITH_JSC_EXTRA_TRACING)
-  installGlobalFunction(ctx, "nativeTraceBeginLegacy", nativeTraceBeginLegacy);
-  installGlobalFunction(ctx, "nativeTraceEndLegacy", nativeTraceEndLegacy);
-#endif
-}
-
-} }
diff --git a/ReactCommon/cxxreact/JSCLegacyTracing.h b/ReactCommon/cxxreact/JSCLegacyTracing.h
deleted file mode 100644
index e0f1b7bf520435..00000000000000
--- a/ReactCommon/cxxreact/JSCLegacyTracing.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <jschelpers/JavaScriptCore.h>
-
-namespace facebook {
-namespace react {
-
-void addNativeTracingLegacyHooks(JSGlobalContextRef ctx);
-
-} }
diff --git a/ReactCommon/cxxreact/JSCMemory.cpp b/ReactCommon/cxxreact/JSCMemory.cpp
deleted file mode 100644
index 38a4590850a955..00000000000000
--- a/ReactCommon/cxxreact/JSCMemory.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "JSCMemory.h"
-
-#ifdef WITH_FB_MEMORY_PROFILING
-
-#include <stdio.h>
-#include <string.h>
-#include <JavaScriptCore/API/JSProfilerPrivate.h>
-#include <jschelpers/JSCHelpers.h>
-#include <jschelpers/Value.h>
-
-using namespace facebook::react;
-
-static JSValueRef nativeCaptureHeap(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  if (argumentCount < 1) {
-    if (exception) {
-      *exception = Value::makeError(
-        ctx,
-        "nativeCaptureHeap requires the path to save the capture");
-    }
-    return Value::makeUndefined(ctx);
-  }
-
-  auto outputFilename = Value(ctx, arguments[0]).toString();
-  JSCaptureHeap(ctx, outputFilename.str().c_str(), exception);
-  return Value::makeUndefined(ctx);
-}
-
-#endif // WITH_FB_MEMORY_PROFILING
-
-namespace facebook {
-namespace react {
-
-void addJSCMemoryHooks(JSGlobalContextRef ctx) {
-#ifdef WITH_FB_MEMORY_PROFILING
-  installGlobalFunction(ctx, "nativeCaptureHeap", nativeCaptureHeap);
-#endif // WITH_FB_MEMORY_PROFILING
-}
-
-} }
diff --git a/ReactCommon/cxxreact/JSCMemory.h b/ReactCommon/cxxreact/JSCMemory.h
deleted file mode 100644
index d8e797aab2d4ad..00000000000000
--- a/ReactCommon/cxxreact/JSCMemory.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <jschelpers/JavaScriptCore.h>
-
-namespace facebook {
-namespace react {
-
-void addJSCMemoryHooks(JSGlobalContextRef ctx);
-
-} }
diff --git a/ReactCommon/cxxreact/JSCNativeModules.cpp b/ReactCommon/cxxreact/JSCNativeModules.cpp
deleted file mode 100644
index 50d199a25ef60b..00000000000000
--- a/ReactCommon/cxxreact/JSCNativeModules.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "JSCNativeModules.h"
-
-#include <string>
-
-#include "ModuleRegistry.h"
-#include "ReactMarker.h"
-
-namespace facebook {
-namespace react {
-
-JSCNativeModules::JSCNativeModules(std::shared_ptr<ModuleRegistry> moduleRegistry) :
-  m_moduleRegistry(std::move(moduleRegistry)) {}
-
-JSValueRef JSCNativeModules::getModule(JSContextRef context, JSStringRef jsName) {
-  if (!m_moduleRegistry) {
-    return nullptr;
-  }
-
-  std::string moduleName = String::ref(context, jsName).str();
-
-  const auto it = m_objects.find(moduleName);
-  if (it != m_objects.end()) {
-    return static_cast<JSObjectRef>(it->second);
-  }
-
-  auto module = createModule(moduleName, context);
-  if (!module.hasValue()) {
-    // Allow lookup to continue in the objects own properties, which allows for overrides of NativeModules
-    return nullptr;
-  }
-
-  // Protect since we'll be holding on to this value, even though JS may not
-  module->makeProtected();
-
-  auto result = m_objects.emplace(std::move(moduleName), std::move(*module)).first;
-  return static_cast<JSObjectRef>(result->second);
-}
-
-void JSCNativeModules::reset() {
-  m_genNativeModuleJS = nullptr;
-  m_objects.clear();
-}
-
-folly::Optional<Object> JSCNativeModules::createModule(const std::string& name, JSContextRef context) {
-  ReactMarker::logTaggedMarker(ReactMarker::NATIVE_MODULE_SETUP_START, name.c_str());
-
-  if (!m_genNativeModuleJS) {
-    auto global = Object::getGlobalObject(context);
-    m_genNativeModuleJS = global.getProperty("__fbGenNativeModule").asObject();
-    m_genNativeModuleJS->makeProtected();
-  }
-
-  auto result = m_moduleRegistry->getConfig(name);
-  if (!result.hasValue()) {
-    return nullptr;
-  }
-
-  Value moduleInfo = m_genNativeModuleJS->callAsFunction({
-    Value::fromDynamic(context, result->config),
-    Value::makeNumber(context, result->index)
-  });
-  CHECK(!moduleInfo.isNull()) << "Module returned from genNativeModule is null";
-
-  folly::Optional<Object> module(moduleInfo.asObject().getProperty("module").asObject());
-
-  ReactMarker::logTaggedMarker(ReactMarker::NATIVE_MODULE_SETUP_STOP, name.c_str());
-
-  return module;
-}
-
-} }
diff --git a/ReactCommon/cxxreact/JSCNativeModules.h b/ReactCommon/cxxreact/JSCNativeModules.h
deleted file mode 100644
index 40f0fd69f55297..00000000000000
--- a/ReactCommon/cxxreact/JSCNativeModules.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <memory>
-#include <string>
-
-#include <folly/Optional.h>
-#include <jschelpers/Value.h>
-
-namespace facebook {
-namespace react {
-
-class ModuleRegistry;
-
-/**
- * Holds and creates JS representations of the modules in ModuleRegistry
- */
-class JSCNativeModules {
-
-public:
-  explicit JSCNativeModules(std::shared_ptr<ModuleRegistry> moduleRegistry);
-  JSValueRef getModule(JSContextRef context, JSStringRef name);
-  void reset();
-
-private:
-  folly::Optional<Object> m_genNativeModuleJS;
-  std::shared_ptr<ModuleRegistry> m_moduleRegistry;
-  std::unordered_map<std::string, Object> m_objects;
-
-  folly::Optional<Object> createModule(const std::string& name, JSContextRef context);
-};
-
-}
-}
diff --git a/ReactCommon/cxxreact/JSCPerfStats.cpp b/ReactCommon/cxxreact/JSCPerfStats.cpp
deleted file mode 100644
index 0373d6ad5e80b4..00000000000000
--- a/ReactCommon/cxxreact/JSCPerfStats.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "JSCPerfStats.h"
-
-#ifdef JSC_HAS_PERF_STATS_API
-
-#include <cstdint>
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include <JavaScriptCore/JSPerfStats.h>
-#include <jschelpers/JSCHelpers.h>
-#include <jschelpers/Value.h>
-
-using namespace facebook::react;
-
-static uint64_t toMillis(struct timeval tv) {
-  return tv.tv_sec * 1000ULL + tv.tv_usec / 1000ULL;
-}
-
-static JSValueRef nativeGetProcessPerfStats(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  struct rusage usage{};
-  if (getrusage(RUSAGE_SELF, &usage) != 0) {
-    return Value::makeUndefined(ctx);
-  }
-
-  auto result = Object::create(ctx);
-  uint64_t cpu_time_ms = toMillis(usage.ru_utime) + toMillis(usage.ru_stime);
-  result.setProperty("major_faults", Value::makeNumber(ctx, usage.ru_majflt));
-  result.setProperty("minor_faults", Value::makeNumber(ctx, usage.ru_minflt));
-  result.setProperty("cpu_time_ms", Value::makeNumber(ctx, cpu_time_ms));
-  result.setProperty("input_blocks", Value::makeNumber(ctx, usage.ru_inblock));
-  result.setProperty("output_blocks", Value::makeNumber(ctx, usage.ru_oublock));
-  return static_cast<JSObjectRef>(result);
-}
-
-static JSValueRef nativeGetHeapStats(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  JSHeapStats heapStats = {0};
-  JSGetHeapStats(ctx, &heapStats);
-
-  auto result = Object::create(ctx);
-  result.setProperty("size", Value::makeNumber(ctx, heapStats.size));
-  result.setProperty("extra_size", Value::makeNumber(ctx, heapStats.extraSize));
-  result.setProperty("capacity", Value::makeNumber(ctx, heapStats.capacity));
-  result.setProperty("object_count", Value::makeNumber(ctx, heapStats.objectCount));
-  result.setProperty("object_size", Value::makeNumber(ctx, heapStats.objectSizeAfterLastCollect));
-  result.setProperty("object_capacity", Value::makeNumber(ctx, heapStats.objectCapacityAfterLastCollect));
-  result.setProperty("block_size", Value::makeNumber(ctx, heapStats.blockSize));
-  result.setProperty("malloc_size", Value::makeNumber(ctx, heapStats.mallocSize));
-  return static_cast<JSObjectRef>(result);
-}
-
-static JSValueRef nativeGetGCStats(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  JSGCStats gcStats = {0};
-  JSGetGCStats(ctx, &gcStats);
-
-  auto result = Object::create(ctx);
-  result.setProperty("last_full_gc_length", Value::makeNumber(ctx, gcStats.lastFullGCLength));
-  result.setProperty("last_eden_gc_length", Value::makeNumber(ctx, gcStats.lastEdenGCLength));
-  return static_cast<JSObjectRef>(result);
-}
-
-#endif
-
-namespace facebook {
-namespace react {
-
-void addJSCPerfStatsHooks(JSGlobalContextRef ctx) {
-#ifdef JSC_HAS_PERF_STATS_API
-  installGlobalFunction(ctx, "nativeGetProcessPerfStats", nativeGetProcessPerfStats);
-  installGlobalFunction(ctx, "nativeGetHeapStats", nativeGetHeapStats);
-  installGlobalFunction(ctx, "nativeGetGCStats", nativeGetGCStats);
-#endif
-}
-
-} }
diff --git a/ReactCommon/cxxreact/JSCPerfStats.h b/ReactCommon/cxxreact/JSCPerfStats.h
deleted file mode 100644
index 1ecf70bf14bc5d..00000000000000
--- a/ReactCommon/cxxreact/JSCPerfStats.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <jschelpers/JavaScriptCore.h>
-
-namespace facebook {
-namespace react {
-
-void addJSCPerfStatsHooks(JSGlobalContextRef ctx);
-
-} }
diff --git a/ReactCommon/cxxreact/JSCSamplingProfiler.cpp b/ReactCommon/cxxreact/JSCSamplingProfiler.cpp
deleted file mode 100644
index 425e4e69e1ab88..00000000000000
--- a/ReactCommon/cxxreact/JSCSamplingProfiler.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "JSCSamplingProfiler.h"
-
-#include <jschelpers/JSCHelpers.h>
-
-static JSValueRef pokeSamplingProfiler(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  return JSC_JSPokeSamplingProfiler(ctx);
-}
-
-namespace facebook {
-namespace react {
-
-void initSamplingProfilerOnMainJSCThread(JSGlobalContextRef ctx) {
-  JSC_JSStartSamplingProfilingOnMainJSCThread(ctx);
-
-  // Allow the profiler to be poked from JS as well
-  // (see SamplingProfiler.js for an example of how it could be used with the JSCSamplingProfiler module).
-  installGlobalFunction(ctx, "pokeSamplingProfiler", pokeSamplingProfiler);
-}
-
-} }
diff --git a/ReactCommon/cxxreact/JSCSamplingProfiler.h b/ReactCommon/cxxreact/JSCSamplingProfiler.h
deleted file mode 100644
index b252db61f57e02..00000000000000
--- a/ReactCommon/cxxreact/JSCSamplingProfiler.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <jschelpers/JavaScriptCore.h>
-
-namespace facebook {
-namespace react {
-
-void initSamplingProfilerOnMainJSCThread(JSGlobalContextRef ctx);
-
-} }
diff --git a/ReactCommon/cxxreact/JSCTracing.cpp b/ReactCommon/cxxreact/JSCTracing.cpp
deleted file mode 100644
index ca870f544be8b7..00000000000000
--- a/ReactCommon/cxxreact/JSCTracing.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "JSCTracing.h"
-
-#if defined(WITH_FBSYSTRACE) && (defined(WITH_JSC_EXTRA_TRACING) || DEBUG)
-#define USE_JSCTRACING 1
-#else
-#define USE_JSCTRACING 0
-#endif
-
-#if USE_JSCTRACING
-
-#include <algorithm>
-#include <fbsystrace.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <jschelpers/JavaScriptCore.h>
-#include <jschelpers/JSCHelpers.h>
-#include <jschelpers/Value.h>
-
-using std::min;
-using namespace facebook::react;
-
-static int64_t int64FromJSValue(JSContextRef ctx, JSValueRef value, JSValueRef* exception) {
-  return static_cast<int64_t>(JSC_JSValueToNumber(ctx, value, exception));
-}
-
-static size_t copyTruncatedAsciiChars(
-    char* buf,
-    size_t bufLen,
-    JSContextRef ctx,
-    JSValueRef value,
-    size_t maxLen) {
-  JSStringRef jsString = JSC_JSValueToStringCopy(ctx, value, NULL);
-  size_t stringLen = JSC_JSStringGetLength(ctx, jsString);
-  // Unlike the Java version, we truncate from the end of the string,
-  // rather than the beginning.
-  size_t toWrite = min(stringLen, min(bufLen, maxLen));
-
-  const char *startBuf = buf;
-  const JSChar* chars = JSC_JSStringGetCharactersPtr(ctx, jsString);
-  while (toWrite-- > 0) {
-    *(buf++) = (char)*(chars++);
-  }
-
-  JSC_JSStringRelease(ctx, jsString);
-
-  // Return the number of bytes written
-  return buf - startBuf;
-}
-
-static size_t copyArgsToBuffer(
-    char* buf,
-    size_t bufLen,
-    size_t pos,
-    JSContextRef ctx,
-    size_t argumentCount,
-    const JSValueRef arguments[]) {
-  char separator = '|';
-  for (
-      size_t idx = 0;
-      idx + 1 < argumentCount;  // Make sure key and value are present.
-      idx += 2) {
-    JSValueRef key = arguments[idx];
-    JSValueRef value = arguments[idx+1];
-
-    buf[pos++] = separator;
-    separator = ';';
-    if (FBSYSTRACE_UNLIKELY(pos >= bufLen)) { break; }
-    pos += copyTruncatedAsciiChars(
-        buf + pos, bufLen - pos, ctx, key, FBSYSTRACE_MAX_MESSAGE_LENGTH);
-    if (FBSYSTRACE_UNLIKELY(pos >= bufLen)) { break; }
-    buf[pos++] = '=';
-    if (FBSYSTRACE_UNLIKELY(pos >= bufLen)) { break; }
-    pos += copyTruncatedAsciiChars(
-        buf + pos, bufLen - pos, ctx, value, FBSYSTRACE_MAX_MESSAGE_LENGTH);
-    if (FBSYSTRACE_UNLIKELY(pos >= bufLen)) { break; }
-  }
-  return pos;
-}
-
-static JSValueRef nativeTraceBeginSection(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  if (FBSYSTRACE_UNLIKELY(argumentCount < 2)) {
-    if (exception) {
-      *exception = Value::makeError(
-        ctx,
-        "nativeTraceBeginSection: requires at least 2 arguments");
-    }
-    return Value::makeUndefined(ctx);
-  }
-
-  uint64_t tag = int64FromJSValue(ctx, arguments[0], exception);
-  if (!fbsystrace_is_tracing(tag)) {
-    return Value::makeUndefined(ctx);
-  }
-
-  char buf[FBSYSTRACE_MAX_MESSAGE_LENGTH];
-  size_t pos = 0;
-
-  pos += snprintf(buf + pos, sizeof(buf) - pos, "B|%d|", getpid());
-  // Skip the overflow check here because the int will be small.
-  pos += copyTruncatedAsciiChars(buf + pos, sizeof(buf) - pos, ctx, arguments[1], FBSYSTRACE_MAX_SECTION_NAME_LENGTH);
-  // Skip the overflow check here because the section name will be small-ish.
-
-  pos = copyArgsToBuffer(buf, sizeof(buf), pos, ctx, argumentCount - 2, arguments + 2);
-  if (FBSYSTRACE_UNLIKELY(pos >= sizeof(buf))) {
-    goto flush;
-  }
-
-flush:
-  fbsystrace_trace_raw(buf, min(pos, sizeof(buf)-1));
-
-  return Value::makeUndefined(ctx);
-}
-
-static JSValueRef nativeTraceEndSection(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  if (FBSYSTRACE_UNLIKELY(argumentCount < 1)) {
-    if (exception) {
-      *exception = Value::makeError(
-        ctx,
-        "nativeTraceEndSection: requires at least 1 argument");
-    }
-    return Value::makeUndefined(ctx);
-  }
-
-  uint64_t tag = int64FromJSValue(ctx, arguments[0], exception);
-  if (!fbsystrace_is_tracing(tag)) {
-    return Value::makeUndefined(ctx);
-  }
-
-  if (FBSYSTRACE_LIKELY(argumentCount == 1)) {
-    fbsystrace_end_section(tag);
-  } else {
-    char buf[FBSYSTRACE_MAX_MESSAGE_LENGTH];
-    size_t pos = 0;
-
-    buf[pos++] = 'E';
-    buf[pos++] = '|';
-    buf[pos++] = '|';
-    pos = copyArgsToBuffer(buf, sizeof(buf), pos, ctx, argumentCount - 1, arguments + 1);
-    if (FBSYSTRACE_UNLIKELY(pos >= sizeof(buf))) {
-      goto flush;
-    }
-
-flush:
-    fbsystrace_trace_raw(buf, min(pos, sizeof(buf)-1));
-  }
-
-  return Value::makeUndefined(ctx);
-}
-
-static JSValueRef beginOrEndAsync(
-    bool isEnd,
-    bool isFlow,
-    JSContextRef ctx,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  if (FBSYSTRACE_UNLIKELY(argumentCount < 3)) {
-    if (exception) {
-      *exception = Value::makeError(
-        ctx,
-        "beginOrEndAsync: requires at least 3 arguments");
-    }
-    return Value::makeUndefined(ctx);
-  }
-
-  uint64_t tag = int64FromJSValue(ctx, arguments[0], exception);
-  if (!fbsystrace_is_tracing(tag)) {
-    return Value::makeUndefined(ctx);
-  }
-
-  char buf[FBSYSTRACE_MAX_MESSAGE_LENGTH];
-  size_t pos = 0;
-
-  // This uses an if-then-else instruction in ARMv7, which should be cheaper
-  // than a full branch.
-  buf[pos++] = ((isFlow) ? (isEnd ? 'f' : 's') : (isEnd ? 'F' : 'S'));
-  pos += snprintf(buf + pos, sizeof(buf) - pos, "|%d|", getpid());
-  // Skip the overflow check here because the int will be small.
-  pos += copyTruncatedAsciiChars(buf + pos, sizeof(buf) - pos, ctx, arguments[1], FBSYSTRACE_MAX_SECTION_NAME_LENGTH);
-  // Skip the overflow check here because the section name will be small-ish.
-
-  // I tried some trickery to avoid a branch here, but gcc did not cooperate.
-  // We could consider changing the implementation to be lest branchy in the
-  // future.
-  // This is not required for flow use an or to avoid introducing another branch
-  if (!(isEnd | isFlow)) {
-    buf[pos++] = '<';
-    buf[pos++] = '0';
-    buf[pos++] = '>';
-  }
-  buf[pos++] = '|';
-
-  // Append the cookie.  It should be an integer, but copyTruncatedAsciiChars
-  // will automatically convert it to a string.  We might be able to get more
-  // performance by just getting the number and doing to string
-  // conversion ourselves.  We truncate to FBSYSTRACE_MAX_SECTION_NAME_LENGTH
-  // just to make sure we can avoid the overflow check even if the caller
-  // passes in something bad.
-  pos += copyTruncatedAsciiChars(buf + pos, sizeof(buf) - pos, ctx, arguments[2], FBSYSTRACE_MAX_SECTION_NAME_LENGTH);
-
-  pos = copyArgsToBuffer(buf, sizeof(buf), pos, ctx, argumentCount - 3, arguments + 3);
-  if (FBSYSTRACE_UNLIKELY(pos >= sizeof(buf))) {
-    goto flush;
-  }
-
-flush:
-  fbsystrace_trace_raw(buf, min(pos, sizeof(buf)-1));
-
-  return Value::makeUndefined(ctx);
-}
-
-static JSValueRef nativeTraceBeginAsyncSection(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  return beginOrEndAsync(false /* isEnd */, false /* isFlow */,
-    ctx, argumentCount, arguments, exception);
-}
-
-static JSValueRef nativeTraceEndAsyncSection(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  return beginOrEndAsync(true /* isEnd */, false /* isFlow */,
-      ctx, argumentCount, arguments, exception);
-}
-
-static JSValueRef nativeTraceBeginAsyncFlow(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  return beginOrEndAsync(false /* isEnd */, true /* isFlow */,
-      ctx, argumentCount, arguments, exception);
-}
-
-static JSValueRef nativeTraceEndAsyncFlow(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  return beginOrEndAsync(true /* isEnd */, true /* isFlow */,
-      ctx, argumentCount, arguments, exception);
-}
-
-static JSValueRef nativeTraceCounter(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  if (FBSYSTRACE_UNLIKELY(argumentCount < 3)) {
-    if (exception) {
-      *exception = Value::makeError(
-        ctx,
-        "nativeTraceCounter: requires at least 3 arguments");
-    }
-    return Value::makeUndefined(ctx);
-  }
-
-  uint64_t tag = int64FromJSValue(ctx, arguments[0], exception);
-  if (!fbsystrace_is_tracing(tag)) {
-    return Value::makeUndefined(ctx);
-  }
-
-  char buf[FBSYSTRACE_MAX_MESSAGE_LENGTH];
-  size_t len = copyTruncatedAsciiChars(buf, sizeof(buf), ctx,
-    arguments[1], FBSYSTRACE_MAX_SECTION_NAME_LENGTH);
-  buf[min(len,(FBSYSTRACE_MAX_MESSAGE_LENGTH-1))] = 0;
-  int64_t value = int64FromJSValue(ctx, arguments[2], exception);
-
-  fbsystrace_counter(tag, buf, value);
-
-  return Value::makeUndefined(ctx);
-}
-
-#endif
-
-namespace facebook {
-namespace react {
-
-void addNativeTracingHooks(JSGlobalContextRef ctx) {
-#if USE_JSCTRACING
-  installGlobalFunction(ctx, "nativeTraceBeginSection", nativeTraceBeginSection);
-  installGlobalFunction(ctx, "nativeTraceEndSection", nativeTraceEndSection);
-  installGlobalFunction(ctx, "nativeTraceBeginAsyncSection", nativeTraceBeginAsyncSection);
-  installGlobalFunction(ctx, "nativeTraceEndAsyncSection", nativeTraceEndAsyncSection);
-  installGlobalFunction(ctx, "nativeTraceBeginAsyncFlow", nativeTraceBeginAsyncFlow);
-  installGlobalFunction(ctx, "nativeTraceEndAsyncFlow", nativeTraceEndAsyncFlow);
-  installGlobalFunction(ctx, "nativeTraceCounter", nativeTraceCounter);
-#endif
-}
-
-} }
diff --git a/ReactCommon/cxxreact/JSCTracing.h b/ReactCommon/cxxreact/JSCTracing.h
deleted file mode 100644
index 0a0b1b39a75670..00000000000000
--- a/ReactCommon/cxxreact/JSCTracing.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <jschelpers/JavaScriptCore.h>
-
-namespace facebook {
-namespace react {
-
-void addNativeTracingHooks(JSGlobalContextRef ctx);
-
-} }
diff --git a/ReactCommon/cxxreact/JSCUtils.cpp b/ReactCommon/cxxreact/JSCUtils.cpp
deleted file mode 100644
index 25e4da18540714..00000000000000
--- a/ReactCommon/cxxreact/JSCUtils.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "JSCUtils.h"
-
-#include "RAMBundleRegistry.h"
-
-#include <folly/Conv.h>
-
-namespace facebook {
-namespace react {
-
-String jsStringFromBigString(JSContextRef ctx, const JSBigString& bigstr) {
-  if (bigstr.isAscii()) {
-    return String::createExpectingAscii(ctx, bigstr.c_str(), bigstr.size());
-  } else {
-    return String(ctx, bigstr.c_str());
-  }
-}
-
-}
-}
diff --git a/ReactCommon/cxxreact/JSCUtils.h b/ReactCommon/cxxreact/JSCUtils.h
deleted file mode 100644
index feeae32c7a9368..00000000000000
--- a/ReactCommon/cxxreact/JSCUtils.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <cxxreact/JSBigString.h>
-#include <jschelpers/JavaScriptCore.h>
-#include <jschelpers/Value.h>
-
-namespace facebook {
-namespace react {
-
-String jsStringFromBigString(JSContextRef ctx, const JSBigString& bigstr);
-
-}
-}
diff --git a/ReactCommon/cxxreact/JSDeltaBundleClient.h b/ReactCommon/cxxreact/JSDeltaBundleClient.h
index 021ae6c622cf89..823beab076fbb3 100644
--- a/ReactCommon/cxxreact/JSDeltaBundleClient.h
+++ b/ReactCommon/cxxreact/JSDeltaBundleClient.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JSExecutor.cpp b/ReactCommon/cxxreact/JSExecutor.cpp
index 846273ab37f702..ca88df2ec3129b 100644
--- a/ReactCommon/cxxreact/JSExecutor.cpp
+++ b/ReactCommon/cxxreact/JSExecutor.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JSExecutor.h b/ReactCommon/cxxreact/JSExecutor.h
index 6627304abbe6af..c5069df308b249 100644
--- a/ReactCommon/cxxreact/JSExecutor.h
+++ b/ReactCommon/cxxreact/JSExecutor.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp b/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp
index cca4ab20338fd0..237b9550f08225 100644
--- a/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp
+++ b/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JSIndexedRAMBundle.h b/ReactCommon/cxxreact/JSIndexedRAMBundle.h
index e91ed076813dd2..be6b27f7a84576 100644
--- a/ReactCommon/cxxreact/JSIndexedRAMBundle.h
+++ b/ReactCommon/cxxreact/JSIndexedRAMBundle.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JSModulesUnbundle.h b/ReactCommon/cxxreact/JSModulesUnbundle.h
index f1662776c312ed..c926a5982c8ef8 100644
--- a/ReactCommon/cxxreact/JSModulesUnbundle.h
+++ b/ReactCommon/cxxreact/JSModulesUnbundle.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JsArgumentHelpers-inl.h b/ReactCommon/cxxreact/JsArgumentHelpers-inl.h
index 63ce70cf060fb9..f5877556b55375 100644
--- a/ReactCommon/cxxreact/JsArgumentHelpers-inl.h
+++ b/ReactCommon/cxxreact/JsArgumentHelpers-inl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/JsArgumentHelpers.h b/ReactCommon/cxxreact/JsArgumentHelpers.h
index ba6cd62af898d8..9d256fa172e083 100644
--- a/ReactCommon/cxxreact/JsArgumentHelpers.h
+++ b/ReactCommon/cxxreact/JsArgumentHelpers.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/MessageQueueThread.h b/ReactCommon/cxxreact/MessageQueueThread.h
index 5158646281ab14..4919273d622d16 100644
--- a/ReactCommon/cxxreact/MessageQueueThread.h
+++ b/ReactCommon/cxxreact/MessageQueueThread.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/MethodCall.cpp b/ReactCommon/cxxreact/MethodCall.cpp
index 70abb42503059f..a83c2955fe518f 100644
--- a/ReactCommon/cxxreact/MethodCall.cpp
+++ b/ReactCommon/cxxreact/MethodCall.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/MethodCall.h b/ReactCommon/cxxreact/MethodCall.h
index ec6bc334e6a09a..b6ed095fb6cf79 100644
--- a/ReactCommon/cxxreact/MethodCall.h
+++ b/ReactCommon/cxxreact/MethodCall.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/ModuleRegistry.cpp b/ReactCommon/cxxreact/ModuleRegistry.cpp
index 17f17746984809..0e3044ce5a2862 100644
--- a/ReactCommon/cxxreact/ModuleRegistry.cpp
+++ b/ReactCommon/cxxreact/ModuleRegistry.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -41,6 +41,7 @@ void ModuleRegistry::updateModuleNamesFromIndex(size_t index) {
 }
 
 void ModuleRegistry::registerModules(std::vector<std::unique_ptr<NativeModule>> modules) {
+  SystraceSection s_("ModuleRegistry::registerModules");
   if (modules_.empty() && unknownModules_.empty()) {
     modules_ = std::move(modules);
   } else {
@@ -67,6 +68,7 @@ void ModuleRegistry::registerModules(std::vector<std::unique_ptr<NativeModule>>
 }
 
 std::vector<std::string> ModuleRegistry::moduleNames() {
+  SystraceSection s_("ModuleRegistry::moduleNames");
   std::vector<std::string> names;
   for (size_t i = 0; i < modules_.size(); i++) {
     std::string name = normalizeName(modules_[i]->getName());
@@ -106,12 +108,12 @@ folly::Optional<ModuleConfig> ModuleRegistry::getConfig(const std::string& name)
   folly::dynamic config = folly::dynamic::array(name);
 
   {
-    SystraceSection s_("getConstants");
+    SystraceSection s_("ModuleRegistry::getConstants", "module", name);
     config.push_back(module->getConstants());
   }
 
   {
-    SystraceSection s_("getMethods");
+    SystraceSection s_("ModuleRegistry::getMethods", "module", name);
     std::vector<MethodDescriptor> methods = module->getMethods();
 
     folly::dynamic methodNames = folly::dynamic::array;
diff --git a/ReactCommon/cxxreact/ModuleRegistry.h b/ReactCommon/cxxreact/ModuleRegistry.h
index 183996dc7b80b9..65d95315c04b28 100644
--- a/ReactCommon/cxxreact/ModuleRegistry.h
+++ b/ReactCommon/cxxreact/ModuleRegistry.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/NativeModule.h b/ReactCommon/cxxreact/NativeModule.h
index a7229b24aa7da8..e01756b57f9d94 100644
--- a/ReactCommon/cxxreact/NativeModule.h
+++ b/ReactCommon/cxxreact/NativeModule.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.cpp b/ReactCommon/cxxreact/NativeToJsBridge.cpp
index 32cb06b9c4fd08..cfd5634f44ced3 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.cpp
+++ b/ReactCommon/cxxreact/NativeToJsBridge.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -8,6 +8,7 @@
 #include <folly/json.h>
 #include <folly/Memory.h>
 #include <folly/MoveWrapper.h>
+#include <glog/logging.h>
 
 #include "Instance.h"
 #include "JSBigString.h"
@@ -99,7 +100,8 @@ void NativeToJsBridge::loadApplication(
     std::unique_ptr<const JSBigString> startupScript,
     std::string startupScriptSourceURL) {
   runOnExecutorQueue(
-      [bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
+      [this,
+       bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
        startupScript=folly::makeMoveWrapper(std::move(startupScript)),
        startupScriptSourceURL=std::move(startupScriptSourceURL)]
         (JSExecutor* executor) mutable {
@@ -107,8 +109,13 @@ void NativeToJsBridge::loadApplication(
     if (bundleRegistry) {
       executor->setBundleRegistry(std::move(bundleRegistry));
     }
-    executor->loadApplicationScript(std::move(*startupScript),
-                                    std::move(startupScriptSourceURL));
+    try {
+      executor->loadApplicationScript(std::move(*startupScript),
+                                      std::move(startupScriptSourceURL));
+    } catch (...) {
+      m_applicationScriptHasFailure = true;
+      throw;
+    }
   });
 }
 
@@ -119,8 +126,13 @@ void NativeToJsBridge::loadApplicationSync(
   if (bundleRegistry) {
     m_executor->setBundleRegistry(std::move(bundleRegistry));
   }
-  m_executor->loadApplicationScript(std::move(startupScript),
-                                        std::move(startupScriptSourceURL));
+  try {
+    m_executor->loadApplicationScript(std::move(startupScript),
+                                          std::move(startupScriptSourceURL));
+  } catch (...) {
+    m_applicationScriptHasFailure = true;
+    throw;
+  }
 }
 
 void NativeToJsBridge::callFunction(
@@ -136,8 +148,13 @@ void NativeToJsBridge::callFunction(
       systraceCookie);
   #endif
 
-  runOnExecutorQueue([module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
+  runOnExecutorQueue([this, module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
     (JSExecutor* executor) {
+      if (m_applicationScriptHasFailure) {
+        LOG(ERROR) << "Attempting to call JS function on a bad application bundle: " << module.c_str() << "." << method.c_str() << "()";
+        throw std::runtime_error("Attempting to call JS function on a bad application bundle: " + module + "." + method + "()");
+      }
+
       #ifdef WITH_FBSYSTRACE
       FbSystraceAsyncFlow::end(
           TRACE_TAG_REACT_CXX_BRIDGE,
@@ -162,8 +179,12 @@ void NativeToJsBridge::invokeCallback(double callbackId, folly::dynamic&& argume
       systraceCookie);
   #endif
 
-  runOnExecutorQueue([callbackId, arguments = std::move(arguments), systraceCookie]
+  runOnExecutorQueue([this, callbackId, arguments = std::move(arguments), systraceCookie]
     (JSExecutor* executor) {
+      if (m_applicationScriptHasFailure) {
+        LOG(ERROR) << "Attempting to call JS callback on a bad application bundle: " << callbackId;
+        throw std::runtime_error("Attempting to invoke JS callback on a bad application bundle.");
+      }
       #ifdef WITH_FBSYSTRACE
       FbSystraceAsyncFlow::end(
           TRACE_TAG_REACT_CXX_BRIDGE,
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.h b/ReactCommon/cxxreact/NativeToJsBridge.h
index 0a6110f67e43ab..8c99d89ac5895c 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.h
+++ b/ReactCommon/cxxreact/NativeToJsBridge.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -94,6 +94,11 @@ class NativeToJsBridge {
   std::unique_ptr<JSExecutor> m_executor;
   std::shared_ptr<MessageQueueThread> m_executorMessageQueueThread;
 
+  // Keep track of whether the JS bundle containing the application logic causes
+  // exception when evaluated initially. If so, more calls to JS will very
+  // likely fail as well, so this flag can help prevent them.
+  bool m_applicationScriptHasFailure = false;
+
   #ifdef WITH_FBSYSTRACE
   std::atomic_uint_least32_t m_systraceCookie = ATOMIC_VAR_INIT();
   #endif
diff --git a/ReactCommon/cxxreact/Platform.cpp b/ReactCommon/cxxreact/Platform.cpp
deleted file mode 100644
index d9835ea94dd2a5..00000000000000
--- a/ReactCommon/cxxreact/Platform.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "Platform.h"
-
-namespace facebook {
-namespace react {
-
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wglobal-constructors"
-#endif
-
-namespace JSCNativeHooks {
-
-Hook loggingHook = nullptr;
-Hook nowHook = nullptr;
-ConfigurationHook installPerfHooks = nullptr;
-
-}
-
-#if __clang__
-#pragma clang diagnostic pop
-#endif
-
-} }
diff --git a/ReactCommon/cxxreact/Platform.h b/ReactCommon/cxxreact/Platform.h
deleted file mode 100644
index 59f49222ceac4a..00000000000000
--- a/ReactCommon/cxxreact/Platform.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <functional>
-#include <memory>
-#include <string>
-
-#include <cxxreact/ReactMarker.h>
-#include <jschelpers/JavaScriptCore.h>
-
-#ifndef RN_EXPORT
-#define RN_EXPORT __attribute__((visibility("default")))
-#endif
-
-namespace facebook {
-namespace react {
-
-namespace JSCNativeHooks {
-
-using Hook = JSValueRef(*)(
-  JSContextRef ctx,
-  JSObjectRef function,
-  JSObjectRef thisObject,
-  size_t argumentCount,
-  const JSValueRef arguments[],
-  JSValueRef *exception);
-extern RN_EXPORT Hook loggingHook;
-extern RN_EXPORT Hook nowHook;
-
-typedef void(*ConfigurationHook)(JSGlobalContextRef);
-extern RN_EXPORT ConfigurationHook installPerfHooks;
-
-}
-
-} }
diff --git a/ReactCommon/cxxreact/RAMBundleRegistry.cpp b/ReactCommon/cxxreact/RAMBundleRegistry.cpp
index d1030897542693..05c5ad215535d1 100644
--- a/ReactCommon/cxxreact/RAMBundleRegistry.cpp
+++ b/ReactCommon/cxxreact/RAMBundleRegistry.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/RAMBundleRegistry.h b/ReactCommon/cxxreact/RAMBundleRegistry.h
index 7670b90b53ded7..224e1541b356ff 100644
--- a/ReactCommon/cxxreact/RAMBundleRegistry.h
+++ b/ReactCommon/cxxreact/RAMBundleRegistry.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/ReactMarker.cpp b/ReactCommon/cxxreact/ReactMarker.cpp
index ae1a502efeb80a..075fd8ffbfd8ca 100644
--- a/ReactCommon/cxxreact/ReactMarker.cpp
+++ b/ReactCommon/cxxreact/ReactMarker.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/ReactMarker.h b/ReactCommon/cxxreact/ReactMarker.h
index 3a71579ab8f0d3..21d5deb00c3c6b 100644
--- a/ReactCommon/cxxreact/ReactMarker.h
+++ b/ReactCommon/cxxreact/ReactMarker.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -23,6 +23,8 @@ enum ReactMarkerId {
   JS_BUNDLE_STRING_CONVERT_STOP,
   NATIVE_MODULE_SETUP_START,
   NATIVE_MODULE_SETUP_STOP,
+  REGISTER_JS_SEGMENT_START,
+  REGISTER_JS_SEGMENT_STOP
 };
 
 #ifdef __APPLE__
diff --git a/ReactCommon/cxxreact/RecoverableError.h b/ReactCommon/cxxreact/RecoverableError.h
index ab62e9a98d089d..5aec7101c384e7 100644
--- a/ReactCommon/cxxreact/RecoverableError.h
+++ b/ReactCommon/cxxreact/RecoverableError.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/SampleCxxModule.cpp b/ReactCommon/cxxreact/SampleCxxModule.cpp
index 358350eeaf2c6f..d0b3199f869c08 100644
--- a/ReactCommon/cxxreact/SampleCxxModule.cpp
+++ b/ReactCommon/cxxreact/SampleCxxModule.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/SampleCxxModule.h b/ReactCommon/cxxreact/SampleCxxModule.h
index 6a7ba9bcec72e4..d7fa1193cb5e4b 100644
--- a/ReactCommon/cxxreact/SampleCxxModule.h
+++ b/ReactCommon/cxxreact/SampleCxxModule.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/SharedProxyCxxModule.h b/ReactCommon/cxxreact/SharedProxyCxxModule.h
index 18a66ebccf7efb..2e0d731dd23202 100644
--- a/ReactCommon/cxxreact/SharedProxyCxxModule.h
+++ b/ReactCommon/cxxreact/SharedProxyCxxModule.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/SystraceSection.h b/ReactCommon/cxxreact/SystraceSection.h
index 5c504185468353..381d099c914b1b 100644
--- a/ReactCommon/cxxreact/SystraceSection.h
+++ b/ReactCommon/cxxreact/SystraceSection.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/tests/BUCK b/ReactCommon/cxxreact/tests/BUCK
index f7a3416fd48627..c6dc902d652731 100644
--- a/ReactCommon/cxxreact/tests/BUCK
+++ b/ReactCommon/cxxreact/tests/BUCK
@@ -1,55 +1,53 @@
-load("//ReactNative:DEFS.bzl", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "IS_OSS_BUILD", "react_native_xplat_target")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "jni_instrumentation_test_lib",
+    "react_native_xplat_target",
+)
 
 TEST_SRCS = [
     "RecoverableErrorTest.cpp",
     "jsarg_helpers.cpp",
     "jsbigstring.cpp",
-    "jscexecutor.cpp",
-    "jsclogging.cpp",
     "methodcall.cpp",
-    "value.cpp",
 ]
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-    load("@xplat//configurations/buck/android:jni_instrumentation_test", "jni_instrumentation_test_lib")
-    load("@xplat//configurations/buck:default_platform_defs.bzl", "APPLE")
+jni_instrumentation_test_lib(
+    name = "tests",
+    srcs = TEST_SRCS,
+    class_under_test = "com/facebook/react/XplatBridgeTest",
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+    ],
+    soname = "libxplat-bridge.so",
+    visibility = [
+        "fbandroid//instrumentation_tests/...",
+    ],
+    deps = [
+        "xplat//third-party/gmock:gtest",
+        "xplat//third-party/linker_lib:android",
+        "xplat//third-party/linker_lib:atomic",
+        react_native_xplat_target("cxxreact:bridge"),
+    ],
+)
 
-    jni_instrumentation_test_lib(
-        name = "tests",
-        class_under_test = "com/facebook/react/XplatBridgeTest",
-        soname = "libxplat-bridge.so",
-        srcs = TEST_SRCS,
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-        ],
-        deps = [
-            "xplat//third-party/linker_lib:android",
-            "xplat//third-party/gmock:gtest",
-            react_native_xplat_target("cxxreact:bridge"),
-        ] + ANDROID_JSC_DEPS,
-        visibility = [
-            "fbandroid//instrumentation_tests/...",
-        ],
-    )
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = TEST_SRCS,
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            react_native_xplat_target("cxxreact:bridge"),
-            react_native_xplat_target("jschelpers:jschelpers"),
-        ] + APPLE_JSC_DEPS,
-        visibility = [
-            react_native_xplat_target("cxxreact/..."),
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = TEST_SRCS,
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+    ],
+    platforms = APPLE,
+    visibility = [
+        react_native_xplat_target("cxxreact/..."),
+    ],
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        react_native_xplat_target("cxxreact:bridge"),
+    ],
+)
diff --git a/ReactCommon/cxxreact/tests/RecoverableErrorTest.cpp b/ReactCommon/cxxreact/tests/RecoverableErrorTest.cpp
index d598d8318960af..ea84601c403cce 100644
--- a/ReactCommon/cxxreact/tests/RecoverableErrorTest.cpp
+++ b/ReactCommon/cxxreact/tests/RecoverableErrorTest.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/tests/jsarg_helpers.cpp b/ReactCommon/cxxreact/tests/jsarg_helpers.cpp
index 7e23dcd26c52de..2c52c1d8a37070 100644
--- a/ReactCommon/cxxreact/tests/jsarg_helpers.cpp
+++ b/ReactCommon/cxxreact/tests/jsarg_helpers.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/tests/jsbigstring.cpp b/ReactCommon/cxxreact/tests/jsbigstring.cpp
index f0081c889b6664..69e265c96f0891 100644
--- a/ReactCommon/cxxreact/tests/jsbigstring.cpp
+++ b/ReactCommon/cxxreact/tests/jsbigstring.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/tests/jscexecutor.cpp b/ReactCommon/cxxreact/tests/jscexecutor.cpp
deleted file mode 100644
index 867d68cd7f9d7e..00000000000000
--- a/ReactCommon/cxxreact/tests/jscexecutor.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include <gtest/gtest.h>
-#include <cxxreact/JSCExecutor.h>
-#include <cxxreact/MessageQueueThread.h>
-#include <cxxreact/MethodCall.h>
-
-using namespace facebook;
-using namespace facebook::react;
-
-
-// TODO(12340362): Fix these tests. And add checks for sizes.
-/*
-
-namespace {
-
-std::string capturedMethodCalls;
-
-struct NullDelegate : ExecutorDelegate {
-  virtual void registerExecutor(std::unique_ptr<JSExecutor> executor,
-                                std::shared_ptr<MessageQueueThread> queue) {
-    std::terminate();
-  }
-
-  virtual std::unique_ptr<JSExecutor> unregisterExecutor(JSExecutor& executor) {
-    std::terminate();
-  }
-
-  virtual std::vector<std::string> moduleNames() {
-    return std::vector<std::string>{};
-  }
-
-  virtual folly::dynamic getModuleConfig(const std::string& name) {
-    std::terminate();
-  }
-  virtual void callNativeModules(
-      JSExecutor& executor, std::string callJSON, bool isEndOfBatch) {
-    // TODO: capture calljson
-    std::terminate();
-  }
-  virtual MethodCallResult callSerializableNativeHook(
-      JSExecutor& executor, unsigned int moduleId, unsigned int methodId, folly::dynamic&& args) {
-    std::terminate();
-  }
-};
-
-struct FakeMessageQueue : MessageQueueThread {
-  virtual void runOnQueue(std::function<void()>&& runnable) {
-    // This is wrong, but oh well.
-    runnable();
-  }
-
-  virtual void runOnQueueSync(std::function<void()>&& runnable) {
-    runnable();
-  }
-
-  virtual void quitSynchronous() {
-    std::terminate();
-  }
-};
-
-std::vector<MethodCall> executeForMethodCalls(
-    JSCExecutor& e,
-    int moduleId,
-    int methodId,
-    folly::dynamic args = folly::dynamic::array()) {
-  e.callFunction(folly::to<std::string>(moduleId), folly::to<std::string>(methodId), std::move(args));
-  return parseMethodCalls(capturedMethodCalls);
-}
-
-void loadApplicationScript(JSCExecutor& e, std::string jsText) {
-  e.loadApplicationScript(std::unique_ptr<JSBigString>(new JSBigStdString(jsText)), "");
-}
-
-void setGlobalVariable(JSCExecutor& e, std::string name, std::string jsonObject) {
-  e.setGlobalVariable(name, std::unique_ptr<JSBigString>(new JSBigStdString(jsonObject)));
-}
-
-}
-
-TEST(JSCExecutor, Initialize) {
-  JSCExecutor executor(std::make_shared<NullDelegate>(), std::make_shared<FakeMessageQueue>(), "", folly::dynamic::object);
-}
-
-TEST(JSCExecutor, Two) {
-  JSCExecutor exec1(std::make_shared<NullDelegate>(), std::make_shared<FakeMessageQueue>(), "", folly::dynamic::object);
-  JSCExecutor exec2(std::make_shared<NullDelegate>(), std::make_shared<FakeMessageQueue>(), "", folly::dynamic::object);
-}
-
-TEST(JSCExecutor, CallFunction) {
-  auto jsText = ""
-  "var Bridge = {"
-  "  callFunctionReturnFlushedQueue: function (module, method, args) {"
-  "    return [[module + 1], [method + 1], [args]];"
-  "  },"
-  "};"
-  "function require() { return Bridge; }"
-  "";
-  JSCExecutor e(std::make_shared<NullDelegate>(), std::make_shared<FakeMessageQueue>(), "", folly::dynamic::object);
-  loadApplicationScript(e, jsText);
-  folly::dynamic args = folly::dynamic::array();
-  args.push_back(true);
-  args.push_back(0.4);
-  args.push_back("hello, world");
-  args.push_back(4.0);
-  auto returnedCalls = executeForMethodCalls(e, 10, 9, args);
-  ASSERT_EQ(1, returnedCalls.size());
-  auto returnedCall = returnedCalls[0];
-  EXPECT_EQ(11, returnedCall.moduleId);
-  EXPECT_EQ(10, returnedCall.methodId);
-  ASSERT_EQ(4, returnedCall.arguments.size());
-  EXPECT_EQ(args[0], returnedCall.arguments[0]);
-  EXPECT_EQ(args[1], returnedCall.arguments[1]);
-  EXPECT_EQ(args[2], returnedCall.arguments[2]);
-  EXPECT_EQ(folly::dynamic(4.0), returnedCall.arguments[3]);
-}
-
-TEST(JSCExecutor, CallFunctionWithMap) {
-  auto jsText = ""
-  "var Bridge = {"
-  "  callFunctionReturnFlushedQueue: function (module, method, args) {"
-  "    var s = args[0].foo + args[0].bar + args[0].baz;"
-  "    return [[module], [method], [[s]]];"
-  "  },"
-  "};"
-  "function require() { return Bridge; }"
-  "";
-  JSCExecutor e(std::make_shared<NullDelegate>(), std::make_shared<FakeMessageQueue>(), "", folly::dynamic::object);
-  loadApplicationScript(e, jsText);
-  folly::dynamic args = folly::dynamic::array();
-  folly::dynamic map = folly::dynamic::object
-    ("foo", folly::dynamic("hello"))
-    ("bar", folly::dynamic(4.0))
-    ("baz", folly::dynamic(true))
-  ;
-  args.push_back(std::move(map));
-  auto returnedCalls = executeForMethodCalls(e, 10, 9, args);
-  ASSERT_EQ(1, returnedCalls.size());
-  auto returnedCall = returnedCalls[0];
-  ASSERT_EQ(1, returnedCall.arguments.size());
-  EXPECT_EQ("hello4true", returnedCall.arguments[0].getString());
-}
-
-TEST(JSCExecutor, CallFunctionReturningMap) {
-  auto jsText = ""
-  "var Bridge = {"
-  "  callFunctionReturnFlushedQueue: function (module, method, args) {"
-  "    var s = { foo: 4, bar: true };"
-  "    return [[module], [method], [[s]]];"
-  "  },"
-  "};"
-  "function require() { return Bridge; }"
-  "";
-  JSCExecutor e(std::make_shared<NullDelegate>(), std::make_shared<FakeMessageQueue>(), "", folly::dynamic::object);
-  loadApplicationScript(e, jsText);
-  auto returnedCalls = executeForMethodCalls(e, 10, 9);
-  ASSERT_EQ(1, returnedCalls.size());
-  auto returnedCall = returnedCalls[0];
-  ASSERT_EQ(1, returnedCall.arguments.size());
-  ASSERT_EQ(folly::dynamic::OBJECT, returnedCall.arguments[0].type());
-  auto& returnedMap = returnedCall.arguments[0];
-  auto foo = returnedMap.at("foo");
-  EXPECT_EQ(folly::dynamic(4.0), foo);
-  auto bar = returnedMap.at("bar");
-  EXPECT_EQ(folly::dynamic(true), bar);
-}
-
-TEST(JSCExecutor, CallFunctionWithArray) {
-  auto jsText = ""
-  "var Bridge = {"
-  "  callFunctionReturnFlushedQueue: function (module, method, args) {"
-  "    var s = args[0][0]+ args[0][1] + args[0][2] + args[0].length;"
-  "    return [[module], [method], [[s]]];"
-  "  },"
-  "};"
-  "function require() { return Bridge; }"
-  "";
-  JSCExecutor e(std::make_shared<NullDelegate>(), std::make_shared<FakeMessageQueue>(), "", folly::dynamic::object);
-  loadApplicationScript(e, jsText);
-  std::vector<folly::dynamic> args;
-  std::vector<folly::dynamic> array {
-    folly::dynamic("hello"),
-    folly::dynamic(4.0),
-    folly::dynamic(true),
-  };
-  args.push_back(std::move(array));
-  auto returnedCalls = executeForMethodCalls(e, 10, 9, args);
-  ASSERT_EQ(1, returnedCalls.size());
-  auto returnedCall = returnedCalls[0];
-  ASSERT_EQ(1, returnedCall.arguments.size());
-  EXPECT_EQ("hello4true3", returnedCall.arguments[0].getString());
-}
-
-TEST(JSCExecutor, CallFunctionReturningNumberArray) {
-  auto jsText = ""
-  "var Bridge = {"
-  "  callFunctionReturnFlushedQueue: function (module, method, args) {"
-  "    var s = [3, 1, 4];"
-  "    return [[module], [method], [[s]]];"
-  "  },"
-  "};"
-  "function require() { return Bridge; }"
-  "";
-  JSCExecutor e(std::make_shared<NullDelegate>(), std::make_shared<FakeMessageQueue>(), "", folly::dynamic::object);
-  loadApplicationScript(e, jsText);
-  auto returnedCalls = executeForMethodCalls(e, 10, 9);
-  ASSERT_EQ(1, returnedCalls.size());
-  auto returnedCall = returnedCalls[0];
-  ASSERT_EQ(1, returnedCall.arguments.size());
-  ASSERT_EQ(folly::dynamic::ARRAY, returnedCall.arguments[0].type());
-
-  auto& array = returnedCall.arguments[0];
-  EXPECT_EQ(3, array.size());
-  EXPECT_EQ(folly::dynamic(3.0), array[0]);
-  EXPECT_EQ(folly::dynamic(4.0), array[2]);
-}
-
-TEST(JSCExecutor, SetSimpleGlobalVariable) {
-  auto jsText = ""
-  "var Bridge = {"
-  "  callFunctionReturnFlushedQueue: function (module, method, args) {"
-  "    return [[module], [method], [[__foo]]];"
-  "  },"
-  "};"
-  "function require() { return Bridge; }"
-  "";
-  JSCExecutor e(std::make_shared<NullDelegate>(), std::make_shared<FakeMessageQueue>(), "", folly::dynamic::object);
-  loadApplicationScript(e, jsText);
-  setGlobalVariable(e, "__foo", "42");
-  auto returnedCalls = executeForMethodCalls(e, 10, 9);
-  ASSERT_EQ(1, returnedCalls.size());
-  auto returnedCall = returnedCalls[0];
-  ASSERT_EQ(1, returnedCall.arguments.size());
-  ASSERT_EQ(42.0, returnedCall.arguments[0].getDouble());
-}
-
-TEST(JSCExecutor, SetObjectGlobalVariable) {
-  auto jsText = ""
-  "var Bridge = {"
-  "  callFunctionReturnFlushedQueue: function (module, method, args) {"
-  "    return [[module], [method], [[__foo]]];"
-  "  },"
-  "};"
-  "function require() { return Bridge; }"
-  "";
-  JSCExecutor e(std::make_shared<NullDelegate>(), std::make_shared<FakeMessageQueue>(), "", folly::dynamic::object);
-  loadApplicationScript(e, jsText);
-  auto jsonObject = ""
-  "{"
-  "  \"foo\": \"hello\","
-  "  \"bar\": 4,"
-  "  \"baz\": true"
-  "}"
-  "";
-  setGlobalVariable(e, "__foo", jsonObject);
-  auto returnedCalls = executeForMethodCalls(e, 10, 9);
-  ASSERT_EQ(1, returnedCalls.size());
-  auto returnedCall = returnedCalls[0];
-  ASSERT_EQ(1, returnedCall.arguments.size());
-  ASSERT_EQ(folly::dynamic::OBJECT, returnedCall.arguments[0].type());
-  auto& returnedMap = returnedCall.arguments[0];
-  auto foo = returnedMap.at("foo");
-  EXPECT_EQ(folly::dynamic("hello"), foo);
-  auto bar = returnedMap.at("bar");
-  EXPECT_EQ(folly::dynamic(4.0), bar);
-  auto baz = returnedMap.at("baz");
-  EXPECT_EQ(folly::dynamic(true), baz);
-}
-
-*/
diff --git a/ReactCommon/cxxreact/tests/jsclogging.cpp b/ReactCommon/cxxreact/tests/jsclogging.cpp
deleted file mode 100644
index 5f4fb0a66ad3a2..00000000000000
--- a/ReactCommon/cxxreact/tests/jsclogging.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include <gtest/gtest.h>
-#include <cxxreact/JSCExecutor.h>
-
-using namespace facebook;
-using namespace facebook::react;
-
-/*
-static const char* expectedLogMessageSubstring = NULL;
-static bool hasSeenExpectedLogMessage = false;
-
-static void mockLogHandler(int pri, const char *tag, const char *msg) {
-  if (expectedLogMessageSubstring == NULL) {
-    return;
-  }
-
-  hasSeenExpectedLogMessage |= (strstr(msg, expectedLogMessageSubstring) != NULL);
-}
-
-class JSCLoggingTest : public testing::Test {
-  protected:
-    virtual void SetUp() override {
-      setLogHandler(&mockLogHandler);
-    }
-
-    virtual void TearDown() override {
-      setLogHandler(NULL);
-      expectedLogMessageSubstring = NULL;
-      hasSeenExpectedLogMessage = false;
-    }
-
-};
-
-TEST_F(JSCLoggingTest, LogException) {
-  auto jsText = "throw new Error('I am a banana!');";
-  expectedLogMessageSubstring = "I am a banana!";
-
-  JSCExecutor e;
-  e.loadApplicationScript(jsText, "");
-
-  ASSERT_TRUE(hasSeenExpectedLogMessage);
-}
-*/
diff --git a/ReactCommon/cxxreact/tests/methodcall.cpp b/ReactCommon/cxxreact/tests/methodcall.cpp
index 395a81b4984ea9..15e47e0acc97c8 100644
--- a/ReactCommon/cxxreact/tests/methodcall.cpp
+++ b/ReactCommon/cxxreact/tests/methodcall.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/cxxreact/tests/value.cpp b/ReactCommon/cxxreact/tests/value.cpp
deleted file mode 100644
index f7c4b6fd2771b4..00000000000000
--- a/ReactCommon/cxxreact/tests/value.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-#include <string>
-#include <gtest/gtest.h>
-#include <folly/json.h>
-#include <jschelpers/Value.h>
-
-#ifdef WITH_FBJSCEXTENSION
-#undef ASSERT
-#include <JavaScriptCore/config.h>
-#include "OpaqueJSString.h"
-#endif
-
-#include <stdexcept>
-
-using namespace facebook::react;
-
-#ifdef ANDROID
-#include <android/looper.h>
-static void prepare() {
-  ALooper_prepare(0);
-}
-#else
-static void prepare() {}
-#endif
-
-TEST(Value, Undefined) {
-  prepare();
-  JSGlobalContextRef ctx = JSC_JSGlobalContextCreateInGroup(false, nullptr, nullptr);
-  auto v = Value::makeUndefined(ctx);
-  auto s = String::adopt(ctx, JSC_JSValueToStringCopy(ctx, v, nullptr));
-  EXPECT_EQ("undefined", s.str());
-  JSC_JSGlobalContextRelease(ctx);
-}
-
-TEST(Value, FromJSON) {
-  prepare();
-  JSGlobalContextRef ctx = JSC_JSGlobalContextCreateInGroup(false, nullptr, nullptr);
-  String s(ctx, "{\"a\": 4}");
-  Value v(Value::fromJSON(s));
-  EXPECT_TRUE(v.isObject());
-  JSC_JSGlobalContextRelease(ctx);
-}
-
-TEST(Value, ToJSONString) {
-  prepare();
-  JSGlobalContextRef ctx = JSC_JSGlobalContextCreateInGroup(false, nullptr, nullptr);
-  String s(ctx, "{\"a\": 4}");
-  Value v(Value::fromJSON(s));
-  folly::dynamic dyn = folly::parseJson(v.toJSONString());
-  ASSERT_NE(nullptr, dyn);
-  EXPECT_TRUE(dyn.isObject());
-  auto val = dyn.at("a");
-  ASSERT_NE(nullptr, val);
-  ASSERT_TRUE(val.isNumber());
-  EXPECT_EQ(4, val.asInt());
-  EXPECT_EQ(4.0f, val.asDouble());
-
-  JSC_JSGlobalContextRelease(ctx);
-}
-
-#ifdef WITH_FBJSCEXTENSION
-// Just test that handling invalid data doesn't crash.
-TEST(Value, FromBadUtf8) {
-  prepare();
-  JSGlobalContextRef ctx = JSC_JSGlobalContextCreateInGroup(false, nullptr, nullptr);
-  // 110xxxxx 10xxxxxx
-  auto dyn = folly::dynamic("\xC0");
-  Value::fromDynamic(ctx, dyn);
-  dyn = folly::dynamic("\xC0\x00");
-  Value::fromDynamic(ctx, dyn);
-  // 1110xxxx 10xxxxxx  10xxxxxx
-  dyn = "\xE0";
-  Value::fromDynamic(ctx, dyn);
-  Value(ctx, Value::fromDynamic(ctx, dyn)).toJSONString();
-  dyn = "\xE0\x00";
-  Value::fromDynamic(ctx, dyn);
-  Value(ctx, Value::fromDynamic(ctx, dyn)).toJSONString();
-  dyn = "\xE0\x00\x00";
-  Value::fromDynamic(ctx, dyn);
-  Value(ctx, Value::fromDynamic(ctx, dyn)).toJSONString();
-  dyn = "\xE0\xA0\x00";
-  Value::fromDynamic(ctx, dyn);
-  // 11110xxx 10xxxxxx  10xxxxxx  10xxxxxx
-  dyn = "\xF0";
-  Value::fromDynamic(ctx, dyn);
-  Value(ctx, Value::fromDynamic(ctx, dyn)).toJSONString();
-  dyn = "\xF0\x00\x00\x00";
-  Value::fromDynamic(ctx, dyn);
-  dyn = "\xF0\x80\x80\x00";
-  Value::fromDynamic(ctx, dyn);
-  Value(ctx, Value::fromDynamic(ctx, dyn)).toJSONString();
-  JSC_JSGlobalContextRelease(ctx);
-}
-
-// Just test that handling invalid data doesn't crash.
-TEST(Value, BadUtf16) {
-  prepare();
-  JSGlobalContextRef ctx = JSC_JSGlobalContextCreateInGroup(false, nullptr, nullptr);
-  UChar buf[] = { 0xDD00, 0xDD00, 0xDD00, 0x1111 };
-  JSStringRef ref = OpaqueJSString::create(buf, 4).leakRef();
-  Value v(ctx, ref);
-  v.toJSONString(0);
-  JSC_JSGlobalContextRelease(ctx);
-}
-#endif
diff --git a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewProps.cpp b/ReactCommon/fabric/activityindicator/ActivityIndicatorViewProps.cpp
deleted file mode 100644
index cfe19d0eef69e6..00000000000000
--- a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewProps.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <fabric/activityindicator/ActivityIndicatorViewProps.h>
-#include <fabric/activityindicator/conversions.h>
-#include <fabric/core/propsConversions.h>
-
-namespace facebook {
-namespace react {
-
-ActivityIndicatorViewProps::ActivityIndicatorViewProps(const ActivityIndicatorViewProps &sourceProps, const RawProps &rawProps):
-  ViewProps(sourceProps, rawProps),
-  animating(convertRawProp(rawProps, "animating", sourceProps.animating)),
-  color(convertRawProp(rawProps, "color", sourceProps.color)),
-  hidesWhenStopped(convertRawProp(rawProps, "hidesWhenStopped", sourceProps.hidesWhenStopped)),
-  size(convertRawProp(rawProps, "size", sourceProps.size)) {}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewProps.h b/ReactCommon/fabric/activityindicator/ActivityIndicatorViewProps.h
deleted file mode 100644
index 470d86e7dc880b..00000000000000
--- a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewProps.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <fabric/activityindicator/primitives.h>
-#include <fabric/graphics/Color.h>
-#include <fabric/view/ViewProps.h>
-
-namespace facebook {
-namespace react {
-
-// TODO (T28334063): Consider for codegen.
-class ActivityIndicatorViewProps final:
-  public ViewProps {
-
-public:
-  ActivityIndicatorViewProps() = default;
-  ActivityIndicatorViewProps(const ActivityIndicatorViewProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  const bool animating {true};
-  const SharedColor color {colorFromComponents({153/255.0, 153/255.0, 153/255.0, 1.0})}; // #999999
-  const bool hidesWhenStopped {true};
-  const ActivityIndicatorViewSize size {ActivityIndicatorViewSize::Small};
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewShadowNode.cpp b/ReactCommon/fabric/activityindicator/ActivityIndicatorViewShadowNode.cpp
deleted file mode 100644
index d6a512930a9c2b..00000000000000
--- a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewShadowNode.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <fabric/activityindicator/ActivityIndicatorViewShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-ComponentName ActivityIndicatorViewShadowNode::getComponentName() const {
-  return ComponentName("ActivityIndicatorView");
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewShadowNode.h b/ReactCommon/fabric/activityindicator/ActivityIndicatorViewShadowNode.h
deleted file mode 100644
index 2cb71f2a7d66f8..00000000000000
--- a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewShadowNode.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <fabric/activityindicator/ActivityIndicatorViewProps.h>
-#include <fabric/view/ConcreteViewShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-/*
- * `ShadowNode` for <ActivityIndicatorView> component.
- */
-class ActivityIndicatorViewShadowNode final:
-  public ConcreteViewShadowNode<ActivityIndicatorViewProps> {
-
-public:
-
-  using ConcreteViewShadowNode::ConcreteViewShadowNode;
-
-  ComponentName getComponentName() const override;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/activityindicator/BUCK b/ReactCommon/fabric/activityindicator/BUCK
deleted file mode 100644
index 952cb7977ff097..00000000000000
--- a/ReactCommon/fabric/activityindicator/BUCK
+++ /dev/null
@@ -1,79 +0,0 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
-
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
-
-rn_xplat_cxx_library(
-    name = "activityindicator",
-    srcs = glob(
-        ["**/*.cpp"],
-        exclude = glob(["tests/**/*.cpp"]),
-    ),
-    headers = [],
-    header_namespace = "",
-    exported_headers = subdir_glob(
-        [
-            ("", "*.h"),
-        ],
-        prefix = "fabric/activityindicator",
-    ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++14",
-        "-Wall",
-    ],
-    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
-    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
-    macosx_tests_override = [],
-    platforms = (ANDROID, APPLE),
-    preprocessor_flags = [
-        "-DLOG_TAG=\"ReactNative\"",
-        "-DWITH_FBSYSTRACE=1",
-    ],
-    tests = [],
-    visibility = ["PUBLIC"],
-    deps = [
-        "xplat//fbsystrace:fbsystrace",
-        "xplat//folly:headers_only",
-        "xplat//folly:memory",
-        "xplat//folly:molly",
-        "xplat//third-party/glog:glog",
-        "xplat//yoga:yoga",
-        react_native_xplat_target("fabric/debug:debug"),
-        react_native_xplat_target("fabric/core:core"),
-        react_native_xplat_target("fabric/graphics:graphics"),
-        react_native_xplat_target("fabric/view:view"),
-    ],
-)
-
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":activityindicator",
-        ],
-    )
diff --git a/ReactCommon/fabric/activityindicator/conversions.h b/ReactCommon/fabric/activityindicator/conversions.h
deleted file mode 100644
index 33b56b05fa9c47..00000000000000
--- a/ReactCommon/fabric/activityindicator/conversions.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <fabric/activityindicator/primitives.h>
-#include <folly/dynamic.h>
-
-namespace facebook {
-namespace react {
-
-inline void fromDynamic(const folly::dynamic &value, ActivityIndicatorViewSize &result) {
-  auto string = value.asString();
-  if (string == "large") { result = ActivityIndicatorViewSize::Large; return; }
-  if (string == "small") { result = ActivityIndicatorViewSize::Small; return; }
-  abort();
-}
-
-inline std::string toString(const ActivityIndicatorViewSize &value) {
-  switch (value) {
-    case ActivityIndicatorViewSize::Large: return "large";
-    case ActivityIndicatorViewSize::Small: return "small";
-  }
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/attributedstring/AttributedString.cpp b/ReactCommon/fabric/attributedstring/AttributedString.cpp
index b5eb74af1aa203..02c6a3d5bd4d06 100644
--- a/ReactCommon/fabric/attributedstring/AttributedString.cpp
+++ b/ReactCommon/fabric/attributedstring/AttributedString.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -15,6 +15,23 @@ namespace react {
 using Fragment = AttributedString::Fragment;
 using Fragments = AttributedString::Fragments;
 
+#pragma mark - Fragment
+
+bool Fragment::operator==(const Fragment &rhs) const {
+  return std::tie(string, textAttributes, shadowNode, parentShadowNode) ==
+      std::tie(
+             rhs.string,
+             rhs.textAttributes,
+             rhs.shadowNode,
+             rhs.parentShadowNode);
+}
+
+bool Fragment::operator!=(const Fragment &rhs) const {
+  return !(*this == rhs);
+}
+
+#pragma mark - AttributedString
+
 void AttributedString::appendFragment(const Fragment &fragment) {
   ensureUnsealed();
   fragments_.push_back(fragment);
@@ -25,44 +42,69 @@ void AttributedString::prependFragment(const Fragment &fragment) {
   fragments_.insert(fragments_.begin(), fragment);
 }
 
-void AttributedString::appendAttributedString(const AttributedString &attributedString) {
+void AttributedString::appendAttributedString(
+    const AttributedString &attributedString) {
   ensureUnsealed();
-  fragments_.insert(fragments_.end(), attributedString.fragments_.begin(), attributedString.fragments_.end());
+  fragments_.insert(
+      fragments_.end(),
+      attributedString.fragments_.begin(),
+      attributedString.fragments_.end());
 }
 
-void AttributedString::prependAttributedString(const AttributedString &attributedString) {
+void AttributedString::prependAttributedString(
+    const AttributedString &attributedString) {
   ensureUnsealed();
-  fragments_.insert(fragments_.begin(), attributedString.fragments_.begin(), attributedString.fragments_.end());
+  fragments_.insert(
+      fragments_.begin(),
+      attributedString.fragments_.begin(),
+      attributedString.fragments_.end());
 }
 
 const std::vector<Fragment> &AttributedString::getFragments() const {
   return fragments_;
 }
 
+std::string AttributedString::getString() const {
+  auto string = std::string{};
+  for (const auto &fragment : fragments_) {
+    string += fragment.string;
+  }
+  return string;
+}
+
+bool AttributedString::operator==(const AttributedString &rhs) const {
+  return fragments_ != rhs.fragments_;
+}
+
+bool AttributedString::operator!=(const AttributedString &rhs) const {
+  return !(*this == rhs);
+}
+
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList AttributedString::getDebugChildren() const {
-  SharedDebugStringConvertibleList list = {};
+  auto list = SharedDebugStringConvertibleList{};
 
   for (auto &&fragment : fragments_) {
-    auto propsList = fragment.textAttributes.DebugStringConvertible::getDebugProps();
+    auto propsList =
+        fragment.textAttributes.DebugStringConvertible::getDebugProps();
 
     if (fragment.shadowNode) {
-      propsList.push_back(std::make_shared<DebugStringConvertibleItem>("shadowNode", fragment.shadowNode->getDebugDescription()));
+      propsList.push_back(std::make_shared<DebugStringConvertibleItem>(
+          "shadowNode", fragment.shadowNode->getDebugDescription()));
     }
 
-    list.push_back(
-      std::make_shared<DebugStringConvertibleItem>(
+    list.push_back(std::make_shared<DebugStringConvertibleItem>(
         "Fragment",
         fragment.string,
         SharedDebugStringConvertibleList(),
-        propsList
-      )
-    );
+        propsList));
   }
 
   return list;
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/attributedstring/AttributedString.h b/ReactCommon/fabric/attributedstring/AttributedString.h
index 07cc47603e4590..164ccac2307f36 100644
--- a/ReactCommon/fabric/attributedstring/AttributedString.h
+++ b/ReactCommon/fabric/attributedstring/AttributedString.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <functional>
 #include <memory>
 
 #include <fabric/attributedstring/TextAttributes.h>
@@ -28,17 +29,17 @@ using SharedAttributedString = std::shared_ptr<const AttributedString>;
  * `AttributedString` is basically a list of `Fragments` which have `string` and
  * `textAttributes` + `shadowNode` associated with the `string`.
  */
-class AttributedString:
-  public Sealable,
-  public DebugStringConvertible {
-
-public:
-
+class AttributedString : public Sealable, public DebugStringConvertible {
+ public:
   class Fragment {
-  public:
+   public:
     std::string string;
     TextAttributes textAttributes;
     SharedShadowNode shadowNode;
+    SharedShadowNode parentShadowNode;
+
+    bool operator==(const Fragment &rhs) const;
+    bool operator!=(const Fragment &rhs) const;
   };
 
   using Fragments = std::vector<Fragment>;
@@ -61,15 +62,53 @@ class AttributedString:
    */
   const Fragments &getFragments() const;
 
+  /*
+   * Returns a string constructed from all strings in all fragments.
+   */
+  std::string getString() const;
+
+  bool operator==(const AttributedString &rhs) const;
+  bool operator!=(const AttributedString &rhs) const;
+
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugChildren() const override;
+#endif
 
-private:
-
+ private:
   Fragments fragments_;
 };
 
 } // namespace react
 } // namespace facebook
 
+namespace std {
+template <>
+struct hash<facebook::react::AttributedString::Fragment> {
+  size_t operator()(
+      const facebook::react::AttributedString::Fragment &fragment) const {
+    return std::hash<decltype(fragment.string)>{}(fragment.string) +
+        std::hash<decltype(fragment.textAttributes)>{}(
+               fragment.textAttributes) +
+        std::hash<decltype(fragment.shadowNode)>{}(fragment.shadowNode) +
+        std::hash<decltype(fragment.parentShadowNode)>{}(
+               fragment.parentShadowNode);
+  }
+};
+
+template <>
+struct hash<facebook::react::AttributedString> {
+  size_t operator()(
+      const facebook::react::AttributedString &attributedString) const {
+    auto result = size_t{0};
+
+    for (const auto &fragment : attributedString.getFragments()) {
+      result +=
+          std::hash<facebook::react::AttributedString::Fragment>{}(fragment);
+    }
+
+    return result;
+  }
+};
+} // namespace std
diff --git a/ReactCommon/fabric/attributedstring/BUCK b/ReactCommon/fabric/attributedstring/BUCK
index 61b897ba9d3195..e767d40ee9d415 100644
--- a/ReactCommon/fabric/attributedstring/BUCK
+++ b/ReactCommon/fabric/attributedstring/BUCK
@@ -1,13 +1,17 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
 
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "attributedstring",
@@ -58,24 +62,21 @@ rn_xplat_cxx_library(
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":attributedstring",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = (ANDROID, APPLE),
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":attributedstring",
+    ],
+)
diff --git a/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp b/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp
index 53550b6db4e0f4..2d6b590f0ba945 100644
--- a/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp
+++ b/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,23 +8,24 @@
 #include "ParagraphAttributes.h"
 
 #include <fabric/attributedstring/conversions.h>
-#include <fabric/graphics/conversions.h>
 #include <fabric/debug/debugStringConvertibleUtils.h>
+#include <fabric/graphics/conversions.h>
 
 namespace facebook {
 namespace react {
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList ParagraphAttributes::getDebugProps() const {
   return {
-    debugStringConvertibleItem("maximumNumberOfLines", maximumNumberOfLines),
-    debugStringConvertibleItem("ellipsizeMode", ellipsizeMode),
-    debugStringConvertibleItem("adjustsFontSizeToFit", adjustsFontSizeToFit),
-    debugStringConvertibleItem("minimumFontSize", minimumFontSize),
-    debugStringConvertibleItem("maximumFontSize", maximumFontSize)
-  };
+      debugStringConvertibleItem("maximumNumberOfLines", maximumNumberOfLines),
+      debugStringConvertibleItem("ellipsizeMode", ellipsizeMode),
+      debugStringConvertibleItem("adjustsFontSizeToFit", adjustsFontSizeToFit),
+      debugStringConvertibleItem("minimumFontSize", minimumFontSize),
+      debugStringConvertibleItem("maximumFontSize", maximumFontSize)};
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/attributedstring/ParagraphAttributes.h b/ReactCommon/fabric/attributedstring/ParagraphAttributes.h
index 9feaea20b50c26..506d13673515c0 100644
--- a/ReactCommon/fabric/attributedstring/ParagraphAttributes.h
+++ b/ReactCommon/fabric/attributedstring/ParagraphAttributes.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -25,40 +25,39 @@ using SharedParagraphAttributes = std::shared_ptr<const ParagraphAttributes>;
  * Two data structures, ParagraphAttributes and AttributedText, should be
  * enough to define visual representation of a piece of text on the screen.
  */
-class ParagraphAttributes:
-  public DebugStringConvertible {
-
-public:
-
+class ParagraphAttributes : public DebugStringConvertible {
+ public:
 #pragma mark - Fields
 
   /*
    * Maximum number of lines which paragraph can take.
    * Zero value represents "no limit".
    */
-  int maximumNumberOfLines {};
+  int maximumNumberOfLines{};
 
   /*
    * In case if a text cannot fit given boundaries, defines a place where
    * an ellipsize should be placed.
    */
-  EllipsizeMode ellipsizeMode {};
+  EllipsizeMode ellipsizeMode{};
 
   /*
    * Enables font size adjustment to fit constrained boundaries.
    */
-  bool adjustsFontSizeToFit {};
+  bool adjustsFontSizeToFit{};
 
   /*
    * In case of font size adjustment enabled, defines minimum and maximum
    * font sizes.
    */
-  Float minimumFontSize {std::numeric_limits<Float>::quiet_NaN()};
-  Float maximumFontSize {std::numeric_limits<Float>::quiet_NaN()};
+  Float minimumFontSize{std::numeric_limits<Float>::quiet_NaN()};
+  Float maximumFontSize{std::numeric_limits<Float>::quiet_NaN()};
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/attributedstring/TextAttributes.cpp b/ReactCommon/fabric/attributedstring/TextAttributes.cpp
index 1a5528182ec799..43f87235a09012 100644
--- a/ReactCommon/fabric/attributedstring/TextAttributes.cpp
+++ b/ReactCommon/fabric/attributedstring/TextAttributes.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -18,81 +18,194 @@ namespace react {
 
 void TextAttributes::apply(TextAttributes textAttributes) {
   // Color
-  foregroundColor = textAttributes.foregroundColor ? textAttributes.foregroundColor : foregroundColor;
-  backgroundColor = textAttributes.backgroundColor ? textAttributes.backgroundColor : backgroundColor;
+  foregroundColor = textAttributes.foregroundColor
+      ? textAttributes.foregroundColor
+      : foregroundColor;
+  backgroundColor = textAttributes.backgroundColor
+      ? textAttributes.backgroundColor
+      : backgroundColor;
   opacity = !isnan(textAttributes.opacity) ? textAttributes.opacity : opacity;
 
   // Font
-  fontFamily = !textAttributes.fontFamily.empty() ? textAttributes.fontFamily : fontFamily;
-  fontSize = !isnan(textAttributes.fontSize) ? textAttributes.fontSize : fontSize;
-  fontSizeMultiplier = !isnan(textAttributes.fontSizeMultiplier) ? textAttributes.fontSizeMultiplier : fontSizeMultiplier;
-  fontWeight = textAttributes.fontWeight.hasValue() ? textAttributes.fontWeight : fontWeight;
-  fontStyle = textAttributes.fontStyle.hasValue() ? textAttributes.fontStyle : fontStyle;
-  fontVariant = textAttributes.fontVariant.hasValue() ? textAttributes.fontVariant : fontVariant;
-  allowFontScaling = textAttributes.allowFontScaling.hasValue() ? textAttributes.allowFontScaling : allowFontScaling;
-  letterSpacing = !isnan(textAttributes.letterSpacing) ? textAttributes.letterSpacing : letterSpacing;
+  fontFamily = !textAttributes.fontFamily.empty() ? textAttributes.fontFamily
+                                                  : fontFamily;
+  fontSize =
+      !isnan(textAttributes.fontSize) ? textAttributes.fontSize : fontSize;
+  fontSizeMultiplier = !isnan(textAttributes.fontSizeMultiplier)
+      ? textAttributes.fontSizeMultiplier
+      : fontSizeMultiplier;
+  fontWeight = textAttributes.fontWeight.hasValue() ? textAttributes.fontWeight
+                                                    : fontWeight;
+  fontStyle = textAttributes.fontStyle.hasValue() ? textAttributes.fontStyle
+                                                  : fontStyle;
+  fontVariant = textAttributes.fontVariant.hasValue()
+      ? textAttributes.fontVariant
+      : fontVariant;
+  allowFontScaling = textAttributes.allowFontScaling.hasValue()
+      ? textAttributes.allowFontScaling
+      : allowFontScaling;
+  letterSpacing = !isnan(textAttributes.letterSpacing)
+      ? textAttributes.letterSpacing
+      : letterSpacing;
 
   // Paragraph Styles
-  lineHeight = !isnan(textAttributes.lineHeight) ? textAttributes.lineHeight : lineHeight;
-  alignment = textAttributes.alignment.hasValue() ? textAttributes.alignment : alignment;
-  baseWritingDirection = textAttributes.baseWritingDirection.hasValue() ? textAttributes.baseWritingDirection : baseWritingDirection;
+  lineHeight = !isnan(textAttributes.lineHeight) ? textAttributes.lineHeight
+                                                 : lineHeight;
+  alignment = textAttributes.alignment.hasValue() ? textAttributes.alignment
+                                                  : alignment;
+  baseWritingDirection = textAttributes.baseWritingDirection.hasValue()
+      ? textAttributes.baseWritingDirection
+      : baseWritingDirection;
 
   // Decoration
-  textDecorationColor = textAttributes.textDecorationColor ? textAttributes.textDecorationColor : textDecorationColor;
-  textDecorationLineType = textAttributes.textDecorationLineType.hasValue() ? textAttributes.textDecorationLineType : textDecorationLineType;
-  textDecorationLineStyle = textAttributes.textDecorationLineStyle.hasValue() ? textAttributes.textDecorationLineStyle : textDecorationLineStyle;
-  textDecorationLinePattern = textAttributes.textDecorationLinePattern.hasValue() ? textAttributes.textDecorationLinePattern : textDecorationLinePattern;
+  textDecorationColor = textAttributes.textDecorationColor
+      ? textAttributes.textDecorationColor
+      : textDecorationColor;
+  textDecorationLineType = textAttributes.textDecorationLineType.hasValue()
+      ? textAttributes.textDecorationLineType
+      : textDecorationLineType;
+  textDecorationLineStyle = textAttributes.textDecorationLineStyle.hasValue()
+      ? textAttributes.textDecorationLineStyle
+      : textDecorationLineStyle;
+  textDecorationLinePattern =
+      textAttributes.textDecorationLinePattern.hasValue()
+      ? textAttributes.textDecorationLinePattern
+      : textDecorationLinePattern;
 
   // Shadow
-  textShadowOffset = textAttributes.textShadowOffset.hasValue() ? textAttributes.textShadowOffset.value() : textShadowOffset;
-  textShadowRadius = !isnan(textAttributes.textShadowRadius) ? textAttributes.textShadowRadius : textShadowRadius;
-  textShadowColor = textAttributes.textShadowColor ? textAttributes.textShadowColor : textShadowColor;
+  textShadowOffset = textAttributes.textShadowOffset.hasValue()
+      ? textAttributes.textShadowOffset.value()
+      : textShadowOffset;
+  textShadowRadius = !isnan(textAttributes.textShadowRadius)
+      ? textAttributes.textShadowRadius
+      : textShadowRadius;
+  textShadowColor = textAttributes.textShadowColor
+      ? textAttributes.textShadowColor
+      : textShadowColor;
 
   // Special
-  isHighlighted = textAttributes.isHighlighted.hasValue() ? textAttributes.isHighlighted : isHighlighted;
-  layoutDirection = textAttributes.layoutDirection.hasValue() ? textAttributes.layoutDirection : layoutDirection;
+  isHighlighted = textAttributes.isHighlighted.hasValue()
+      ? textAttributes.isHighlighted
+      : isHighlighted;
+  layoutDirection = textAttributes.layoutDirection.hasValue()
+      ? textAttributes.layoutDirection
+      : layoutDirection;
+}
+
+#pragma mark - Operators
+
+bool TextAttributes::operator==(const TextAttributes &rhs) const {
+  return std::tie(
+             foregroundColor,
+             backgroundColor,
+             opacity,
+             fontFamily,
+             fontSize,
+             fontSizeMultiplier,
+             fontWeight,
+             fontStyle,
+             fontVariant,
+             allowFontScaling,
+             letterSpacing,
+             lineHeight,
+             alignment,
+             baseWritingDirection,
+             textDecorationColor,
+             textDecorationLineType,
+             textDecorationLineStyle,
+             textDecorationLinePattern,
+             textShadowOffset,
+             textShadowRadius,
+             textShadowColor,
+             isHighlighted,
+             layoutDirection) ==
+      std::tie(
+             rhs.foregroundColor,
+             rhs.backgroundColor,
+             rhs.opacity,
+             rhs.fontFamily,
+             rhs.fontSize,
+             rhs.fontSizeMultiplier,
+             rhs.fontWeight,
+             rhs.fontStyle,
+             rhs.fontVariant,
+             rhs.allowFontScaling,
+             rhs.letterSpacing,
+             rhs.lineHeight,
+             rhs.alignment,
+             rhs.baseWritingDirection,
+             rhs.textDecorationColor,
+             rhs.textDecorationLineType,
+             rhs.textDecorationLineStyle,
+             rhs.textDecorationLinePattern,
+             rhs.textShadowOffset,
+             rhs.textShadowRadius,
+             rhs.textShadowColor,
+             rhs.isHighlighted,
+             rhs.layoutDirection);
+}
+
+bool TextAttributes::operator!=(const TextAttributes &rhs) const {
+  return !(*this == rhs);
+}
+
+TextAttributes TextAttributes::defaultTextAttributes() {
+  static auto textAttributes = [] {
+    auto textAttributes = TextAttributes{};
+    // Non-obvious (can be different among platforms) default text attributes.
+    textAttributes.foregroundColor = blackColor();
+    textAttributes.backgroundColor = clearColor();
+    textAttributes.fontSize = 12.0;
+    return textAttributes;
+  }();
+  return textAttributes;
 }
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
   return {
-    // Color
-    debugStringConvertibleItem("backgroundColor", backgroundColor),
-    debugStringConvertibleItem("foregroundColor", foregroundColor),
-    debugStringConvertibleItem("opacity", opacity),
-
-    // Font
-    debugStringConvertibleItem("fontFamily", fontFamily),
-    debugStringConvertibleItem("fontSize", fontSize),
-    debugStringConvertibleItem("fontSizeMultiplier", fontSizeMultiplier),
-    debugStringConvertibleItem("fontWeight", fontWeight),
-    debugStringConvertibleItem("fontStyle", fontStyle),
-    debugStringConvertibleItem("fontVariant", fontVariant),
-    debugStringConvertibleItem("allowFontScaling", allowFontScaling),
-    debugStringConvertibleItem("letterSpacing", letterSpacing),
-
-    // Paragraph Styles
-    debugStringConvertibleItem("lineHeight", lineHeight),
-    debugStringConvertibleItem("alignment", alignment),
-    debugStringConvertibleItem("baseWritingDirection", baseWritingDirection),
-
-    // Decoration
-    debugStringConvertibleItem("textDecorationColor", textDecorationColor),
-    debugStringConvertibleItem("textDecorationLineType", textDecorationLineType),
-    debugStringConvertibleItem("textDecorationLineStyle", textDecorationLineStyle),
-    debugStringConvertibleItem("textDecorationLinePattern", textDecorationLinePattern),
-
-    // Shadow
-    debugStringConvertibleItem("textShadowOffset", textShadowOffset),
-    debugStringConvertibleItem("textShadowRadius", textShadowRadius),
-    debugStringConvertibleItem("textShadowColor", textShadowColor),
-
-    // Special
-    debugStringConvertibleItem("isHighlighted", isHighlighted),
-    debugStringConvertibleItem("layoutDirection", layoutDirection),
+      // Color
+      debugStringConvertibleItem("backgroundColor", backgroundColor),
+      debugStringConvertibleItem("foregroundColor", foregroundColor),
+      debugStringConvertibleItem("opacity", opacity),
+
+      // Font
+      debugStringConvertibleItem("fontFamily", fontFamily),
+      debugStringConvertibleItem("fontSize", fontSize),
+      debugStringConvertibleItem("fontSizeMultiplier", fontSizeMultiplier),
+      debugStringConvertibleItem("fontWeight", fontWeight),
+      debugStringConvertibleItem("fontStyle", fontStyle),
+      debugStringConvertibleItem("fontVariant", fontVariant),
+      debugStringConvertibleItem("allowFontScaling", allowFontScaling),
+      debugStringConvertibleItem("letterSpacing", letterSpacing),
+
+      // Paragraph Styles
+      debugStringConvertibleItem("lineHeight", lineHeight),
+      debugStringConvertibleItem("alignment", alignment),
+      debugStringConvertibleItem("baseWritingDirection", baseWritingDirection),
+
+      // Decoration
+      debugStringConvertibleItem("textDecorationColor", textDecorationColor),
+      debugStringConvertibleItem(
+          "textDecorationLineType", textDecorationLineType),
+      debugStringConvertibleItem(
+          "textDecorationLineStyle", textDecorationLineStyle),
+      debugStringConvertibleItem(
+          "textDecorationLinePattern", textDecorationLinePattern),
+
+      // Shadow
+      debugStringConvertibleItem("textShadowOffset", textShadowOffset),
+      debugStringConvertibleItem("textShadowRadius", textShadowRadius),
+      debugStringConvertibleItem("textShadowColor", textShadowColor),
+
+      // Special
+      debugStringConvertibleItem("isHighlighted", isHighlighted),
+      debugStringConvertibleItem("layoutDirection", layoutDirection),
   };
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/attributedstring/TextAttributes.h b/ReactCommon/fabric/attributedstring/TextAttributes.h
index 584387bf5471eb..e0acba5768178a 100644
--- a/ReactCommon/fabric/attributedstring/TextAttributes.h
+++ b/ReactCommon/fabric/attributedstring/TextAttributes.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <functional>
 #include <limits>
 
 #include <fabric/attributedstring/primitives.h>
@@ -24,57 +25,122 @@ class TextAttributes;
 
 using SharedTextAttributes = std::shared_ptr<const TextAttributes>;
 
-class TextAttributes:
-  public DebugStringConvertible {
-public:
+class TextAttributes : public DebugStringConvertible {
+ public:
+  /*
+   * Returns TextAttribute object which has actual default attribute values
+   * (e.g. `foregroundColor = black`), in oppose to TextAttribute's default
+   * constructor which creates an object with nulled attributes.
+   */
+  static TextAttributes defaultTextAttributes();
 
 #pragma mark - Fields
 
   // Color
-  SharedColor foregroundColor {nullptr};
-  SharedColor backgroundColor {nullptr};
-  Float opacity {std::numeric_limits<Float>::quiet_NaN()};
+  SharedColor foregroundColor{};
+  SharedColor backgroundColor{};
+  Float opacity{std::numeric_limits<Float>::quiet_NaN()};
 
   // Font
-  std::string fontFamily {""};
-  Float fontSize {std::numeric_limits<Float>::quiet_NaN()};
-  Float fontSizeMultiplier {std::numeric_limits<Float>::quiet_NaN()};
-  folly::Optional<FontWeight> fontWeight {};
-  folly::Optional<FontStyle> fontStyle {};
-  folly::Optional<FontVariant> fontVariant {};
-  folly::Optional<bool> allowFontScaling {};
-  Float letterSpacing {std::numeric_limits<Float>::quiet_NaN()};
+  std::string fontFamily{""};
+  Float fontSize{std::numeric_limits<Float>::quiet_NaN()};
+  Float fontSizeMultiplier{std::numeric_limits<Float>::quiet_NaN()};
+  folly::Optional<FontWeight> fontWeight{};
+  folly::Optional<FontStyle> fontStyle{};
+  folly::Optional<FontVariant> fontVariant{};
+  folly::Optional<bool> allowFontScaling{};
+  Float letterSpacing{std::numeric_limits<Float>::quiet_NaN()};
 
   // Paragraph Styles
-  Float lineHeight {std::numeric_limits<Float>::quiet_NaN()};
-  folly::Optional<TextAlignment> alignment {};
-  folly::Optional<WritingDirection> baseWritingDirection {};
+  Float lineHeight{std::numeric_limits<Float>::quiet_NaN()};
+  folly::Optional<TextAlignment> alignment{};
+  folly::Optional<WritingDirection> baseWritingDirection{};
 
   // Decoration
-  SharedColor textDecorationColor {nullptr};
-  folly::Optional<TextDecorationLineType> textDecorationLineType {};
-  folly::Optional<TextDecorationLineStyle> textDecorationLineStyle {};
-  folly::Optional<TextDecorationLinePattern> textDecorationLinePattern {};
+  SharedColor textDecorationColor{};
+  folly::Optional<TextDecorationLineType> textDecorationLineType{};
+  folly::Optional<TextDecorationLineStyle> textDecorationLineStyle{};
+  folly::Optional<TextDecorationLinePattern> textDecorationLinePattern{};
 
   // Shadow
   // TODO: Use `Point` type instead of `Size` for `textShadowOffset` attribute.
-  folly::Optional<Size> textShadowOffset {};
-  Float textShadowRadius {std::numeric_limits<Float>::quiet_NaN()};
-  SharedColor textShadowColor {nullptr};
+  folly::Optional<Size> textShadowOffset{};
+  Float textShadowRadius{std::numeric_limits<Float>::quiet_NaN()};
+  SharedColor textShadowColor{};
 
   // Special
-  folly::Optional<bool> isHighlighted {};
-  folly::Optional<LayoutDirection> layoutDirection {};
+  folly::Optional<bool> isHighlighted{};
+  folly::Optional<LayoutDirection> layoutDirection{};
 
 #pragma mark - Operations
 
   void apply(TextAttributes textAttributes);
 
+#pragma mark - Operators
+
+  bool operator==(const TextAttributes &rhs) const;
+  bool operator!=(const TextAttributes &rhs) const;
+
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react
 } // namespace facebook
 
+namespace std {
+template <>
+struct hash<facebook::react::TextAttributes> {
+  size_t operator()(
+      const facebook::react::TextAttributes &textAttributes) const {
+    return std::hash<decltype(textAttributes.foregroundColor)>{}(
+               textAttributes.foregroundColor) +
+        std::hash<decltype(textAttributes.backgroundColor)>{}(
+               textAttributes.backgroundColor) +
+        std::hash<decltype(textAttributes.opacity)>{}(textAttributes.opacity) +
+        std::hash<decltype(textAttributes.fontFamily)>{}(
+               textAttributes.fontFamily) +
+        std::hash<decltype(textAttributes.fontSize)>{}(
+               textAttributes.fontSize) +
+        std::hash<decltype(textAttributes.fontSizeMultiplier)>{}(
+               textAttributes.fontSizeMultiplier) +
+        std::hash<decltype(textAttributes.fontWeight)>{}(
+               textAttributes.fontWeight) +
+        std::hash<decltype(textAttributes.fontStyle)>{}(
+               textAttributes.fontStyle) +
+        std::hash<decltype(textAttributes.fontVariant)>{}(
+               textAttributes.fontVariant) +
+        std::hash<decltype(textAttributes.allowFontScaling)>{}(
+               textAttributes.allowFontScaling) +
+        std::hash<decltype(textAttributes.letterSpacing)>{}(
+               textAttributes.letterSpacing) +
+        std::hash<decltype(textAttributes.lineHeight)>{}(
+               textAttributes.lineHeight) +
+        std::hash<decltype(textAttributes.alignment)>{}(
+               textAttributes.alignment) +
+        std::hash<decltype(textAttributes.baseWritingDirection)>{}(
+               textAttributes.baseWritingDirection) +
+        std::hash<decltype(textAttributes.textDecorationColor)>{}(
+               textAttributes.textDecorationColor) +
+        std::hash<decltype(textAttributes.textDecorationLineType)>{}(
+               textAttributes.textDecorationLineType) +
+        std::hash<decltype(textAttributes.textDecorationLineStyle)>{}(
+               textAttributes.textDecorationLineStyle) +
+        std::hash<decltype(textAttributes.textDecorationLinePattern)>{}(
+               textAttributes.textDecorationLinePattern) +
+        std::hash<decltype(textAttributes.textShadowOffset)>{}(
+               textAttributes.textShadowOffset) +
+        std::hash<decltype(textAttributes.textShadowRadius)>{}(
+               textAttributes.textShadowRadius) +
+        std::hash<decltype(textAttributes.textShadowColor)>{}(
+               textAttributes.textShadowColor) +
+        std::hash<decltype(textAttributes.isHighlighted)>{}(
+               textAttributes.isHighlighted) +
+        std::hash<decltype(textAttributes.layoutDirection)>{}(
+               textAttributes.layoutDirection);
+  }
+};
+} // namespace std
diff --git a/ReactCommon/fabric/attributedstring/conversions.h b/ReactCommon/fabric/attributedstring/conversions.h
index 7e63dc1a431c0f..c30a4e2879b1cb 100644
--- a/ReactCommon/fabric/attributedstring/conversions.h
+++ b/ReactCommon/fabric/attributedstring/conversions.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,7 +7,15 @@
 
 #pragma once
 
+#include <fabric/attributedstring/conversions.h>
 #include <fabric/attributedstring/primitives.h>
+#include <fabric/attributedstring/AttributedString.h>
+#include <fabric/attributedstring/ParagraphAttributes.h>
+#include <fabric/attributedstring/TextAttributes.h>
+#include <fabric/core/conversions.h>
+#include <fabric/core/LayoutableShadowNode.h>
+#include <fabric/core/ShadowNode.h>
+#include <fabric/graphics/conversions.h>
 #include <fabric/graphics/Geometry.h>
 #include <folly/dynamic.h>
 
@@ -16,36 +24,88 @@ namespace react {
 
 inline std::string toString(const EllipsizeMode &ellipsisMode) {
   switch (ellipsisMode) {
-    case EllipsizeMode::Clip: return "clip";
-    case EllipsizeMode::Head: return "head";
-    case EllipsizeMode::Tail: return "tail";
-    case EllipsizeMode::Middle: return "middle";
+    case EllipsizeMode::Clip:
+      return "clip";
+    case EllipsizeMode::Head:
+      return "head";
+    case EllipsizeMode::Tail:
+      return "tail";
+    case EllipsizeMode::Middle:
+      return "middle";
   }
 }
 
 inline void fromDynamic(const folly::dynamic &value, EllipsizeMode &result) {
   auto string = value.getString();
-  if (string == "clip") { result = EllipsizeMode::Clip; return; }
-  if (string == "head") { result = EllipsizeMode::Head; return; }
-  if (string == "tail") { result = EllipsizeMode::Tail; return; }
-  if (string == "middle") { result = EllipsizeMode::Middle; return; }
+  if (string == "clip") {
+    result = EllipsizeMode::Clip;
+    return;
+  }
+  if (string == "head") {
+    result = EllipsizeMode::Head;
+    return;
+  }
+  if (string == "tail") {
+    result = EllipsizeMode::Tail;
+    return;
+  }
+  if (string == "middle") {
+    result = EllipsizeMode::Middle;
+    return;
+  }
   abort();
 }
 
 inline void fromDynamic(const folly::dynamic &value, FontWeight &result) {
   auto string = value.asString();
-  if (string == "normal") { result = FontWeight::Regular; return; }
-  if (string == "regular") { result = FontWeight::Regular; return; }
-  if (string == "bold") { result = FontWeight::Bold; return; }
-  if (string == "100") { result = FontWeight::Weight100; return; }
-  if (string == "200") { result = FontWeight::Weight200; return; }
-  if (string == "300") { result = FontWeight::Weight300; return; }
-  if (string == "400") { result = FontWeight::Weight400; return; }
-  if (string == "500") { result = FontWeight::Weight500; return; }
-  if (string == "600") { result = FontWeight::Weight600; return; }
-  if (string == "700") { result = FontWeight::Weight700; return; }
-  if (string == "800") { result = FontWeight::Weight800; return; }
-  if (string == "900") { result = FontWeight::Weight900; return; }
+  if (string == "normal") {
+    result = FontWeight::Regular;
+    return;
+  }
+  if (string == "regular") {
+    result = FontWeight::Regular;
+    return;
+  }
+  if (string == "bold") {
+    result = FontWeight::Bold;
+    return;
+  }
+  if (string == "100") {
+    result = FontWeight::Weight100;
+    return;
+  }
+  if (string == "200") {
+    result = FontWeight::Weight200;
+    return;
+  }
+  if (string == "300") {
+    result = FontWeight::Weight300;
+    return;
+  }
+  if (string == "400") {
+    result = FontWeight::Weight400;
+    return;
+  }
+  if (string == "500") {
+    result = FontWeight::Weight500;
+    return;
+  }
+  if (string == "600") {
+    result = FontWeight::Weight600;
+    return;
+  }
+  if (string == "700") {
+    result = FontWeight::Weight700;
+    return;
+  }
+  if (string == "800") {
+    result = FontWeight::Weight800;
+    return;
+  }
+  if (string == "900") {
+    result = FontWeight::Weight900;
+    return;
+  }
   abort();
 }
 
@@ -55,17 +115,29 @@ inline std::string toString(const FontWeight &fontWeight) {
 
 inline void fromDynamic(const folly::dynamic &value, FontStyle &result) {
   auto string = value.asString();
-  if (string == "normal") { result = FontStyle::Normal; return; }
-  if (string == "italic") { result = FontStyle::Italic; return; }
-  if (string == "oblique") { result = FontStyle::Oblique; return; }
+  if (string == "normal") {
+    result = FontStyle::Normal;
+    return;
+  }
+  if (string == "italic") {
+    result = FontStyle::Italic;
+    return;
+  }
+  if (string == "oblique") {
+    result = FontStyle::Oblique;
+    return;
+  }
   abort();
 }
 
 inline std::string toString(const FontStyle &fontStyle) {
   switch (fontStyle) {
-    case FontStyle::Normal: return "normal";
-    case FontStyle::Italic: return "italic";
-    case FontStyle::Oblique: return "oblique";
+    case FontStyle::Normal:
+      return "normal";
+    case FontStyle::Italic:
+      return "italic";
+    case FontStyle::Oblique:
+      return "oblique";
   }
 }
 
@@ -74,22 +146,47 @@ inline void fromDynamic(const folly::dynamic &value, FontVariant &result) {
   result = FontVariant::Default;
   for (auto &&item : value) {
     auto string = item.asString();
-    if (string == "small-caps") { result = (FontVariant)((int)result | (int)FontVariant::SmallCaps); continue; }
-    if (string == "oldstyle-nums") { result = (FontVariant)((int)result | (int)FontVariant::OldstyleNums); continue; }
-    if (string == "lining-nums") { result = (FontVariant)((int)result | (int)FontVariant::LiningNums); continue; }
-    if (string == "tabular-nums") { result = (FontVariant)((int)result | (int)FontVariant::TabularNums); continue; }
-    if (string == "proportional-nums") { result = (FontVariant)((int)result | (int)FontVariant::ProportionalNums); continue; }
+    if (string == "small-caps") {
+      result = (FontVariant)((int)result | (int)FontVariant::SmallCaps);
+      continue;
+    }
+    if (string == "oldstyle-nums") {
+      result = (FontVariant)((int)result | (int)FontVariant::OldstyleNums);
+      continue;
+    }
+    if (string == "lining-nums") {
+      result = (FontVariant)((int)result | (int)FontVariant::LiningNums);
+      continue;
+    }
+    if (string == "tabular-nums") {
+      result = (FontVariant)((int)result | (int)FontVariant::TabularNums);
+      continue;
+    }
+    if (string == "proportional-nums") {
+      result = (FontVariant)((int)result | (int)FontVariant::ProportionalNums);
+      continue;
+    }
   }
 }
 
 inline std::string toString(const FontVariant &fontVariant) {
-  std::string result;
-  std::string separator = ", ";
-  if ((int)fontVariant & (int)FontVariant::SmallCaps) { result += "small-caps" + separator; }
-  if ((int)fontVariant & (int)FontVariant::OldstyleNums) { result += "oldstyle-nums" + separator; }
-  if ((int)fontVariant & (int)FontVariant::LiningNums) { result += "lining-nums" + separator; }
-  if ((int)fontVariant & (int)FontVariant::TabularNums) { result += "tabular-nums" + separator; }
-  if ((int)fontVariant & (int)FontVariant::ProportionalNums) { result += "proportional-nums" + separator; }
+  auto result = std::string{};
+  auto separator = std::string{", "};
+  if ((int)fontVariant & (int)FontVariant::SmallCaps) {
+    result += "small-caps" + separator;
+  }
+  if ((int)fontVariant & (int)FontVariant::OldstyleNums) {
+    result += "oldstyle-nums" + separator;
+  }
+  if ((int)fontVariant & (int)FontVariant::LiningNums) {
+    result += "lining-nums" + separator;
+  }
+  if ((int)fontVariant & (int)FontVariant::TabularNums) {
+    result += "tabular-nums" + separator;
+  }
+  if ((int)fontVariant & (int)FontVariant::ProportionalNums) {
+    result += "proportional-nums" + separator;
+  }
 
   if (!result.empty()) {
     result.erase(result.length() - separator.length());
@@ -100,92 +197,296 @@ inline std::string toString(const FontVariant &fontVariant) {
 
 inline void fromDynamic(const folly::dynamic &value, TextAlignment &result) {
   auto string = value.asString();
-  if (string == "natural") { result = TextAlignment::Natural; return; }
-  if (string == "left") { result = TextAlignment::Left; return; }
-  if (string == "center") { result = TextAlignment::Center; return; }
-  if (string == "right") { result = TextAlignment::Right; return; }
-  if (string == "justified") { result = TextAlignment::Justified; return; }
+  if (string == "natural") {
+    result = TextAlignment::Natural;
+    return;
+  }
+  if (string == "left") {
+    result = TextAlignment::Left;
+    return;
+  }
+  if (string == "center") {
+    result = TextAlignment::Center;
+    return;
+  }
+  if (string == "right") {
+    result = TextAlignment::Right;
+    return;
+  }
+  if (string == "justified") {
+    result = TextAlignment::Justified;
+    return;
+  }
   abort();
 }
 
 inline std::string toString(const TextAlignment &textAlignment) {
   switch (textAlignment) {
-    case TextAlignment::Natural: return "natural";
-    case TextAlignment::Left: return "left";
-    case TextAlignment::Center: return "center";
-    case TextAlignment::Right: return "right";
-    case TextAlignment::Justified: return "justified";
+    case TextAlignment::Natural:
+      return "natural";
+    case TextAlignment::Left:
+      return "left";
+    case TextAlignment::Center:
+      return "center";
+    case TextAlignment::Right:
+      return "right";
+    case TextAlignment::Justified:
+      return "justified";
   }
 }
 
 inline void fromDynamic(const folly::dynamic &value, WritingDirection &result) {
   auto string = value.asString();
-  if (string == "natural") { result = WritingDirection::Natural; return; }
-  if (string == "ltr") { result = WritingDirection::LeftToRight; return; }
-  if (string == "rtl") { result = WritingDirection::RightToLeft; return; }
+  if (string == "natural") {
+    result = WritingDirection::Natural;
+    return;
+  }
+  if (string == "ltr") {
+    result = WritingDirection::LeftToRight;
+    return;
+  }
+  if (string == "rtl") {
+    result = WritingDirection::RightToLeft;
+    return;
+  }
   abort();
 }
 
 inline std::string toString(const WritingDirection &writingDirection) {
   switch (writingDirection) {
-    case WritingDirection::Natural: return "natural";
-    case WritingDirection::LeftToRight: return "ltr";
-    case WritingDirection::RightToLeft: return "rtl";
+    case WritingDirection::Natural:
+      return "natural";
+    case WritingDirection::LeftToRight:
+      return "ltr";
+    case WritingDirection::RightToLeft:
+      return "rtl";
   }
 }
 
-inline void fromDynamic(const folly::dynamic &value, TextDecorationLineType &result) {
+inline void fromDynamic(
+    const folly::dynamic &value,
+    TextDecorationLineType &result) {
   auto string = value.asString();
-  if (string == "none") { result = TextDecorationLineType::None; return; }
-  if (string == "underline") { result = TextDecorationLineType::Underline; return; }
-  if (string == "strikethrough") { result = TextDecorationLineType::Strikethrough; return; }
-  if (string == "underline-strikethrough") { result = TextDecorationLineType::UnderlineStrikethrough; return; }
+  if (string == "none") {
+    result = TextDecorationLineType::None;
+    return;
+  }
+  if (string == "underline") {
+    result = TextDecorationLineType::Underline;
+    return;
+  }
+  if (string == "strikethrough") {
+    result = TextDecorationLineType::Strikethrough;
+    return;
+  }
+  if (string == "underline-strikethrough") {
+    result = TextDecorationLineType::UnderlineStrikethrough;
+    return;
+  }
   abort();
 }
 
-inline std::string toString(const TextDecorationLineType &textDecorationLineType) {
+inline std::string toString(
+    const TextDecorationLineType &textDecorationLineType) {
   switch (textDecorationLineType) {
-    case TextDecorationLineType::None: return "none";
-    case TextDecorationLineType::Underline: return "underline";
-    case TextDecorationLineType::Strikethrough: return "strikethrough";
-    case TextDecorationLineType::UnderlineStrikethrough: return "underline-strikethrough";
+    case TextDecorationLineType::None:
+      return "none";
+    case TextDecorationLineType::Underline:
+      return "underline";
+    case TextDecorationLineType::Strikethrough:
+      return "strikethrough";
+    case TextDecorationLineType::UnderlineStrikethrough:
+      return "underline-strikethrough";
   }
 }
 
-inline void fromDynamic(const folly::dynamic &value, TextDecorationLineStyle &result) {
+inline void fromDynamic(
+    const folly::dynamic &value,
+    TextDecorationLineStyle &result) {
   auto string = value.asString();
-  if (string == "single") { result = TextDecorationLineStyle::Single; return; }
-  if (string == "thick") { result = TextDecorationLineStyle::Thick; return; }
-  if (string == "double") { result = TextDecorationLineStyle::Double; return; }
+  if (string == "single") {
+    result = TextDecorationLineStyle::Single;
+    return;
+  }
+  if (string == "thick") {
+    result = TextDecorationLineStyle::Thick;
+    return;
+  }
+  if (string == "double") {
+    result = TextDecorationLineStyle::Double;
+    return;
+  }
   abort();
 }
 
-inline std::string toString(const TextDecorationLineStyle &textDecorationLineStyle) {
+inline std::string toString(
+    const TextDecorationLineStyle &textDecorationLineStyle) {
   switch (textDecorationLineStyle) {
-    case TextDecorationLineStyle::Single: return "single";
-    case TextDecorationLineStyle::Thick: return "thick";
-    case TextDecorationLineStyle::Double: return "double";
+    case TextDecorationLineStyle::Single:
+      return "single";
+    case TextDecorationLineStyle::Thick:
+      return "thick";
+    case TextDecorationLineStyle::Double:
+      return "double";
   }
 }
 
-inline void fromDynamic(const folly::dynamic &value, TextDecorationLinePattern &result) {
+inline void fromDynamic(
+    const folly::dynamic &value,
+    TextDecorationLinePattern &result) {
   auto string = value.asString();
-  if (string == "solid") { result = TextDecorationLinePattern::Solid; return; }
-  if (string == "dot") { result = TextDecorationLinePattern::Dot; return; }
-  if (string == "dash") { result = TextDecorationLinePattern::Dash; return; }
-  if (string == "dash-dot") { result = TextDecorationLinePattern::DashDot; return; }
-  if (string == "dash-dot-dot") { result = TextDecorationLinePattern::DashDotDot; return; }
+  if (string == "solid") {
+    result = TextDecorationLinePattern::Solid;
+    return;
+  }
+  if (string == "dot") {
+    result = TextDecorationLinePattern::Dot;
+    return;
+  }
+  if (string == "dash") {
+    result = TextDecorationLinePattern::Dash;
+    return;
+  }
+  if (string == "dash-dot") {
+    result = TextDecorationLinePattern::DashDot;
+    return;
+  }
+  if (string == "dash-dot-dot") {
+    result = TextDecorationLinePattern::DashDotDot;
+    return;
+  }
   abort();
 }
 
-inline std::string toString(const TextDecorationLinePattern &textDecorationLinePattern) {
+inline std::string toString(
+    const TextDecorationLinePattern &textDecorationLinePattern) {
   switch (textDecorationLinePattern) {
-    case TextDecorationLinePattern::Solid: return "solid";
-    case TextDecorationLinePattern::Dot: return "dot";
-    case TextDecorationLinePattern::Dash: return "dash";
-    case TextDecorationLinePattern::DashDot: return "dash-dot";
-    case TextDecorationLinePattern::DashDotDot: return "dash-dot-dot";
+    case TextDecorationLinePattern::Solid:
+      return "solid";
+    case TextDecorationLinePattern::Dot:
+      return "dot";
+    case TextDecorationLinePattern::Dash:
+      return "dash";
+    case TextDecorationLinePattern::DashDot:
+      return "dash-dot";
+    case TextDecorationLinePattern::DashDotDot:
+      return "dash-dot-dot";
+  }
+}
+
+inline folly::dynamic toDynamic(
+    const ParagraphAttributes &paragraphAttributes) {
+  auto values = folly::dynamic::object();
+  values("maximumNumberOfLines", paragraphAttributes.maximumNumberOfLines);
+  values("ellipsizeMode", toString(paragraphAttributes.ellipsizeMode));
+  values("adjustsFontSizeToFit", paragraphAttributes.adjustsFontSizeToFit);
+  values("minimumFontSize", paragraphAttributes.minimumFontSize);
+  values("maximumFontSize", paragraphAttributes.maximumFontSize);
+  return values;
+}
+
+inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
+  auto _textAttributes = folly::dynamic::object();
+  if (textAttributes.foregroundColor) {
+    _textAttributes("foregroundColor", toDynamic(textAttributes.foregroundColor));
+  }
+  if (textAttributes.backgroundColor) {
+    _textAttributes(
+        "backgroundColor", toDynamic(textAttributes.backgroundColor));
+  }
+  if (!isnan(textAttributes.opacity)) {
+    _textAttributes("opacity", textAttributes.opacity);
+  }
+  if (!textAttributes.fontFamily.empty()) {
+    _textAttributes("fontFamily", textAttributes.fontFamily);
+  }
+  if (!isnan(textAttributes.fontSize)) {
+    _textAttributes("fontSize", textAttributes.fontSize);
+  }
+  if (!isnan(textAttributes.fontSizeMultiplier)) {
+    _textAttributes("fontSizeMultiplier", textAttributes.fontSizeMultiplier);
+  }
+  if (textAttributes.fontWeight.has_value()) {
+    _textAttributes("fontWeight", toString(*textAttributes.fontWeight));
+  }
+  if (textAttributes.fontStyle.has_value()) {
+    _textAttributes("fontStyle", toString(*textAttributes.fontStyle));
+  }
+  if (textAttributes.fontVariant.has_value()) {
+    _textAttributes("fontVariant", toString(*textAttributes.fontVariant));
+  }
+  if (textAttributes.allowFontScaling.has_value()) {
+    _textAttributes("allowFontScaling", *textAttributes.allowFontScaling);
+  }
+  if (!isnan(textAttributes.letterSpacing)) {
+    _textAttributes("letterSpacing", textAttributes.letterSpacing);
+  }
+  if (!isnan(textAttributes.lineHeight)) {
+    _textAttributes("lineHeight", textAttributes.lineHeight);
+  }
+  if (textAttributes.alignment.has_value()) {
+    _textAttributes("alignment", toString(*textAttributes.alignment));
+  }
+  if (textAttributes.baseWritingDirection.has_value()) {
+    _textAttributes(
+        "baseWritingDirection", toString(*textAttributes.baseWritingDirection));
+  }
+  // Decoration
+  if (textAttributes.textDecorationColor) {
+    _textAttributes(
+        "textDecorationColor", toDynamic(textAttributes.textDecorationColor));
+  }
+  if (textAttributes.textDecorationLineType.has_value()) {
+    _textAttributes(
+        "textDecorationLineType",
+        toString(*textAttributes.textDecorationLineType));
+  }
+  if (textAttributes.textDecorationLineStyle.has_value()) {
+    _textAttributes(
+        "textDecorationLineStyle",
+        toString(*textAttributes.textDecorationLineStyle));
+  }
+  if (textAttributes.textDecorationLinePattern.has_value()) {
+    _textAttributes(
+        "textDecorationLinePattern",
+        toString(*textAttributes.textDecorationLinePattern));
+  }
+  // Shadow
+  // textShadowOffset = textAttributes.textShadowOffset.has_value() ?
+  // textAttributes.textShadowOffset.value() : textShadowOffset;
+  if (!isnan(textAttributes.textShadowRadius)) {
+    _textAttributes("textShadowRadius", textAttributes.textShadowRadius);
+  }
+  if (textAttributes.textShadowColor) {
+    _textAttributes(
+        "textShadowColor", toDynamic(textAttributes.textShadowColor));
+  }
+  // Special
+  if (textAttributes.isHighlighted.has_value()) {
+    _textAttributes("isHighlighted", *textAttributes.isHighlighted);
+  }
+  if (textAttributes.layoutDirection.has_value()) {
+    _textAttributes(
+        "layoutDirection", toString(*textAttributes.layoutDirection));
+  }
+  return _textAttributes;
+}
+
+inline folly::dynamic toDynamic(const AttributedString &attributedString) {
+  auto value = folly::dynamic::object();
+  auto fragments = folly::dynamic::array();
+  for (auto fragment : attributedString.getFragments()) {
+    folly::dynamic dynamicFragment = folly::dynamic::object();
+    dynamicFragment["string"] = fragment.string;
+    if (fragment.parentShadowNode) {
+      dynamicFragment["reactTag"] = fragment.parentShadowNode->getTag();
+    }
+    dynamicFragment["textAttributes"] = toDynamic(fragment.textAttributes);
+    fragments.push_back(dynamicFragment);
   }
+  value("fragments", fragments);
+  value("string", attributedString.getString());
+  return value;
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/attributedstring/primitives.h b/ReactCommon/fabric/attributedstring/primitives.h
index 7d6d0a79b7cc3b..d849258a7fa993 100644
--- a/ReactCommon/fabric/attributedstring/primitives.h
+++ b/ReactCommon/fabric/attributedstring/primitives.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,16 +7,15 @@
 
 #pragma once
 
+#include <functional>
+#include <limits>
+
 namespace facebook {
 namespace react {
 
-enum class FontStyle {
-  Normal,
-  Italic,
-  Oblique
-};
+enum class FontStyle { Normal, Italic, Oblique };
 
-enum class FontWeight: int {
+enum class FontWeight : int {
   Weight100 = 100,
   UltraLight = 100,
   Weight200 = 200,
@@ -38,7 +37,7 @@ enum class FontWeight: int {
   Black = 900
 };
 
-enum class FontVariant: int {
+enum class FontVariant : int {
   Default = 0,
   SmallCaps = 1 << 1,
   OldstyleNums = 1 << 2,
@@ -48,24 +47,25 @@ enum class FontVariant: int {
 };
 
 enum class EllipsizeMode {
-  Clip,  // Do not add ellipsize, simply clip.
-  Head,  // Truncate at head of line: "...wxyz".
-  Tail,  // Truncate at tail of line: "abcd...".
+  Clip, // Do not add ellipsize, simply clip.
+  Head, // Truncate at head of line: "...wxyz".
+  Tail, // Truncate at tail of line: "abcd...".
   Middle // Truncate middle of line: "ab...yz".
 };
 
 enum class TextAlignment {
-  Natural,  // Indicates the default alignment for script.
-  Left,     // Visually left aligned.
-  Center,   // Visually centered.
-  Right,    // Visually right aligned.
+  Natural, // Indicates the default alignment for script.
+  Left, // Visually left aligned.
+  Center, // Visually centered.
+  Right, // Visually right aligned.
   Justified // Fully-justified. The last line in a paragraph is natural-aligned.
 };
 
 enum class WritingDirection {
-  Natural,     // Determines direction using the Unicode Bidi Algorithm rules P2 and P3.
+  Natural, // Determines direction using the Unicode Bidi Algorithm rules P2 and
+           // P3.
   LeftToRight, // Left to right writing direction.
-  RightToLeft  // Right to left writing direction.
+  RightToLeft // Right to left writing direction.
 };
 
 enum class TextDecorationLineType {
@@ -75,11 +75,7 @@ enum class TextDecorationLineType {
   UnderlineStrikethrough
 };
 
-enum class TextDecorationLineStyle {
-  Single,
-  Thick,
-  Double
-};
+enum class TextDecorationLineStyle { Single, Thick, Double };
 
 enum class TextDecorationLinePattern {
   Solid,
@@ -92,3 +88,67 @@ enum class TextDecorationLinePattern {
 } // namespace react
 } // namespace facebook
 
+namespace std {
+template <>
+struct hash<facebook::react::FontVariant> {
+  size_t operator()(const facebook::react::FontVariant &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+
+template <>
+struct hash<facebook::react::TextAlignment> {
+  size_t operator()(const facebook::react::TextAlignment &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+
+template <>
+struct hash<facebook::react::FontStyle> {
+  size_t operator()(const facebook::react::FontStyle &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+
+template <>
+struct hash<facebook::react::TextDecorationLineType> {
+  size_t operator()(const facebook::react::TextDecorationLineType &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+
+template <>
+struct hash<facebook::react::WritingDirection> {
+  size_t operator()(const facebook::react::WritingDirection &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+
+template <>
+struct hash<facebook::react::TextDecorationLinePattern> {
+  size_t operator()(const facebook::react::TextDecorationLinePattern &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+
+template <>
+struct hash<facebook::react::TextDecorationLineStyle> {
+  size_t operator()(const facebook::react::TextDecorationLineStyle &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+
+template <>
+struct hash<facebook::react::FontWeight> {
+  size_t operator()(const facebook::react::FontWeight &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+
+template <>
+struct hash<facebook::react::EllipsizeMode> {
+  size_t operator()(const facebook::react::EllipsizeMode &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+} // namespace std
diff --git a/ReactCommon/fabric/attributedstring/tests/AttributedStringTest.cpp b/ReactCommon/fabric/attributedstring/tests/AttributedStringTest.cpp
index a04597a74552b9..9ad5f5cb857097 100644
--- a/ReactCommon/fabric/attributedstring/tests/AttributedStringTest.cpp
+++ b/ReactCommon/fabric/attributedstring/tests/AttributedStringTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,8 +7,40 @@
 
 #include <memory>
 
+#include <assert.h>
+#include <fabric/attributedstring/TextAttributes.h>
+#include <fabric/attributedstring/conversions.h>
+#include <fabric/attributedstring/primitives.h>
+#include <fabric/graphics/conversions.h>
 #include <gtest/gtest.h>
 
-TEST(AttributedStringTest, testSomething) {
-  // TODO
+namespace facebook {
+namespace react {
+
+TEST(AttributedStringTest, testToDynamic) {
+  auto attString = new AttributedString();
+  auto fragment = new AttributedString::Fragment();
+  fragment->string = "test";
+
+  auto text = new TextAttributes();
+  text->foregroundColor = {
+      colorFromComponents({100 / 255.0, 153 / 255.0, 200 / 255.0, 1.0})};
+  text->opacity = 0.5;
+  text->fontStyle = FontStyle::Italic;
+  text->fontWeight = FontWeight::Thin;
+  text->fontVariant = FontVariant::TabularNums;
+  fragment->textAttributes = *text;
+
+  attString->prependFragment(*fragment);
+
+  auto result = toDynamic(*attString);
+  assert(result["string"] == fragment->string);
+  auto textAttribute = result["fragments"][0]["textAttributes"];
+  assert(textAttribute["foregroundColor"] == toDynamic(text->foregroundColor));
+  assert(textAttribute["opacity"] == text->opacity);
+  assert(textAttribute["fontStyle"] == toString(*text->fontStyle));
+  assert(textAttribute["fontWeight"] == toString(*text->fontWeight));
 }
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/attributedstring/tests/ParagraphAttributesTest.cpp b/ReactCommon/fabric/attributedstring/tests/ParagraphAttributesTest.cpp
new file mode 100644
index 00000000000000..cd66bd10922e46
--- /dev/null
+++ b/ReactCommon/fabric/attributedstring/tests/ParagraphAttributesTest.cpp
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <memory>
+
+#include <assert.h>
+#include <fabric/attributedstring/ParagraphAttributes.h>
+#include <fabric/attributedstring/conversions.h>
+#include <fabric/attributedstring/primitives.h>
+#include <gtest/gtest.h>
+
+namespace facebook {
+namespace react {
+
+TEST(ParagraphAttributesTest, testToDynamic) {
+  auto paragraphAttributes = ParagraphAttributes();
+  paragraphAttributes.maximumNumberOfLines = 2;
+  paragraphAttributes.adjustsFontSizeToFit = false;
+  paragraphAttributes.ellipsizeMode = EllipsizeMode::Middle;
+  paragraphAttributes.minimumFontSize = 10;
+  paragraphAttributes.maximumFontSize = 20;
+
+  auto result = toDynamic(paragraphAttributes);
+  assert(
+      result["maximumNumberOfLines"] ==
+      paragraphAttributes.maximumNumberOfLines);
+  assert(
+      result["adjustsFontSizeToFit"] ==
+      paragraphAttributes.adjustsFontSizeToFit);
+  assert(
+      result["ellipsizeMode"] == toString(paragraphAttributes.ellipsizeMode));
+  assert(result["minimumFontSize"] == paragraphAttributes.minimumFontSize);
+  assert(result["maximumFontSize"] == paragraphAttributes.maximumFontSize);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/attributedstring/tests/TextAttributesTest.cpp b/ReactCommon/fabric/attributedstring/tests/TextAttributesTest.cpp
new file mode 100644
index 00000000000000..e9f455bb9ce1ea
--- /dev/null
+++ b/ReactCommon/fabric/attributedstring/tests/TextAttributesTest.cpp
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <memory>
+
+#include <assert.h>
+#include <fabric/attributedstring/TextAttributes.h>
+#include <fabric/attributedstring/conversions.h>
+#include <fabric/attributedstring/primitives.h>
+#include <fabric/graphics/conversions.h>
+#include <gtest/gtest.h>
+
+namespace facebook {
+namespace react {
+
+TEST(TextAttributesTest, testToDynamic) {
+  auto text = TextAttributes();
+  text.foregroundColor = {
+      colorFromComponents({200 / 255.0, 153 / 255.0, 100 / 255.0, 1.0})};
+  text.opacity = 0.5;
+  text.fontStyle = FontStyle::Italic;
+  text.fontWeight = FontWeight::Thin;
+  text.fontVariant = FontVariant::TabularNums;
+
+  auto result = toDynamic(text);
+  assert(result["foregroundColor"] == toDynamic(text.foregroundColor));
+  assert(result["opacity"] == text.opacity);
+  assert(result["fontStyle"] == toString(*text.fontStyle));
+  assert(result["fontWeight"] == toString(*text.fontWeight));
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewComponentDescriptor.h b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h
similarity index 54%
rename from ReactCommon/fabric/activityindicator/ActivityIndicatorViewComponentDescriptor.h
rename to ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h
index 933b8ad59950a1..4d0a2d64eee0e9 100644
--- a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewComponentDescriptor.h
+++ b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,13 +7,14 @@
 
 #pragma once
 
-#include <fabric/activityindicator/ActivityIndicatorViewShadowNode.h>
+#include <fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h>
 #include <fabric/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
 namespace react {
 
-using ActivityIndicatorViewComponentDescriptor = ConcreteComponentDescriptor<ActivityIndicatorViewShadowNode>;
+using ActivityIndicatorViewComponentDescriptor =
+    ConcreteComponentDescriptor<ActivityIndicatorViewShadowNode>;
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.cpp b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.cpp
new file mode 100644
index 00000000000000..f20964ca2c7949
--- /dev/null
+++ b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.cpp
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <fabric/components/activityindicator/ActivityIndicatorViewProps.h>
+#include <fabric/components/activityindicator/conversions.h>
+#include <fabric/core/propsConversions.h>
+
+namespace facebook {
+namespace react {
+
+ActivityIndicatorViewProps::ActivityIndicatorViewProps(
+    const ActivityIndicatorViewProps &sourceProps,
+    const RawProps &rawProps)
+    : ViewProps(sourceProps, rawProps),
+      animating(convertRawProp(rawProps, "animating", sourceProps.animating)),
+      color(convertRawProp(rawProps, "color", sourceProps.color)),
+      hidesWhenStopped(convertRawProp(
+          rawProps,
+          "hidesWhenStopped",
+          sourceProps.hidesWhenStopped)),
+      size(convertRawProp(rawProps, "size", sourceProps.size)) {}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.h b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.h
new file mode 100644
index 00000000000000..d205f147713c49
--- /dev/null
+++ b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.h
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <fabric/components/activityindicator/primitives.h>
+#include <fabric/components/view/ViewProps.h>
+#include <fabric/graphics/Color.h>
+
+namespace facebook {
+namespace react {
+
+// TODO (T28334063): Consider for codegen.
+class ActivityIndicatorViewProps final : public ViewProps {
+ public:
+  ActivityIndicatorViewProps() = default;
+  ActivityIndicatorViewProps(
+      const ActivityIndicatorViewProps &sourceProps,
+      const RawProps &rawProps);
+
+#pragma mark - Props
+
+  const bool animating{true};
+  const SharedColor color{colorFromComponents(
+      {153 / 255.0, 153 / 255.0, 153 / 255.0, 1.0})}; // #999999
+  const bool hidesWhenStopped{true};
+  const ActivityIndicatorViewSize size{ActivityIndicatorViewSize::Small};
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/view/accessibility/accessibilityValuesConversions.h b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.cpp
similarity index 50%
rename from ReactCommon/fabric/view/accessibility/accessibilityValuesConversions.h
rename to ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.cpp
index 7240a7cd9aa6b4..09bb4700032b09 100644
--- a/ReactCommon/fabric/view/accessibility/accessibilityValuesConversions.h
+++ b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.cpp
@@ -1,20 +1,16 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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 <folly/dynamic.h>
-
-#include <fabric/view/AccessibilityPrimitives.h>
+#include "ActivityIndicatorViewShadowNode.h"
 
 namespace facebook {
 namespace react {
 
-AccessibilityTraits accessibilityTraitsFromDynamic(const folly::dynamic &value);
+const char ActivityIndicatorViewComponentName[] = "ActivityIndicatorView";
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h
new file mode 100644
index 00000000000000..bffcdb7b46031c
--- /dev/null
+++ b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/activityindicator/ActivityIndicatorViewProps.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>
+
+namespace facebook {
+namespace react {
+
+extern const char ActivityIndicatorViewComponentName[];
+
+/*
+ * `ShadowNode` for <ActivityIndicatorView> component.
+ */
+using ActivityIndicatorViewShadowNode = ConcreteViewShadowNode<
+    ActivityIndicatorViewComponentName,
+    ActivityIndicatorViewProps>;
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/activityindicator/BUCK b/ReactCommon/fabric/components/activityindicator/BUCK
new file mode 100644
index 00000000000000..503a799884d6d0
--- /dev/null
+++ b/ReactCommon/fabric/components/activityindicator/BUCK
@@ -0,0 +1,69 @@
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "fb_xplat_cxx_test", "get_apple_compiler_flags", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "activityindicator",
+    srcs = glob(
+        ["**/*.cpp"],
+        exclude = glob(["tests/**/*.cpp"]),
+    ),
+    headers = [],
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        prefix = "fabric/components/activityindicator",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
+    fbobjc_tests = [
+        ":tests",
+    ],
+    macosx_tests_override = [],
+    platforms = (ANDROID, APPLE),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    tests = [],
+    visibility = ["PUBLIC"],
+    deps = [
+        "xplat//fbsystrace:fbsystrace",
+        "xplat//folly:headers_only",
+        "xplat//folly:memory",
+        "xplat//folly:molly",
+        "xplat//third-party/glog:glog",
+        "xplat//yoga:yoga",
+        react_native_xplat_target("fabric/debug:debug"),
+        react_native_xplat_target("fabric/core:core"),
+        react_native_xplat_target("fabric/graphics:graphics"),
+        react_native_xplat_target("fabric/components/view:view"),
+    ],
+)
+
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    platforms = APPLE,
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":activityindicator",
+    ],
+)
diff --git a/ReactCommon/fabric/components/activityindicator/conversions.h b/ReactCommon/fabric/components/activityindicator/conversions.h
new file mode 100644
index 00000000000000..929f7fa77b5593
--- /dev/null
+++ b/ReactCommon/fabric/components/activityindicator/conversions.h
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/activityindicator/primitives.h>
+#include <folly/dynamic.h>
+
+namespace facebook {
+namespace react {
+
+inline void fromDynamic(
+    const folly::dynamic &value,
+    ActivityIndicatorViewSize &result) {
+  auto string = value.asString();
+  if (string == "large") {
+    result = ActivityIndicatorViewSize::Large;
+    return;
+  }
+  if (string == "small") {
+    result = ActivityIndicatorViewSize::Small;
+    return;
+  }
+  abort();
+}
+
+inline std::string toString(const ActivityIndicatorViewSize &value) {
+  switch (value) {
+    case ActivityIndicatorViewSize::Large:
+      return "large";
+    case ActivityIndicatorViewSize::Small:
+      return "small";
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/activityindicator/primitives.h b/ReactCommon/fabric/components/activityindicator/primitives.h
similarity index 85%
rename from ReactCommon/fabric/activityindicator/primitives.h
rename to ReactCommon/fabric/components/activityindicator/primitives.h
index 4d727793be587d..ba9b2606e1d152 100644
--- a/ReactCommon/fabric/activityindicator/primitives.h
+++ b/ReactCommon/fabric/components/activityindicator/primitives.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/activityindicator/tests/ActivityIndicatorViewTest.cpp b/ReactCommon/fabric/components/activityindicator/tests/ActivityIndicatorViewTest.cpp
similarity index 82%
rename from ReactCommon/fabric/activityindicator/tests/ActivityIndicatorViewTest.cpp
rename to ReactCommon/fabric/components/activityindicator/tests/ActivityIndicatorViewTest.cpp
index 5a168cf958e9dc..05b6e147c22cf9 100644
--- a/ReactCommon/fabric/activityindicator/tests/ActivityIndicatorViewTest.cpp
+++ b/ReactCommon/fabric/components/activityindicator/tests/ActivityIndicatorViewTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/components/image/BUCK b/ReactCommon/fabric/components/image/BUCK
index fccf34aeb43d69..ee165e9addca2f 100644
--- a/ReactCommon/fabric/components/image/BUCK
+++ b/ReactCommon/fabric/components/image/BUCK
@@ -1,13 +1,17 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
 
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "image",
@@ -54,28 +58,25 @@ rn_xplat_cxx_library(
         react_native_xplat_target("fabric/core:core"),
         react_native_xplat_target("fabric/graphics:graphics"),
         react_native_xplat_target("fabric/imagemanager:imagemanager"),
-        react_native_xplat_target("fabric/view:view"),
+        react_native_xplat_target("fabric/components/view:view"),
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":image",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = APPLE,
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":image",
+    ],
+)
diff --git a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h b/ReactCommon/fabric/components/image/ImageComponentDescriptor.h
index b2219e4495b208..72c79fb7df1888 100644
--- a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h
+++ b/ReactCommon/fabric/components/image/ImageComponentDescriptor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -18,29 +18,33 @@ namespace react {
 /*
  * Descriptor for <Image> component.
  */
-class ImageComponentDescriptor final:
-  public ConcreteComponentDescriptor<ImageShadowNode> {
-
-public:
-  ImageComponentDescriptor(SharedEventDispatcher eventDispatcher, const SharedContextContainer &contextContainer):
-    ConcreteComponentDescriptor(eventDispatcher),
-    imageManager_(std::static_pointer_cast<ImageManager>(contextContainer->at(typeid(ImageManager)))) {}
+class ImageComponentDescriptor final
+    : public ConcreteComponentDescriptor<ImageShadowNode> {
+ public:
+  ImageComponentDescriptor(
+      SharedEventDispatcher eventDispatcher,
+      const SharedContextContainer &contextContainer)
+      : ConcreteComponentDescriptor(eventDispatcher),
+        imageManager_(
+            contextContainer
+                ? contextContainer->getInstance<SharedImageManager>()
+                : nullptr) {}
 
   void adopt(UnsharedShadowNode shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
     assert(std::dynamic_pointer_cast<ImageShadowNode>(shadowNode));
-    auto imageShadowNode = std::static_pointer_cast<ImageShadowNode>(shadowNode);
+    auto imageShadowNode =
+        std::static_pointer_cast<ImageShadowNode>(shadowNode);
 
     // `ImageShadowNode` uses `ImageManager` to initiate image loading and
     // communicate the loading state and results to mounting layer.
     imageShadowNode->setImageManager(imageManager_);
   }
 
-private:
+ private:
   const SharedImageManager imageManager_;
 };
 
 } // namespace react
 } // namespace facebook
-
diff --git a/ReactCommon/fabric/components/image/ImageEventEmitter.cpp b/ReactCommon/fabric/components/image/ImageEventEmitter.cpp
index 85ba6114ebc22a..bc83aa4d9b8768 100644
--- a/ReactCommon/fabric/components/image/ImageEventEmitter.cpp
+++ b/ReactCommon/fabric/components/image/ImageEventEmitter.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/components/image/ImageEventEmitter.h b/ReactCommon/fabric/components/image/ImageEventEmitter.h
index f06fb837efd3f8..e6a570acecf410 100644
--- a/ReactCommon/fabric/components/image/ImageEventEmitter.h
+++ b/ReactCommon/fabric/components/image/ImageEventEmitter.h
@@ -1,20 +1,18 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/view/ViewEventEmitter.h>
+#include <fabric/components/view/ViewEventEmitter.h>
 
 namespace facebook {
 namespace react {
 
-class ImageEventEmitter:
-  public ViewEventEmitter {
-
-public:
+class ImageEventEmitter : public ViewEventEmitter {
+ public:
   using ViewEventEmitter::ViewEventEmitter;
 
   void onLoadStart() const;
diff --git a/ReactCommon/fabric/components/image/ImageLocalData.cpp b/ReactCommon/fabric/components/image/ImageLocalData.cpp
index 7ce5429da5f4ec..d3abbc68906913 100644
--- a/ReactCommon/fabric/components/image/ImageLocalData.cpp
+++ b/ReactCommon/fabric/components/image/ImageLocalData.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -23,15 +23,15 @@ const ImageRequest &ImageLocalData::getImageRequest() const {
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 std::string ImageLocalData::getDebugName() const {
   return "ImageLocalData";
 }
 
 SharedDebugStringConvertibleList ImageLocalData::getDebugProps() const {
-  return {
-    debugStringConvertibleItem("imageSource", imageSource_)
-  };
+  return {debugStringConvertibleItem("imageSource", imageSource_)};
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/image/ImageLocalData.h b/ReactCommon/fabric/components/image/ImageLocalData.h
index 5a3d1a75dfaa5a..f0be34848dada2 100644
--- a/ReactCommon/fabric/components/image/ImageLocalData.h
+++ b/ReactCommon/fabric/components/image/ImageLocalData.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,8 +8,8 @@
 #pragma once
 
 #include <fabric/core/LocalData.h>
-#include <fabric/imagemanager/primitives.h>
 #include <fabric/imagemanager/ImageRequest.h>
+#include <fabric/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {
@@ -22,14 +22,10 @@ using SharedImageLocalData = std::shared_ptr<const ImageLocalData>;
  * LocalData for <Image> component.
  * Represents the image request state and (possible) retrieved image bitmap.
  */
-class ImageLocalData:
-  public LocalData {
-
-public:
-
-  ImageLocalData(const ImageSource &imageSource, ImageRequest imageRequest):
-    imageSource_(imageSource),
-    imageRequest_(std::move(imageRequest)) {};
+class ImageLocalData : public LocalData {
+ public:
+  ImageLocalData(const ImageSource &imageSource, ImageRequest imageRequest)
+      : imageSource_(imageSource), imageRequest_(std::move(imageRequest)){};
 
   /*
    * Returns stored ImageSource object.
@@ -44,11 +40,12 @@ class ImageLocalData:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   std::string getDebugName() const override;
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 
-private:
-
+ private:
   ImageSource imageSource_;
   ImageRequest imageRequest_;
 };
diff --git a/ReactCommon/fabric/components/image/ImageProps.cpp b/ReactCommon/fabric/components/image/ImageProps.cpp
index 8e09e551710bb7..6c4ca171b99909 100644
--- a/ReactCommon/fabric/components/image/ImageProps.cpp
+++ b/ReactCommon/fabric/components/image/ImageProps.cpp
@@ -1,25 +1,33 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <fabric/components/image/conversions.h>
 #include <fabric/components/image/ImageProps.h>
+#include <fabric/components/image/conversions.h>
 #include <fabric/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
-ImageProps::ImageProps(const ImageProps &sourceProps, const RawProps &rawProps):
-  ViewProps(sourceProps, rawProps),
-  sources(convertRawProp(rawProps, "source", sourceProps.sources)),
-  defaultSources(convertRawProp(rawProps, "defaultSource", sourceProps.defaultSources)),
-  resizeMode(convertRawProp(rawProps, "resizeMode", sourceProps.resizeMode, ImageResizeMode::Stretch)),
-  blurRadius(convertRawProp(rawProps, "blurRadius", sourceProps.blurRadius)),
-  capInsets(convertRawProp(rawProps, "capInsets", sourceProps.capInsets)),
-  tintColor(convertRawProp(rawProps, "tintColor", sourceProps.tintColor)) {}
+ImageProps::ImageProps(const ImageProps &sourceProps, const RawProps &rawProps)
+    : ViewProps(sourceProps, rawProps),
+      sources(convertRawProp(rawProps, "source", sourceProps.sources)),
+      defaultSources(convertRawProp(
+          rawProps,
+          "defaultSource",
+          sourceProps.defaultSources)),
+      resizeMode(convertRawProp(
+          rawProps,
+          "resizeMode",
+          sourceProps.resizeMode,
+          ImageResizeMode::Stretch)),
+      blurRadius(
+          convertRawProp(rawProps, "blurRadius", sourceProps.blurRadius)),
+      capInsets(convertRawProp(rawProps, "capInsets", sourceProps.capInsets)),
+      tintColor(convertRawProp(rawProps, "tintColor", sourceProps.tintColor)) {}
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/image/ImageProps.h b/ReactCommon/fabric/components/image/ImageProps.h
index 6d772d1c99e2cf..2e2dedd880c63b 100644
--- a/ReactCommon/fabric/components/image/ImageProps.h
+++ b/ReactCommon/fabric/components/image/ImageProps.h
@@ -1,33 +1,31 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <fabric/components/view/ViewProps.h>
 #include <fabric/graphics/Color.h>
 #include <fabric/imagemanager/primitives.h>
-#include <fabric/view/ViewProps.h>
 
 namespace facebook {
 namespace react {
 
 // TODO (T28334063): Consider for codegen.
-class ImageProps final:
-  public ViewProps {
-
-public:
+class ImageProps final : public ViewProps {
+ public:
   ImageProps() = default;
   ImageProps(const ImageProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
-  const ImageSources sources {};
-  const ImageSources defaultSources {};
-  const ImageResizeMode resizeMode {ImageResizeMode::Stretch};
-  const Float blurRadius {};
-  const EdgeInsets capInsets {};
-  const SharedColor tintColor {};
+  const ImageSources sources{};
+  const ImageSources defaultSources{};
+  const ImageResizeMode resizeMode{ImageResizeMode::Stretch};
+  const Float blurRadius{};
+  const EdgeInsets capInsets{};
+  const SharedColor tintColor{};
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/components/image/ImageShadowNode.cpp b/ReactCommon/fabric/components/image/ImageShadowNode.cpp
index c9849fb347e73b..933fc6d40ab4be 100644
--- a/ReactCommon/fabric/components/image/ImageShadowNode.cpp
+++ b/ReactCommon/fabric/components/image/ImageShadowNode.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,16 +7,14 @@
 
 #include <cstdlib>
 
-#include <fabric/components/image/ImageShadowNode.h>
 #include <fabric/components/image/ImageLocalData.h>
+#include <fabric/components/image/ImageShadowNode.h>
 #include <fabric/core/LayoutContext.h>
 
 namespace facebook {
 namespace react {
 
-ComponentName ImageShadowNode::getComponentName() const {
-  return ComponentName("Image");
-}
+const char ImageComponentName[] = "Image";
 
 void ImageShadowNode::setImageManager(const SharedImageManager &imageManager) {
   ensureUnsealed();
@@ -28,7 +26,8 @@ void ImageShadowNode::updateLocalData() {
   const auto &currentLocalData = getLocalData();
   if (currentLocalData) {
     assert(std::dynamic_pointer_cast<const ImageLocalData>(currentLocalData));
-    auto currentImageLocalData = std::static_pointer_cast<const ImageLocalData>(currentLocalData);
+    auto currentImageLocalData =
+        std::static_pointer_cast<const ImageLocalData>(currentLocalData);
     if (currentImageLocalData->getImageSource() == imageSource) {
       // Same `imageSource` is already in `localData`,
       // no need to (re)request an image resource.
@@ -40,7 +39,8 @@ void ImageShadowNode::updateLocalData() {
   ensureUnsealed();
 
   auto imageRequest = imageManager_->requestImage(imageSource);
-  auto imageLocalData = std::make_shared<ImageLocalData>(imageSource, std::move(imageRequest));
+  auto imageLocalData =
+      std::make_shared<ImageLocalData>(imageSource, std::move(imageRequest));
   setLocalData(imageLocalData);
 }
 
@@ -61,13 +61,13 @@ ImageSource ImageShadowNode::getImageSource() const {
   auto targetImageArea = size.width * size.height * scale * scale;
   auto bestFit = kFloatMax;
 
-  ImageSource bestSource;
+  auto bestSource = ImageSource{};
 
   for (const auto &source : sources) {
     auto sourceSize = source.size;
     auto sourceScale = source.scale == 0 ? scale : source.scale;
     auto sourceArea =
-      sourceSize.width * sourceSize.height * sourceScale * sourceScale;
+        sourceSize.width * sourceSize.height * sourceScale * sourceScale;
 
     auto fit = std::abs(1 - (sourceArea / targetImageArea));
 
diff --git a/ReactCommon/fabric/components/image/ImageShadowNode.h b/ReactCommon/fabric/components/image/ImageShadowNode.h
index 2c2d39bfc22825..fc7008fbd7f017 100644
--- a/ReactCommon/fabric/components/image/ImageShadowNode.h
+++ b/ReactCommon/fabric/components/image/ImageShadowNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,25 +9,25 @@
 
 #include <fabric/components/image/ImageEventEmitter.h>
 #include <fabric/components/image/ImageProps.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>
 #include <fabric/imagemanager/ImageManager.h>
 #include <fabric/imagemanager/primitives.h>
-#include <fabric/view/ConcreteViewShadowNode.h>
 
 namespace facebook {
 namespace react {
 
+extern const char ImageComponentName[];
+
 /*
  * `ShadowNode` for <Image> component.
  */
-class ImageShadowNode final:
-  public ConcreteViewShadowNode<ImageProps, ImageEventEmitter> {
-
-public:
-
+class ImageShadowNode final : public ConcreteViewShadowNode<
+                                  ImageComponentName,
+                                  ImageProps,
+                                  ImageEventEmitter> {
+ public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
-  ComponentName getComponentName() const override;
-
   /*
    * Associates a shared `ImageManager` with the node.
    */
@@ -37,8 +37,7 @@ class ImageShadowNode final:
 
   void layout(LayoutContext layoutContext) override;
 
-private:
-
+ private:
   /*
    * (Re)Creates a `LocalData` object (with `ImageRequest`) if needed.
    */
diff --git a/ReactCommon/fabric/components/image/conversions.h b/ReactCommon/fabric/components/image/conversions.h
index 3ec3674efd5cb2..c6a0ceb25b8334 100644
--- a/ReactCommon/fabric/components/image/conversions.h
+++ b/ReactCommon/fabric/components/image/conversions.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/imagemanager/primitives.h>
 #include <fabric/graphics/conversions.h>
+#include <fabric/imagemanager/primitives.h>
 #include <folly/dynamic.h>
 
 namespace facebook {
@@ -16,10 +16,7 @@ namespace react {
 
 inline void fromDynamic(const folly::dynamic &value, ImageSource &result) {
   if (value.isString()) {
-    result = {
-      .type = ImageSource::Type::Remote,
-      .uri = value.asString()
-    };
+    result = {.type = ImageSource::Type::Remote, .uri = value.asString()};
     return;
   }
 
@@ -68,21 +65,41 @@ inline std::string toString(const ImageSource &value) {
 inline void fromDynamic(const folly::dynamic &value, ImageResizeMode &result) {
   assert(value.isString());
   auto stringValue = value.asString();
-  if (stringValue == "cover") { result = ImageResizeMode::Cover; return; }
-  if (stringValue == "contain") { result = ImageResizeMode::Contain; return; }
-  if (stringValue == "stretch") { result = ImageResizeMode::Stretch; return; }
-  if (stringValue == "center") { result = ImageResizeMode::Center; return; }
-  if (stringValue == "repeat") { result = ImageResizeMode::Repeat; return; }
+  if (stringValue == "cover") {
+    result = ImageResizeMode::Cover;
+    return;
+  }
+  if (stringValue == "contain") {
+    result = ImageResizeMode::Contain;
+    return;
+  }
+  if (stringValue == "stretch") {
+    result = ImageResizeMode::Stretch;
+    return;
+  }
+  if (stringValue == "center") {
+    result = ImageResizeMode::Center;
+    return;
+  }
+  if (stringValue == "repeat") {
+    result = ImageResizeMode::Repeat;
+    return;
+  }
   abort();
 }
 
 inline std::string toString(const ImageResizeMode &value) {
   switch (value) {
-    case ImageResizeMode::Cover: return "cover";
-    case ImageResizeMode::Contain: return "contain";
-    case ImageResizeMode::Stretch: return "stretch";
-    case ImageResizeMode::Center: return "center";
-    case ImageResizeMode::Repeat: return "repeat";
+    case ImageResizeMode::Cover:
+      return "cover";
+    case ImageResizeMode::Contain:
+      return "contain";
+    case ImageResizeMode::Stretch:
+      return "stretch";
+    case ImageResizeMode::Center:
+      return "center";
+    case ImageResizeMode::Repeat:
+      return "repeat";
   }
 }
 
diff --git a/ReactCommon/fabric/components/image/tests/ImageTest.cpp b/ReactCommon/fabric/components/image/tests/ImageTest.cpp
index a55a5783d83c10..2a15830d82e902 100644
--- a/ReactCommon/fabric/components/image/tests/ImageTest.cpp
+++ b/ReactCommon/fabric/components/image/tests/ImageTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/components/root/BUCK b/ReactCommon/fabric/components/root/BUCK
new file mode 100644
index 00000000000000..46fb37865aeac7
--- /dev/null
+++ b/ReactCommon/fabric/components/root/BUCK
@@ -0,0 +1,80 @@
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "root",
+    srcs = glob(
+        ["**/*.cpp"],
+        exclude = glob(["tests/**/*.cpp"]),
+    ),
+    headers = [],
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        prefix = "fabric/components/root",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
+    fbobjc_tests = [
+        ":tests",
+    ],
+    macosx_tests_override = [],
+    platforms = (ANDROID, APPLE),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    tests = [],
+    visibility = ["PUBLIC"],
+    deps = [
+        "xplat//fbsystrace:fbsystrace",
+        "xplat//folly:headers_only",
+        "xplat//folly:memory",
+        "xplat//folly:molly",
+        "xplat//third-party/glog:glog",
+        "xplat//yoga:yoga",
+        react_native_xplat_target("fabric/debug:debug"),
+        react_native_xplat_target("fabric/core:core"),
+        react_native_xplat_target("fabric/graphics:graphics"),
+        react_native_xplat_target("fabric/components/view:view"),
+    ],
+)
+
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = APPLE,
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":root",
+    ],
+)
diff --git a/ReactCommon/fabric/components/root/RootProps.cpp b/ReactCommon/fabric/components/root/RootProps.cpp
new file mode 100644
index 00000000000000..d30da924e24113
--- /dev/null
+++ b/ReactCommon/fabric/components/root/RootProps.cpp
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "RootProps.h"
+
+#include <fabric/components/view/YogaLayoutableShadowNode.h>
+#include <fabric/components/view/conversions.h>
+
+namespace facebook {
+namespace react {
+
+static YGStyle yogaStyleFromLayoutConstraints(
+    const LayoutConstraints &layoutConstraints) {
+  auto yogaStyle = YGStyle{};
+  yogaStyle.minDimensions[YGDimensionWidth] =
+      yogaStyleValueFromFloat(layoutConstraints.minimumSize.width);
+  yogaStyle.minDimensions[YGDimensionHeight] =
+      yogaStyleValueFromFloat(layoutConstraints.minimumSize.height);
+
+  yogaStyle.maxDimensions[YGDimensionWidth] =
+      yogaStyleValueFromFloat(layoutConstraints.maximumSize.width);
+  yogaStyle.maxDimensions[YGDimensionHeight] =
+      yogaStyleValueFromFloat(layoutConstraints.maximumSize.height);
+
+  yogaStyle.direction =
+      yogaDirectionFromLayoutDirection(layoutConstraints.layoutDirection);
+
+  return yogaStyle;
+}
+
+RootProps::RootProps(
+    const RootProps &sourceProps,
+    const LayoutConstraints &layoutConstraints,
+    const LayoutContext &layoutContext)
+    : ViewProps(yogaStyleFromLayoutConstraints(layoutConstraints)),
+      layoutConstraints(layoutConstraints),
+      layoutContext(layoutContext){};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/view/root/RootProps.h b/ReactCommon/fabric/components/root/RootProps.h
similarity index 56%
rename from ReactCommon/fabric/view/root/RootProps.h
rename to ReactCommon/fabric/components/root/RootProps.h
index f26c53c718155c..aa48ac724a3720 100644
--- a/ReactCommon/fabric/view/root/RootProps.h
+++ b/ReactCommon/fabric/components/root/RootProps.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,9 +9,9 @@
 
 #include <memory>
 
+#include <fabric/components/view/ViewProps.h>
 #include <fabric/core/LayoutConstraints.h>
 #include <fabric/core/LayoutContext.h>
-#include <fabric/view/ViewProps.h>
 
 namespace facebook {
 namespace react {
@@ -20,22 +20,18 @@ class RootProps;
 
 using SharedRootProps = std::shared_ptr<const RootProps>;
 
-class RootProps final:
-  public ViewProps {
-
-public:
-
+class RootProps final : public ViewProps {
+ public:
   RootProps() = default;
   RootProps(
-    const RootProps &sourceProps,
-    const LayoutConstraints &layoutConstraints,
-    const LayoutContext &layoutContext
-  );
+      const RootProps &sourceProps,
+      const LayoutConstraints &layoutConstraints,
+      const LayoutContext &layoutContext);
 
 #pragma mark - Props
 
-  const LayoutConstraints layoutConstraints {};
-  const LayoutContext layoutContext {};
+  const LayoutConstraints layoutConstraints{};
+  const LayoutContext layoutContext{};
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/view/root/RootShadowNode.cpp b/ReactCommon/fabric/components/root/RootShadowNode.cpp
similarity index 75%
rename from ReactCommon/fabric/view/root/RootShadowNode.cpp
rename to ReactCommon/fabric/components/root/RootShadowNode.cpp
index 970eb8db776680..912ea4bfc7d415 100644
--- a/ReactCommon/fabric/view/root/RootShadowNode.cpp
+++ b/ReactCommon/fabric/components/root/RootShadowNode.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,14 +7,12 @@
 
 #include "RootShadowNode.h"
 
-#include <fabric/view/conversions.h>
+#include <fabric/components/view/conversions.h>
 
 namespace facebook {
 namespace react {
 
-ComponentName RootShadowNode::getComponentName() const {
-  return ComponentName("RootView");
-}
+const char RootComponentName[] = "RootView";
 
 void RootShadowNode::layout() {
   ensureUnsealed();
diff --git a/ReactCommon/fabric/view/root/RootShadowNode.h b/ReactCommon/fabric/components/root/RootShadowNode.h
similarity index 72%
rename from ReactCommon/fabric/view/root/RootShadowNode.h
rename to ReactCommon/fabric/components/root/RootShadowNode.h
index 6508fa5872181d..771f770296ecba 100644
--- a/ReactCommon/fabric/view/root/RootShadowNode.h
+++ b/ReactCommon/fabric/components/root/RootShadowNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,9 +9,9 @@
 
 #include <memory>
 
+#include <fabric/components/root/RootProps.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>
 #include <fabric/core/LayoutContext.h>
-#include <fabric/view/RootProps.h>
-#include <fabric/view/ConcreteViewShadowNode.h>
 
 namespace facebook {
 namespace react {
@@ -21,28 +21,25 @@ class RootShadowNode;
 using SharedRootShadowNode = std::shared_ptr<const RootShadowNode>;
 using UnsharedRootShadowNode = std::shared_ptr<RootShadowNode>;
 
+extern const char RootComponentName[];
+
 /*
  * `ShadowNode` for the root component.
  * Besides all functionality of the `View` component, `RootShadowNode` contains
  * props which represent external layout constraints and context of the
  * shadow tree.
  */
-class RootShadowNode final:
-  public ConcreteViewShadowNode<RootProps> {
-
-public:
-
+class RootShadowNode final
+    : public ConcreteViewShadowNode<RootComponentName, RootProps> {
+ public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
-  ComponentName getComponentName() const override;
-
   /*
    * Layouts the shadow tree.
    */
   void layout();
 
-private:
-
+ private:
   using YogaLayoutableShadowNode::layout;
 };
 
diff --git a/ReactCommon/fabric/components/root/tests/RootShadowNodeTest.cpp b/ReactCommon/fabric/components/root/tests/RootShadowNodeTest.cpp
new file mode 100644
index 00000000000000..5ebd60a99cbf26
--- /dev/null
+++ b/ReactCommon/fabric/components/root/tests/RootShadowNodeTest.cpp
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <memory>
+
+#include <gtest/gtest.h>
+
+TEST(RootShadowNodeTest, testSomething) {
+  // TODO
+}
diff --git a/ReactCommon/fabric/scrollview/BUCK b/ReactCommon/fabric/components/scrollview/BUCK
similarity index 50%
rename from ReactCommon/fabric/scrollview/BUCK
rename to ReactCommon/fabric/components/scrollview/BUCK
index 1f20c65532f1ad..0f41f2e426ba44 100644
--- a/ReactCommon/fabric/scrollview/BUCK
+++ b/ReactCommon/fabric/components/scrollview/BUCK
@@ -1,13 +1,17 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
 
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "scrollview",
@@ -24,7 +28,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/scrollview",
+        prefix = "fabric/components/scrollview",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -56,28 +60,25 @@ rn_xplat_cxx_library(
         react_native_xplat_target("fabric/debug:debug"),
         react_native_xplat_target("fabric/core:core"),
         react_native_xplat_target("fabric/graphics:graphics"),
-        react_native_xplat_target("fabric/view:view"),
+        react_native_xplat_target("fabric/components/view:view"),
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":scrollview",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = APPLE,
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":scrollview",
+    ],
+)
diff --git a/ReactCommon/fabric/scrollview/ScrollViewComponentDescriptor.h b/ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h
similarity index 58%
rename from ReactCommon/fabric/scrollview/ScrollViewComponentDescriptor.h
rename to ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h
index b1c075980ff65e..a2390adfe9aa47 100644
--- a/ReactCommon/fabric/scrollview/ScrollViewComponentDescriptor.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,13 +7,14 @@
 
 #pragma once
 
+#include <fabric/components/scrollview/ScrollViewShadowNode.h>
 #include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/scrollview/ScrollViewShadowNode.h>
 
 namespace facebook {
 namespace react {
 
-using ScrollViewComponentDescriptor = ConcreteComponentDescriptor<ScrollViewShadowNode>;
+using ScrollViewComponentDescriptor =
+    ConcreteComponentDescriptor<ScrollViewShadowNode>;
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.cpp
new file mode 100644
index 00000000000000..2db1b61aec1388
--- /dev/null
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.cpp
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ScrollViewEventEmitter.h"
+
+namespace facebook {
+namespace react {
+
+void ScrollViewEventEmitter::onScroll(
+    const ScrollViewMetrics &scrollViewMetrics) const {
+  dispatchScrollViewEvent("scroll", scrollViewMetrics);
+}
+
+void ScrollViewEventEmitter::onScrollBeginDrag(
+    const ScrollViewMetrics &scrollViewMetrics) const {
+  dispatchScrollViewEvent("scrollBeginDrag", scrollViewMetrics);
+}
+
+void ScrollViewEventEmitter::onScrollEndDrag(
+    const ScrollViewMetrics &scrollViewMetrics) const {
+  dispatchScrollViewEvent("scrollEndDrag", scrollViewMetrics);
+}
+
+void ScrollViewEventEmitter::onMomentumScrollBegin(
+    const ScrollViewMetrics &scrollViewMetrics) const {
+  dispatchScrollViewEvent("momentumScrollBegin", scrollViewMetrics);
+}
+
+void ScrollViewEventEmitter::onMomentumScrollEnd(
+    const ScrollViewMetrics &scrollViewMetrics) const {
+  dispatchScrollViewEvent("momentumScrollEnd", scrollViewMetrics);
+}
+
+void ScrollViewEventEmitter::dispatchScrollViewEvent(
+    const std::string &name,
+    const ScrollViewMetrics &scrollViewMetrics,
+    const folly::dynamic &payload) const {
+  folly::dynamic compoundPayload = folly::dynamic::object();
+
+  compoundPayload["contentOffset"] =
+      folly::dynamic::object("x", scrollViewMetrics.contentOffset.x)(
+          "y", scrollViewMetrics.contentOffset.y);
+
+  compoundPayload["contentInset"] =
+      folly::dynamic::object("top", scrollViewMetrics.contentInset.top)(
+          "left", scrollViewMetrics.contentInset.left)(
+          "bottom", scrollViewMetrics.contentInset.bottom)(
+          "right", scrollViewMetrics.contentInset.right);
+
+  compoundPayload["contentSize"] =
+      folly::dynamic::object("width", scrollViewMetrics.contentSize.width)(
+          "height", scrollViewMetrics.contentSize.height);
+
+  compoundPayload["layoutMeasurement"] =
+      folly::dynamic::object("width", scrollViewMetrics.containerSize.width)(
+          "height", scrollViewMetrics.containerSize.height);
+
+  compoundPayload["zoomScale"] = scrollViewMetrics.zoomScale;
+
+  if (!payload.isNull()) {
+    compoundPayload.merge_patch(payload);
+  }
+
+  dispatchEvent(name, compoundPayload);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/scrollview/ScrollViewEventEmitter.h b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
similarity index 65%
rename from ReactCommon/fabric/scrollview/ScrollViewEventEmitter.h
rename to ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
index c9bd52543ad2bb..ed43669364629e 100644
--- a/ReactCommon/fabric/scrollview/ScrollViewEventEmitter.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,17 +8,16 @@
 
 #include <memory>
 
+#include <fabric/components/view/ViewEventEmitter.h>
+#include <fabric/events/EventEmitter.h>
 #include <fabric/graphics/Geometry.h>
-#include <fabric/core/EventEmitter.h>
-#include <fabric/view/ViewEventEmitter.h>
-
 #include <folly/dynamic.h>
 
 namespace facebook {
 namespace react {
 
 class ScrollViewMetrics {
-public:
+ public:
   Size contentSize;
   Point contentOffset;
   EdgeInsets contentInset;
@@ -28,13 +27,11 @@ class ScrollViewMetrics {
 
 class ScrollViewEventEmitter;
 
-using SharedScrollViewEventEmitter = std::shared_ptr<const ScrollViewEventEmitter>;
-
-class ScrollViewEventEmitter:
-  public ViewEventEmitter {
-
-public:
+using SharedScrollViewEventEmitter =
+    std::shared_ptr<const ScrollViewEventEmitter>;
 
+class ScrollViewEventEmitter : public ViewEventEmitter {
+ public:
   using ViewEventEmitter::ViewEventEmitter;
 
   void onScroll(const ScrollViewMetrics &scrollViewMetrics) const;
@@ -43,9 +40,11 @@ class ScrollViewEventEmitter:
   void onMomentumScrollBegin(const ScrollViewMetrics &scrollViewMetrics) const;
   void onMomentumScrollEnd(const ScrollViewMetrics &scrollViewMetrics) const;
 
-private:
-
-  void dispatchScrollViewEvent(const std::string &name, const ScrollViewMetrics &scrollViewMetrics, const folly::dynamic &payload = {}) const;
+ private:
+  void dispatchScrollViewEvent(
+      const std::string &name,
+      const ScrollViewMetrics &scrollViewMetrics,
+      const folly::dynamic &payload = {}) const;
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/scrollview/ScrollViewLocalData.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.cpp
similarity index 69%
rename from ReactCommon/fabric/scrollview/ScrollViewLocalData.cpp
rename to ReactCommon/fabric/components/scrollview/ScrollViewLocalData.cpp
index a4424f81f97b7d..f65676a3d5a492 100644
--- a/ReactCommon/fabric/scrollview/ScrollViewLocalData.cpp
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,24 +13,25 @@
 namespace facebook {
 namespace react {
 
-ScrollViewLocalData::ScrollViewLocalData(Rect contentBoundingRect):
-  contentBoundingRect(contentBoundingRect) {}
+ScrollViewLocalData::ScrollViewLocalData(Rect contentBoundingRect)
+    : contentBoundingRect(contentBoundingRect) {}
 
 Size ScrollViewLocalData::getContentSize() const {
-  return Size {contentBoundingRect.getMaxX(), contentBoundingRect.getMaxY()};
+  return Size{contentBoundingRect.getMaxX(), contentBoundingRect.getMaxY()};
 }
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 std::string ScrollViewLocalData::getDebugName() const {
   return "ScrollViewLocalData";
 }
 
 SharedDebugStringConvertibleList ScrollViewLocalData::getDebugProps() const {
   return {
-    debugStringConvertibleItem("contentBoundingRect", contentBoundingRect)
-  };
+      debugStringConvertibleItem("contentBoundingRect", contentBoundingRect)};
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/scrollview/ScrollViewLocalData.h b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.h
similarity index 85%
rename from ReactCommon/fabric/scrollview/ScrollViewLocalData.h
rename to ReactCommon/fabric/components/scrollview/ScrollViewLocalData.h
index 8ed967d6232880..d9b92fc421c131 100644
--- a/ReactCommon/fabric/scrollview/ScrollViewLocalData.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,10 +20,8 @@ using SharedScrollViewLocalData = std::shared_ptr<const ScrollViewLocalData>;
 /*
  * LocalData for <ScrollView> component.
  */
-class ScrollViewLocalData:
-  public LocalData {
-
-public:
+class ScrollViewLocalData : public LocalData {
+ public:
   ScrollViewLocalData(Rect contentBoundingRect);
 
   /*
@@ -38,8 +36,10 @@ class ScrollViewLocalData:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   std::string getDebugName() const override;
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp
new file mode 100644
index 00000000000000..5b104df5970044
--- /dev/null
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp
@@ -0,0 +1,232 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ScrollViewProps.h"
+
+#include <fabric/components/scrollview/conversions.h>
+#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <fabric/graphics/conversions.h>
+
+#include <fabric/core/propsConversions.h>
+
+namespace facebook {
+namespace react {
+
+ScrollViewProps::ScrollViewProps(
+    const ScrollViewProps &sourceProps,
+    const RawProps &rawProps)
+    : ViewProps(sourceProps, rawProps),
+      alwaysBounceHorizontal(convertRawProp(
+          rawProps,
+          "alwaysBounceHorizontal",
+          sourceProps.alwaysBounceHorizontal)),
+      alwaysBounceVertical(convertRawProp(
+          rawProps,
+          "alwaysBounceVertical",
+          sourceProps.alwaysBounceVertical)),
+      bounces(convertRawProp(rawProps, "bounces", sourceProps.bounces, true)),
+      bouncesZoom(convertRawProp(
+          rawProps,
+          "bouncesZoom",
+          sourceProps.bouncesZoom,
+          true)),
+      canCancelContentTouches(convertRawProp(
+          rawProps,
+          "canCancelContentTouches",
+          sourceProps.canCancelContentTouches)),
+      centerContent(
+          convertRawProp(rawProps, "centerContent", sourceProps.centerContent)),
+      automaticallyAdjustContentInsets(convertRawProp(
+          rawProps,
+          "automaticallyAdjustContentInsets",
+          sourceProps.automaticallyAdjustContentInsets)),
+      decelerationRate(convertRawProp(
+          rawProps,
+          "decelerationRate",
+          sourceProps.decelerationRate,
+          (Float)0.998)),
+      directionalLockEnabled(convertRawProp(
+          rawProps,
+          "directionalLockEnabled",
+          sourceProps.directionalLockEnabled)),
+      indicatorStyle(convertRawProp(
+          rawProps,
+          "indicatorStyle",
+          sourceProps.indicatorStyle)),
+      keyboardDismissMode(convertRawProp(
+          rawProps,
+          "keyboardDismissMode",
+          sourceProps.keyboardDismissMode)),
+      maximumZoomScale(convertRawProp(
+          rawProps,
+          "maximumZoomScale",
+          sourceProps.maximumZoomScale,
+          (Float)1.0)),
+      minimumZoomScale(convertRawProp(
+          rawProps,
+          "minimumZoomScale",
+          sourceProps.minimumZoomScale,
+          (Float)1.0)),
+      scrollEnabled(convertRawProp(
+          rawProps,
+          "scrollEnabled",
+          sourceProps.scrollEnabled,
+          true)),
+      pagingEnabled(
+          convertRawProp(rawProps, "pagingEnabled", sourceProps.pagingEnabled)),
+      pinchGestureEnabled(convertRawProp(
+          rawProps,
+          "pinchGestureEnabled",
+          sourceProps.pinchGestureEnabled,
+          true)),
+      scrollsToTop(convertRawProp(
+          rawProps,
+          "scrollsToTop",
+          sourceProps.scrollsToTop,
+          true)),
+      showsHorizontalScrollIndicator(convertRawProp(
+          rawProps,
+          "showsHorizontalScrollIndicator",
+          sourceProps.showsHorizontalScrollIndicator,
+          true)),
+      showsVerticalScrollIndicator(convertRawProp(
+          rawProps,
+          "showsVerticalScrollIndicator",
+          sourceProps.showsVerticalScrollIndicator,
+          true)),
+      scrollEventThrottle(convertRawProp(
+          rawProps,
+          "scrollEventThrottle",
+          sourceProps.scrollEventThrottle)),
+      zoomScale(convertRawProp(
+          rawProps,
+          "zoomScale",
+          sourceProps.zoomScale,
+          (Float)1.0)),
+      contentInset(
+          convertRawProp(rawProps, "contentInset", sourceProps.contentInset)),
+      scrollIndicatorInsets(convertRawProp(
+          rawProps,
+          "scrollIndicatorInsets",
+          sourceProps.scrollIndicatorInsets)),
+      snapToInterval(convertRawProp(
+          rawProps,
+          "snapToInterval",
+          sourceProps.snapToInterval)),
+      snapToAlignment(convertRawProp(
+          rawProps,
+          "snapToAlignment",
+          sourceProps.snapToAlignment)) {}
+
+#pragma mark - DebugStringConvertible
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const {
+  auto defaultScrollViewProps = ScrollViewProps{};
+
+  return ViewProps::getDebugProps() +
+      SharedDebugStringConvertibleList{
+          debugStringConvertibleItem(
+              "alwaysBounceHorizontal",
+              alwaysBounceHorizontal,
+              defaultScrollViewProps.alwaysBounceHorizontal),
+          debugStringConvertibleItem(
+              "alwaysBounceVertical",
+              alwaysBounceVertical,
+              defaultScrollViewProps.alwaysBounceVertical),
+          debugStringConvertibleItem(
+              "bounces", bounces, defaultScrollViewProps.bounces),
+          debugStringConvertibleItem(
+              "bouncesZoom", bouncesZoom, defaultScrollViewProps.bouncesZoom),
+          debugStringConvertibleItem(
+              "canCancelContentTouches",
+              canCancelContentTouches,
+              defaultScrollViewProps.canCancelContentTouches),
+          debugStringConvertibleItem(
+              "centerContent",
+              centerContent,
+              defaultScrollViewProps.centerContent),
+          debugStringConvertibleItem(
+              "automaticallyAdjustContentInsets",
+              automaticallyAdjustContentInsets,
+              defaultScrollViewProps.automaticallyAdjustContentInsets),
+          debugStringConvertibleItem(
+              "decelerationRate",
+              decelerationRate,
+              defaultScrollViewProps.decelerationRate),
+          debugStringConvertibleItem(
+              "directionalLockEnabled",
+              directionalLockEnabled,
+              defaultScrollViewProps.directionalLockEnabled),
+          debugStringConvertibleItem(
+              "indicatorStyle",
+              indicatorStyle,
+              defaultScrollViewProps.indicatorStyle),
+          debugStringConvertibleItem(
+              "keyboardDismissMode",
+              keyboardDismissMode,
+              defaultScrollViewProps.keyboardDismissMode),
+          debugStringConvertibleItem(
+              "maximumZoomScale",
+              maximumZoomScale,
+              defaultScrollViewProps.maximumZoomScale),
+          debugStringConvertibleItem(
+              "minimumZoomScale",
+              minimumZoomScale,
+              defaultScrollViewProps.minimumZoomScale),
+          debugStringConvertibleItem(
+              "scrollEnabled",
+              scrollEnabled,
+              defaultScrollViewProps.scrollEnabled),
+          debugStringConvertibleItem(
+              "pagingEnabled",
+              pagingEnabled,
+              defaultScrollViewProps.pagingEnabled),
+          debugStringConvertibleItem(
+              "pinchGestureEnabled",
+              pinchGestureEnabled,
+              defaultScrollViewProps.pinchGestureEnabled),
+          debugStringConvertibleItem(
+              "scrollsToTop",
+              scrollsToTop,
+              defaultScrollViewProps.scrollsToTop),
+          debugStringConvertibleItem(
+              "showsHorizontalScrollIndicator",
+              showsHorizontalScrollIndicator,
+              defaultScrollViewProps.showsHorizontalScrollIndicator),
+          debugStringConvertibleItem(
+              "showsVerticalScrollIndicator",
+              showsVerticalScrollIndicator,
+              defaultScrollViewProps.showsVerticalScrollIndicator),
+          debugStringConvertibleItem(
+              "scrollEventThrottle",
+              scrollEventThrottle,
+              defaultScrollViewProps.scrollEventThrottle),
+          debugStringConvertibleItem(
+              "zoomScale", zoomScale, defaultScrollViewProps.zoomScale),
+          debugStringConvertibleItem(
+              "contentInset",
+              contentInset,
+              defaultScrollViewProps.contentInset),
+          debugStringConvertibleItem(
+              "scrollIndicatorInsets",
+              scrollIndicatorInsets,
+              defaultScrollViewProps.scrollIndicatorInsets),
+          debugStringConvertibleItem(
+              "snapToInterval",
+              snapToInterval,
+              defaultScrollViewProps.snapToInterval),
+          debugStringConvertibleItem(
+              "snapToAlignment",
+              snapToAlignment,
+              defaultScrollViewProps.snapToAlignment),
+      };
+}
+#endif
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewProps.h b/ReactCommon/fabric/components/scrollview/ScrollViewProps.h
new file mode 100644
index 00000000000000..18bd21ff607ef6
--- /dev/null
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewProps.h
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/scrollview/primitives.h>
+#include <fabric/components/view/ViewProps.h>
+
+namespace facebook {
+namespace react {
+
+// TODO (T28334063): Consider for codegen.
+class ScrollViewProps final : public ViewProps {
+ public:
+  ScrollViewProps() = default;
+  ScrollViewProps(const ScrollViewProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  const bool alwaysBounceHorizontal{};
+  const bool alwaysBounceVertical{};
+  const bool bounces{true};
+  const bool bouncesZoom{true};
+  const bool canCancelContentTouches{true};
+  const bool centerContent{};
+  const bool automaticallyAdjustContentInsets{};
+  const Float decelerationRate{0.998};
+  const bool directionalLockEnabled{};
+  const ScrollViewIndicatorStyle indicatorStyle{};
+  const ScrollViewKeyboardDismissMode keyboardDismissMode{};
+  const Float maximumZoomScale{1.0};
+  const Float minimumZoomScale{1.0};
+  const bool scrollEnabled{true};
+  const bool pagingEnabled{};
+  const bool pinchGestureEnabled{true};
+  const bool scrollsToTop{true};
+  const bool showsHorizontalScrollIndicator{true};
+  const bool showsVerticalScrollIndicator{true};
+  const Float scrollEventThrottle{};
+  const Float zoomScale{1.0};
+  const EdgeInsets contentInset{};
+  const EdgeInsets scrollIndicatorInsets{};
+  const int snapToInterval{};
+  const ScrollViewSnapToAlignment snapToAlignment{};
+
+#pragma mark - DebugStringConvertible
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/scrollview/ScrollViewShadowNode.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp
similarity index 73%
rename from ReactCommon/fabric/scrollview/ScrollViewShadowNode.cpp
rename to ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp
index 5662889f2e8b2a..a18e651e26a1fd 100644
--- a/ReactCommon/fabric/scrollview/ScrollViewShadowNode.cpp
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,19 +14,18 @@
 namespace facebook {
 namespace react {
 
-ComponentName ScrollViewShadowNode::getComponentName() const {
-  return ComponentName("ScrollView");
-}
+const char ScrollViewComponentName[] = "ScrollView";
 
 void ScrollViewShadowNode::updateLocalData() {
   ensureUnsealed();
 
-  Rect contentBoundingRect;
+  auto contentBoundingRect = Rect{};
   for (const auto &childNode : getLayoutableChildNodes()) {
     contentBoundingRect.unionInPlace(childNode->getLayoutMetrics().frame);
   }
 
-  const auto &localData = std::make_shared<const ScrollViewLocalData>(contentBoundingRect);
+  const auto &localData =
+      std::make_shared<const ScrollViewLocalData>(contentBoundingRect);
   setLocalData(localData);
 }
 
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
new file mode 100644
index 00000000000000..065727b7745fa0
--- /dev/null
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/scrollview/ScrollViewEventEmitter.h>
+#include <fabric/components/scrollview/ScrollViewProps.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>
+#include <fabric/core/LayoutContext.h>
+
+namespace facebook {
+namespace react {
+
+extern const char ScrollViewComponentName[];
+
+/*
+ * `ShadowNode` for <ScrollView> component.
+ */
+class ScrollViewShadowNode final : public ConcreteViewShadowNode<
+                                       ScrollViewComponentName,
+                                       ScrollViewProps,
+                                       ScrollViewEventEmitter> {
+ public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+#pragma mark - LayoutableShadowNode
+
+  void layout(LayoutContext layoutContext) override;
+
+ private:
+  void updateLocalData();
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/scrollview/conversions.h b/ReactCommon/fabric/components/scrollview/conversions.h
new file mode 100644
index 00000000000000..4dc551e0bc0daa
--- /dev/null
+++ b/ReactCommon/fabric/components/scrollview/conversions.h
@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/scrollview/primitives.h>
+#include <folly/dynamic.h>
+
+namespace facebook {
+namespace react {
+
+inline void fromDynamic(
+    const folly::dynamic &value,
+    ScrollViewSnapToAlignment &result) {
+  auto string = value.asString();
+  if (string == "start") {
+    result = ScrollViewSnapToAlignment::Start;
+    return;
+  }
+  if (string == "center") {
+    result = ScrollViewSnapToAlignment::Center;
+    return;
+  }
+  if (string == "end") {
+    result = ScrollViewSnapToAlignment::End;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(
+    const folly::dynamic &value,
+    ScrollViewIndicatorStyle &result) {
+  auto string = value.asString();
+  if (string == "default") {
+    result = ScrollViewIndicatorStyle::Default;
+    return;
+  }
+  if (string == "black") {
+    result = ScrollViewIndicatorStyle::Black;
+    return;
+  }
+  if (string == "white") {
+    result = ScrollViewIndicatorStyle::White;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(
+    const folly::dynamic &value,
+    ScrollViewKeyboardDismissMode &result) {
+  auto string = value.asString();
+  if (string == "none") {
+    result = ScrollViewKeyboardDismissMode::None;
+    return;
+  }
+  if (string == "on-drag") {
+    result = ScrollViewKeyboardDismissMode::OnDrag;
+    return;
+  }
+  if (string == "interactive") {
+    result = ScrollViewKeyboardDismissMode::Interactive;
+    return;
+  }
+  abort();
+}
+
+inline std::string toString(const ScrollViewSnapToAlignment &value) {
+  switch (value) {
+    case ScrollViewSnapToAlignment::Start:
+      return "start";
+    case ScrollViewSnapToAlignment::Center:
+      return "center";
+    case ScrollViewSnapToAlignment::End:
+      return "end";
+  }
+}
+
+inline std::string toString(const ScrollViewIndicatorStyle &value) {
+  switch (value) {
+    case ScrollViewIndicatorStyle::Default:
+      return "default";
+    case ScrollViewIndicatorStyle::Black:
+      return "black";
+    case ScrollViewIndicatorStyle::White:
+      return "white";
+  }
+}
+
+inline std::string toString(const ScrollViewKeyboardDismissMode &value) {
+  switch (value) {
+    case ScrollViewKeyboardDismissMode::None:
+      return "none";
+    case ScrollViewKeyboardDismissMode::OnDrag:
+      return "on-drag";
+    case ScrollViewKeyboardDismissMode::Interactive:
+      return "interactive";
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/scrollview/primitives.h b/ReactCommon/fabric/components/scrollview/primitives.h
new file mode 100644
index 00000000000000..81ceb0ded700ba
--- /dev/null
+++ b/ReactCommon/fabric/components/scrollview/primitives.h
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 {
+
+enum class ScrollViewSnapToAlignment { Start, Center, End };
+
+enum class ScrollViewIndicatorStyle { Default, Black, White };
+
+enum class ScrollViewKeyboardDismissMode { None, OnDrag, Interactive };
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/scrollview/tests/ScrollViewTest.cpp b/ReactCommon/fabric/components/scrollview/tests/ScrollViewTest.cpp
similarity index 81%
rename from ReactCommon/fabric/scrollview/tests/ScrollViewTest.cpp
rename to ReactCommon/fabric/components/scrollview/tests/ScrollViewTest.cpp
index 7b7e23fea4102e..c95dea07aa4fab 100644
--- a/ReactCommon/fabric/scrollview/tests/ScrollViewTest.cpp
+++ b/ReactCommon/fabric/components/scrollview/tests/ScrollViewTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/components/switch/BUCK b/ReactCommon/fabric/components/switch/BUCK
index b2a4f8c1d69193..0b97fcd7a0e8d6 100644
--- a/ReactCommon/fabric/components/switch/BUCK
+++ b/ReactCommon/fabric/components/switch/BUCK
@@ -1,13 +1,17 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
 
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "switch",
@@ -52,28 +56,25 @@ rn_xplat_cxx_library(
         react_native_xplat_target("fabric/debug:debug"),
         react_native_xplat_target("fabric/core:core"),
         react_native_xplat_target("fabric/graphics:graphics"),
-        react_native_xplat_target("fabric/view:view"),
+        react_native_xplat_target("fabric/components/view:view"),
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":switch",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = APPLE,
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":switch",
+    ],
+)
diff --git a/ReactCommon/fabric/components/switch/SwitchComponentDescriptor.h b/ReactCommon/fabric/components/switch/SwitchComponentDescriptor.h
index 1ea9e4582c2b86..c603eb596e3d2b 100644
--- a/ReactCommon/fabric/components/switch/SwitchComponentDescriptor.h
+++ b/ReactCommon/fabric/components/switch/SwitchComponentDescriptor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/components/switch/SwitchEventEmitter.cpp b/ReactCommon/fabric/components/switch/SwitchEventEmitter.cpp
index 680f1dbd5e3d81..514a30b31361e7 100644
--- a/ReactCommon/fabric/components/switch/SwitchEventEmitter.cpp
+++ b/ReactCommon/fabric/components/switch/SwitchEventEmitter.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/components/switch/SwitchEventEmitter.h b/ReactCommon/fabric/components/switch/SwitchEventEmitter.h
index 2f1cf3733fd634..bce9a9d8ed7486 100644
--- a/ReactCommon/fabric/components/switch/SwitchEventEmitter.h
+++ b/ReactCommon/fabric/components/switch/SwitchEventEmitter.h
@@ -1,21 +1,18 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/view/ViewEventEmitter.h>
+#include <fabric/components/view/ViewEventEmitter.h>
 
 namespace facebook {
 namespace react {
 
-class SwitchEventEmitter:
-  public ViewEventEmitter {
-
-public:
-
+class SwitchEventEmitter : public ViewEventEmitter {
+ public:
   using ViewEventEmitter::ViewEventEmitter;
 
   void onChange(const bool &value) const;
diff --git a/ReactCommon/fabric/components/switch/SwitchProps.cpp b/ReactCommon/fabric/components/switch/SwitchProps.cpp
index 9f80943c6fa9cc..5d648c14735bc2 100644
--- a/ReactCommon/fabric/components/switch/SwitchProps.cpp
+++ b/ReactCommon/fabric/components/switch/SwitchProps.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,13 +11,28 @@
 namespace facebook {
 namespace react {
 
-SwitchProps::SwitchProps(const SwitchProps &sourceProps, const RawProps &rawProps):
-  ViewProps(sourceProps, rawProps),
-  value(convertRawProp(rawProps, "value", sourceProps.value, value)),
-  disabled(convertRawProp(rawProps, "disabled", sourceProps.disabled, disabled)),
-  tintColor(convertRawProp(rawProps, "tintColor", sourceProps.tintColor, tintColor)),
-  onTintColor(convertRawProp(rawProps, "onTintColor", sourceProps.onTintColor, onTintColor)),
-  thumbTintColor(convertRawProp(rawProps, "thumbTintColor", sourceProps.thumbTintColor, thumbTintColor)) {}
+SwitchProps::SwitchProps(
+    const SwitchProps &sourceProps,
+    const RawProps &rawProps)
+    : ViewProps(sourceProps, rawProps),
+      value(convertRawProp(rawProps, "value", sourceProps.value, value)),
+      disabled(
+          convertRawProp(rawProps, "disabled", sourceProps.disabled, disabled)),
+      tintColor(convertRawProp(
+          rawProps,
+          "tintColor",
+          sourceProps.tintColor,
+          tintColor)),
+      onTintColor(convertRawProp(
+          rawProps,
+          "onTintColor",
+          sourceProps.onTintColor,
+          onTintColor)),
+      thumbTintColor(convertRawProp(
+          rawProps,
+          "thumbTintColor",
+          sourceProps.thumbTintColor,
+          thumbTintColor)) {}
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/switch/SwitchProps.h b/ReactCommon/fabric/components/switch/SwitchProps.h
index 6ddac619b4b477..102497ffbb2393 100644
--- a/ReactCommon/fabric/components/switch/SwitchProps.h
+++ b/ReactCommon/fabric/components/switch/SwitchProps.h
@@ -1,31 +1,29 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <fabric/components/view/ViewProps.h>
 #include <fabric/graphics/Color.h>
-#include <fabric/view/ViewProps.h>
 
 namespace facebook {
 namespace react {
 
 // TODO (T28334063): Consider for codegen.
-class SwitchProps final:
-  public ViewProps {
-
-public:
+class SwitchProps final : public ViewProps {
+ public:
   SwitchProps() = default;
   SwitchProps(const SwitchProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
-  const bool value {false};
-  const bool disabled {false};
-  const SharedColor tintColor {};
-  const SharedColor onTintColor {};
-  const SharedColor thumbTintColor {};
+  const bool value{false};
+  const bool disabled{false};
+  const SharedColor tintColor{};
+  const SharedColor onTintColor{};
+  const SharedColor thumbTintColor{};
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/components/switch/SwitchShadowNode.cpp b/ReactCommon/fabric/components/switch/SwitchShadowNode.cpp
index 87896d0c69150d..3fba6a84aae269 100644
--- a/ReactCommon/fabric/components/switch/SwitchShadowNode.cpp
+++ b/ReactCommon/fabric/components/switch/SwitchShadowNode.cpp
@@ -1,18 +1,16 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <fabric/components/switch/SwitchShadowNode.h>
+#include "SwitchShadowNode.h"
 
 namespace facebook {
 namespace react {
 
-ComponentName SwitchShadowNode::getComponentName() const {
-  return ComponentName("Switch");
-}
+extern const char SwitchComponentName[] = "Switch";
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/switch/SwitchShadowNode.h b/ReactCommon/fabric/components/switch/SwitchShadowNode.h
index b94256c74d2aa4..a9de57b3763f4d 100644
--- a/ReactCommon/fabric/components/switch/SwitchShadowNode.h
+++ b/ReactCommon/fabric/components/switch/SwitchShadowNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,23 +9,20 @@
 
 #include <fabric/components/switch/SwitchEventEmitter.h>
 #include <fabric/components/switch/SwitchProps.h>
-#include <fabric/view/ConcreteViewShadowNode.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook {
 namespace react {
 
+extern const char SwitchComponentName[];
+
 /*
  * `ShadowNode` for <Switch> component.
  */
-class SwitchShadowNode final:
-  public ConcreteViewShadowNode<SwitchProps, SwitchEventEmitter> {
-
-public:
-
-  using ConcreteViewShadowNode::ConcreteViewShadowNode;
-
-  ComponentName getComponentName() const override;
-};
+using SwitchShadowNode = ConcreteViewShadowNode<
+    SwitchComponentName,
+    SwitchProps,
+    SwitchEventEmitter>;
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/switch/tests/SwitchTest.cpp b/ReactCommon/fabric/components/switch/tests/SwitchTest.cpp
index a55a5783d83c10..2a15830d82e902 100644
--- a/ReactCommon/fabric/components/switch/tests/SwitchTest.cpp
+++ b/ReactCommon/fabric/components/switch/tests/SwitchTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/text/BUCK b/ReactCommon/fabric/components/text/BUCK
similarity index 55%
rename from ReactCommon/fabric/text/BUCK
rename to ReactCommon/fabric/components/text/BUCK
index e8dc5e5971c545..4f241814b6101c 100644
--- a/ReactCommon/fabric/text/BUCK
+++ b/ReactCommon/fabric/components/text/BUCK
@@ -1,13 +1,17 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
 
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "text",
@@ -28,7 +32,7 @@ rn_xplat_cxx_library(
             ("text", "*.h"),
             ("rawtext", "*.h"),
         ],
-        prefix = "fabric/text",
+        prefix = "fabric/components/text",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -62,28 +66,26 @@ rn_xplat_cxx_library(
         react_native_xplat_target("fabric/debug:debug"),
         react_native_xplat_target("fabric/graphics:graphics"),
         react_native_xplat_target("fabric/textlayoutmanager:textlayoutmanager"),
-        react_native_xplat_target("fabric/view:view"),
+        react_native_xplat_target("fabric/components/view:view"),
+        react_native_xplat_target("fabric/uimanager:uimanager"),
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":text",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = (ANDROID, APPLE),
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":text",
+    ],
+)
diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp b/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp
new file mode 100644
index 00000000000000..4e2d95289fb34e
--- /dev/null
+++ b/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp
@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "BaseTextProps.h"
+
+#include <fabric/attributedstring/conversions.h>
+#include <fabric/core/propsConversions.h>
+#include <fabric/debug/DebugStringConvertibleItem.h>
+#include <fabric/graphics/conversions.h>
+
+namespace facebook {
+namespace react {
+
+static TextAttributes convertRawProp(
+    const RawProps &rawProps,
+    const TextAttributes defaultTextAttributes) {
+  auto textAttributes = TextAttributes{};
+
+  // Color
+  textAttributes.foregroundColor =
+      convertRawProp(rawProps, "color", defaultTextAttributes.foregroundColor);
+  textAttributes.backgroundColor = convertRawProp(
+      rawProps, "backgroundColor", defaultTextAttributes.backgroundColor);
+  textAttributes.opacity =
+      convertRawProp(rawProps, "opacity", defaultTextAttributes.opacity);
+
+  // Font
+  textAttributes.fontFamily =
+      convertRawProp(rawProps, "fontFamily", defaultTextAttributes.fontFamily);
+  textAttributes.fontSize =
+      convertRawProp(rawProps, "fontSize", defaultTextAttributes.fontSize);
+  textAttributes.fontSizeMultiplier = convertRawProp(
+      rawProps, "fontSizeMultiplier", defaultTextAttributes.fontSizeMultiplier);
+  textAttributes.fontWeight =
+      convertRawProp(rawProps, "fontWeight", defaultTextAttributes.fontWeight);
+  textAttributes.fontStyle =
+      convertRawProp(rawProps, "fontStyle", defaultTextAttributes.fontStyle);
+  textAttributes.fontVariant = convertRawProp(
+      rawProps, "fontVariant", defaultTextAttributes.fontVariant);
+  textAttributes.allowFontScaling = convertRawProp(
+      rawProps, "allowFontScaling", defaultTextAttributes.allowFontScaling);
+  textAttributes.letterSpacing = convertRawProp(
+      rawProps, "letterSpacing", defaultTextAttributes.letterSpacing);
+
+  // Paragraph
+  textAttributes.lineHeight =
+      convertRawProp(rawProps, "lineHeight", defaultTextAttributes.lineHeight);
+  textAttributes.alignment =
+      convertRawProp(rawProps, "alignment", defaultTextAttributes.alignment);
+  textAttributes.baseWritingDirection = convertRawProp(
+      rawProps,
+      "baseWritingDirection",
+      defaultTextAttributes.baseWritingDirection);
+
+  // Decoration
+  textAttributes.textDecorationColor = convertRawProp(
+      rawProps,
+      "textDecorationColor",
+      defaultTextAttributes.textDecorationColor);
+  textAttributes.textDecorationLineType = convertRawProp(
+      rawProps,
+      "textDecorationLineType",
+      defaultTextAttributes.textDecorationLineType);
+  textAttributes.textDecorationLineStyle = convertRawProp(
+      rawProps,
+      "textDecorationLineStyle",
+      defaultTextAttributes.textDecorationLineStyle);
+  textAttributes.textDecorationLinePattern = convertRawProp(
+      rawProps,
+      "textDecorationLinePattern",
+      defaultTextAttributes.textDecorationLinePattern);
+
+  // Shadow
+  textAttributes.textShadowOffset = convertRawProp(
+      rawProps, "textShadowOffset", defaultTextAttributes.textShadowOffset);
+  textAttributes.textShadowRadius = convertRawProp(
+      rawProps, "textShadowRadius", defaultTextAttributes.textShadowRadius);
+  textAttributes.textShadowColor = convertRawProp(
+      rawProps, "textShadowColor", defaultTextAttributes.textShadowColor);
+
+  // Special
+  textAttributes.isHighlighted = convertRawProp(
+      rawProps, "isHighlighted", defaultTextAttributes.isHighlighted);
+
+  return textAttributes;
+}
+
+BaseTextProps::BaseTextProps(
+    const BaseTextProps &sourceProps,
+    const RawProps &rawProps)
+    : textAttributes(convertRawProp(rawProps, sourceProps.textAttributes)){};
+
+#pragma mark - DebugStringConvertible
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList BaseTextProps::getDebugProps() const {
+  return textAttributes.getDebugProps();
+}
+#endif
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/text/basetext/BaseTextProps.h b/ReactCommon/fabric/components/text/basetext/BaseTextProps.h
similarity index 85%
rename from ReactCommon/fabric/text/basetext/BaseTextProps.h
rename to ReactCommon/fabric/components/text/basetext/BaseTextProps.h
index 6e5026a594db9b..d23e6b1b1b334f 100644
--- a/ReactCommon/fabric/text/basetext/BaseTextProps.h
+++ b/ReactCommon/fabric/components/text/basetext/BaseTextProps.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,18 +20,19 @@ namespace react {
  * that can have text attributes (such as Text and Paragraph).
  */
 class BaseTextProps {
-public:
-
+ public:
   BaseTextProps() = default;
   BaseTextProps(const BaseTextProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
-  const TextAttributes textAttributes {};
+  const TextAttributes textAttributes{};
 
 #pragma mark - DebugStringConvertible (partially)
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const;
+#endif
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp b/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp
new file mode 100644
index 00000000000000..086d2bde32447f
--- /dev/null
+++ b/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "BaseTextShadowNode.h"
+
+#include <fabric/components/text/RawTextProps.h>
+#include <fabric/components/text/RawTextShadowNode.h>
+#include <fabric/components/text/TextProps.h>
+#include <fabric/components/text/TextShadowNode.h>
+#include <fabric/debug/DebugStringConvertibleItem.h>
+
+namespace facebook {
+namespace react {
+
+AttributedString BaseTextShadowNode::getAttributedString(
+    const TextAttributes &textAttributes,
+    const SharedShadowNode &parentNode) const {
+  auto attributedString = AttributedString{};
+
+  for (const auto &childNode : parentNode->getChildren()) {
+    // RawShadowNode
+    auto rawTextShadowNode =
+        std::dynamic_pointer_cast<const RawTextShadowNode>(childNode);
+    if (rawTextShadowNode) {
+      auto fragment = AttributedString::Fragment{};
+      fragment.string = rawTextShadowNode->getProps()->text;
+      fragment.textAttributes = textAttributes;
+      fragment.parentShadowNode = parentNode;
+      attributedString.appendFragment(fragment);
+      continue;
+    }
+
+    // TextShadowNode
+    auto textShadowNode =
+        std::dynamic_pointer_cast<const TextShadowNode>(childNode);
+    if (textShadowNode) {
+      auto localTextAttributes = textAttributes;
+      localTextAttributes.apply(textShadowNode->getProps()->textAttributes);
+      attributedString.appendAttributedString(
+          textShadowNode->getAttributedString(
+              localTextAttributes, textShadowNode));
+      continue;
+    }
+
+    // Any other kind of ShadowNode
+    auto fragment = AttributedString::Fragment{};
+    fragment.shadowNode = childNode;
+    fragment.textAttributes = textAttributes;
+    attributedString.appendFragment(fragment);
+  }
+
+  return attributedString;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/text/basetext/BaseTextShadowNode.h b/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h
similarity index 79%
rename from ReactCommon/fabric/text/basetext/BaseTextShadowNode.h
rename to ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h
index 9d52b9c5ebe921..4c47a18dce39d1 100644
--- a/ReactCommon/fabric/text/basetext/BaseTextShadowNode.h
+++ b/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -18,15 +18,13 @@ namespace react {
  * such as Text and Paragraph (but not RawText).
  */
 class BaseTextShadowNode {
-public:
-
+ public:
   /*
    * Returns a `AttributedString` which represents text content of the node.
    */
   AttributedString getAttributedString(
-    const TextAttributes &baseTextAttributes,
-    const SharedShadowNodeSharedList &childNodes
-  ) const;
+      const TextAttributes &baseTextAttributes,
+      const SharedShadowNode &parentNode) const;
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphComponentDescriptor.h b/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h
similarity index 59%
rename from ReactCommon/fabric/text/paragraph/ParagraphComponentDescriptor.h
rename to ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h
index 71e6b8adaa92df..9adeb0f344a434 100644
--- a/ReactCommon/fabric/text/paragraph/ParagraphComponentDescriptor.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,9 +7,10 @@
 
 #pragma once
 
+#include <fabric/components/text/ParagraphShadowNode.h>
 #include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/text/ParagraphShadowNode.h>
 #include <fabric/textlayoutmanager/TextLayoutManager.h>
+#include <fabric/uimanager/ContextContainer.h>
 
 namespace facebook {
 namespace react {
@@ -17,23 +18,24 @@ namespace react {
 /*
  * Descriptor for <Paragraph> component.
  */
-class ParagraphComponentDescriptor final:
-  public ConcreteComponentDescriptor<ParagraphShadowNode> {
-
-public:
-
-  ParagraphComponentDescriptor(SharedEventDispatcher eventDispatcher):
-    ConcreteComponentDescriptor<ParagraphShadowNode>(eventDispatcher) {
+class ParagraphComponentDescriptor final
+    : public ConcreteComponentDescriptor<ParagraphShadowNode> {
+ public:
+  ParagraphComponentDescriptor(
+      SharedEventDispatcher eventDispatcher,
+      const SharedContextContainer &contextContainer)
+      : ConcreteComponentDescriptor<ParagraphShadowNode>(eventDispatcher) {
     // Every single `ParagraphShadowNode` will have a reference to
     // a shared `TextLayoutManager`.
-    textLayoutManager_ = std::make_shared<TextLayoutManager>();
+    textLayoutManager_ = std::make_shared<TextLayoutManager>(contextContainer);
   }
 
   void adopt(UnsharedShadowNode shadowNode) const override {
-    ConcreteComponentDescriptor<ParagraphShadowNode>::adopt(shadowNode);
+    ConcreteComponentDescriptor::adopt(shadowNode);
 
     assert(std::dynamic_pointer_cast<ParagraphShadowNode>(shadowNode));
-    auto paragraphShadowNode = std::static_pointer_cast<ParagraphShadowNode>(shadowNode);
+    auto paragraphShadowNode =
+        std::static_pointer_cast<ParagraphShadowNode>(shadowNode);
 
     // `ParagraphShadowNode` uses `TextLayoutManager` to measure text content
     // and communicate text rendering metrics to mounting layer.
@@ -44,8 +46,7 @@ class ParagraphComponentDescriptor final:
     paragraphShadowNode->enableMeasurement();
   }
 
-private:
-
+ private:
   SharedTextLayoutManager textLayoutManager_;
 };
 
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphLocalData.cpp b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.cpp
similarity index 63%
rename from ReactCommon/fabric/text/paragraph/ParagraphLocalData.cpp
rename to ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.cpp
index 30fc681fd041a2..664e480188ef62 100644
--- a/ReactCommon/fabric/text/paragraph/ParagraphLocalData.cpp
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,7 @@
 
 #include "ParagraphLocalData.h"
 
+#include <fabric/components/text/conversions.h>
 #include <fabric/debug/debugStringConvertibleUtils.h>
 
 namespace facebook {
@@ -16,7 +17,8 @@ AttributedString ParagraphLocalData::getAttributedString() const {
   return attributedString_;
 }
 
-void ParagraphLocalData::setAttributedString(AttributedString attributedString) {
+void ParagraphLocalData::setAttributedString(
+    AttributedString attributedString) {
   ensureUnsealed();
   attributedString_ = attributedString;
 }
@@ -25,22 +27,28 @@ SharedTextLayoutManager ParagraphLocalData::getTextLayoutManager() const {
   return textLayoutManager_;
 }
 
-void ParagraphLocalData::setTextLayoutManager(SharedTextLayoutManager textLayoutManager) {
+void ParagraphLocalData::setTextLayoutManager(
+    SharedTextLayoutManager textLayoutManager) {
   ensureUnsealed();
   textLayoutManager_ = textLayoutManager;
 }
 
+folly::dynamic ParagraphLocalData::getDynamic() const {
+  return toDynamic(*this);
+}
+
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 std::string ParagraphLocalData::getDebugName() const {
   return "ParagraphLocalData";
 }
 
 SharedDebugStringConvertibleList ParagraphLocalData::getDebugProps() const {
   return {
-    debugStringConvertibleItem("attributedString", attributedString_, "")
-  };
+      debugStringConvertibleItem("attributedString", attributedString_, "")};
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphLocalData.h b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.h
similarity index 86%
rename from ReactCommon/fabric/text/paragraph/ParagraphLocalData.h
rename to ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.h
index 7f3ad4007a3399..d03a634f5b8e0f 100644
--- a/ReactCommon/fabric/text/paragraph/ParagraphLocalData.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -22,11 +22,8 @@ using SharedParagraphLocalData = std::shared_ptr<const ParagraphLocalData>;
  * LocalData for <Paragraph> component.
  * Represents what to render and how to render.
  */
-class ParagraphLocalData:
-  public LocalData {
-
-public:
-
+class ParagraphLocalData : public LocalData {
+ public:
   /*
    * All content of <Paragraph> component represented as an `AttributedString`.
    */
@@ -41,13 +38,16 @@ class ParagraphLocalData:
   SharedTextLayoutManager getTextLayoutManager() const;
   void setTextLayoutManager(SharedTextLayoutManager textLayoutManager);
 
+  folly::dynamic getDynamic() const override;
+
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   std::string getDebugName() const override;
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 
-private:
-
+ private:
   AttributedString attributedString_;
   SharedTextLayoutManager textLayoutManager_;
 };
diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp
new file mode 100644
index 00000000000000..321d2abff6b9b9
--- /dev/null
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ParagraphProps.h"
+
+#include <fabric/attributedstring/conversions.h>
+#include <fabric/core/propsConversions.h>
+#include <fabric/debug/debugStringConvertibleUtils.h>
+
+namespace facebook {
+namespace react {
+
+static ParagraphAttributes convertRawProp(
+    const RawProps &rawProps,
+    const ParagraphAttributes &defaultParagraphAttributes) {
+  auto paragraphAttributes = ParagraphAttributes{};
+
+  paragraphAttributes.maximumNumberOfLines = convertRawProp(
+      rawProps,
+      "numberOfLines",
+      defaultParagraphAttributes.maximumNumberOfLines);
+  paragraphAttributes.ellipsizeMode = convertRawProp(
+      rawProps, "ellipsizeMode", defaultParagraphAttributes.ellipsizeMode);
+  paragraphAttributes.adjustsFontSizeToFit = convertRawProp(
+      rawProps,
+      "adjustsFontSizeToFit",
+      defaultParagraphAttributes.adjustsFontSizeToFit);
+  paragraphAttributes.minimumFontSize = convertRawProp(
+      rawProps,
+      "minimumFontSize",
+      defaultParagraphAttributes.minimumFontSize,
+      std::numeric_limits<Float>::quiet_NaN());
+  paragraphAttributes.maximumFontSize = convertRawProp(
+      rawProps,
+      "maximumFontSize",
+      defaultParagraphAttributes.maximumFontSize,
+      std::numeric_limits<Float>::quiet_NaN());
+
+  return paragraphAttributes;
+}
+
+ParagraphProps::ParagraphProps(
+    const ParagraphProps &sourceProps,
+    const RawProps &rawProps)
+    : ViewProps(sourceProps, rawProps),
+      BaseTextProps(sourceProps, rawProps),
+      paragraphAttributes(
+          convertRawProp(rawProps, sourceProps.paragraphAttributes)),
+      isSelectable(
+          convertRawProp(rawProps, "selectable", sourceProps.isSelectable)){};
+
+#pragma mark - DebugStringConvertible
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList ParagraphProps::getDebugProps() const {
+  return ViewProps::getDebugProps() + BaseTextProps::getDebugProps() +
+      paragraphAttributes.getDebugProps() +
+      SharedDebugStringConvertibleList{
+          debugStringConvertibleItem("isSelectable", isSelectable)};
+}
+#endif
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphProps.h b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
similarity index 69%
rename from ReactCommon/fabric/text/paragraph/ParagraphProps.h
rename to ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
index 5877be6cb86d9a..3874f5513a2e80 100644
--- a/ReactCommon/fabric/text/paragraph/ParagraphProps.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,46 +11,41 @@
 #include <memory>
 
 #include <fabric/attributedstring/ParagraphAttributes.h>
+#include <fabric/components/text/BaseTextProps.h>
+#include <fabric/components/view/ViewProps.h>
 #include <fabric/core/Props.h>
-#include <fabric/text/BaseTextProps.h>
-#include <fabric/view/ViewProps.h>
 
 namespace facebook {
 namespace react {
 
-class ParagraphProps;
-
-using SharedParagraphProps = std::shared_ptr<const ParagraphProps>;
-
 /*
  * Props of <Paragraph> component.
  * Most of the props are directly stored in composed `ParagraphAttributes`
  * object.
  */
-class ParagraphProps:
-  public ViewProps,
-  public BaseTextProps {
-
-public:
+class ParagraphProps : public ViewProps, public BaseTextProps {
+ public:
   ParagraphProps() = default;
   ParagraphProps(const ParagraphProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
   /*
-   * Contains all prop values that affect visual representation of the paragraph.
+   * Contains all prop values that affect visual representation of the
+   * paragraph.
    */
-  const ParagraphAttributes paragraphAttributes {};
+  const ParagraphAttributes paragraphAttributes{};
 
   /*
    * Defines can the text be selected (and copied) or not.
    */
-  const bool isSelectable {};
+  const bool isSelectable{};
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
-
+#endif
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphShadowNode.cpp b/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.cpp
similarity index 55%
rename from ReactCommon/fabric/text/paragraph/ParagraphShadowNode.cpp
rename to ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.cpp
index e7b6513ba235e9..245dcee932f9d9 100644
--- a/ReactCommon/fabric/text/paragraph/ParagraphShadowNode.cpp
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,22 +7,27 @@
 
 #include "ParagraphShadowNode.h"
 
-#include <fabric/debug/DebugStringConvertibleItem.h>
-
-#import "ParagraphLocalData.h"
+#include "ParagraphLocalData.h"
 
 namespace facebook {
 namespace react {
 
-ComponentName ParagraphShadowNode::getComponentName() const {
-  return ComponentName("Paragraph");
-}
+const char ParagraphComponentName[] = "Paragraph";
 
 AttributedString ParagraphShadowNode::getAttributedString() const {
-  return BaseTextShadowNode::getAttributedString(getProps()->textAttributes, getChildren());
+  if (!cachedAttributedString_.has_value()) {
+    auto textAttributes = TextAttributes::defaultTextAttributes();
+    textAttributes.apply(getProps()->textAttributes);
+
+    cachedAttributedString_ = BaseTextShadowNode::getAttributedString(
+        textAttributes, shared_from_this());
+  }
+
+  return cachedAttributedString_.value();
 }
 
-void ParagraphShadowNode::setTextLayoutManager(SharedTextLayoutManager textLayoutManager) {
+void ParagraphShadowNode::setTextLayoutManager(
+    SharedTextLayoutManager textLayoutManager) {
   ensureUnsealed();
   textLayoutManager_ = textLayoutManager;
 }
@@ -40,15 +45,15 @@ void ParagraphShadowNode::updateLocalData() {
 
 Size ParagraphShadowNode::measure(LayoutConstraints layoutConstraints) const {
   return textLayoutManager_->measure(
-    getAttributedString(),
-    getProps()->paragraphAttributes,
-    layoutConstraints
-  );
+      getTag(),
+      getAttributedString(),
+      getProps()->paragraphAttributes,
+      layoutConstraints);
 }
 
 void ParagraphShadowNode::layout(LayoutContext layoutContext) {
   updateLocalData();
-  ConcreteViewShadowNode<ParagraphProps>::layout(layoutContext);
+  ConcreteViewShadowNode::layout(layoutContext);
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphShadowNode.h b/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
similarity index 63%
rename from ReactCommon/fabric/text/paragraph/ParagraphShadowNode.h
rename to ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
index df16aee1b797bd..f711acec9646b8 100644
--- a/ReactCommon/fabric/text/paragraph/ParagraphShadowNode.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,36 +7,35 @@
 
 #pragma once
 
+#include <fabric/components/text/ParagraphProps.h>
+#include <fabric/components/text/TextShadowNode.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>
 #include <fabric/core/ConcreteShadowNode.h>
-#include <fabric/core/ShadowNode.h>
 #include <fabric/core/LayoutContext.h>
-#include <fabric/text/ParagraphProps.h>
-#include <fabric/text/TextShadowNode.h>
+#include <fabric/core/ShadowNode.h>
 #include <fabric/textlayoutmanager/TextLayoutManager.h>
-#include <fabric/view/ConcreteViewShadowNode.h>
+#include <folly/Optional.h>
 
 namespace facebook {
 namespace react {
 
-class ParagraphShadowNode;
+extern const char ParagraphComponentName[];
 
-using SharedParagraphShadowNode = std::shared_ptr<const ParagraphShadowNode>;
+using ParagraphEventEmitter = ViewEventEmitter;
 
 /*
  * `ShadowNode` for <Paragraph> component, represents <View>-like component
  * containing and displaying text. Text content is represented as nested <Text>
  * and <RawText> components.
  */
-class ParagraphShadowNode:
-  public ConcreteViewShadowNode<ParagraphProps>,
-  public BaseTextShadowNode {
-
-public:
-
+class ParagraphShadowNode : public ConcreteViewShadowNode<
+                                ParagraphComponentName,
+                                ParagraphProps,
+                                ParagraphEventEmitter>,
+                            public BaseTextShadowNode {
+ public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
-  ComponentName getComponentName() const override;
-
   /*
    * Returns a `AttributedString` which represents text content of the node.
    */
@@ -54,8 +53,7 @@ class ParagraphShadowNode:
   void layout(LayoutContext layoutContext) override;
   Size measure(LayoutConstraints layoutConstraints) const override;
 
-private:
-
+ private:
   /*
    * Creates a `LocalData` object (with `AttributedText` and
    * `TextLayoutManager`) if needed.
@@ -63,6 +61,12 @@ class ParagraphShadowNode:
   void updateLocalData();
 
   SharedTextLayoutManager textLayoutManager_;
+
+  /*
+   * Cached attributed string that represents the content of the subtree started
+   * from the node.
+   */
+  mutable folly::Optional<AttributedString> cachedAttributedString_{};
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/components/text/paragraph/conversions.h b/ReactCommon/fabric/components/text/paragraph/conversions.h
new file mode 100644
index 00000000000000..c9d614144d0f74
--- /dev/null
+++ b/ReactCommon/fabric/components/text/paragraph/conversions.h
@@ -0,0 +1,17 @@
+
+#include <fabric/attributedstring/conversions.h>
+#include <fabric/components/text/ParagraphLocalData.h>
+#include <folly/dynamic.h>
+
+namespace facebook {
+namespace react {
+
+inline folly::dynamic toDynamic(const ParagraphLocalData &paragraphLocalData) {
+  folly::dynamic newLocalData = folly::dynamic::object();
+  newLocalData["attributedString"] =
+      toDynamic(paragraphLocalData.getAttributedString());
+  return newLocalData;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/text/rawtext/RawTextComponentDescriptor.h b/ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h
similarity index 60%
rename from ReactCommon/fabric/text/rawtext/RawTextComponentDescriptor.h
rename to ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h
index ca2ccdbe1cf93c..0796e25ffacb03 100644
--- a/ReactCommon/fabric/text/rawtext/RawTextComponentDescriptor.h
+++ b/ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,13 +7,14 @@
 
 #pragma once
 
+#include <fabric/components/text/RawTextShadowNode.h>
 #include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/text/RawTextShadowNode.h>
 
 namespace facebook {
 namespace react {
 
-using RawTextComponentDescriptor = ConcreteComponentDescriptor<RawTextShadowNode>;
+using RawTextComponentDescriptor =
+    ConcreteComponentDescriptor<RawTextShadowNode>;
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/text/rawtext/RawTextProps.cpp b/ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp
similarity index 57%
rename from ReactCommon/fabric/text/rawtext/RawTextProps.cpp
rename to ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp
index f3945701befcd3..d3d993634ab54e 100644
--- a/ReactCommon/fabric/text/rawtext/RawTextProps.cpp
+++ b/ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,17 +13,19 @@
 namespace facebook {
 namespace react {
 
-RawTextProps::RawTextProps(const RawTextProps &sourceProps, const RawProps &rawProps):
-  Props(sourceProps, rawProps),
-  text(convertRawProp(rawProps, "text", sourceProps.text)) {};
+RawTextProps::RawTextProps(
+    const RawTextProps &sourceProps,
+    const RawProps &rawProps)
+    : Props(sourceProps, rawProps),
+      text(convertRawProp(rawProps, "text", sourceProps.text)){};
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList RawTextProps::getDebugProps() const {
-  return {
-    debugStringConvertibleItem("text", text)
-  };
+  return {debugStringConvertibleItem("text", text)};
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/text/rawtext/RawTextProps.h b/ReactCommon/fabric/components/text/rawtext/RawTextProps.h
similarity index 80%
rename from ReactCommon/fabric/text/rawtext/RawTextProps.h
rename to ReactCommon/fabric/components/text/rawtext/RawTextProps.h
index 45f1f3d01dee60..c89f4f77206439 100644
--- a/ReactCommon/fabric/text/rawtext/RawTextProps.h
+++ b/ReactCommon/fabric/components/text/rawtext/RawTextProps.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -19,21 +19,20 @@ class RawTextProps;
 
 using SharedRawTextProps = std::shared_ptr<const RawTextProps>;
 
-class RawTextProps:
-  public Props {
-
-public:
-
+class RawTextProps : public Props {
+ public:
   RawTextProps() = default;
   RawTextProps(const RawTextProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
-  const std::string text {};
+  const std::string text{};
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/view/ViewShadowNode.cpp b/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.cpp
similarity index 57%
rename from ReactCommon/fabric/view/ViewShadowNode.cpp
rename to ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.cpp
index 2bf7f30d76aeea..61de150a5b3a82 100644
--- a/ReactCommon/fabric/view/ViewShadowNode.cpp
+++ b/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.cpp
@@ -1,18 +1,16 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "ViewShadowNode.h"
+#include "RawTextShadowNode.h"
 
 namespace facebook {
 namespace react {
 
-ComponentName ViewShadowNode::getComponentName() const {
-  return ComponentName("View");
-}
+extern const char RawTextComponentName[] = "RawText";
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/text/rawtext/RawTextShadowNode.h b/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h
similarity index 56%
rename from ReactCommon/fabric/text/rawtext/RawTextShadowNode.h
rename to ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h
index f4a2e2ffcebaf8..0935678b4a49c8 100644
--- a/ReactCommon/fabric/text/rawtext/RawTextShadowNode.h
+++ b/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,18 +7,13 @@
 
 #pragma once
 
-#include <memory>
-
+#include <fabric/components/text/RawTextProps.h>
 #include <fabric/core/ConcreteShadowNode.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/text/RawTextProps.h>
 
 namespace facebook {
 namespace react {
 
-class RawTextShadowNode;
-
-using SharedRawTextShadowNode = std::shared_ptr<const RawTextShadowNode>;
+extern const char RawTextComponentName[];
 
 /*
  * `ShadowNode` for <RawText> component, represents a purely regular string
@@ -26,14 +21,8 @@ using SharedRawTextShadowNode = std::shared_ptr<const RawTextShadowNode>;
  * is represented as `<RawText text="Hello!"/>`.
  * <RawText> component must not have any children.
  */
-class RawTextShadowNode:
-  public ConcreteShadowNode<RawTextProps> {
-
-public:
-  using ConcreteShadowNode::ConcreteShadowNode;
-
-  ComponentName getComponentName() const override;
-};
+using RawTextShadowNode =
+    ConcreteShadowNode<RawTextComponentName, RawTextProps>;
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/text/tests/ParagraphLocalDataTest.cpp b/ReactCommon/fabric/components/text/tests/ParagraphLocalDataTest.cpp
new file mode 100644
index 00000000000000..d9572c5a4e5b1e
--- /dev/null
+++ b/ReactCommon/fabric/components/text/tests/ParagraphLocalDataTest.cpp
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <memory>
+
+#include <assert.h>
+#include <fabric/attributedstring/AttributedString.h>
+#include <fabric/attributedstring/TextAttributes.h>
+#include <fabric/attributedstring/primitives.h>
+#include <fabric/components/text/ParagraphLocalData.h>
+#include <fabric/components/text/conversions.h>
+#include <gtest/gtest.h>
+
+namespace facebook {
+namespace react {
+
+TEST(ParagraphLocalDataTest, testSomething) {
+  auto attString = AttributedString();
+  auto fragment = AttributedString::Fragment();
+  fragment.string = "test";
+
+  auto text = TextAttributes();
+  text.foregroundColor = {
+      colorFromComponents({100 / 255.0, 153 / 255.0, 253 / 255.0, 1.0})};
+  text.opacity = 0.5;
+  text.fontStyle = FontStyle::Italic;
+  text.fontWeight = FontWeight::Thin;
+  text.fontVariant = FontVariant::TabularNums;
+  fragment.textAttributes = text;
+  attString.prependFragment(fragment);
+
+  auto paragraphLocalData = ParagraphLocalData();
+  paragraphLocalData.setAttributedString(attString);
+
+  auto result = toDynamic(paragraphLocalData)["attributedString"];
+
+  assert(result["string"] == fragment.string);
+  auto textAttribute = result["fragments"][0]["textAttributes"];
+  assert(textAttribute["foregroundColor"] == toDynamic(text.foregroundColor));
+  assert(textAttribute["opacity"] == text.opacity);
+  assert(textAttribute["fontStyle"] == toString(*text.fontStyle));
+  assert(textAttribute["fontWeight"] == toString(*text.fontWeight));
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/text/tests/TextTest.cpp b/ReactCommon/fabric/components/text/tests/TextTest.cpp
similarity index 81%
rename from ReactCommon/fabric/text/tests/TextTest.cpp
rename to ReactCommon/fabric/components/text/tests/TextTest.cpp
index 6b995ae90d7b0f..1be2d441e698a1 100644
--- a/ReactCommon/fabric/text/tests/TextTest.cpp
+++ b/ReactCommon/fabric/components/text/tests/TextTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/text/text/TextComponentDescriptor.h b/ReactCommon/fabric/components/text/text/TextComponentDescriptor.h
similarity index 78%
rename from ReactCommon/fabric/text/text/TextComponentDescriptor.h
rename to ReactCommon/fabric/components/text/text/TextComponentDescriptor.h
index 5abb428e33dece..ce4ee80ea53c31 100644
--- a/ReactCommon/fabric/text/text/TextComponentDescriptor.h
+++ b/ReactCommon/fabric/components/text/text/TextComponentDescriptor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include <fabric/components/text/TextShadowNode.h>
 #include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/text/TextShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/text/text/TextProps.cpp b/ReactCommon/fabric/components/text/text/TextProps.cpp
similarity index 73%
rename from ReactCommon/fabric/text/text/TextProps.cpp
rename to ReactCommon/fabric/components/text/text/TextProps.cpp
index 443fe48c045122..6a24fa8b703624 100644
--- a/ReactCommon/fabric/text/text/TextProps.cpp
+++ b/ReactCommon/fabric/components/text/text/TextProps.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,14 +10,16 @@
 namespace facebook {
 namespace react {
 
-TextProps::TextProps(const TextProps &sourceProps, const RawProps &rawProps):
-  BaseTextProps::BaseTextProps(sourceProps, rawProps) {};
+TextProps::TextProps(const TextProps &sourceProps, const RawProps &rawProps)
+    : BaseTextProps::BaseTextProps(sourceProps, rawProps){};
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList TextProps::getDebugProps() const {
   return BaseTextProps::getDebugProps();
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/text/text/TextProps.h b/ReactCommon/fabric/components/text/text/TextProps.h
similarity index 72%
rename from ReactCommon/fabric/text/text/TextProps.h
rename to ReactCommon/fabric/components/text/text/TextProps.h
index b420507317408f..3d81d17d77673e 100644
--- a/ReactCommon/fabric/text/text/TextProps.h
+++ b/ReactCommon/fabric/components/text/text/TextProps.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,30 +8,24 @@
 #pragma once
 
 #include <fabric/attributedstring/TextAttributes.h>
+#include <fabric/components/text/BaseTextProps.h>
 #include <fabric/core/Props.h>
 #include <fabric/graphics/Color.h>
 #include <fabric/graphics/Geometry.h>
-#include <fabric/text/BaseTextProps.h>
 
 namespace facebook {
 namespace react {
 
-class TextProps;
-
-using SharedTextProps = std::shared_ptr<const TextProps>;
-
-class TextProps:
-  public Props,
-  public BaseTextProps {
-
-public:
-
+class TextProps : public Props, public BaseTextProps {
+ public:
   TextProps() = default;
   TextProps(const TextProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/text/text/TextShadowNode.cpp b/ReactCommon/fabric/components/text/text/TextShadowNode.cpp
similarity index 56%
rename from ReactCommon/fabric/text/text/TextShadowNode.cpp
rename to ReactCommon/fabric/components/text/text/TextShadowNode.cpp
index c49c8bfd243c18..60e0445adbe761 100644
--- a/ReactCommon/fabric/text/text/TextShadowNode.cpp
+++ b/ReactCommon/fabric/components/text/text/TextShadowNode.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,14 +7,10 @@
 
 #include "TextShadowNode.h"
 
-#include <fabric/debug/DebugStringConvertibleItem.h>
-
 namespace facebook {
 namespace react {
 
-ComponentName TextShadowNode::getComponentName() const {
-  return ComponentName("Text");
-}
+extern const char TextComponentName[] = "Text";
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/text/text/TextShadowNode.h b/ReactCommon/fabric/components/text/text/TextShadowNode.h
new file mode 100644
index 00000000000000..1cd7805a18b575
--- /dev/null
+++ b/ReactCommon/fabric/components/text/text/TextShadowNode.h
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/text/BaseTextShadowNode.h>
+#include <fabric/components/text/TextProps.h>
+#include <fabric/components/view/ViewEventEmitter.h>
+#include <fabric/core/ConcreteShadowNode.h>
+
+namespace facebook {
+namespace react {
+
+extern const char TextComponentName[];
+
+using TextEventEmitter = TouchEventEmitter;
+
+class TextShadowNode
+    : public ConcreteShadowNode<TextComponentName, TextProps, TextEventEmitter>,
+      public BaseTextShadowNode {
+ public:
+  using ConcreteShadowNode::ConcreteShadowNode;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/view/BUCK b/ReactCommon/fabric/components/view/BUCK
similarity index 53%
rename from ReactCommon/fabric/view/BUCK
rename to ReactCommon/fabric/components/view/BUCK
index 42ea4a7a5d0712..f246ff427b233c 100644
--- a/ReactCommon/fabric/view/BUCK
+++ b/ReactCommon/fabric/components/view/BUCK
@@ -1,13 +1,17 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
 
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "view",
@@ -27,7 +31,7 @@ rn_xplat_cxx_library(
             ("root", "*.h"),
             ("yoga", "*.h"),
         ],
-        prefix = "fabric/view",
+        prefix = "fabric/components/view",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -62,24 +66,21 @@ rn_xplat_cxx_library(
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":view",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = APPLE,
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":view",
+    ],
+)
diff --git a/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h b/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h
new file mode 100644
index 00000000000000..41e8a9b4219a3c
--- /dev/null
+++ b/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h
@@ -0,0 +1,134 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/view/AccessibleShadowNode.h>
+#include <fabric/components/view/ViewEventEmitter.h>
+#include <fabric/components/view/ViewProps.h>
+#include <fabric/components/view/YogaLayoutableShadowNode.h>
+#include <fabric/core/ConcreteShadowNode.h>
+#include <fabric/core/LayoutableShadowNode.h>
+#include <fabric/core/ShadowNode.h>
+#include <fabric/core/ShadowNodeFragment.h>
+#include <fabric/debug/DebugStringConvertibleItem.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Template for all <View>-like classes (classes which have all same props
+ * as <View> and similar basic behaviour).
+ * For example: <Paragraph>, <Image>, but not <Text>, <RawText>.
+ */
+template <
+    const char *concreteComponentName,
+    typename ViewPropsT = ViewProps,
+    typename ViewEventEmitterT = ViewEventEmitter>
+class ConcreteViewShadowNode : public ConcreteShadowNode<
+                                   concreteComponentName,
+                                   ViewPropsT,
+                                   ViewEventEmitterT>,
+                               public AccessibleShadowNode,
+                               public YogaLayoutableShadowNode {
+  static_assert(
+      std::is_base_of<ViewProps, ViewPropsT>::value,
+      "ViewPropsT must be a descendant of ViewProps");
+  static_assert(
+      std::is_base_of<YogaStylableProps, ViewPropsT>::value,
+      "ViewPropsT must be a descendant of YogaStylableProps");
+  static_assert(
+      std::is_base_of<AccessibilityProps, ViewPropsT>::value,
+      "ViewPropsT must be a descendant of AccessibilityProps");
+
+ public:
+  using BaseShadowNode =
+      ConcreteShadowNode<concreteComponentName, ViewPropsT, ViewEventEmitterT>;
+  using ConcreteViewProps = ViewPropsT;
+
+  ConcreteViewShadowNode(
+      const ShadowNodeFragment &fragment,
+      const ShadowNodeCloneFunction &cloneFunction)
+      : BaseShadowNode(fragment, cloneFunction),
+        AccessibleShadowNode(
+            std::static_pointer_cast<const ConcreteViewProps>(fragment.props)),
+        YogaLayoutableShadowNode() {
+    YogaLayoutableShadowNode::setProps(
+        *std::static_pointer_cast<const ConcreteViewProps>(fragment.props));
+    YogaLayoutableShadowNode::setChildren(
+        BaseShadowNode::template getChildrenSlice<YogaLayoutableShadowNode>());
+  };
+
+  ConcreteViewShadowNode(
+      const ShadowNode &sourceShadowNode,
+      const ShadowNodeFragment &fragment)
+      : BaseShadowNode(sourceShadowNode, fragment),
+        AccessibleShadowNode(
+            static_cast<const ConcreteViewShadowNode &>(sourceShadowNode),
+            std::static_pointer_cast<const ConcreteViewProps>(fragment.props)),
+        YogaLayoutableShadowNode(
+            static_cast<const ConcreteViewShadowNode &>(sourceShadowNode)) {
+    if (fragment.props) {
+      YogaLayoutableShadowNode::setProps(
+          *std::static_pointer_cast<const ConcreteViewProps>(fragment.props));
+    }
+
+    if (fragment.children) {
+      YogaLayoutableShadowNode::setChildren(
+          BaseShadowNode::template getChildrenSlice<
+              YogaLayoutableShadowNode>());
+    }
+  };
+
+  void appendChild(const SharedShadowNode &child) {
+    ensureUnsealed();
+
+    ShadowNode::appendChild(child);
+
+    auto nonConstChild = const_cast<ShadowNode *>(child.get());
+    auto yogaLayoutableChild =
+        dynamic_cast<YogaLayoutableShadowNode *>(nonConstChild);
+    if (yogaLayoutableChild) {
+      YogaLayoutableShadowNode::appendChild(yogaLayoutableChild);
+    }
+  }
+
+  LayoutableShadowNode *cloneAndReplaceChild(
+      LayoutableShadowNode *child,
+      int suggestedIndex = -1) override {
+    ensureUnsealed();
+    auto childShadowNode = static_cast<const ConcreteViewShadowNode *>(child);
+    auto clonedChildShadowNode =
+        std::static_pointer_cast<ConcreteViewShadowNode>(
+            childShadowNode->clone({}));
+    ShadowNode::replaceChild(
+        childShadowNode->shared_from_this(),
+        clonedChildShadowNode,
+        suggestedIndex);
+    return clonedChildShadowNode.get();
+  }
+
+#pragma mark - DebugStringConvertible
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override {
+    auto list = SharedDebugStringConvertibleList{};
+
+    auto basePropsList = ShadowNode::getDebugProps();
+    std::move(
+        basePropsList.begin(), basePropsList.end(), std::back_inserter(list));
+
+    list.push_back(std::make_shared<DebugStringConvertibleItem>(
+        "layout", "", LayoutableShadowNode::getDebugProps()));
+
+    return list;
+  }
+#endif
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/view/ViewEventEmitter.cpp b/ReactCommon/fabric/components/view/TouchEventEmitter.cpp
similarity index 52%
rename from ReactCommon/fabric/view/ViewEventEmitter.cpp
rename to ReactCommon/fabric/components/view/TouchEventEmitter.cpp
index 643b0b017847e1..73cb985e65a70c 100644
--- a/ReactCommon/fabric/view/ViewEventEmitter.cpp
+++ b/ReactCommon/fabric/components/view/TouchEventEmitter.cpp
@@ -5,39 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "ViewEventEmitter.h"
+#include "TouchEventEmitter.h"
 
 namespace facebook {
 namespace react {
 
-#pragma mark - Accessibility
-
-void ViewEventEmitter::onAccessibilityAction(const std::string &name) const {
-  dispatchEvent("accessibilityAction", folly::dynamic::object("action", name));
-}
-
-void ViewEventEmitter::onAccessibilityTap() const {
-  dispatchEvent("accessibilityTap");
-}
-
-void ViewEventEmitter::onAccessibilityMagicTap() const {
-  dispatchEvent("magicTap");
-}
-
-#pragma mark - Layout
-
-void ViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
-  folly::dynamic payload = folly::dynamic::object();
-  const auto &frame = layoutMetrics.frame;
-  payload["layout"] = folly::dynamic::object
-    ("x", frame.origin.x)
-    ("y", frame.origin.y)
-    ("width", frame.size.width)
-    ("height", frame.size.height);
-
-  dispatchEvent("layout", payload);
-}
-
 #pragma mark - Touches
 
 static folly::dynamic touchPayload(const Touch &touch) {
@@ -71,20 +43,28 @@ static folly::dynamic touchEventPayload(const TouchEvent &event) {
   return object;
 }
 
-void ViewEventEmitter::onTouchStart(const TouchEvent &event) const {
-  dispatchEvent("touchStart", touchEventPayload(event));
+void TouchEventEmitter::onTouchStart(const TouchEvent &event) const {
+  dispatchEvent(
+      "touchStart",
+      touchEventPayload(event),
+      EventPriority::SynchronousUnbatched);
 }
 
-void ViewEventEmitter::onTouchMove(const TouchEvent &event) const {
-  dispatchEvent("touchMove", touchEventPayload(event));
+void TouchEventEmitter::onTouchMove(const TouchEvent &event) const {
+  dispatchEvent(
+      "touchMove", touchEventPayload(event), EventPriority::SynchronousBatched);
 }
 
-void ViewEventEmitter::onTouchEnd(const TouchEvent &event) const {
-  dispatchEvent("touchEnd", touchEventPayload(event));
+void TouchEventEmitter::onTouchEnd(const TouchEvent &event) const {
+  dispatchEvent(
+      "touchEnd", touchEventPayload(event), EventPriority::SynchronousBatched);
 }
 
-void ViewEventEmitter::onTouchCancel(const TouchEvent &event) const {
-  dispatchEvent("touchCancel", touchEventPayload(event));
+void TouchEventEmitter::onTouchCancel(const TouchEvent &event) const {
+  dispatchEvent(
+      "touchCancel",
+      touchEventPayload(event),
+      EventPriority::SynchronousBatched);
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/view/ViewEventEmitter.h b/ReactCommon/fabric/components/view/TouchEventEmitter.h
similarity index 76%
rename from ReactCommon/fabric/view/ViewEventEmitter.h
rename to ReactCommon/fabric/components/view/TouchEventEmitter.h
index 04af2fee6e10cb..ce8ddfb2e55c36 100644
--- a/ReactCommon/fabric/view/ViewEventEmitter.h
+++ b/ReactCommon/fabric/components/view/TouchEventEmitter.h
@@ -6,11 +6,9 @@
  */
 #pragma once
 
-#include <memory>
-
-#include <fabric/core/EventEmitter.h>
 #include <fabric/core/LayoutMetrics.h>
 #include <fabric/core/ReactPrimitives.h>
+#include <fabric/events/EventEmitter.h>
 
 namespace facebook {
 namespace react {
@@ -41,8 +39,9 @@ struct Touch {
   int identifier;
 
   /*
-   * The tag of a component on which the touch point started when it was first placed on the surface,
-   * even if the touch point has since moved outside the interactive area of that element.
+   * The tag of a component on which the touch point started when it was first
+   * placed on the surface, even if the touch point has since moved outside the
+   * interactive area of that element.
    */
   Tag target;
 
@@ -58,8 +57,8 @@ struct Touch {
 
   /*
    * The particular implementation of `Hasher` and (especially) `Comparator`
-   * make sense only when `Touch` object is used as a *key* in indexed collections.
-   * Because of that they are expressed as separate classes.
+   * make sense only when `Touch` object is used as a *key* in indexed
+   * collections. Because of that they are expressed as separate classes.
    */
   struct Hasher {
     size_t operator()(const Touch &touch) const {
@@ -77,16 +76,19 @@ struct Touch {
 using Touches = std::unordered_set<Touch, Touch::Hasher, Touch::Comparator>;
 
 /*
- * Defines the `touchstart`, `touchend`, `touchmove`, and `touchcancel` event types.
+ * Defines the `touchstart`, `touchend`, `touchmove`, and `touchcancel` event
+ * types.
  */
 struct TouchEvent {
   /*
-   * A list of Touches for every point of contact currently touching the surface.
+   * A list of Touches for every point of contact currently touching the
+   * surface.
    */
   Touches touches;
 
   /*
-   * A list of Touches for every point of contact which contributed to the event.
+   * A list of Touches for every point of contact which contributed to the
+   * event.
    */
   Touches changedTouches;
 
@@ -97,29 +99,13 @@ struct TouchEvent {
   Touches targetTouches;
 };
 
-class ViewEventEmitter;
-
-using SharedViewEventEmitter = std::shared_ptr<const ViewEventEmitter>;
-
-class ViewEventEmitter:
-  public EventEmitter {
-
-public:
+class TouchEventEmitter;
+using SharedTouchEventEmitter = std::shared_ptr<const TouchEventEmitter>;
 
+class TouchEventEmitter : public EventEmitter {
+ public:
   using EventEmitter::EventEmitter;
 
-#pragma mark - Accessibility
-
-  void onAccessibilityAction(const std::string &name) const;
-  void onAccessibilityTap() const;
-  void onAccessibilityMagicTap() const;
-
-#pragma mark - Layout
-
-  void onLayout(const LayoutMetrics &layoutMetrics) const;
-
-#pragma mark - Touches
-
   void onTouchStart(const TouchEvent &event) const;
   void onTouchMove(const TouchEvent &event) const;
   void onTouchEnd(const TouchEvent &event) const;
diff --git a/ReactCommon/fabric/view/ViewComponentDescriptor.h b/ReactCommon/fabric/components/view/ViewComponentDescriptor.h
similarity index 78%
rename from ReactCommon/fabric/view/ViewComponentDescriptor.h
rename to ReactCommon/fabric/components/view/ViewComponentDescriptor.h
index 4c25d8b943b663..fe8a6f74f43f82 100644
--- a/ReactCommon/fabric/view/ViewComponentDescriptor.h
+++ b/ReactCommon/fabric/components/view/ViewComponentDescriptor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include <fabric/components/view/ViewShadowNode.h>
 #include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/view/ViewShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/ViewEventEmitter.cpp b/ReactCommon/fabric/components/view/ViewEventEmitter.cpp
new file mode 100644
index 00000000000000..16c1d6e1630854
--- /dev/null
+++ b/ReactCommon/fabric/components/view/ViewEventEmitter.cpp
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ViewEventEmitter.h"
+
+namespace facebook {
+namespace react {
+
+#pragma mark - Accessibility
+
+void ViewEventEmitter::onAccessibilityAction(const std::string &name) const {
+  dispatchEvent("accessibilityAction", folly::dynamic::object("action", name));
+}
+
+void ViewEventEmitter::onAccessibilityTap() const {
+  dispatchEvent("accessibilityTap");
+}
+
+void ViewEventEmitter::onAccessibilityMagicTap() const {
+  dispatchEvent("magicTap");
+}
+
+#pragma mark - Layout
+
+void ViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
+  folly::dynamic payload = folly::dynamic::object();
+  const auto &frame = layoutMetrics.frame;
+  payload["layout"] =
+      folly::dynamic::object("x", frame.origin.x)("y", frame.origin.y)(
+          "width", frame.size.width)("height", frame.size.height);
+
+  dispatchEvent("layout", payload);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/view/ViewEventEmitter.h b/ReactCommon/fabric/components/view/ViewEventEmitter.h
new file mode 100644
index 00000000000000..e410a43da5e675
--- /dev/null
+++ b/ReactCommon/fabric/components/view/ViewEventEmitter.h
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <memory>
+
+#include <fabric/core/LayoutMetrics.h>
+#include <fabric/core/ReactPrimitives.h>
+#include "TouchEventEmitter.h"
+
+namespace facebook {
+namespace react {
+
+class ViewEventEmitter;
+
+using SharedViewEventEmitter = std::shared_ptr<const ViewEventEmitter>;
+
+class ViewEventEmitter : public TouchEventEmitter {
+ public:
+  using TouchEventEmitter::TouchEventEmitter;
+
+#pragma mark - Accessibility
+
+  void onAccessibilityAction(const std::string &name) const;
+  void onAccessibilityTap() const;
+  void onAccessibilityMagicTap() const;
+
+#pragma mark - Layout
+
+  void onLayout(const LayoutMetrics &layoutMetrics) const;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/view/ViewProps.cpp b/ReactCommon/fabric/components/view/ViewProps.cpp
new file mode 100644
index 00000000000000..91c2742d29dd7d
--- /dev/null
+++ b/ReactCommon/fabric/components/view/ViewProps.cpp
@@ -0,0 +1,124 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ViewProps.h"
+
+#include <fabric/components/view/conversions.h>
+#include <fabric/components/view/propsConversions.h>
+#include <fabric/core/propsConversions.h>
+#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <fabric/graphics/conversions.h>
+
+namespace facebook {
+namespace react {
+
+ViewProps::ViewProps(const YGStyle &yogaStyle) : YogaStylableProps(yogaStyle) {}
+
+ViewProps::ViewProps(const ViewProps &sourceProps, const RawProps &rawProps)
+    : Props(sourceProps, rawProps),
+      YogaStylableProps(sourceProps, rawProps),
+      AccessibilityProps(sourceProps, rawProps),
+      opacity(
+          convertRawProp(rawProps, "opacity", sourceProps.opacity, (Float)1.0)),
+      foregroundColor(convertRawProp(
+          rawProps,
+          "foregroundColor",
+          sourceProps.foregroundColor)),
+      backgroundColor(convertRawProp(
+          rawProps,
+          "backgroundColor",
+          sourceProps.backgroundColor)),
+      borderRadii(convertRawProp(
+          rawProps,
+          "border",
+          "Radius",
+          sourceProps.borderRadii)),
+      borderColors(convertRawProp(
+          rawProps,
+          "border",
+          "Color",
+          sourceProps.borderColors)),
+      borderStyles(convertRawProp(
+          rawProps,
+          "border",
+          "Style",
+          sourceProps.borderStyles)),
+      shadowColor(
+          convertRawProp(rawProps, "shadowColor", sourceProps.shadowColor)),
+      shadowOffset(
+          convertRawProp(rawProps, "shadowOffset", sourceProps.shadowOffset)),
+      shadowOpacity(
+          convertRawProp(rawProps, "shadowOpacity", sourceProps.shadowOpacity)),
+      shadowRadius(
+          convertRawProp(rawProps, "shadowRadius", sourceProps.shadowRadius)),
+      transform(convertRawProp(rawProps, "transform", sourceProps.transform)),
+      backfaceVisibility(convertRawProp(
+          rawProps,
+          "backfaceVisibility",
+          sourceProps.backfaceVisibility)),
+      shouldRasterize(convertRawProp(
+          rawProps,
+          "shouldRasterize",
+          sourceProps.shouldRasterize)),
+      zIndex(convertRawProp(rawProps, "zIndex", sourceProps.zIndex)),
+      pointerEvents(
+          convertRawProp(rawProps, "pointerEvents", sourceProps.pointerEvents)),
+      hitSlop(convertRawProp(rawProps, "hitSlop", sourceProps.hitSlop)),
+      onLayout(convertRawProp(rawProps, "onLayout", sourceProps.onLayout)),
+      collapsable(convertRawProp(
+          rawProps,
+          "collapsable",
+          sourceProps.collapsable,
+          true)){};
+
+#pragma mark - Convenience Methods
+
+BorderMetrics ViewProps::resolveBorderMetrics(bool isRTL) const {
+  auto borderWidths = CascadedBorderWidths{
+      .left = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeLeft]),
+      .top = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeTop]),
+      .right = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeRight]),
+      .bottom = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeBottom]),
+      .start = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeStart]),
+      .end = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeEnd]),
+      .horizontal =
+          optionalFloatFromYogaValue(yogaStyle.border[YGEdgeHorizontal]),
+      .vertical = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeVertical]),
+      .all = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeAll])};
+
+  return {.borderColors = borderColors.resolve(isRTL, {}),
+          .borderWidths = borderWidths.resolve(isRTL, 0),
+          .borderRadii = borderRadii.resolve(isRTL, 0),
+          .borderStyles = borderStyles.resolve(isRTL, BorderStyle::Solid)};
+}
+
+#pragma mark - DebugStringConvertible
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList ViewProps::getDebugProps() const {
+  const auto &defaultViewProps = ViewProps();
+
+  return AccessibilityProps::getDebugProps() +
+      YogaStylableProps::getDebugProps() +
+      SharedDebugStringConvertibleList{
+          debugStringConvertibleItem("zIndex", zIndex, defaultViewProps.zIndex),
+          debugStringConvertibleItem(
+              "opacity", opacity, defaultViewProps.opacity),
+          debugStringConvertibleItem(
+              "foregroundColor",
+              foregroundColor,
+              defaultViewProps.foregroundColor),
+          debugStringConvertibleItem(
+              "backgroundColor",
+              backgroundColor,
+              defaultViewProps.backgroundColor),
+      };
+}
+#endif
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/view/ViewProps.h b/ReactCommon/fabric/components/view/ViewProps.h
new file mode 100644
index 00000000000000..69d355e8e97a73
--- /dev/null
+++ b/ReactCommon/fabric/components/view/ViewProps.h
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/view/AccessibilityProps.h>
+#include <fabric/components/view/YogaStylableProps.h>
+#include <fabric/components/view/primitives.h>
+#include <fabric/core/Props.h>
+#include <fabric/graphics/Color.h>
+#include <fabric/graphics/Geometry.h>
+
+namespace facebook {
+namespace react {
+
+class ViewProps;
+
+using SharedViewProps = std::shared_ptr<const ViewProps>;
+
+class ViewProps : public Props,
+                  public YogaStylableProps,
+                  public AccessibilityProps {
+ public:
+  ViewProps() = default;
+  ViewProps(const YGStyle &yogaStyle);
+  ViewProps(const ViewProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  // Color
+  const Float opacity{1.0};
+  const SharedColor foregroundColor{};
+  const SharedColor backgroundColor{};
+
+  // Borders
+  const CascadedBorderRadii borderRadii{};
+  const CascadedBorderColors borderColors{};
+  const CascadedBorderStyles borderStyles{};
+
+  // Shadow
+  const SharedColor shadowColor{};
+  const Size shadowOffset{};
+  const Float shadowOpacity{};
+  const Float shadowRadius{};
+
+  // Transform
+  const Transform transform{};
+  const bool backfaceVisibility{};
+  const bool shouldRasterize{};
+  const int zIndex{};
+
+  // Events
+  const PointerEventsMode pointerEvents{};
+  const EdgeInsets hitSlop{};
+  const bool onLayout{};
+
+  const bool collapsable{true};
+
+#pragma mark - Convenience Methods
+
+  BorderMetrics resolveBorderMetrics(bool isRTL) const;
+
+#pragma mark - DebugStringConvertible
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/view/ViewShadowNode.cpp b/ReactCommon/fabric/components/view/ViewShadowNode.cpp
new file mode 100644
index 00000000000000..1ef7a291b7d29f
--- /dev/null
+++ b/ReactCommon/fabric/components/view/ViewShadowNode.cpp
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ViewShadowNode.h"
+
+namespace facebook {
+namespace react {
+
+const char ViewComponentName[] = "View";
+
+bool ViewShadowNode::isLayoutOnly() const {
+  const auto &viewProps = *std::static_pointer_cast<const ViewProps>(props_);
+
+  return
+      viewProps.collapsable &&
+      // Event listeners
+      !viewProps.onLayout &&
+      // Generic Props
+      viewProps.nativeId.empty() &&
+      // Accessibility Props
+      !viewProps.accessible &&
+      // Style Props
+      viewProps.yogaStyle.overflow == YGOverflowVisible &&
+      viewProps.opacity == 1.0 && !viewProps.backgroundColor &&
+      !viewProps.foregroundColor && !viewProps.shadowColor &&
+      viewProps.transform == Transform{} && viewProps.zIndex == 0 &&
+      // Layout Metrics
+      getLayoutMetrics().borderWidth == EdgeInsets{};
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/view/ViewShadowNode.h b/ReactCommon/fabric/components/view/ViewShadowNode.h
new file mode 100644
index 00000000000000..d3eb4edcd9a36c
--- /dev/null
+++ b/ReactCommon/fabric/components/view/ViewShadowNode.h
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/view/ConcreteViewShadowNode.h>
+#include <fabric/components/view/ViewProps.h>
+
+namespace facebook {
+namespace react {
+
+extern const char ViewComponentName[];
+
+/*
+ * `ShadowNode` for <View> component.
+ */
+class ViewShadowNode final : public ConcreteViewShadowNode<
+                                 ViewComponentName,
+                                 ViewProps,
+                                 ViewEventEmitter> {
+ public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+  bool isLayoutOnly() const;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/view/accessibility/AccessibilityPrimitives.h b/ReactCommon/fabric/components/view/accessibility/AccessibilityPrimitives.h
similarity index 59%
rename from ReactCommon/fabric/view/accessibility/AccessibilityPrimitives.h
rename to ReactCommon/fabric/components/view/accessibility/AccessibilityPrimitives.h
index 60e73f1c485ba8..36d4c221d6f2e7 100644
--- a/ReactCommon/fabric/view/accessibility/AccessibilityPrimitives.h
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibilityPrimitives.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,10 +7,12 @@
 
 #pragma once
 
+#include <cinttypes>
+
 namespace facebook {
 namespace react {
 
-enum class AccessibilityTraits: uint32_t {
+enum class AccessibilityTraits : uint32_t {
   None = 0,
   Button = (1 << 0),
   Link = (1 << 1),
@@ -25,14 +27,22 @@ enum class AccessibilityTraits: uint32_t {
   SearchField = (1 << 10),
   StartsMediaSession = (1 << 11),
   Adjustable = (1 << 12),
-  DirectInteraction = (1 << 13),
+  AllowsDirectInteraction = (1 << 13),
   CausesPageTurn = (1 << 14),
   Header = (1 << 15),
 };
 
-constexpr enum AccessibilityTraits operator |(const enum AccessibilityTraits lhs, const enum AccessibilityTraits rhs) {
+constexpr enum AccessibilityTraits operator|(
+    const enum AccessibilityTraits lhs,
+    const enum AccessibilityTraits rhs) {
   return (enum AccessibilityTraits)((uint32_t)lhs | (uint32_t)rhs);
 }
 
+constexpr enum AccessibilityTraits operator&(
+    const enum AccessibilityTraits lhs,
+    const enum AccessibilityTraits rhs) {
+  return (enum AccessibilityTraits)((uint32_t)lhs & (uint32_t)rhs);
+}
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp
new file mode 100644
index 00000000000000..84d18dfc813bd5
--- /dev/null
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "AccessibilityProps.h"
+
+#include <fabric/components/view/accessibilityPropsConversions.h>
+#include <fabric/components/view/propsConversions.h>
+#include <fabric/core/propsConversions.h>
+
+namespace facebook {
+namespace react {
+
+AccessibilityProps::AccessibilityProps(
+    const AccessibilityProps &sourceProps,
+    const RawProps &rawProps)
+    : accessible(convertRawProp(
+          rawProps,
+          "accessible",
+          sourceProps.accessible)),
+      accessibilityTraits(convertRawProp(
+          rawProps,
+          "accessibilityTraits",
+          sourceProps.accessibilityTraits)),
+      accessibilityLabel(convertRawProp(
+          rawProps,
+          "accessibilityLabel",
+          sourceProps.accessibilityLabel)),
+      accessibilityHint(convertRawProp(
+          rawProps,
+          "accessibilityHint",
+          sourceProps.accessibilityHint)),
+      accessibilityActions(convertRawProp(
+          rawProps,
+          "accessibilityActions",
+          sourceProps.accessibilityActions)),
+      accessibilityViewIsModal(convertRawProp(
+          rawProps,
+          "accessibilityViewIsModal",
+          sourceProps.accessibilityViewIsModal)),
+      accessibilityElementsHidden(convertRawProp(
+          rawProps,
+          "accessibilityElementsHidden",
+          sourceProps.accessibilityElementsHidden)),
+      accessibilityIgnoresInvertColors(convertRawProp(
+          rawProps,
+          "accessibilityIgnoresInvertColors",
+          sourceProps.accessibilityIgnoresInvertColors)) {}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h
new file mode 100644
index 00000000000000..66fe5538940c29
--- /dev/null
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/view/AccessibilityPrimitives.h>
+#include <fabric/core/Props.h>
+#include <fabric/core/ReactPrimitives.h>
+#include <fabric/debug/DebugStringConvertible.h>
+
+namespace facebook {
+namespace react {
+
+class AccessibilityProps;
+
+typedef std::shared_ptr<const AccessibilityProps> SharedAccessibilityProps;
+
+class AccessibilityProps : public virtual DebugStringConvertible {
+ public:
+  AccessibilityProps() = default;
+  AccessibilityProps(
+      const AccessibilityProps &sourceProps,
+      const RawProps &rawProps);
+
+#pragma mark - Props
+
+  const bool accessible{false};
+  const AccessibilityTraits accessibilityTraits{AccessibilityTraits::None};
+  const std::string accessibilityLabel{""};
+  const std::string accessibilityHint{""};
+  const std::vector<std::string> accessibilityActions{};
+  const bool accessibilityViewIsModal{false};
+  const bool accessibilityElementsHidden{false};
+  const bool accessibilityIgnoresInvertColors{false};
+  const std::string testId{""};
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/view/accessibility/AccessibleShadowNode.cpp b/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.cpp
similarity index 65%
rename from ReactCommon/fabric/view/accessibility/AccessibleShadowNode.cpp
rename to ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.cpp
index 4941cd49e2852f..627f1c2f0a24ac 100644
--- a/ReactCommon/fabric/view/accessibility/AccessibleShadowNode.cpp
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,17 +13,13 @@ namespace facebook {
 namespace react {
 
 AccessibleShadowNode::AccessibleShadowNode(
-  const SharedAccessibilityProps &props
-) {
+    const SharedAccessibilityProps &props) {
   assert(props);
 }
 
 AccessibleShadowNode::AccessibleShadowNode(
-  const SharedAccessibleShadowNode &shadowNode,
-  const SharedAccessibilityProps &props
-) {
-  assert(shadowNode);
-}
+    const AccessibleShadowNode &shadowNode,
+    const SharedAccessibilityProps &props) {}
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/view/accessibility/AccessibleShadowNode.h b/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.h
similarity index 55%
rename from ReactCommon/fabric/view/accessibility/AccessibleShadowNode.h
rename to ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.h
index 1fa8316ba6d4ca..88a490ccde5a83 100644
--- a/ReactCommon/fabric/view/accessibility/AccessibleShadowNode.h
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,32 +9,27 @@
 
 #include <memory>
 
+#include <fabric/components/view/AccessibilityProps.h>
 #include <fabric/core/ShadowNode.h>
-#include <fabric/view/AccessibilityProps.h>
 
 namespace facebook {
 namespace react {
 
 class AccessibleShadowNode;
 
-typedef std::shared_ptr<const AccessibleShadowNode> SharedAccessibleShadowNode;
+using SharedAccessibleShadowNode = std::shared_ptr<const AccessibleShadowNode>;
 
 class AccessibleShadowNode {
-
-public:
-
+ public:
 #pragma mark - Constructors
 
   AccessibleShadowNode() = default;
 
-  AccessibleShadowNode(
-    const SharedAccessibilityProps &props
-  );
+  AccessibleShadowNode(const SharedAccessibilityProps &props);
 
   AccessibleShadowNode(
-    const SharedAccessibleShadowNode &shadowNode,
-    const SharedAccessibilityProps &props = nullptr
-  );
+      const AccessibleShadowNode &shadowNode,
+      const SharedAccessibilityProps &props = nullptr);
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/components/view/accessibility/accessibilityPropsConversions.h b/ReactCommon/fabric/components/view/accessibility/accessibilityPropsConversions.h
new file mode 100644
index 00000000000000..2e73874dee2518
--- /dev/null
+++ b/ReactCommon/fabric/components/view/accessibility/accessibilityPropsConversions.h
@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/view/AccessibilityPrimitives.h>
+#include <folly/dynamic.h>
+
+namespace facebook {
+namespace react {
+
+inline void fromString(const std::string &string, AccessibilityTraits &result) {
+  if (string == "none") {
+    result = AccessibilityTraits::None;
+    return;
+  }
+  if (string == "button") {
+    result = AccessibilityTraits::Button;
+    return;
+  }
+  if (string == "link") {
+    result = AccessibilityTraits::Link;
+    return;
+  }
+  if (string == "image") {
+    result = AccessibilityTraits::Image;
+    return;
+  }
+  if (string == "selected") {
+    result = AccessibilityTraits::Selected;
+    return;
+  }
+  if (string == "plays") {
+    result = AccessibilityTraits::PlaysSound;
+    return;
+  }
+  if (string == "keyboardkey") {
+    result = AccessibilityTraits::KeyboardKey;
+    return;
+  }
+  if (string == "text") {
+    result = AccessibilityTraits::StaticText;
+    return;
+  }
+  if (string == "disabled") {
+    result = AccessibilityTraits::NotEnabled;
+    return;
+  }
+  if (string == "frequentUpdates") {
+    result = AccessibilityTraits::UpdatesFrequently;
+    return;
+  }
+  if (string == "search") {
+    result = AccessibilityTraits::SearchField;
+    return;
+  }
+  if (string == "startsMedia") {
+    result = AccessibilityTraits::StartsMediaSession;
+    return;
+  }
+  if (string == "adjustable") {
+    result = AccessibilityTraits::Adjustable;
+    return;
+  }
+  if (string == "allowsDirectInteraction") {
+    result = AccessibilityTraits::AllowsDirectInteraction;
+    return;
+  }
+  if (string == "pageTurn") {
+    result = AccessibilityTraits::CausesPageTurn;
+    return;
+  }
+  if (string == "header") {
+    result = AccessibilityTraits::Header;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(
+    const folly::dynamic &value,
+    AccessibilityTraits &result) {
+  if (value.isString()) {
+    fromString(value.asString(), result);
+    return;
+  }
+
+  if (value.isArray()) {
+    result = {};
+    for (auto &item : value) {
+      auto string = item.asString();
+      AccessibilityTraits itemAccessibilityTraits;
+      fromString(value.asString(), itemAccessibilityTraits);
+      result = result | itemAccessibilityTraits;
+    }
+  }
+
+  abort();
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/view/conversions.h b/ReactCommon/fabric/components/view/conversions.h
new file mode 100644
index 00000000000000..0b541379e4e94d
--- /dev/null
+++ b/ReactCommon/fabric/components/view/conversions.h
@@ -0,0 +1,619 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/view/primitives.h>
+#include <fabric/core/LayoutMetrics.h>
+#include <fabric/graphics/Geometry.h>
+#include <folly/Conv.h>
+#include <folly/dynamic.h>
+#include <yoga/YGNode.h>
+#include <yoga/Yoga.h>
+
+namespace facebook {
+namespace react {
+
+inline Float floatFromYogaFloat(float value) {
+  if (value == YGUndefined) {
+    return kFloatUndefined;
+  }
+
+  return (Float)value;
+}
+
+inline float yogaFloatFromFloat(Float value) {
+  if (value == kFloatUndefined) {
+    return YGUndefined;
+  }
+
+  return (float)value;
+}
+
+inline Float floatFromYogaOptionalFloat(YGFloatOptional value) {
+  if (value.isUndefined()) {
+    return kFloatUndefined;
+  }
+
+  return floatFromYogaFloat(value.getValue());
+}
+
+inline YGFloatOptional yogaOptionalFloatFromFloat(Float value) {
+  if (value == kFloatUndefined) {
+    return YGFloatOptional();
+  }
+
+  return YGFloatOptional(yogaFloatFromFloat(value));
+}
+
+inline YGValue yogaStyleValueFromFloat(const Float &value) {
+  if (isnan(value) || value == kFloatUndefined) {
+    return YGValueUndefined;
+  }
+
+  return {(float)value, YGUnitPoint};
+}
+
+inline folly::Optional<Float> optionalFloatFromYogaValue(
+    const YGValue &value,
+    folly::Optional<Float> base = {}) {
+  switch (value.unit) {
+    case YGUnitUndefined:
+      return {};
+    case YGUnitPoint:
+      return floatFromYogaFloat(value.value);
+    case YGUnitPercent:
+      return base.has_value()
+          ? folly::Optional<Float>(
+                base.value() * floatFromYogaFloat(value.value))
+          : folly::Optional<Float>();
+    case YGUnitAuto:
+      return {};
+  }
+}
+
+inline LayoutMetrics layoutMetricsFromYogaNode(YGNode &yogaNode) {
+  auto layoutMetrics = LayoutMetrics{};
+
+  layoutMetrics.frame =
+      Rect{Point{floatFromYogaFloat(YGNodeLayoutGetLeft(&yogaNode)),
+                 floatFromYogaFloat(YGNodeLayoutGetTop(&yogaNode))},
+           Size{floatFromYogaFloat(YGNodeLayoutGetWidth(&yogaNode)),
+                floatFromYogaFloat(YGNodeLayoutGetHeight(&yogaNode))}};
+
+  layoutMetrics.borderWidth = EdgeInsets{
+      floatFromYogaFloat(YGNodeLayoutGetBorder(&yogaNode, YGEdgeLeft)),
+      floatFromYogaFloat(YGNodeLayoutGetBorder(&yogaNode, YGEdgeTop)),
+      floatFromYogaFloat(YGNodeLayoutGetBorder(&yogaNode, YGEdgeRight)),
+      floatFromYogaFloat(YGNodeLayoutGetBorder(&yogaNode, YGEdgeBottom))};
+
+  layoutMetrics.contentInsets = EdgeInsets{
+      layoutMetrics.borderWidth.left +
+          floatFromYogaFloat(YGNodeLayoutGetPadding(&yogaNode, YGEdgeLeft)),
+      layoutMetrics.borderWidth.top +
+          floatFromYogaFloat(YGNodeLayoutGetPadding(&yogaNode, YGEdgeTop)),
+      layoutMetrics.borderWidth.right +
+          floatFromYogaFloat(YGNodeLayoutGetPadding(&yogaNode, YGEdgeRight)),
+      layoutMetrics.borderWidth.bottom +
+          floatFromYogaFloat(YGNodeLayoutGetPadding(&yogaNode, YGEdgeBottom))};
+
+  layoutMetrics.displayType = yogaNode.getStyle().display == YGDisplayNone
+      ? DisplayType::None
+      : DisplayType::Flex;
+
+  layoutMetrics.layoutDirection =
+      YGNodeLayoutGetDirection(&yogaNode) == YGDirectionRTL
+      ? LayoutDirection::RightToLeft
+      : LayoutDirection::LeftToRight;
+
+  return layoutMetrics;
+}
+
+inline YGDirection yogaDirectionFromLayoutDirection(LayoutDirection direction) {
+  switch (direction) {
+    case LayoutDirection::Undefined:
+      return YGDirectionInherit;
+    case LayoutDirection::LeftToRight:
+      return YGDirectionLTR;
+    case LayoutDirection::RightToLeft:
+      return YGDirectionRTL;
+  }
+}
+
+inline void fromDynamic(const folly::dynamic &value, YGDirection &result) {
+  assert(value.isString());
+  auto stringValue = value.asString();
+  if (stringValue == "inherit") {
+    result = YGDirectionInherit;
+    return;
+  }
+  if (stringValue == "ltr") {
+    result = YGDirectionLTR;
+    return;
+  }
+  if (stringValue == "rtl") {
+    result = YGDirectionRTL;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(const folly::dynamic &value, YGFlexDirection &result) {
+  assert(value.isString());
+  auto stringValue = value.asString();
+  if (stringValue == "column") {
+    result = YGFlexDirectionColumn;
+    return;
+  }
+  if (stringValue == "column-reverse") {
+    result = YGFlexDirectionColumnReverse;
+    return;
+  }
+  if (stringValue == "row") {
+    result = YGFlexDirectionRow;
+    return;
+  }
+  if (stringValue == "row-reverse") {
+    result = YGFlexDirectionRowReverse;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(const folly::dynamic &value, YGJustify &result) {
+  assert(value.isString());
+  auto stringValue = value.asString();
+  if (stringValue == "flex-start") {
+    result = YGJustifyFlexStart;
+    return;
+  }
+  if (stringValue == "center") {
+    result = YGJustifyCenter;
+    return;
+  }
+  if (stringValue == "flex-end") {
+    result = YGJustifyFlexEnd;
+    return;
+  }
+  if (stringValue == "space-between") {
+    result = YGJustifySpaceBetween;
+    return;
+  }
+  if (stringValue == "space-around") {
+    result = YGJustifySpaceAround;
+    return;
+  }
+  if (stringValue == "space-evenly") {
+    result = YGJustifySpaceEvenly;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(const folly::dynamic &value, YGAlign &result) {
+  assert(value.isString());
+  auto stringValue = value.asString();
+  if (stringValue == "auto") {
+    result = YGAlignAuto;
+    return;
+  }
+  if (stringValue == "flex-start") {
+    result = YGAlignFlexStart;
+    return;
+  }
+  if (stringValue == "center") {
+    result = YGAlignCenter;
+    return;
+  }
+  if (stringValue == "flex-end") {
+    result = YGAlignFlexEnd;
+    return;
+  }
+  if (stringValue == "stretch") {
+    result = YGAlignStretch;
+    return;
+  }
+  if (stringValue == "baseline") {
+    result = YGAlignBaseline;
+    return;
+  }
+  if (stringValue == "between") {
+    result = YGAlignSpaceBetween;
+    return;
+  }
+  if (stringValue == "space-around") {
+    result = YGAlignSpaceAround;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(const folly::dynamic &value, YGPositionType &result) {
+  assert(value.isString());
+  auto stringValue = value.asString();
+  if (stringValue == "relative") {
+    result = YGPositionTypeRelative;
+    return;
+  }
+  if (stringValue == "absolute") {
+    result = YGPositionTypeAbsolute;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(const folly::dynamic &value, YGWrap &result) {
+  assert(value.isString());
+  auto stringValue = value.asString();
+  if (stringValue == "no-wrap") {
+    result = YGWrapNoWrap;
+    return;
+  }
+  if (stringValue == "wrap") {
+    result = YGWrapWrap;
+    return;
+  }
+  if (stringValue == "wrap-reverse") {
+    result = YGWrapWrapReverse;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(const folly::dynamic &value, YGOverflow &result) {
+  assert(value.isString());
+  auto stringValue = value.asString();
+  if (stringValue == "visible") {
+    result = YGOverflowVisible;
+    return;
+  }
+  if (stringValue == "hidden") {
+    result = YGOverflowHidden;
+    return;
+  }
+  if (stringValue == "scroll") {
+    result = YGOverflowScroll;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(const folly::dynamic &value, YGDisplay &result) {
+  assert(value.isString());
+  auto stringValue = value.asString();
+  if (stringValue == "flex") {
+    result = YGDisplayFlex;
+    return;
+  }
+  if (stringValue == "none") {
+    result = YGDisplayNone;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(const folly::dynamic &value, YGValue &result) {
+  if (value.isNumber()) {
+    result = yogaStyleValueFromFloat(value.asDouble());
+    return;
+  } else if (value.isString()) {
+    const auto stringValue = value.asString();
+    if (stringValue == "auto") {
+      result = YGValueUndefined;
+      return;
+    } else {
+      if (stringValue.back() == '%') {
+        result = {
+            folly::to<float>(stringValue.substr(0, stringValue.length() - 1)),
+            YGUnitPercent};
+        return;
+      } else {
+        result = {folly::to<float>(stringValue), YGUnitPoint};
+        return;
+      }
+    }
+  }
+  result = YGValueUndefined;
+}
+
+inline void fromDynamic(const folly::dynamic &value, YGFloatOptional &result) {
+  if (value.isNumber()) {
+    result = YGFloatOptional(value.asDouble());
+    return;
+  } else if (value.isString()) {
+    const auto stringValue = value.asString();
+    if (stringValue == "auto") {
+      result = YGFloatOptional();
+      return;
+    }
+  }
+  abort();
+}
+
+inline void fromDynamic(const folly::dynamic &value, Transform &result) {
+  assert(value.isArray());
+  auto transformMatrix = Transform{};
+  for (const auto &tranformConfiguration : value) {
+    assert(tranformConfiguration.isObject());
+    auto pair = *tranformConfiguration.items().begin();
+    const auto &operation = pair.first.asString();
+    const auto &parameters = pair.second;
+
+    if (operation == "matrix") {
+      assert(parameters.isArray());
+      assert(parameters.size() == transformMatrix.matrix.size());
+      auto i = 0;
+      for (auto item : parameters) {
+        transformMatrix.matrix[i++] = (Float)item.asDouble();
+      }
+    } else if (operation == "perspective") {
+      transformMatrix = transformMatrix *
+          Transform::Perspective((Float)parameters.asDouble());
+    } else if (operation == "rotateX") {
+      transformMatrix = transformMatrix *
+          Transform::Rotate((Float)parameters.asDouble(), 0, 0);
+    } else if (operation == "rotateY") {
+      transformMatrix = transformMatrix *
+          Transform::Rotate(0, (Float)parameters.asDouble(), 0);
+    } else if (operation == "rotateZ") {
+      transformMatrix = transformMatrix *
+          Transform::Rotate(0, 0, (Float)parameters.asDouble());
+    } else if (operation == "scale") {
+      transformMatrix = transformMatrix *
+          Transform::Scale((Float)parameters.asDouble(),
+                           (Float)parameters.asDouble(),
+                           (Float)parameters.asDouble());
+    } else if (operation == "scaleX") {
+      transformMatrix = transformMatrix *
+          Transform::Scale((Float)parameters.asDouble(), 0, 0);
+    } else if (operation == "scaleY") {
+      transformMatrix = transformMatrix *
+          Transform::Scale(0, (Float)parameters.asDouble(), 0);
+    } else if (operation == "scaleZ") {
+      transformMatrix = transformMatrix *
+          Transform::Scale(0, 0, (Float)parameters.asDouble());
+    } else if (operation == "translate") {
+      transformMatrix =
+          transformMatrix *
+          Transform::Translate(
+              parameters[0].asDouble(), parameters[1].asDouble(), 0);
+    } else if (operation == "translateX") {
+      transformMatrix =
+          transformMatrix * Transform::Translate(parameters.asDouble(), 0, 0);
+    } else if (operation == "translateY") {
+      transformMatrix =
+          transformMatrix * Transform::Translate(0, parameters.asDouble(), 0);
+    } else if (operation == "skewX") {
+      transformMatrix =
+          transformMatrix * Transform::Skew(parameters.asDouble(), 0);
+    } else if (operation == "skewY") {
+      transformMatrix =
+          transformMatrix * Transform::Skew(0, parameters.asDouble());
+    }
+  }
+
+  result = transformMatrix;
+}
+
+inline void fromDynamic(
+    const folly::dynamic &value,
+    PointerEventsMode &result) {
+  assert(value.isString());
+  auto stringValue = value.asString();
+  if (stringValue == "auto") {
+    result = PointerEventsMode::Auto;
+    return;
+  }
+  if (stringValue == "none") {
+    result = PointerEventsMode::None;
+    return;
+  }
+  if (stringValue == "box-none") {
+    result = PointerEventsMode::BoxNone;
+    return;
+  }
+  if (stringValue == "box-only") {
+    result = PointerEventsMode::BoxOnly;
+    return;
+  }
+  abort();
+}
+
+inline void fromDynamic(const folly::dynamic &value, BorderStyle &result) {
+  assert(value.isString());
+  auto stringValue = value.asString();
+  if (stringValue == "solid") {
+    result = BorderStyle::Solid;
+    return;
+  }
+  if (stringValue == "dotted") {
+    result = BorderStyle::Dotted;
+    return;
+  }
+  if (stringValue == "dashed") {
+    result = BorderStyle::Dashed;
+    return;
+  }
+  abort();
+}
+
+inline std::string toString(
+    const std::array<float, YGDimensionCount> &dimensions) {
+  return "{" + folly::to<std::string>(dimensions[0]) + ", " +
+      folly::to<std::string>(dimensions[1]) + "}";
+}
+
+inline std::string toString(const std::array<float, 4> &position) {
+  return "{" + folly::to<std::string>(position[0]) + ", " +
+      folly::to<std::string>(position[1]) + "}";
+}
+
+inline std::string toString(const std::array<float, YGEdgeCount> &edges) {
+  return "{" + folly::to<std::string>(edges[0]) + ", " +
+      folly::to<std::string>(edges[1]) + ", " +
+      folly::to<std::string>(edges[2]) + ", " +
+      folly::to<std::string>(edges[3]) + "}";
+}
+
+inline std::string toString(const YGDirection &value) {
+  switch (value) {
+    case YGDirectionInherit:
+      return "inherit";
+    case YGDirectionLTR:
+      return "ltr";
+    case YGDirectionRTL:
+      return "rtl";
+  }
+}
+
+inline std::string toString(const YGFlexDirection &value) {
+  switch (value) {
+    case YGFlexDirectionColumn:
+      return "column";
+    case YGFlexDirectionColumnReverse:
+      return "column-reverse";
+    case YGFlexDirectionRow:
+      return "row";
+    case YGFlexDirectionRowReverse:
+      return "row-reverse";
+  }
+}
+
+inline std::string toString(const YGJustify &value) {
+  switch (value) {
+    case YGJustifyFlexStart:
+      return "flex-start";
+    case YGJustifyCenter:
+      return "center";
+    case YGJustifyFlexEnd:
+      return "flex-end";
+    case YGJustifySpaceBetween:
+      return "space-between";
+    case YGJustifySpaceAround:
+      return "space-around";
+    case YGJustifySpaceEvenly:
+      return "space-evenly";
+  }
+}
+
+inline std::string toString(const YGAlign &value) {
+  switch (value) {
+    case YGAlignAuto:
+      return "auto";
+    case YGAlignFlexStart:
+      return "flex-start";
+    case YGAlignCenter:
+      return "center";
+    case YGAlignFlexEnd:
+      return "flex-end";
+    case YGAlignStretch:
+      return "stretch";
+    case YGAlignBaseline:
+      return "baseline";
+    case YGAlignSpaceBetween:
+      return "space-between";
+    case YGAlignSpaceAround:
+      return "space-around";
+  }
+}
+
+inline std::string toString(const YGPositionType &value) {
+  switch (value) {
+    case YGPositionTypeRelative:
+      return "relative";
+    case YGPositionTypeAbsolute:
+      return "absolute";
+  }
+}
+
+inline std::string toString(const YGWrap &value) {
+  switch (value) {
+    case YGWrapNoWrap:
+      return "no-wrap";
+    case YGWrapWrap:
+      return "wrap";
+    case YGWrapWrapReverse:
+      return "wrap-reverse";
+  }
+}
+
+inline std::string toString(const YGOverflow &value) {
+  switch (value) {
+    case YGOverflowVisible:
+      return "visible";
+    case YGOverflowScroll:
+      return "scroll";
+    case YGOverflowHidden:
+      return "hidden";
+  }
+}
+
+inline std::string toString(const YGDisplay &value) {
+  switch (value) {
+    case YGDisplayFlex:
+      return "flex";
+    case YGDisplayNone:
+      return "none";
+  }
+}
+
+inline std::string toString(const YGValue &value) {
+  switch (value.unit) {
+    case YGUnitUndefined:
+      return "undefined";
+    case YGUnitPoint:
+      return folly::to<std::string>(value.value);
+    case YGUnitPercent:
+      return folly::to<std::string>(value.value) + "%";
+    case YGUnitAuto:
+      return "auto";
+  }
+}
+
+inline std::string toString(const YGFloatOptional &value) {
+  if (value.isUndefined()) {
+    return "undefined";
+  }
+
+  return folly::to<std::string>(floatFromYogaFloat(value.getValue()));
+}
+
+inline std::string toString(
+    const std::array<YGValue, YGDimensionCount> &value) {
+  return "{" + toString(value[0]) + ", " + toString(value[1]) + "}";
+}
+
+inline std::string toString(const std::array<YGValue, YGEdgeCount> &value) {
+  static std::array<std::string, YGEdgeCount> names = {{"left",
+                                                        "top",
+                                                        "right",
+                                                        "bottom",
+                                                        "start",
+                                                        "end",
+                                                        "horizontal",
+                                                        "vertical",
+                                                        "all"}};
+
+  auto result = std::string{};
+  auto separator = std::string{", "};
+
+  for (auto i = 0; i < YGEdgeCount; i++) {
+    if (value[i].unit == YGUnitUndefined) {
+      continue;
+    }
+    result += names[i] + ": " + toString(value[i]) + separator;
+  }
+
+  if (!result.empty()) {
+    result.erase(result.length() - separator.length());
+  }
+
+  return "{" + result + "}";
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/view/primitives.h b/ReactCommon/fabric/components/view/primitives.h
new file mode 100644
index 00000000000000..4f3a00dd550b91
--- /dev/null
+++ b/ReactCommon/fabric/components/view/primitives.h
@@ -0,0 +1,337 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/graphics/Color.h>
+#include <fabric/graphics/Geometry.h>
+#include <folly/Optional.h>
+#include <array>
+#include <cmath>
+
+namespace facebook {
+namespace react {
+
+struct Transform {
+  std::array<Float, 16> matrix{
+      {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1}};
+
+  static Transform Identity() {
+    return {};
+  }
+
+  static Transform Perspective(const Float &perspective) {
+    auto transform = Transform{};
+    transform.matrix[11] = -1.0 / perspective;
+    return transform;
+  }
+
+  static Transform
+  Scale(const Float &factorX, const Float &factorY, const Float &factorZ) {
+    auto transform = Transform{};
+    transform.matrix[0] = factorX;
+    transform.matrix[5] = factorY;
+    transform.matrix[10] = factorZ;
+    return transform;
+  }
+
+  static Transform Translate(const Float &x, const Float &y, const Float &z) {
+    auto transform = Transform{};
+    transform.matrix[12] = x;
+    transform.matrix[13] = y;
+    transform.matrix[14] = z;
+    return transform;
+  }
+
+  static Transform Skew(const Float &x, const Float &y) {
+    auto transform = Transform{};
+    transform.matrix[4] = std::tan(x);
+    transform.matrix[1] = std::tan(y);
+    return transform;
+  }
+
+  static Transform RotateX(const Float &radians) {
+    auto transform = Transform{};
+    transform.matrix[5] = std::cos(radians);
+    transform.matrix[6] = std::sin(radians);
+    transform.matrix[9] = -std::sin(radians);
+    transform.matrix[10] = std::cos(radians);
+    return transform;
+  }
+
+  static Transform RotateY(const Float &radians) {
+    auto transform = Transform{};
+    transform.matrix[0] = std::cos(radians);
+    transform.matrix[2] = -std::sin(radians);
+    transform.matrix[8] = std::sin(radians);
+    transform.matrix[10] = std::cos(radians);
+    return transform;
+  }
+
+  static Transform RotateZ(const Float &radians) {
+    auto transform = Transform{};
+    transform.matrix[0] = std::cos(radians);
+    transform.matrix[1] = std::sin(radians);
+    transform.matrix[4] = -std::sin(radians);
+    transform.matrix[5] = std::cos(radians);
+    return transform;
+  }
+
+  static Transform Rotate(const Float &x, const Float &y, const Float &z) {
+    auto transform = Transform{};
+    if (x != 0) {
+      transform = transform * Transform::RotateX(x);
+    }
+    if (y != 0) {
+      transform = transform * Transform::RotateY(y);
+    }
+    if (z != 0) {
+      transform = transform * Transform::RotateZ(z);
+    }
+    return transform;
+  }
+
+  bool operator==(const Transform &rhs) const {
+    for (auto i = 0; i < 16; i++) {
+      if (matrix[i] != rhs.matrix[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  bool operator!=(const Transform &rhs) const {
+    return !(*this == rhs);
+  }
+
+  Transform operator*(const Transform &rhs) const {
+    if (*this == Transform::Identity()) {
+      return rhs;
+    }
+
+    const auto &lhs = *this;
+    auto result = Transform{};
+
+    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];
+    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;
+    result.matrix[3] =
+        rhs0 * lhs03 + rhs1 * lhs13 + rhs2 * lhs23 + rhs3 * lhs33;
+
+    rhs0 = rhs.matrix[4];
+    rhs1 = rhs.matrix[5];
+    rhs2 = rhs.matrix[6];
+    rhs3 = rhs.matrix[7];
+    result.matrix[4] =
+        rhs0 * lhs00 + rhs1 * lhs10 + rhs2 * lhs20 + rhs3 * lhs30;
+    result.matrix[5] =
+        rhs0 * lhs01 + rhs1 * lhs11 + rhs2 * lhs21 + rhs3 * lhs31;
+    result.matrix[6] =
+        rhs0 * lhs02 + rhs1 * lhs12 + rhs2 * lhs22 + rhs3 * lhs32;
+    result.matrix[7] =
+        rhs0 * lhs03 + rhs1 * lhs13 + rhs2 * lhs23 + rhs3 * lhs33;
+
+    rhs0 = rhs.matrix[8];
+    rhs1 = rhs.matrix[9];
+    rhs2 = rhs.matrix[10];
+    rhs3 = rhs.matrix[11];
+    result.matrix[8] =
+        rhs0 * lhs00 + rhs1 * lhs10 + rhs2 * lhs20 + rhs3 * lhs30;
+    result.matrix[9] =
+        rhs0 * lhs01 + rhs1 * lhs11 + rhs2 * lhs21 + rhs3 * lhs31;
+    result.matrix[10] =
+        rhs0 * lhs02 + rhs1 * lhs12 + rhs2 * lhs22 + rhs3 * lhs32;
+    result.matrix[11] =
+        rhs0 * lhs03 + rhs1 * lhs13 + rhs2 * lhs23 + rhs3 * lhs33;
+
+    rhs0 = rhs.matrix[12];
+    rhs1 = rhs.matrix[13];
+    rhs2 = rhs.matrix[14];
+    rhs3 = rhs.matrix[15];
+    result.matrix[12] =
+        rhs0 * lhs00 + rhs1 * lhs10 + rhs2 * lhs20 + rhs3 * lhs30;
+    result.matrix[13] =
+        rhs0 * lhs01 + rhs1 * lhs11 + rhs2 * lhs21 + rhs3 * lhs31;
+    result.matrix[14] =
+        rhs0 * lhs02 + rhs1 * lhs12 + rhs2 * lhs22 + rhs3 * lhs32;
+    result.matrix[15] =
+        rhs0 * lhs03 + rhs1 * lhs13 + rhs2 * lhs23 + rhs3 * lhs33;
+
+    return result;
+  }
+};
+
+enum class PointerEventsMode { Auto, None, BoxNone, BoxOnly };
+
+enum class BorderStyle { Solid, Dotted, Dashed };
+
+template <typename T>
+struct CascadedRectangleEdges {
+  using Counterpart = RectangleEdges<T>;
+  using OptionalT = folly::Optional<T>;
+
+  OptionalT left{};
+  OptionalT top{};
+  OptionalT right{};
+  OptionalT bottom{};
+  OptionalT start{};
+  OptionalT end{};
+  OptionalT horizontal{};
+  OptionalT vertical{};
+  OptionalT all{};
+
+  Counterpart resolve(bool isRTL, T defaults) const {
+    const auto leading = isRTL ? end : start;
+    const auto trailing = isRTL ? start : end;
+    const auto horizontalOrAllOrDefault =
+        horizontal.value_or(all.value_or(defaults));
+    const auto verticalOrAllOrDefault =
+        vertical.value_or(all.value_or(defaults));
+
+    return Counterpart{
+        .left = left.value_or(leading.value_or(horizontalOrAllOrDefault)),
+        .right = right.value_or(trailing.value_or(horizontalOrAllOrDefault)),
+        .top = top.value_or(verticalOrAllOrDefault),
+        .bottom = bottom.value_or(verticalOrAllOrDefault)};
+  }
+
+  bool operator==(const CascadedRectangleEdges<T> &rhs) const {
+    return std::tie(
+               this->left,
+               this->top,
+               this->right,
+               this->bottom,
+               this->start,
+               this->end,
+               this->horizontal,
+               this->vertical,
+               this->all) ==
+        std::tie(
+               rhs.left,
+               rhs.top,
+               rhs.right,
+               rhs.bottom,
+               rhs.start,
+               rhs.end,
+               rhs.horizontal,
+               rhs.vertical,
+               rhs.all);
+  }
+
+  bool operator!=(const CascadedRectangleEdges<T> &rhs) const {
+    return !(*this == rhs);
+  }
+};
+
+template <typename T>
+struct CascadedRectangleCorners {
+  using Counterpart = RectangleCorners<T>;
+  using OptionalT = folly::Optional<T>;
+
+  OptionalT topLeft{};
+  OptionalT topRight{};
+  OptionalT bottomLeft{};
+  OptionalT bottomRight{};
+  OptionalT topStart{};
+  OptionalT topEnd{};
+  OptionalT bottomStart{};
+  OptionalT bottomEnd{};
+  OptionalT all{};
+
+  Counterpart resolve(bool isRTL, T defaults) const {
+    const auto topLeading = isRTL ? topEnd : topStart;
+    const auto topTrailing = isRTL ? topStart : topEnd;
+    const auto bottomLeading = isRTL ? bottomEnd : bottomStart;
+    const auto bottomTrailing = isRTL ? bottomStart : bottomEnd;
+
+    return Counterpart{
+        .topLeft =
+            topLeft.value_or(topLeading.value_or(all.value_or(defaults))),
+        .topRight =
+            topRight.value_or(topTrailing.value_or(all.value_or(defaults))),
+        .bottomLeft =
+            bottomLeft.value_or(topLeading.value_or(all.value_or(defaults))),
+        .bottomRight =
+            bottomRight.value_or(topTrailing.value_or(all.value_or(defaults)))};
+  }
+
+  bool operator==(const CascadedRectangleCorners<T> &rhs) const {
+    return std::tie(
+               this->topLeft,
+               this->topRight,
+               this->bottomLeft,
+               this->bottomRight,
+               this->topStart,
+               this->topEnd,
+               this->bottomStart,
+               this->bottomEnd,
+               this->all) ==
+        std::tie(
+               rhs.topLeft,
+               rhs.topRight,
+               rhs.bottomLeft,
+               rhs.bottomRight,
+               rhs.topStart,
+               rhs.topEnd,
+               rhs.bottomStart,
+               rhs.bottomEnd,
+               rhs.all);
+  }
+
+  bool operator!=(const CascadedRectangleCorners<T> &rhs) const {
+    return !(*this == rhs);
+  }
+};
+
+using BorderWidths = RectangleEdges<Float>;
+using BorderStyles = RectangleEdges<BorderStyle>;
+using BorderColors = RectangleEdges<SharedColor>;
+using BorderRadii = RectangleCorners<Float>;
+
+using CascadedBorderWidths = CascadedRectangleEdges<Float>;
+using CascadedBorderStyles = CascadedRectangleEdges<BorderStyle>;
+using CascadedBorderColors = CascadedRectangleEdges<SharedColor>;
+using CascadedBorderRadii = CascadedRectangleCorners<Float>;
+
+struct BorderMetrics {
+  BorderColors borderColors{};
+  BorderWidths borderWidths{};
+  BorderRadii borderRadii{};
+  BorderStyles borderStyles{};
+
+  bool operator==(const BorderMetrics &rhs) const {
+    return std::tie(
+               this->borderColors,
+               this->borderWidths,
+               this->borderRadii,
+               this->borderStyles) ==
+        std::tie(
+               rhs.borderColors,
+               rhs.borderWidths,
+               rhs.borderRadii,
+               rhs.borderStyles);
+  }
+
+  bool operator!=(const BorderMetrics &rhs) const {
+    return !(*this == rhs);
+  }
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/components/view/propsConversions.h b/ReactCommon/fabric/components/view/propsConversions.h
new file mode 100644
index 00000000000000..4ef72d1d3be2f7
--- /dev/null
+++ b/ReactCommon/fabric/components/view/propsConversions.h
@@ -0,0 +1,249 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/components/view/conversions.h>
+#include <fabric/core/propsConversions.h>
+
+namespace facebook {
+namespace react {
+
+static inline std::array<YGValue, 2> convertRawProp(
+    const RawProps &rawProps,
+    const std::string &widthName,
+    const std::string &heightName,
+    const std::array<YGValue, 2> &sourceValue,
+    const std::array<YGValue, 2> &defaultValue) {
+  auto dimentions = defaultValue;
+  dimentions[YGDimensionWidth] = convertRawProp(
+      rawProps,
+      widthName,
+      sourceValue[YGDimensionWidth],
+      defaultValue[YGDimensionWidth]);
+  dimentions[YGDimensionHeight] = convertRawProp(
+      rawProps,
+      heightName,
+      sourceValue[YGDimensionHeight],
+      defaultValue[YGDimensionWidth]);
+  return dimentions;
+}
+
+static inline std::array<YGValue, YGEdgeCount> convertRawProp(
+    const RawProps &rawProps,
+    const std::string &prefix,
+    const std::string &suffix,
+    const std::array<YGValue, YGEdgeCount> &sourceValue,
+    const std::array<YGValue, YGEdgeCount> &defaultValue) {
+  auto result = defaultValue;
+  result[YGEdgeLeft] = convertRawProp(
+      rawProps,
+      prefix + "Left" + suffix,
+      sourceValue[YGEdgeLeft],
+      defaultValue[YGEdgeLeft]);
+  result[YGEdgeTop] = convertRawProp(
+      rawProps,
+      prefix + "Top" + suffix,
+      sourceValue[YGEdgeTop],
+      defaultValue[YGEdgeTop]);
+  result[YGEdgeRight] = convertRawProp(
+      rawProps,
+      prefix + "Right" + suffix,
+      sourceValue[YGEdgeRight],
+      defaultValue[YGEdgeRight]);
+  result[YGEdgeBottom] = convertRawProp(
+      rawProps,
+      prefix + "Bottom" + suffix,
+      sourceValue[YGEdgeBottom],
+      defaultValue[YGEdgeBottom]);
+  result[YGEdgeStart] = convertRawProp(
+      rawProps,
+      prefix + "Start" + suffix,
+      sourceValue[YGEdgeStart],
+      defaultValue[YGEdgeStart]);
+  result[YGEdgeEnd] = convertRawProp(
+      rawProps,
+      prefix + "End" + suffix,
+      sourceValue[YGEdgeEnd],
+      defaultValue[YGEdgeEnd]);
+  result[YGEdgeHorizontal] = convertRawProp(
+      rawProps,
+      prefix + "Horizontal" + suffix,
+      sourceValue[YGEdgeHorizontal],
+      defaultValue[YGEdgeHorizontal]);
+  result[YGEdgeVertical] = convertRawProp(
+      rawProps,
+      prefix + "Vertical" + suffix,
+      sourceValue[YGEdgeVertical],
+      defaultValue[YGEdgeVertical]);
+  result[YGEdgeAll] = convertRawProp(
+      rawProps,
+      prefix + suffix,
+      sourceValue[YGEdgeAll],
+      defaultValue[YGEdgeAll]);
+  return result;
+}
+
+static inline std::array<YGValue, YGEdgeCount> convertRawProp(
+    const RawProps &rawProps,
+    const std::array<YGValue, YGEdgeCount> &sourceValue,
+    const std::array<YGValue, YGEdgeCount> &defaultValue) {
+  auto result = defaultValue;
+  result[YGEdgeLeft] = convertRawProp(
+      rawProps, "left", sourceValue[YGEdgeLeft], defaultValue[YGEdgeLeft]);
+  result[YGEdgeTop] = convertRawProp(
+      rawProps, "top", sourceValue[YGEdgeTop], defaultValue[YGEdgeTop]);
+  result[YGEdgeRight] = convertRawProp(
+      rawProps, "right", sourceValue[YGEdgeRight], defaultValue[YGEdgeRight]);
+  result[YGEdgeBottom] = convertRawProp(
+      rawProps,
+      "bottom",
+      sourceValue[YGEdgeBottom],
+      defaultValue[YGEdgeBottom]);
+  result[YGEdgeStart] = convertRawProp(
+      rawProps, "start", sourceValue[YGEdgeStart], defaultValue[YGEdgeStart]);
+  result[YGEdgeEnd] = convertRawProp(
+      rawProps, "end", sourceValue[YGEdgeEnd], defaultValue[YGEdgeEnd]);
+  return result;
+}
+
+static inline YGStyle convertRawProp(
+    const RawProps &rawProps,
+    const YGStyle &sourceValue) {
+  auto yogaStyle = YGStyle{};
+  yogaStyle.direction = convertRawProp(
+      rawProps, "direction", sourceValue.direction, yogaStyle.direction);
+  yogaStyle.flexDirection = convertRawProp(
+      rawProps,
+      "flexDirection",
+      sourceValue.flexDirection,
+      yogaStyle.flexDirection);
+  yogaStyle.justifyContent = convertRawProp(
+      rawProps,
+      "justifyContent",
+      sourceValue.justifyContent,
+      yogaStyle.justifyContent);
+  yogaStyle.alignContent = convertRawProp(
+      rawProps,
+      "alignContent",
+      sourceValue.alignContent,
+      yogaStyle.alignContent);
+  yogaStyle.alignItems = convertRawProp(
+      rawProps, "alignItems", sourceValue.alignItems, yogaStyle.alignItems);
+  yogaStyle.alignSelf = convertRawProp(
+      rawProps, "alignSelf", sourceValue.alignSelf, yogaStyle.alignSelf);
+  yogaStyle.positionType = convertRawProp(
+      rawProps, "position", sourceValue.positionType, yogaStyle.positionType);
+  yogaStyle.flexWrap = convertRawProp(
+      rawProps, "flexWrap", sourceValue.flexWrap, yogaStyle.flexWrap);
+  yogaStyle.overflow = convertRawProp(
+      rawProps, "overflow", sourceValue.overflow, yogaStyle.overflow);
+  yogaStyle.display = convertRawProp(
+      rawProps, "display", sourceValue.display, yogaStyle.display);
+  yogaStyle.flex =
+      convertRawProp(rawProps, "flex", sourceValue.flex, yogaStyle.flex);
+  yogaStyle.flexGrow = convertRawProp(
+      rawProps, "flexGrow", sourceValue.flexGrow, yogaStyle.flexGrow);
+  yogaStyle.flexShrink = convertRawProp(
+      rawProps, "flexShrink", sourceValue.flexShrink, yogaStyle.flexShrink);
+  yogaStyle.flexBasis = convertRawProp(
+      rawProps, "flexBasis", sourceValue.flexBasis, yogaStyle.flexBasis);
+  yogaStyle.margin = convertRawProp(
+      rawProps, "margin", "", sourceValue.margin, yogaStyle.margin);
+  yogaStyle.position =
+      convertRawProp(rawProps, sourceValue.position, yogaStyle.position);
+  yogaStyle.padding = convertRawProp(
+      rawProps, "padding", "", sourceValue.padding, yogaStyle.padding);
+  yogaStyle.border = convertRawProp(
+      rawProps, "border", "Width", sourceValue.border, yogaStyle.border);
+  yogaStyle.dimensions = convertRawProp(
+      rawProps,
+      "width",
+      "height",
+      sourceValue.dimensions,
+      yogaStyle.dimensions);
+  yogaStyle.minDimensions = convertRawProp(
+      rawProps,
+      "minWidth",
+      "minHeight",
+      sourceValue.minDimensions,
+      yogaStyle.minDimensions);
+  yogaStyle.maxDimensions = convertRawProp(
+      rawProps,
+      "maxWidth",
+      "maxHeight",
+      sourceValue.maxDimensions,
+      yogaStyle.maxDimensions);
+  yogaStyle.aspectRatio = convertRawProp(
+      rawProps, "aspectRatio", sourceValue.aspectRatio, yogaStyle.aspectRatio);
+  return yogaStyle;
+}
+
+template <typename T>
+static inline CascadedRectangleCorners<T> convertRawProp(
+    const RawProps &rawProps,
+    const std::string &prefix,
+    const std::string &suffix,
+    const CascadedRectangleCorners<T> &sourceValue) {
+  CascadedRectangleCorners<T> result;
+
+  result.topLeft = convertRawProp(
+      rawProps, prefix + "TopLeft" + suffix, sourceValue.topLeft);
+  result.topRight = convertRawProp(
+      rawProps, prefix + "TopRight" + suffix, sourceValue.topRight);
+  result.bottomLeft = convertRawProp(
+      rawProps, prefix + "BottomLeft" + suffix, sourceValue.bottomLeft);
+  result.bottomRight = convertRawProp(
+      rawProps, prefix + "BottomRight" + suffix, sourceValue.bottomRight);
+
+  result.topStart = convertRawProp(
+      rawProps, prefix + "TopStart" + suffix, sourceValue.topStart);
+  result.topEnd =
+      convertRawProp(rawProps, prefix + "TopEnd" + suffix, sourceValue.topEnd);
+  result.bottomStart = convertRawProp(
+      rawProps, prefix + "BottomStart" + suffix, sourceValue.bottomStart);
+  result.bottomEnd = convertRawProp(
+      rawProps, prefix + "BottomEnd" + suffix, sourceValue.bottomEnd);
+
+  result.all = convertRawProp(rawProps, prefix + suffix, sourceValue.all);
+
+  return result;
+}
+
+template <typename T>
+static inline CascadedRectangleEdges<T> convertRawProp(
+    const RawProps &rawProps,
+    const std::string &prefix,
+    const std::string &suffix,
+    const CascadedRectangleEdges<T> &sourceValue) {
+  CascadedRectangleEdges<T> result;
+
+  result.left =
+      convertRawProp(rawProps, prefix + "Left" + suffix, sourceValue.left);
+  result.right =
+      convertRawProp(rawProps, prefix + "Right" + suffix, sourceValue.right);
+  result.top =
+      convertRawProp(rawProps, prefix + "Top" + suffix, sourceValue.top);
+  result.bottom =
+      convertRawProp(rawProps, prefix + "Bottom" + suffix, sourceValue.bottom);
+
+  result.start =
+      convertRawProp(rawProps, prefix + "Start" + suffix, sourceValue.start);
+  result.end =
+      convertRawProp(rawProps, prefix + "End" + suffix, sourceValue.end);
+  result.horizontal = convertRawProp(
+      rawProps, prefix + "Horizontal" + suffix, sourceValue.horizontal);
+  result.vertical = convertRawProp(
+      rawProps, prefix + "Vertical" + suffix, sourceValue.vertical);
+
+  result.all = convertRawProp(rawProps, prefix + suffix, sourceValue.all);
+
+  return result;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/view/tests/ViewTest.cpp b/ReactCommon/fabric/components/view/tests/ViewTest.cpp
similarity index 69%
rename from ReactCommon/fabric/view/tests/ViewTest.cpp
rename to ReactCommon/fabric/components/view/tests/ViewTest.cpp
index 6ea577d8fa52bf..66a6a0b2218fab 100644
--- a/ReactCommon/fabric/view/tests/ViewTest.cpp
+++ b/ReactCommon/fabric/components/view/tests/ViewTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include <fabric/view/ViewComponentDescriptor.h>
+#include <fabric/components/view/ViewComponentDescriptor.h>
 #include <gtest/gtest.h>
 
 using namespace facebook::react;
diff --git a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp
new file mode 100644
index 00000000000000..3adadef249fbb7
--- /dev/null
+++ b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp
@@ -0,0 +1,215 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "YogaLayoutableShadowNode.h"
+
+#include <algorithm>
+#include <memory>
+
+#include <fabric/components/view/conversions.h>
+#include <fabric/core/LayoutConstraints.h>
+#include <fabric/core/LayoutContext.h>
+#include <fabric/debug/DebugStringConvertibleItem.h>
+#include <yoga/Yoga.h>
+
+namespace facebook {
+namespace react {
+
+YogaLayoutableShadowNode::YogaLayoutableShadowNode()
+    : yogaNode_({}), yogaConfig_(nullptr) {
+  initializeYogaConfig(yogaConfig_);
+
+  yogaNode_.setConfig(&yogaConfig_);
+  yogaNode_.setContext(this);
+  yogaNode_.setDirty(true);
+}
+
+YogaLayoutableShadowNode::YogaLayoutableShadowNode(
+    const YogaLayoutableShadowNode &layoutableShadowNode)
+    : yogaNode_(layoutableShadowNode.yogaNode_), yogaConfig_(nullptr) {
+  initializeYogaConfig(yogaConfig_);
+
+  yogaNode_.setConfig(&yogaConfig_);
+  yogaNode_.setContext(this);
+  yogaNode_.setOwner(nullptr);
+  yogaNode_.setDirty(true);
+}
+
+void YogaLayoutableShadowNode::cleanLayout() {
+  yogaNode_.setDirty(false);
+}
+
+void YogaLayoutableShadowNode::dirtyLayout() {
+  yogaNode_.markDirtyAndPropogate();
+}
+
+bool YogaLayoutableShadowNode::getIsLayoutClean() const {
+  return !yogaNode_.isDirty();
+}
+
+bool YogaLayoutableShadowNode::getHasNewLayout() const {
+  return yogaNode_.getHasNewLayout();
+}
+
+void YogaLayoutableShadowNode::setHasNewLayout(bool hasNewLayout) {
+  yogaNode_.setHasNewLayout(hasNewLayout);
+}
+
+#pragma mark - Mutating Methods
+
+void YogaLayoutableShadowNode::enableMeasurement() {
+  ensureUnsealed();
+
+  yogaNode_.setMeasureFunc(
+      YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector);
+}
+
+void YogaLayoutableShadowNode::appendChild(YogaLayoutableShadowNode *child) {
+  ensureUnsealed();
+
+  auto yogaNodeRawPtr = &yogaNode_;
+  auto childYogaNodeRawPtr = &child->yogaNode_;
+
+  if (childYogaNodeRawPtr->getOwner() != nullptr) {
+    child = static_cast<YogaLayoutableShadowNode *>(
+        cloneAndReplaceChild(child, yogaNode_.getChildren().size()));
+    childYogaNodeRawPtr = &child->yogaNode_;
+    assert(childYogaNodeRawPtr->getOwner() == nullptr);
+  }
+
+  child->ensureUnsealed();
+  childYogaNodeRawPtr->setOwner(yogaNodeRawPtr);
+
+  yogaNodeRawPtr->insertChild(
+      childYogaNodeRawPtr, yogaNodeRawPtr->getChildren().size());
+}
+
+void YogaLayoutableShadowNode::setChildren(
+    std::vector<YogaLayoutableShadowNode *> children) {
+  yogaNode_.setChildren({});
+  for (const auto &child : children) {
+    appendChild(child);
+  }
+}
+
+void YogaLayoutableShadowNode::setProps(const YogaStylableProps &props) {
+  yogaNode_.setStyle(props.yogaStyle);
+}
+
+void YogaLayoutableShadowNode::layout(LayoutContext layoutContext) {
+  if (!getIsLayoutClean()) {
+    ensureUnsealed();
+
+    /*
+     * In Yoga, every single Yoga Node has to have a (non-null) pointer to
+     * Yoga Config (this config can be shared between many nodes),
+     * so every node can be individually configured. This does *not* mean
+     * however that Yoga consults with every single Yoga Node Config for every
+     * config parameter. Especially in case of `pointScaleFactor`,
+     * the only value in the config of the root node is taken into account
+     * (and this is by design).
+     */
+    yogaConfig_.pointScaleFactor = layoutContext.pointScaleFactor;
+    YGNodeCalculateLayout(
+        &yogaNode_, YGUndefined, YGUndefined, YGDirectionInherit);
+  }
+
+  LayoutableShadowNode::layout(layoutContext);
+}
+
+void YogaLayoutableShadowNode::layoutChildren(LayoutContext layoutContext) {
+  for (const auto &childYogaNode : yogaNode_.getChildren()) {
+    auto childNode =
+        static_cast<YogaLayoutableShadowNode *>(childYogaNode->getContext());
+
+    LayoutMetrics childLayoutMetrics =
+        layoutMetricsFromYogaNode(childNode->yogaNode_);
+    childLayoutMetrics.pointScaleFactor = layoutContext.pointScaleFactor;
+    childNode->setLayoutMetrics(childLayoutMetrics);
+  }
+}
+
+std::vector<LayoutableShadowNode *>
+YogaLayoutableShadowNode::getLayoutableChildNodes() const {
+  std::vector<LayoutableShadowNode *> yogaLayoutableChildNodes;
+  yogaLayoutableChildNodes.reserve(yogaNode_.getChildren().size());
+
+  for (const auto &childYogaNode : yogaNode_.getChildren()) {
+    auto childNode =
+        static_cast<YogaLayoutableShadowNode *>(childYogaNode->getContext());
+    yogaLayoutableChildNodes.push_back(childNode);
+  }
+
+  return yogaLayoutableChildNodes;
+}
+
+#pragma mark - Yoga Connectors
+
+YGNode *YogaLayoutableShadowNode::yogaNodeCloneCallbackConnector(
+    YGNode *oldYogaNode,
+    YGNode *parentYogaNode,
+    int childIndex) {
+  // At this point it is garanteed that all shadow nodes associated with yoga
+  // nodes are `YogaLayoutableShadowNode` subclasses.
+  auto parentNode =
+      static_cast<YogaLayoutableShadowNode *>(parentYogaNode->getContext());
+  auto oldNode =
+      static_cast<YogaLayoutableShadowNode *>(oldYogaNode->getContext());
+  auto clonedNode = static_cast<YogaLayoutableShadowNode *>(
+      parentNode->cloneAndReplaceChild(oldNode, childIndex));
+  return &clonedNode->yogaNode_;
+}
+
+YGSize YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector(
+    YGNode *yogaNode,
+    float width,
+    YGMeasureMode widthMode,
+    float height,
+    YGMeasureMode heightMode) {
+  auto shadowNodeRawPtr =
+      static_cast<YogaLayoutableShadowNode *>(yogaNode->getContext());
+
+  auto minimumSize = Size{0, 0};
+  auto maximumSize = Size{kFloatMax, kFloatMax};
+
+  switch (widthMode) {
+    case YGMeasureModeUndefined:
+      break;
+    case YGMeasureModeExactly:
+      minimumSize.width = floatFromYogaFloat(width);
+      maximumSize.width = floatFromYogaFloat(width);
+      break;
+    case YGMeasureModeAtMost:
+      maximumSize.width = floatFromYogaFloat(width);
+      break;
+  }
+
+  switch (heightMode) {
+    case YGMeasureModeUndefined:
+      break;
+    case YGMeasureModeExactly:
+      minimumSize.height = floatFromYogaFloat(height);
+      maximumSize.height = floatFromYogaFloat(height);
+      break;
+    case YGMeasureModeAtMost:
+      maximumSize.height = floatFromYogaFloat(height);
+      break;
+  }
+
+  auto size = shadowNodeRawPtr->measure({minimumSize, maximumSize});
+
+  return YGSize{yogaFloatFromFloat(size.width),
+                yogaFloatFromFloat(size.height)};
+}
+
+void YogaLayoutableShadowNode::initializeYogaConfig(YGConfig &config) {
+  config.cloneNodeCallback =
+      YogaLayoutableShadowNode::yogaNodeCloneCallbackConnector;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/view/yoga/YogaLayoutableShadowNode.h b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h
similarity index 51%
rename from ReactCommon/fabric/view/yoga/YogaLayoutableShadowNode.h
rename to ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h
index c35b812af77eb9..8c82d2ec4d84ee 100644
--- a/ReactCommon/fabric/view/yoga/YogaLayoutableShadowNode.h
+++ b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,42 +12,24 @@
 
 #include <yoga/YGNode.h>
 
+#include <fabric/components/view/YogaStylableProps.h>
 #include <fabric/core/LayoutableShadowNode.h>
 #include <fabric/core/Sealable.h>
-#include <fabric/core/ShadowNode.h>
 #include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/view/YogaStylableProps.h>
 
 namespace facebook {
 namespace react {
 
-class YogaLayoutableShadowNode;
-
-using SharedYogaConfig = std::shared_ptr<YGConfig>;
-
-using SharedYogaLayoutableShadowNode = std::shared_ptr<const YogaLayoutableShadowNode>;
-using SharedYogaLayoutableShadowNodeList = std::vector<SharedYogaLayoutableShadowNode>;
-using SharedYogaLayoutableShadowNodeSharedList = std::shared_ptr<const SharedYogaLayoutableShadowNodeList>;
-
-class YogaLayoutableShadowNode:
-  public LayoutableShadowNode,
-  public virtual DebugStringConvertible,
-  public virtual Sealable {
-
-public:
-
+class YogaLayoutableShadowNode : public LayoutableShadowNode,
+                                 public virtual DebugStringConvertible,
+                                 public virtual Sealable {
+ public:
 #pragma mark - Constructors
 
-  YogaLayoutableShadowNode(
-    const SharedYogaStylableProps &props,
-    const SharedShadowNodeSharedList &children
-  );
+  YogaLayoutableShadowNode();
 
   YogaLayoutableShadowNode(
-    const SharedYogaLayoutableShadowNode &shadowNode,
-    const SharedYogaStylableProps &props = nullptr,
-    const SharedShadowNodeSharedList &children = nullptr
-  );
+      const YogaLayoutableShadowNode &layoutableShadowNode);
 
 #pragma mark - Mutating Methods
 
@@ -59,10 +41,24 @@ class YogaLayoutableShadowNode:
 
   /*
    * Appends `child`'s Yoga node to the own Yoga node.
-   * So, it complements `ShadowNode::appendChild(...)` functionality from Yoga
+   * Complements `ShadowNode::appendChild(...)` functionality from Yoga
    * perspective.
    */
-  void appendChild(SharedYogaLayoutableShadowNode child);
+  void appendChild(YogaLayoutableShadowNode *child);
+
+  /*
+   * Sets Yoga children based on collection of `YogaLayoutableShadowNode`
+   * instances. Complements `ShadowNode::setChildren(...)` functionality from
+   * Yoga perspective.
+   */
+  void setChildren(std::vector<YogaLayoutableShadowNode *> children);
+
+  /*
+   * Sets Yoga styles based on given `YogaStylableProps`.
+   */
+  void setProps(const YogaStylableProps &props);
+
+#pragma mark - LayoutableShadowNode
 
   void cleanLayout() override;
   void dirtyLayout() override;
@@ -76,10 +72,12 @@ class YogaLayoutableShadowNode:
    * See `LayoutableShadowNode` for more details.
    */
   void layout(LayoutContext layoutContext) override;
-  
+
   void layoutChildren(LayoutContext layoutContext) override;
 
-protected:
+  std::vector<LayoutableShadowNode *> getLayoutableChildNodes() const override;
+
+ protected:
   /*
    * All Yoga functions only accept non-const arguments, so we have to mark
    * Yoga node as `mutable` here to avoid `static_cast`ing the pointer to this
@@ -92,11 +90,18 @@ class YogaLayoutableShadowNode:
    */
   YGConfig yogaConfig_;
 
-private:
+ private:
   static void initializeYogaConfig(YGConfig &config);
-  static void setYogaNodeChildrenBasedOnShadowNodeChildren(YGNode *yogaNodeRawPtr, const SharedShadowNodeSharedList &children);
-  static YGNode *yogaNodeCloneCallbackConnector(YGNode *oldYogaNode, YGNode *parentYogaNode, int childIndex);
-  static YGSize yogaNodeMeasureCallbackConnector(YGNode *yogaNode, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode);
+  static YGNode *yogaNodeCloneCallbackConnector(
+      YGNode *oldYogaNode,
+      YGNode *parentYogaNode,
+      int childIndex);
+  static YGSize yogaNodeMeasureCallbackConnector(
+      YGNode *yogaNode,
+      float width,
+      YGMeasureMode widthMode,
+      float height,
+      YGMeasureMode heightMode);
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp
new file mode 100644
index 00000000000000..bf134efc81747c
--- /dev/null
+++ b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "YogaStylableProps.h"
+
+#include <fabric/components/view/conversions.h>
+#include <fabric/components/view/propsConversions.h>
+#include <fabric/core/propsConversions.h>
+#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <yoga/YGNode.h>
+#include <yoga/Yoga.h>
+
+#include "conversions.h"
+
+namespace facebook {
+namespace react {
+
+YogaStylableProps::YogaStylableProps(const YGStyle &yogaStyle)
+    : yogaStyle(yogaStyle) {}
+
+YogaStylableProps::YogaStylableProps(
+    const YogaStylableProps &sourceProps,
+    const RawProps &rawProps)
+    : yogaStyle(convertRawProp(rawProps, sourceProps.yogaStyle)){};
+
+#pragma mark - DebugStringConvertible
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList YogaStylableProps::getDebugProps() const {
+  auto defaultYogaStyle = YGStyle{};
+  return {
+      debugStringConvertibleItem(
+          "direction", yogaStyle.direction, defaultYogaStyle.direction),
+      debugStringConvertibleItem(
+          "flexDirection",
+          yogaStyle.flexDirection,
+          defaultYogaStyle.flexDirection),
+      debugStringConvertibleItem(
+          "justifyContent",
+          yogaStyle.justifyContent,
+          defaultYogaStyle.justifyContent),
+      debugStringConvertibleItem(
+          "alignContent",
+          yogaStyle.alignContent,
+          defaultYogaStyle.alignContent),
+      debugStringConvertibleItem(
+          "alignItems", yogaStyle.alignItems, defaultYogaStyle.alignItems),
+      debugStringConvertibleItem(
+          "alignSelf", yogaStyle.alignSelf, defaultYogaStyle.alignSelf),
+      debugStringConvertibleItem(
+          "positionType",
+          yogaStyle.positionType,
+          defaultYogaStyle.positionType),
+      debugStringConvertibleItem(
+          "flexWrap", yogaStyle.flexWrap, defaultYogaStyle.flexWrap),
+      debugStringConvertibleItem(
+          "overflow", yogaStyle.overflow, defaultYogaStyle.overflow),
+      debugStringConvertibleItem(
+          "display", yogaStyle.display, defaultYogaStyle.display),
+      debugStringConvertibleItem("flex", yogaStyle.flex, defaultYogaStyle.flex),
+      debugStringConvertibleItem(
+          "flexGrow", yogaStyle.flexGrow, defaultYogaStyle.flexGrow),
+      debugStringConvertibleItem(
+          "flexShrink", yogaStyle.flexShrink, defaultYogaStyle.flexShrink),
+      debugStringConvertibleItem(
+          "flexBasis", yogaStyle.flexBasis, defaultYogaStyle.flexBasis),
+      debugStringConvertibleItem(
+          "margin", yogaStyle.margin, defaultYogaStyle.margin),
+      debugStringConvertibleItem(
+          "position", yogaStyle.position, defaultYogaStyle.position),
+      debugStringConvertibleItem(
+          "padding", yogaStyle.padding, defaultYogaStyle.padding),
+      debugStringConvertibleItem(
+          "border", yogaStyle.border, defaultYogaStyle.border),
+      debugStringConvertibleItem(
+          "dimensions", yogaStyle.dimensions, defaultYogaStyle.dimensions),
+      debugStringConvertibleItem(
+          "minDimensions",
+          yogaStyle.minDimensions,
+          defaultYogaStyle.minDimensions),
+      debugStringConvertibleItem(
+          "maxDimensions",
+          yogaStyle.maxDimensions,
+          defaultYogaStyle.maxDimensions),
+      debugStringConvertibleItem(
+          "aspectRatio", yogaStyle.aspectRatio, defaultYogaStyle.aspectRatio),
+  };
+}
+#endif
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/view/yoga/YogaStylableProps.h b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h
similarity index 75%
rename from ReactCommon/fabric/view/yoga/YogaStylableProps.h
rename to ReactCommon/fabric/components/view/yoga/YogaStylableProps.h
index c62bb03e7094d3..340a8ccb6258a1 100644
--- a/ReactCommon/fabric/view/yoga/YogaStylableProps.h
+++ b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,20 +20,22 @@ class YogaStylableProps;
 typedef std::shared_ptr<const YogaStylableProps> SharedYogaStylableProps;
 
 class YogaStylableProps {
-
-public:
-
+ public:
   YogaStylableProps() = default;
   YogaStylableProps(const YGStyle &yogaStyle);
-  YogaStylableProps(const YogaStylableProps &sourceProps, const RawProps &rawProps);
+  YogaStylableProps(
+      const YogaStylableProps &sourceProps,
+      const RawProps &rawProps);
 
 #pragma mark - Props
 
-  const YGStyle yogaStyle {};
+  const YGStyle yogaStyle{};
 
 #pragma mark - DebugStringConvertible (Partial)
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const;
+#endif
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/core/BUCK b/ReactCommon/fabric/core/BUCK
index f663ff3590edba..6e22c107d54a23 100644
--- a/ReactCommon/fabric/core/BUCK
+++ b/ReactCommon/fabric/core/BUCK
@@ -1,13 +1,7 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "fb_xplat_cxx_test", "get_apple_compiler_flags", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
 
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
-
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "core",
@@ -58,28 +52,26 @@ rn_xplat_cxx_library(
         "xplat//folly:molly",
         "xplat//third-party/glog:glog",
         react_native_xplat_target("fabric/debug:debug"),
+        react_native_xplat_target("fabric/events:events"),
         react_native_xplat_target("fabric/graphics:graphics"),
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":core",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = (ANDROID,APPLE),
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":core",
+    ],
+)
diff --git a/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h b/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h
index 53312ed2fb9551..91dd70326fb026 100644
--- a/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h
+++ b/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/core/ShadowNode.h>
 #include <fabric/core/Props.h>
+#include <fabric/core/ShadowNode.h>
 
 namespace facebook {
 namespace react {
@@ -24,8 +24,7 @@ using SharedComponentDescriptor = std::shared_ptr<ComponentDescriptor>;
  * `ShadowNode`s (such as creating, cloning, props and children managing).
  */
 class ComponentDescriptor {
-public:
-
+ public:
   virtual ~ComponentDescriptor() = default;
 
   /*
@@ -45,29 +44,21 @@ class ComponentDescriptor {
    * Creates a new `ShadowNode` of a particular type.
    */
   virtual SharedShadowNode createShadowNode(
-    const Tag &tag,
-    const Tag &rootTag,
-    const SharedEventEmitter &eventEmitter,
-    const SharedProps &props
-  ) const = 0;
+      const ShadowNodeFragment &fragment) const = 0;
 
   /*
    * Clones a `ShadowNode` with optionally new `props` and/or `children`.
    */
-  virtual SharedShadowNode cloneShadowNode(
-    const SharedShadowNode &shadowNode,
-    const SharedProps &props = nullptr,
-    const SharedEventEmitter &eventEmitter = nullptr,
-    const SharedShadowNodeSharedList &children = nullptr
-  ) const = 0;
+  virtual UnsharedShadowNode cloneShadowNode(
+      const ShadowNode &sourceShadowNode,
+      const ShadowNodeFragment &fragment) const = 0;
 
   /*
    * Appends (by mutating) a given `childShadowNode` to `parentShadowNode`.
    */
   virtual void appendChild(
-    const SharedShadowNode &parentShadowNode,
-    const SharedShadowNode &childShadowNode
-  ) const = 0;
+      const SharedShadowNode &parentShadowNode,
+      const SharedShadowNode &childShadowNode) const = 0;
 
   /*
    * Creates a new `Props` of a particular type with all values copied from
@@ -76,18 +67,16 @@ class ComponentDescriptor {
    * will be used.
    */
   virtual SharedProps cloneProps(
-    const SharedProps &props,
-    const RawProps &rawProps
-  ) const = 0;
+      const SharedProps &props,
+      const RawProps &rawProps) const = 0;
 
   /*
    * Creates a new `EventEmitter` object compatible with particular type of
    * shadow nodes.
    */
   virtual SharedEventEmitter createEventEmitter(
-    const EventTarget &eventTarget,
-    const Tag &tag
-  ) const = 0;
+      SharedEventTarget eventTarget,
+      const Tag &tag) const = 0;
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h b/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h
index 82801a7753f346..8d31318326596b 100644
--- a/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h
+++ b/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,12 +7,14 @@
 
 #pragma once
 
-#include <memory>
 #include <functional>
+#include <memory>
 
 #include <fabric/core/ComponentDescriptor.h>
 #include <fabric/core/Props.h>
 #include <fabric/core/ShadowNode.h>
+#include <fabric/core/ShadowNodeFragment.h>
+#include <fabric/events/EventDispatcher.h>
 
 namespace facebook {
 namespace react {
@@ -23,119 +25,93 @@ namespace react {
  * if necessary.
  */
 template <typename ShadowNodeT>
-class ConcreteComponentDescriptor: public ComponentDescriptor {
-  static_assert(std::is_base_of<ShadowNode, ShadowNodeT>::value, "ShadowNodeT must be a descendant of ShadowNode");
+class ConcreteComponentDescriptor : public ComponentDescriptor {
+  static_assert(
+      std::is_base_of<ShadowNode, ShadowNodeT>::value,
+      "ShadowNodeT must be a descendant of ShadowNode");
 
   using SharedShadowNodeT = std::shared_ptr<const ShadowNodeT>;
   using ConcreteProps = typename ShadowNodeT::ConcreteProps;
   using SharedConcreteProps = typename ShadowNodeT::SharedConcreteProps;
   using ConcreteEventEmitter = typename ShadowNodeT::ConcreteEventEmitter;
-  using SharedConcreteEventEmitter = typename ShadowNodeT::SharedConcreteEventEmitter;
+  using SharedConcreteEventEmitter =
+      typename ShadowNodeT::SharedConcreteEventEmitter;
 
-public:
-  ConcreteComponentDescriptor(SharedEventDispatcher eventDispatcher):
-    eventDispatcher_(eventDispatcher) {}
+ public:
+  ConcreteComponentDescriptor(SharedEventDispatcher eventDispatcher)
+      : eventDispatcher_(eventDispatcher) {}
 
   ComponentHandle getComponentHandle() const override {
-    return typeid(ShadowNodeT).hash_code();
+    return ShadowNodeT::Handle();
   }
 
   ComponentName getComponentName() const override {
-    // Even if this looks suboptimal, it is the only way to call
-    // a virtual non-static method of `ShadowNodeT`.
-    // Because it is not a hot path (it is executed once per an app run),
-    // it's fine.
-    return std::make_shared<ShadowNodeT>(
-      0,
-      0,
-      std::make_shared<const ConcreteProps>(),
-      nullptr,
-      ShadowNode::emptySharedShadowNodeSharedList(),
-      nullptr
-    )->ShadowNodeT::getComponentName();
+    return ShadowNodeT::Name();
   }
 
   SharedShadowNode createShadowNode(
-    const Tag &tag,
-    const Tag &rootTag,
-    const SharedEventEmitter &eventEmitter,
-    const SharedProps &props
-  ) const override {
-    assert(std::dynamic_pointer_cast<const ConcreteProps>(props));
-    assert(std::dynamic_pointer_cast<const ConcreteEventEmitter>(eventEmitter));
-
-    const auto &shadowNode = std::make_shared<ShadowNodeT>(
-      tag,
-      rootTag,
-      std::static_pointer_cast<const ConcreteProps>(props),
-      std::static_pointer_cast<const ConcreteEventEmitter>(eventEmitter),
-      ShadowNode::emptySharedShadowNodeSharedList(),
-      getCloneFunction()
-    );
+      const ShadowNodeFragment &fragment) const override {
+    assert(std::dynamic_pointer_cast<const ConcreteProps>(fragment.props));
+    assert(std::dynamic_pointer_cast<const ConcreteEventEmitter>(
+        fragment.eventEmitter));
+
+    auto shadowNode =
+        std::make_shared<ShadowNodeT>(fragment, getCloneFunction());
 
     adopt(shadowNode);
+
     return shadowNode;
   }
 
-  SharedShadowNode cloneShadowNode(
-    const SharedShadowNode &sourceShadowNode,
-    const SharedProps &props = nullptr,
-    const SharedEventEmitter &eventEmitter = nullptr,
-    const SharedShadowNodeSharedList &children = nullptr
-  ) const override {
-    assert(std::dynamic_pointer_cast<const ShadowNodeT>(sourceShadowNode));
-
-    const auto &shadowNode = std::make_shared<ShadowNodeT>(
-      std::static_pointer_cast<const ShadowNodeT>(sourceShadowNode),
-      std::static_pointer_cast<const ConcreteProps>(props),
-      std::static_pointer_cast<const ConcreteEventEmitter>(eventEmitter),
-      children
-    );
+  UnsharedShadowNode cloneShadowNode(
+      const ShadowNode &sourceShadowNode,
+      const ShadowNodeFragment &fragment) const override {
+    auto shadowNode = std::make_shared<ShadowNodeT>(sourceShadowNode, fragment);
 
     adopt(shadowNode);
     return shadowNode;
   }
 
   void appendChild(
-    const SharedShadowNode &parentShadowNode,
-    const SharedShadowNode &childShadowNode
-  ) const override {
-    auto concreteParentShadowNode = std::static_pointer_cast<const ShadowNodeT>(parentShadowNode);
-    auto concreteNonConstParentShadowNode = std::const_pointer_cast<ShadowNodeT>(concreteParentShadowNode);
+      const SharedShadowNode &parentShadowNode,
+      const SharedShadowNode &childShadowNode) const override {
+    auto concreteParentShadowNode =
+        std::static_pointer_cast<const ShadowNodeT>(parentShadowNode);
+    auto concreteNonConstParentShadowNode =
+        std::const_pointer_cast<ShadowNodeT>(concreteParentShadowNode);
     concreteNonConstParentShadowNode->appendChild(childShadowNode);
   }
 
   virtual SharedProps cloneProps(
-    const SharedProps &props,
-    const RawProps &rawProps
-  ) const override {
+      const SharedProps &props,
+      const RawProps &rawProps) const override {
     return ShadowNodeT::Props(rawProps, props);
   };
 
   virtual SharedEventEmitter createEventEmitter(
-    const EventTarget &eventTarget,
-    const Tag &tag
-  ) const override {
-    return std::make_shared<ConcreteEventEmitter>(eventTarget, tag, eventDispatcher_);
+      SharedEventTarget eventTarget,
+      const Tag &tag) const override {
+    return std::make_shared<ConcreteEventEmitter>(
+        std::move(eventTarget), tag, eventDispatcher_);
   }
 
-protected:
-
+ protected:
   virtual void adopt(UnsharedShadowNode shadowNode) const {
     // Default implementation does nothing.
+    assert(shadowNode->getComponentHandle() == getComponentHandle());
   }
 
-private:
-
-  mutable SharedEventDispatcher eventDispatcher_ {nullptr};
+ private:
+  mutable SharedEventDispatcher eventDispatcher_{nullptr};
 
   mutable ShadowNodeCloneFunction cloneFunction_;
 
   ShadowNodeCloneFunction getCloneFunction() const {
     if (!cloneFunction_) {
-      cloneFunction_ = [this](const SharedShadowNode &shadowNode, const SharedProps &props, const SharedEventEmitter &eventEmitter, const SharedShadowNodeSharedList &children) {
-        assert(std::dynamic_pointer_cast<const ShadowNodeT>(shadowNode));
-        return this->cloneShadowNode(shadowNode, props, eventEmitter, children);
+      cloneFunction_ = [this](
+                           const ShadowNode &shadowNode,
+                           const ShadowNodeFragment &fragment) {
+        return this->cloneShadowNode(shadowNode, fragment);
       };
     }
 
diff --git a/ReactCommon/fabric/core/conversions.h b/ReactCommon/fabric/core/conversions.h
index 1d058558dfca02..9a9c4495e25412 100644
--- a/ReactCommon/fabric/core/conversions.h
+++ b/ReactCommon/fabric/core/conversions.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,17 +14,23 @@ namespace react {
 
 inline std::string toString(const LayoutDirection &layoutDirection) {
   switch (layoutDirection) {
-    case LayoutDirection::Undefined: return "undefined";
-    case LayoutDirection::LeftToRight: return "ltr";
-    case LayoutDirection::RightToLeft: return "rtl";
+    case LayoutDirection::Undefined:
+      return "undefined";
+    case LayoutDirection::LeftToRight:
+      return "ltr";
+    case LayoutDirection::RightToLeft:
+      return "rtl";
   }
 }
 
 inline std::string toString(const DisplayType &displayType) {
   switch (displayType) {
-    case DisplayType::None: return "none";
-    case DisplayType::Flex: return "flex";
-    case DisplayType::Inline: return "inline";
+    case DisplayType::None:
+      return "none";
+    case DisplayType::Flex:
+      return "flex";
+    case DisplayType::Inline:
+      return "inline";
   }
 }
 
diff --git a/ReactCommon/fabric/core/events/EventDispatcher.h b/ReactCommon/fabric/core/events/EventDispatcher.h
deleted file mode 100644
index 11ba3580850e11..00000000000000
--- a/ReactCommon/fabric/core/events/EventDispatcher.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <memory>
-
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/core/EventPrimitives.h>
-#include <folly/dynamic.h>
-
-namespace facebook {
-namespace react {
-
-class EventDispatcher;
-
-using SharedEventDispatcher = std::shared_ptr<const EventDispatcher>;
-
-/*
- * Abstract class that represent event-delivery infrastructure.
- * Particular `EventEmitter` clases use an object of this class to invoke
- * events.
- */
-class EventDispatcher {
-
-public:
-
-  /*
-   * Dispatches "raw" event using some event-delivery infrastructure.
-   */
-  virtual void dispatchEvent(
-    const EventTarget &eventTarget,
-    const std::string &type,
-    const folly::dynamic &payload,
-    const EventPriority &priority
-  ) const = 0;
-
-  virtual void releaseEventTarget(const EventTarget &eventTarget) const = 0;
-
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/core/events/EventEmitter.cpp b/ReactCommon/fabric/core/events/EventEmitter.cpp
deleted file mode 100644
index 2e99199eea7035..00000000000000
--- a/ReactCommon/fabric/core/events/EventEmitter.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "EventEmitter.h"
-
-#include <folly/dynamic.h>
-
-namespace facebook {
-namespace react {
-
-EventEmitter::EventEmitter(const EventTarget &eventTarget, const Tag &tag, const SharedEventDispatcher &eventDispatcher):
-  eventTarget_(eventTarget),
-  tag_(tag),
-  eventDispatcher_(eventDispatcher) {
-}
-
-EventEmitter::~EventEmitter() {
-  auto &&eventDispatcher = eventDispatcher_.lock();
-  if (eventDispatcher && eventTarget_) {
-    eventDispatcher->releaseEventTarget(eventTarget_);
-  }
-}
-
-void EventEmitter::dispatchEvent(
-  const std::string &type,
-  const folly::dynamic &payload,
-  const EventPriority &priority
-) const {
-  const auto &eventDispatcher = eventDispatcher_.lock();
-  if (!eventDispatcher) {
-    return;
-  }
-
-  assert(eventTarget_ && "Attempted to dispatch an event without an eventTarget.");
-
-  // Mixing `target` into `payload`.
-  assert(payload.isObject());
-  folly::dynamic extendedPayload = folly::dynamic::object("target", tag_);
-  extendedPayload.merge_patch(payload);
-
-  // TODO(T29610783): Reconsider using dynamic dispatch here.
-  eventDispatcher->dispatchEvent(eventTarget_, type, extendedPayload, priority);
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/core/events/EventEmitter.h b/ReactCommon/fabric/core/events/EventEmitter.h
deleted file mode 100644
index 3876be111c095f..00000000000000
--- a/ReactCommon/fabric/core/events/EventEmitter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <memory>
-#include <mutex>
-
-#include <folly/dynamic.h>
-#include <fabric/core/EventDispatcher.h>
-#include <fabric/core/EventPrimitives.h>
-#include <fabric/core/ReactPrimitives.h>
-
-namespace facebook {
-namespace react {
-
-class EventEmitter;
-
-using SharedEventEmitter = std::shared_ptr<const EventEmitter>;
-
-/*
- * Base class for all particular typed event handlers.
- * Stores `InstanceHandle` identifying a particular component and the pointer
- * to `EventDispatcher` which is responsible for delivering the event.
- *
- * TODO: Reconsider naming of all event-related things.
- */
-class EventEmitter {
-
-public:
-  EventEmitter(const EventTarget &eventTarget, const Tag &tag, const SharedEventDispatcher &eventDispatcher);
-  virtual ~EventEmitter();
-
-protected:
-
-  /*
-   * Initates an event delivery process.
-   * Is used by particular subclasses only.
-   */
-  void dispatchEvent(
-    const std::string &type,
-    const folly::dynamic &payload = folly::dynamic::object(),
-    const EventPriority &priority = EventPriority::AsynchronousBatched
-  ) const;
-
-private:
-
-  mutable EventTarget eventTarget_ {nullptr};
-  Tag tag_;
-  std::weak_ptr<const EventDispatcher> eventDispatcher_;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/core/events/EventPrimitives.h b/ReactCommon/fabric/core/events/EventPrimitives.h
deleted file mode 100644
index 5dc5cb5d62d5d2..00000000000000
--- a/ReactCommon/fabric/core/events/EventPrimitives.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 {
-
-enum class EventPriority {
-  SynchronousUnbatched,
-  SynchronousBatched,
-  AsynchronousUnbatched,
-  AsynchronousBatched,
-
-  Sync = SynchronousUnbatched,
-  Work = SynchronousBatched,
-  Interactive = AsynchronousUnbatched,
-  Deferred = AsynchronousBatched,
-};
-
-/* `InstanceHandler`, `EventTarget`, and `EventHandler` are all opaque
- * raw pointers. We use `struct {} *` trick to differentiate them in compiler's
- * eyes to ensure type safety.
- * These structs must have names (and the names must be exported)
- * to allow consistent template (e.g. `std::function`) instantiating
- * across different modules.
- */
-using EventTarget = struct EventTargetDummyStruct {} *;
-using EventHandler = struct EventHandlerDummyStruct {} *;
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/core/layout/LayoutConstraints.h b/ReactCommon/fabric/core/layout/LayoutConstraints.h
index 8f92cc22c1cc07..33607c300b86dd 100644
--- a/ReactCommon/fabric/core/layout/LayoutConstraints.h
+++ b/ReactCommon/fabric/core/layout/LayoutConstraints.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,9 +17,9 @@ namespace react {
  * Unified layout constraints for measuring.
  */
 struct LayoutConstraints {
-  Size minimumSize {0, 0};
-  Size maximumSize {kFloatUndefined, kFloatUndefined};
-  LayoutDirection layoutDirection;
+  Size minimumSize{0, 0};
+  Size maximumSize{kFloatUndefined, kFloatUndefined};
+  LayoutDirection layoutDirection{LayoutDirection::Undefined};
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/core/layout/LayoutContext.h b/ReactCommon/fabric/core/layout/LayoutContext.h
index 255952df41b190..80988f0986c60d 100644
--- a/ReactCommon/fabric/core/layout/LayoutContext.h
+++ b/ReactCommon/fabric/core/layout/LayoutContext.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,7 +20,7 @@ struct LayoutContext {
   /*
    * Compound absolute position of the node relative to the root node.
    */
-  Point absolutePosition {0, 0};
+  Point absolutePosition{0, 0};
 
   /*
    * Reflects the scale factor needed to convert from the logical coordinate
diff --git a/ReactCommon/fabric/core/layout/LayoutMetrics.h b/ReactCommon/fabric/core/layout/LayoutMetrics.h
index 5c915310a8c556..92c31e833a5ddf 100644
--- a/ReactCommon/fabric/core/layout/LayoutMetrics.h
+++ b/ReactCommon/fabric/core/layout/LayoutMetrics.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -18,29 +18,46 @@ namespace react {
  */
 struct LayoutMetrics {
   Rect frame;
-  EdgeInsets contentInsets {0};
-  EdgeInsets borderWidth {0};
-  DisplayType displayType {DisplayType::Flex};
-  LayoutDirection layoutDirection {LayoutDirection::Undefined};
-  Float pointScaleFactor {1.0};
+  EdgeInsets contentInsets{0};
+  EdgeInsets borderWidth{0};
+  DisplayType displayType{DisplayType::Flex};
+  LayoutDirection layoutDirection{LayoutDirection::Undefined};
+  Float pointScaleFactor{1.0};
 
   Rect getContentFrame() const {
-    return Rect {
-      Point {contentInsets.left, contentInsets.top},
-      Size {frame.size.width - contentInsets.left - contentInsets.right, frame.size.height - contentInsets.top - contentInsets.bottom}
-    };
+    return Rect{
+        Point{contentInsets.left, contentInsets.top},
+        Size{frame.size.width - contentInsets.left - contentInsets.right,
+             frame.size.height - contentInsets.top - contentInsets.bottom}};
   }
 
-  bool operator ==(const LayoutMetrics& rhs) const {
-    return
-      std::tie(this->frame, this->contentInsets, this->borderWidth, this->displayType, this->layoutDirection) ==
-      std::tie(rhs.frame, rhs.contentInsets, rhs.borderWidth, rhs.displayType, rhs.layoutDirection);
+  bool operator==(const LayoutMetrics &rhs) const {
+    return std::tie(
+               this->frame,
+               this->contentInsets,
+               this->borderWidth,
+               this->displayType,
+               this->layoutDirection,
+               this->pointScaleFactor) ==
+        std::tie(
+               rhs.frame,
+               rhs.contentInsets,
+               rhs.borderWidth,
+               rhs.displayType,
+               rhs.layoutDirection,
+               this->pointScaleFactor);
   }
 
-  bool operator !=(const LayoutMetrics& rhs) const {
+  bool operator!=(const LayoutMetrics &rhs) const {
     return !(*this == rhs);
   }
 };
 
+/*
+ * Represents some undefined, not-yet-computed or meaningless value of
+ * `LayoutMetrics` type.
+ */
+static const LayoutMetrics EmptyLayoutMetrics = {.frame = {.size = {-1, -1}}};
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/core/layout/LayoutPrimitives.h b/ReactCommon/fabric/core/layout/LayoutPrimitives.h
index 0d699aac3c6bec..6c6f524aec16f2 100644
--- a/ReactCommon/fabric/core/layout/LayoutPrimitives.h
+++ b/ReactCommon/fabric/core/layout/LayoutPrimitives.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,9 @@
 
 #pragma once
 
+#include <functional>
+#include <limits>
+
 namespace facebook {
 namespace react {
 
@@ -31,3 +34,12 @@ enum class LayoutDirection {
 
 } // namespace react
 } // namespace facebook
+
+namespace std {
+template <>
+struct hash<facebook::react::LayoutDirection> {
+  size_t operator()(const facebook::react::LayoutDirection &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+} // namespace std
diff --git a/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp b/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp
index 5db399f373f78e..f12e1175df35c9 100644
--- a/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp
+++ b/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -31,6 +31,10 @@ bool LayoutableShadowNode::setLayoutMetrics(LayoutMetrics layoutMetrics) {
   return true;
 }
 
+bool LayoutableShadowNode::LayoutableShadowNode::isLayoutOnly() const {
+  return false;
+}
+
 void LayoutableShadowNode::cleanLayout() {
   isLayoutClean_ = true;
 }
@@ -72,23 +76,17 @@ void LayoutableShadowNode::layout(LayoutContext layoutContext) {
     }
 
     child->ensureUnsealed();
+    child->setHasNewLayout(false);
 
-    // The assumption:
-    // All `sealed` children were replaced with not-yet-sealed clones
-    // somewhere in `layoutChildren`.
-    auto nonConstChild = std::const_pointer_cast<LayoutableShadowNode>(child);
-
-    nonConstChild->setHasNewLayout(false);
-
-    const LayoutMetrics childLayoutMetrics = nonConstChild->getLayoutMetrics();
+    const auto childLayoutMetrics = child->getLayoutMetrics();
     if (childLayoutMetrics.displayType == DisplayType::None) {
       continue;
     }
 
-    LayoutContext childLayoutContext = LayoutContext(layoutContext);
+    auto childLayoutContext = LayoutContext(layoutContext);
     childLayoutContext.absolutePosition += childLayoutMetrics.frame.origin;
 
-    nonConstChild->layout(layoutContext);
+    child->layout(layoutContext);
   }
 }
 
@@ -96,28 +94,33 @@ void LayoutableShadowNode::layoutChildren(LayoutContext layoutContext) {
   // Default implementation does nothing.
 }
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList LayoutableShadowNode::getDebugProps() const {
-  SharedDebugStringConvertibleList list = {};
+  auto list = SharedDebugStringConvertibleList{};
 
   if (getHasNewLayout()) {
-    list.push_back(std::make_shared<DebugStringConvertibleItem>("hasNewLayout"));
+    list.push_back(
+        std::make_shared<DebugStringConvertibleItem>("hasNewLayout"));
   }
 
   if (!getIsLayoutClean()) {
     list.push_back(std::make_shared<DebugStringConvertibleItem>("dirty"));
   }
 
-  LayoutMetrics layoutMetrics = getLayoutMetrics();
-  LayoutMetrics defaultLayoutMetrics = LayoutMetrics();
+  auto layoutMetrics = getLayoutMetrics();
+  auto defaultLayoutMetrics = LayoutMetrics();
 
-  list.push_back(std::make_shared<DebugStringConvertibleItem>("frame", toString(layoutMetrics.frame)));
+  list.push_back(std::make_shared<DebugStringConvertibleItem>(
+      "frame", toString(layoutMetrics.frame)));
 
   if (layoutMetrics.borderWidth != defaultLayoutMetrics.borderWidth) {
-    list.push_back(std::make_shared<DebugStringConvertibleItem>("borderWidth", toString(layoutMetrics.borderWidth)));
+    list.push_back(std::make_shared<DebugStringConvertibleItem>(
+        "borderWidth", toString(layoutMetrics.borderWidth)));
   }
 
   if (layoutMetrics.contentInsets != defaultLayoutMetrics.contentInsets) {
-    list.push_back(std::make_shared<DebugStringConvertibleItem>("contentInsets", toString(layoutMetrics.contentInsets)));
+    list.push_back(std::make_shared<DebugStringConvertibleItem>(
+        "contentInsets", toString(layoutMetrics.contentInsets)));
   }
 
   if (layoutMetrics.displayType == DisplayType::None) {
@@ -130,6 +133,7 @@ SharedDebugStringConvertibleList LayoutableShadowNode::getDebugProps() const {
 
   return list;
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/core/layout/LayoutableShadowNode.h b/ReactCommon/fabric/core/layout/LayoutableShadowNode.h
index 3958f6c5ce525e..a419be119cf1e4 100644
--- a/ReactCommon/fabric/core/layout/LayoutableShadowNode.h
+++ b/ReactCommon/fabric/core/layout/LayoutableShadowNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,8 +9,8 @@
 
 #include <array>
 #include <cmath>
-#include <vector>
 #include <memory>
+#include <vector>
 
 #include <fabric/core/LayoutMetrics.h>
 #include <fabric/core/Sealable.h>
@@ -22,20 +22,12 @@ namespace react {
 struct LayoutConstraints;
 struct LayoutContext;
 
-class LayoutableShadowNode;
-using SharedLayoutableShadowNode = std::shared_ptr<const LayoutableShadowNode>;
-using SharedLayoutableShadowNodeList = std::vector<SharedLayoutableShadowNode>;
-using LayoutableShadowNodeIterator = std::iterator<std::input_iterator_tag, const SharedLayoutableShadowNode>;
-
 /*
  * Describes all sufficient layout API (in approach-agnostic way)
  * which makes a concurrent layout possible.
  */
-class LayoutableShadowNode:
-  public virtual Sealable {
-
-public:
-
+class LayoutableShadowNode : public virtual Sealable {
+ public:
   /*
    * Measures the node (and node content, propbably recursivly) with
    * given constrains and relying on possible layout.
@@ -47,8 +39,9 @@ class LayoutableShadowNode:
    * Computes layout recusively.
    * Additional environmental constraints might be provided via `layoutContext`
    * argument.
-   * Default implementation basically calls `layoutChildren()` and then `layout()`
-   * (recursively), and provides some obvious performance optimization.
+   * Default implementation basically calls `layoutChildren()` and then
+   * `layout()` (recursively), and provides some obvious performance
+   * optimization.
    */
   virtual void layout(LayoutContext layoutContext);
 
@@ -57,8 +50,14 @@ class LayoutableShadowNode:
    */
   virtual LayoutMetrics getLayoutMetrics() const;
 
-protected:
+  /*
+   * Returns `true` if the node represents only information necessary for
+   * layout computation and can be safely removed from view hierarchy.
+   * Default implementation returns `false`.
+   */
+  virtual bool isLayoutOnly() const;
 
+ protected:
   /*
    * Clean or Dirty layout state:
    * Indicates whether all nodes (and possibly their subtrees) along the path
@@ -90,13 +89,16 @@ class LayoutableShadowNode:
   /*
    * Returns layoutable children to interate on.
    */
-  virtual SharedLayoutableShadowNodeList getLayoutableChildNodes() const = 0;
+  virtual std::vector<LayoutableShadowNode *> getLayoutableChildNodes()
+      const = 0;
 
   /*
    * In case layout algorithm needs to mutate this (probably sealed) node,
    * it has to clone and replace it in the hierarchy before to do so.
    */
-  virtual SharedLayoutableShadowNode cloneAndReplaceChild(const SharedLayoutableShadowNode &child) = 0;
+  virtual LayoutableShadowNode *cloneAndReplaceChild(
+      LayoutableShadowNode *child,
+      int suggestedIndex = -1) = 0;
 
   /*
    * Sets layout metrics for the shadow node.
@@ -106,12 +108,14 @@ class LayoutableShadowNode:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const;
+#endif
 
-private:
-  LayoutMetrics layoutMetrics_ {};
-  bool hasNewLayout_ {false};
-  bool isLayoutClean_ {false};
+ private:
+  LayoutMetrics layoutMetrics_{};
+  bool hasNewLayout_{false};
+  bool isLayoutClean_{false};
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/core/primitives/ReactPrimitives.h b/ReactCommon/fabric/core/primitives/ReactPrimitives.h
index 836fdb741758e7..296266e1bef53c 100644
--- a/ReactCommon/fabric/core/primitives/ReactPrimitives.h
+++ b/ReactCommon/fabric/core/primitives/ReactPrimitives.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,6 +9,7 @@
 
 #include <memory>
 #include <string>
+#include <unordered_map>
 
 #include <folly/dynamic.h>
 
@@ -19,13 +20,19 @@ namespace react {
  * `Tag` and `InstanceHandle` are used to address React Native components.
  */
 using Tag = int32_t;
-using InstanceHandle = struct InstanceHandleDummyStruct {} *;
+using InstanceHandle = struct InstanceHandleDummyStruct {
+} *;
+
+/*
+ * An id of a running Surface instance that is used to refer to the instance.
+ */
+using SurfaceId = int32_t;
 
 /*
  * `RawProps` represents untyped map with props comes from JavaScript side.
  */
 // TODO(T26954420): Use iterator as underlying type for RawProps.
-using RawProps = std::map<std::string, folly::dynamic>;
+using RawProps = std::unordered_map<std::string, folly::dynamic>;
 using SharedRawProps = std::shared_ptr<const RawProps>;
 
 /*
@@ -34,7 +41,7 @@ using SharedRawProps = std::shared_ptr<const RawProps>;
  * Practically, it's something that concrete ShadowNode and concrete
  * ComponentDescriptor have in common.
  */
-using ComponentHandle = size_t;
+using ComponentHandle = int64_t;
 
 /*
  * String identifier for components used for addressing them from
diff --git a/ReactCommon/fabric/core/primitives/Sealable.cpp b/ReactCommon/fabric/core/primitives/Sealable.cpp
index a44181ee125bde..cd1c2b029849cb 100644
--- a/ReactCommon/fabric/core/primitives/Sealable.cpp
+++ b/ReactCommon/fabric/core/primitives/Sealable.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -24,11 +24,13 @@ namespace react {
  * http://en.cppreference.com/w/cpp/language/rule_of_three
  */
 
-Sealable::Sealable(): sealed_(false) {}
+#ifndef NDEBUG
 
-Sealable::Sealable(const Sealable &other): sealed_(false) {};
+Sealable::Sealable() : sealed_(false) {}
 
-Sealable::Sealable(Sealable &&other) noexcept: sealed_(false) {};
+Sealable::Sealable(const Sealable &other) : sealed_(false){};
+
+Sealable::Sealable(Sealable &&other) noexcept : sealed_(false){};
 
 Sealable::~Sealable() noexcept {};
 
@@ -40,7 +42,7 @@ Sealable &Sealable::operator=(const Sealable &other) {
 Sealable &Sealable::operator=(Sealable &&other) noexcept {
   ensureUnsealed();
   return *this;
-};
+}
 
 void Sealable::seal() const {
   sealed_ = true;
@@ -56,5 +58,7 @@ void Sealable::ensureUnsealed() const {
   }
 }
 
+#endif
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/core/primitives/Sealable.h b/ReactCommon/fabric/core/primitives/Sealable.h
index 8cc3c6ed946d68..b11afecbf9fce1 100644
--- a/ReactCommon/fabric/core/primitives/Sealable.h
+++ b/ReactCommon/fabric/core/primitives/Sealable.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,13 +7,14 @@
 
 #pragma once
 
-#import <atomic>
+#include <atomic>
 
 namespace facebook {
 namespace react {
 
 /*
- * Represents an object which can be *sealed* (imperatively marked as immutable).
+ * Represents an object which can be *sealed* (imperatively marked as
+ * immutable).
  *
  * The `sealed` flag is tight to a particular instance of the class and resets
  * to `false` for all newly created (by copy-constructor, assignment operator
@@ -21,27 +22,41 @@ namespace react {
  *
  * Why do we need this? In Fabric, some objects are semi-immutable
  * even if they are explicitly marked as `const`. It means that in some special
- * cases those objects can be const-casted-away and then mutated. That comes from
- * the fact that we share some object's life-cycle responsibilities with React
- * and the immutability is guaranteed by some logic splitted between native and
- * JavaScript worlds (which makes it impossible to fully use immutability
- * enforcement at a language level).
- * To detect possible errors as early as possible we additionally mark objects
- * as *sealed* after some stages and then enforce this at run-time.
+ * cases those objects can be const-casted-away and then mutated. That comes
+ * from the fact that we share some object's life-cycle responsibilities with
+ * React and the immutability is guaranteed by some logic splitted between
+ * native and JavaScript worlds (which makes it impossible to fully use
+ * immutability enforcement at a language level). To detect possible errors as
+ * early as possible we additionally mark objects as *sealed* after some stages
+ * and then enforce this at run-time.
  *
  * How to use:
  *   1. Inherit your class from `Sealable`.
  *   2. Call `ensureUnsealed()` in all cases where the object might be mutated:
  *      a. At the beginning of all *always* mutating `non-const` methods;
- *      b. Right before the place where actual mutation happens in all *possible*
- *         mutating `non-const` methods;
- *      c. Right after performing `const_cast`. (Optionally. This is not strictly
- *         necessary but might help detect problems earlier.)
+ *      b. Right before the place where actual mutation happens in all
+ * *possible* mutating `non-const` methods; c. Right after performing
+ * `const_cast`. (Optionally. This is not strictly necessary but might help
+ * detect problems earlier.)
  *   3. Call `seal()` at some point from which any modifications
  *      must be prevented.
  */
+
+#ifdef NDEBUG
+
 class Sealable {
-public:
+ public:
+  inline void seal() const {}
+  inline bool getSealed() const {
+    return true;
+  }
+  inline void ensureUnsealed() const {}
+};
+
+#else
+
+class Sealable {
+ public:
   Sealable();
   Sealable(const Sealable &other);
   Sealable(Sealable &&other) noexcept;
@@ -66,9 +81,11 @@ class Sealable {
    */
   void ensureUnsealed() const;
 
-private:
-  mutable std::atomic<bool> sealed_ {false};
+ private:
+  mutable std::atomic<bool> sealed_{false};
 };
 
+#endif
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/core/propsConversions.h b/ReactCommon/fabric/core/propsConversions.h
index 350eb017e75315..a1a8db5b00f8a1 100644
--- a/ReactCommon/fabric/core/propsConversions.h
+++ b/ReactCommon/fabric/core/propsConversions.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,24 +7,35 @@
 
 #pragma once
 
-#include <folly/Optional.h>
-#include <folly/dynamic.h>
 #include <fabric/graphics/Color.h>
 #include <fabric/graphics/Geometry.h>
 #include <fabric/graphics/conversions.h>
+#include <folly/Optional.h>
+#include <folly/dynamic.h>
 
 namespace facebook {
 namespace react {
 
-inline void fromDynamic(const folly::dynamic &value, bool &result) { result = value.getBool(); }
+inline void fromDynamic(const folly::dynamic &value, bool &result) {
+  result = value.getBool();
+}
 inline void fromDynamic(const folly::dynamic &value, int &result) {
-  // All numbers from JS are treated as double, and JS cannot represent int64 in practice.
-  // So this always converts the value to int64 instead.
+  // All numbers from JS are treated as double, and JS cannot represent int64 in
+  // practice. So this always converts the value to int64 instead.
   result = value.asInt();
 }
-inline void fromDynamic(const folly::dynamic &value, float &result) { result = (float)value.asDouble(); }
-inline void fromDynamic(const folly::dynamic &value, double &result) { result = value.asDouble(); }
-inline void fromDynamic(const folly::dynamic &value, std::string &result) { result = value.getString(); }
+inline void fromDynamic(const folly::dynamic &value, float &result) {
+  result = (float)value.asDouble();
+}
+inline void fromDynamic(const folly::dynamic &value, double &result) {
+  result = value.asDouble();
+}
+inline void fromDynamic(const folly::dynamic &value, std::string &result) {
+  result = value.getString();
+}
+inline void fromDynamic(const folly::dynamic &value, folly::dynamic &result) {
+  result = value;
+}
 
 template <typename T>
 inline void fromDynamic(const folly::dynamic &value, std::vector<T> &result) {
@@ -45,11 +56,10 @@ inline void fromDynamic(const folly::dynamic &value, std::vector<T> &result) {
 
 template <typename T>
 inline T convertRawProp(
-  const RawProps &rawProps,
-  const std::string &name,
-  const T &sourceValue,
-  const T &defaultValue = T()
-) {
+    const RawProps &rawProps,
+    const std::string &name,
+    const T &sourceValue,
+    const T &defaultValue = T()) {
   const auto &iterator = rawProps.find(name);
   if (iterator == rawProps.end()) {
     return sourceValue;
@@ -57,7 +67,8 @@ inline T convertRawProp(
 
   const auto &value = iterator->second;
 
-  // Special case: `null` always means `the prop was removed, use default value`.
+  // Special case: `null` always means `the prop was removed, use default
+  // value`.
   if (value.isNull()) {
     return defaultValue;
   }
@@ -69,11 +80,10 @@ inline T convertRawProp(
 
 template <typename T>
 inline static folly::Optional<T> convertRawProp(
-  const RawProps &rawProps,
-  const std::string &name,
-  const folly::Optional<T> &sourceValue,
-  const folly::Optional<T> &defaultValue = {}
-) {
+    const RawProps &rawProps,
+    const std::string &name,
+    const folly::Optional<T> &sourceValue,
+    const folly::Optional<T> &defaultValue = {}) {
   const auto &iterator = rawProps.find(name);
   if (iterator == rawProps.end()) {
     return sourceValue;
@@ -81,7 +91,8 @@ inline static folly::Optional<T> convertRawProp(
 
   const auto &value = iterator->second;
 
-  // Special case: `null` always means `the prop was removed, use default value`.
+  // Special case: `null` always means `the prop was removed, use default
+  // value`.
   if (value.isNull()) {
     return defaultValue;
   }
diff --git a/ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h b/ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h
index c4f08a45a65e71..cd99d629fa5815 100644
--- a/ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h
+++ b/ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -19,64 +19,76 @@ namespace react {
  * `ConcreteShadowNode` is a default implementation of `ShadowNode` interface
  * with many handy features.
  */
-template <typename PropsT, typename EventEmitterT = EventEmitter>
-class ConcreteShadowNode: public ShadowNode {
-  static_assert(std::is_base_of<Props, PropsT>::value, "PropsT must be a descendant of Props");
+template <
+    const char *concreteComponentName,
+    typename PropsT,
+    typename EventEmitterT = EventEmitter>
+class ConcreteShadowNode : public ShadowNode {
+  static_assert(
+      std::is_base_of<Props, PropsT>::value,
+      "PropsT must be a descendant of Props");
+
+ public:
+  using ShadowNode::ShadowNode;
 
-public:
   using ConcreteProps = PropsT;
   using SharedConcreteProps = std::shared_ptr<const PropsT>;
   using ConcreteEventEmitter = EventEmitterT;
   using SharedConcreteEventEmitter = std::shared_ptr<const EventEmitterT>;
   using SharedConcreteShadowNode = std::shared_ptr<const ConcreteShadowNode>;
 
-  static SharedConcreteProps Props(const RawProps &rawProps, const SharedProps &baseProps = nullptr) {
-    return std::make_shared<const PropsT>(baseProps ? *std::static_pointer_cast<const PropsT>(baseProps) : PropsT(), rawProps);
+  static ComponentName Name() {
+    return ComponentName(concreteComponentName);
+  }
+
+  static ComponentHandle Handle() {
+    return ComponentHandle(concreteComponentName);
+  }
+
+  static SharedConcreteProps Props(
+      const RawProps &rawProps,
+      const SharedProps &baseProps = nullptr) {
+    return std::make_shared<const PropsT>(
+        baseProps ? *std::static_pointer_cast<const PropsT>(baseProps)
+                  : PropsT(),
+        rawProps);
   }
 
   static SharedConcreteProps defaultSharedProps() {
-    static const SharedConcreteProps defaultSharedProps = std::make_shared<const PropsT>();
+    static const SharedConcreteProps defaultSharedProps =
+        std::make_shared<const PropsT>();
     return defaultSharedProps;
   }
 
-  ConcreteShadowNode(
-    const Tag &tag,
-    const Tag &rootTag,
-    const SharedConcreteProps &props,
-    const SharedConcreteEventEmitter &eventEmitter,
-    const SharedShadowNodeSharedList &children,
-    const ShadowNodeCloneFunction &cloneFunction
-  ):
-    ShadowNode(
-      tag,
-      rootTag,
-      (SharedProps)props,
-      eventEmitter,
-      children,
-      cloneFunction
-    ) {};
-
-  ConcreteShadowNode(
-    const SharedConcreteShadowNode &shadowNode,
-    const SharedProps &props,
-    const SharedEventEmitter &eventEmitter,
-    const SharedShadowNodeSharedList &children
-  ):
-    ShadowNode(
-      shadowNode,
-      (SharedProps)props,
-      eventEmitter,
-      children
-    ) {}
+  ComponentName getComponentName() const override {
+    return ComponentName(concreteComponentName);
+  }
 
-  virtual ComponentHandle getComponentHandle() const {
-    return typeid(*this).hash_code();
+  ComponentHandle getComponentHandle() const override {
+    return reinterpret_cast<ComponentHandle>(concreteComponentName);
   }
 
   const SharedConcreteProps getProps() const {
     assert(std::dynamic_pointer_cast<const PropsT>(props_));
     return std::static_pointer_cast<const PropsT>(props_);
   }
+
+  /*
+   * Returns subset of children that are inherited from `SpecificShadowNodeT`.
+   */
+  template <typename SpecificShadowNodeT>
+  std::vector<SpecificShadowNodeT *> getChildrenSlice() const {
+    std::vector<SpecificShadowNodeT *> children;
+    for (const auto &childShadowNode : getChildren()) {
+      auto specificChildShadowNode =
+          dynamic_cast<const SpecificShadowNodeT *>(childShadowNode.get());
+      if (specificChildShadowNode) {
+        children.push_back(
+            const_cast<SpecificShadowNodeT *>(specificChildShadowNode));
+      }
+    }
+    return children;
+  }
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/core/shadownode/LocalData.h b/ReactCommon/fabric/core/shadownode/LocalData.h
index 8b5b0fca093b7e..9fe47c774b522c 100644
--- a/ReactCommon/fabric/core/shadownode/LocalData.h
+++ b/ReactCommon/fabric/core/shadownode/LocalData.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,6 +9,7 @@
 
 #include <fabric/core/Sealable.h>
 #include <fabric/debug/DebugStringConvertible.h>
+#include <folly/dynamic.h>
 
 namespace facebook {
 namespace react {
@@ -25,11 +26,13 @@ using SharedLocalData = std::shared_ptr<const LocalData>;
  * All `LocalData` objects *must* be immutable (sealed) when they became
  * a part of the shadow tree.
  */
-class LocalData:
-  public Sealable,
-  public DebugStringConvertible {
+class LocalData : public Sealable, public DebugStringConvertible {
+ public:
+  virtual ~LocalData() = default;
 
-  // Nothing.
+  virtual folly::dynamic getDynamic() const {
+    return folly::dynamic::object();
+  }
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/core/shadownode/Props.cpp b/ReactCommon/fabric/core/shadownode/Props.cpp
index f70632d4746476..c6ca7d20c3092a 100644
--- a/ReactCommon/fabric/core/shadownode/Props.cpp
+++ b/ReactCommon/fabric/core/shadownode/Props.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,8 +13,13 @@
 namespace facebook {
 namespace react {
 
-Props::Props(const Props &sourceProps, const RawProps &rawProps):
-  nativeId(convertRawProp(rawProps, "nativeID", sourceProps.nativeId)) {};
+Props::Props(const Props &sourceProps, const RawProps &rawProps)
+    : nativeId(convertRawProp(rawProps, "nativeID", sourceProps.nativeId))
+#ifdef ANDROID
+      ,
+      rawProps(rawProps)
+#endif
+          {};
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/core/shadownode/Props.h b/ReactCommon/fabric/core/shadownode/Props.h
index 1e349020a9720b..ace5e4dfe9996c 100644
--- a/ReactCommon/fabric/core/shadownode/Props.h
+++ b/ReactCommon/fabric/core/shadownode/Props.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,8 +9,8 @@
 
 #include <folly/dynamic.h>
 
-#include <fabric/core/Sealable.h>
 #include <fabric/core/ReactPrimitives.h>
+#include <fabric/core/Sealable.h>
 #include <fabric/debug/DebugStringConvertible.h>
 
 namespace facebook {
@@ -23,15 +23,17 @@ using SharedProps = std::shared_ptr<const Props>;
 /*
  * Represents the most generic props object.
  */
-class Props:
-  public virtual Sealable,
-  public virtual DebugStringConvertible {
-
-public:
+class Props : public virtual Sealable, public virtual DebugStringConvertible {
+ public:
   Props() = default;
   Props(const Props &sourceProps, const RawProps &rawProps);
+  virtual ~Props() = default;
 
   const std::string nativeId;
+
+#ifdef ANDROID
+  const RawProps rawProps;
+#endif
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/core/shadownode/ShadowNode.cpp b/ReactCommon/fabric/core/shadownode/ShadowNode.cpp
index b2182bcd570d89..3ea2d8193f3833 100644
--- a/ReactCommon/fabric/core/shadownode/ShadowNode.cpp
+++ b/ReactCommon/fabric/core/shadownode/ShadowNode.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,63 +9,61 @@
 
 #include <string>
 
+#include <fabric/core/ShadowNodeFragment.h>
 #include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/debug/DebugStringConvertibleItem.h>
+#include <fabric/debug/debugStringConvertibleUtils.h>
 
 namespace facebook {
 namespace react {
 
 SharedShadowNodeSharedList ShadowNode::emptySharedShadowNodeSharedList() {
-  static const auto emptySharedShadowNodeSharedList = std::make_shared<SharedShadowNodeList>();
+  static const auto emptySharedShadowNodeSharedList =
+      std::make_shared<SharedShadowNodeList>();
   return emptySharedShadowNodeSharedList;
 }
 
 #pragma mark - Constructors
 
 ShadowNode::ShadowNode(
-  const Tag &tag,
-  const Tag &rootTag,
-  const SharedProps &props,
-  const SharedEventEmitter &eventEmitter,
-  const SharedShadowNodeSharedList &children,
-  const ShadowNodeCloneFunction &cloneFunction
-):
-  tag_(tag),
-  rootTag_(rootTag),
-  props_(props),
-  eventEmitter_(eventEmitter),
-  children_(std::make_shared<SharedShadowNodeList>(*children)),
-  cloneFunction_(cloneFunction),
-  revision_(1) {}
+    const ShadowNodeFragment &fragment,
+    const ShadowNodeCloneFunction &cloneFunction)
+    : tag_(fragment.tag),
+      rootTag_(fragment.rootTag),
+      props_(fragment.props),
+      eventEmitter_(fragment.eventEmitter),
+      children_(fragment.children ?: emptySharedShadowNodeSharedList()),
+      cloneFunction_(cloneFunction),
+      childrenAreShared_(true),
+      revision_(1) {
+  assert(props_);
+  assert(children_);
+}
 
 ShadowNode::ShadowNode(
-  const SharedShadowNode &shadowNode,
-  const SharedProps &props,
-  const SharedEventEmitter &eventEmitter,
-  const SharedShadowNodeSharedList &children
-):
-  tag_(shadowNode->tag_),
-  rootTag_(shadowNode->rootTag_),
-  props_(props ? props : shadowNode->props_),
-  eventEmitter_(eventEmitter ? eventEmitter : shadowNode->eventEmitter_),
-  children_(std::make_shared<SharedShadowNodeList>(*(children ? children : shadowNode->children_))),
-  sourceNode_(shadowNode),
-  localData_(shadowNode->localData_),
-  cloneFunction_(shadowNode->cloneFunction_),
-  revision_(shadowNode->revision_ + 1) {}
-
-SharedShadowNode ShadowNode::clone(
-  const SharedProps &props,
-  const SharedShadowNodeSharedList &children
-) const {
+    const ShadowNode &sourceShadowNode,
+    const ShadowNodeFragment &fragment)
+    : tag_(fragment.tag ?: sourceShadowNode.tag_),
+      rootTag_(fragment.rootTag ?: sourceShadowNode.rootTag_),
+      props_(fragment.props ?: sourceShadowNode.props_),
+      eventEmitter_(fragment.eventEmitter ?: sourceShadowNode.eventEmitter_),
+      children_(fragment.children ?: sourceShadowNode.children_),
+      localData_(fragment.localData ?: sourceShadowNode.localData_),
+      cloneFunction_(sourceShadowNode.cloneFunction_),
+      childrenAreShared_(true),
+      revision_(sourceShadowNode.revision_ + 1) {
+  assert(props_);
+  assert(children_);
+}
+
+UnsharedShadowNode ShadowNode::clone(const ShadowNodeFragment &fragment) const {
   assert(cloneFunction_);
-  return cloneFunction_(shared_from_this(), props_, eventEmitter_, children_);
+  return cloneFunction_(*this, fragment);
 }
 
 #pragma mark - Getters
 
-SharedShadowNodeSharedList ShadowNode::getChildren() const {
-  return children_;
+const SharedShadowNodeList &ShadowNode::getChildren() const {
+  return *children_;
 }
 
 SharedProps ShadowNode::getProps() const {
@@ -84,10 +82,6 @@ Tag ShadowNode::getRootTag() const {
   return rootTag_;
 }
 
-SharedShadowNode ShadowNode::getSourceNode() const {
-  return sourceNode_.lock();
-}
-
 SharedLocalData ShadowNode::getLocalData() const {
   return localData_;
 }
@@ -111,20 +105,32 @@ void ShadowNode::sealRecursive() const {
 void ShadowNode::appendChild(const SharedShadowNode &child) {
   ensureUnsealed();
 
-  auto nonConstChildren = std::const_pointer_cast<SharedShadowNodeList>(children_);
+  cloneChildrenIfShared();
+  auto nonConstChildren =
+      std::const_pointer_cast<SharedShadowNodeList>(children_);
   nonConstChildren->push_back(child);
 }
 
-void ShadowNode::replaceChild(const SharedShadowNode &oldChild, const SharedShadowNode &newChild) {
+void ShadowNode::replaceChild(
+    const SharedShadowNode &oldChild,
+    const SharedShadowNode &newChild,
+    int suggestedIndex) {
   ensureUnsealed();
 
-  auto nonConstChildren = std::const_pointer_cast<SharedShadowNodeList>(children_);
-  std::replace(nonConstChildren->begin(), nonConstChildren->end(), oldChild, newChild);
-}
+  cloneChildrenIfShared();
 
-void ShadowNode::clearSourceNode() {
-  ensureUnsealed();
-  sourceNode_.reset();
+  auto nonConstChildren =
+      std::const_pointer_cast<SharedShadowNodeList>(children_);
+
+  if (suggestedIndex != -1 && suggestedIndex < nonConstChildren->size()) {
+    if (nonConstChildren->at(suggestedIndex) == oldChild) {
+      (*nonConstChildren)[suggestedIndex] = newChild;
+      return;
+    }
+  }
+
+  std::replace(
+      nonConstChildren->begin(), nonConstChildren->end(), oldChild, newChild);
 }
 
 void ShadowNode::setLocalData(const SharedLocalData &localData) {
@@ -132,46 +138,32 @@ void ShadowNode::setLocalData(const SharedLocalData &localData) {
   localData_ = localData;
 }
 
-void ShadowNode::shallowSourceNode() {
-  ensureUnsealed();
-
-  auto sourceNode = sourceNode_.lock();
-  assert(sourceNode);
-  sourceNode_ = sourceNode->getSourceNode();
-}
-
-#pragma mark - Equality
-
-bool ShadowNode::operator==(const ShadowNode& rhs) const {
-  // Note: Child nodes are not considered as part of instance's value
-  // and/or identity.
-  return
-    tag_ == rhs.tag_ &&
-    rootTag_ == rhs.rootTag_ &&
-    props_ == rhs.props_ &&
-    eventEmitter_ == rhs.eventEmitter_ &&
-    localData_ == rhs.localData_;
-}
-
-bool ShadowNode::operator!=(const ShadowNode& rhs) const {
-  return !(*this == rhs);
+void ShadowNode::cloneChildrenIfShared() {
+  if (!childrenAreShared_) {
+    return;
+  }
+  childrenAreShared_ = false;
+  children_ = std::make_shared<SharedShadowNodeList>(*children_);
 }
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 std::string ShadowNode::getDebugName() const {
   return getComponentName();
 }
 
 std::string ShadowNode::getDebugValue() const {
-  return "r" + folly::to<std::string>(revision_) + (getSealed() ? "/sealed" : "");
+  return "r" + folly::to<std::string>(revision_) +
+      (getSealed() ? "/sealed" : "");
 }
 
 SharedDebugStringConvertibleList ShadowNode::getDebugChildren() const {
-  SharedDebugStringConvertibleList debugChildren = {};
+  auto debugChildren = SharedDebugStringConvertibleList{};
 
   for (auto child : *children_) {
-    auto debugChild = std::dynamic_pointer_cast<const DebugStringConvertible>(child);
+    auto debugChild =
+        std::dynamic_pointer_cast<const DebugStringConvertible>(child);
     if (debugChild) {
       debugChildren.push_back(debugChild);
     }
@@ -181,22 +173,11 @@ SharedDebugStringConvertibleList ShadowNode::getDebugChildren() const {
 }
 
 SharedDebugStringConvertibleList ShadowNode::getDebugProps() const {
-  SharedDebugStringConvertibleList list = {};
-
-  list.push_back(std::make_shared<DebugStringConvertibleItem>("tag", folly::to<std::string>(tag_)));
-
-  SharedShadowNode sourceNode = getSourceNode();
-  if (sourceNode) {
-    list.push_back(std::make_shared<DebugStringConvertibleItem>(
-      "source",
-      sourceNode->getDebugDescription({.maximumDepth = 1, .format = false})
-    ));
-  }
-
-  SharedDebugStringConvertibleList propsList = props_->getDebugProps();
-  std::move(propsList.begin(), propsList.end(), std::back_inserter(list));
-  return list;
+  return props_->getDebugProps() +
+      SharedDebugStringConvertibleList{
+          debugStringConvertibleItem("tag", folly::to<std::string>(tag_))};
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/core/shadownode/ShadowNode.h b/ReactCommon/fabric/core/shadownode/ShadowNode.h
index a526fd698692a6..a58c3aeb86d4fb 100644
--- a/ReactCommon/fabric/core/shadownode/ShadowNode.h
+++ b/ReactCommon/fabric/core/shadownode/ShadowNode.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,88 +7,75 @@
 
 #pragma once
 
-#include <string>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include <fabric/core/EventEmitter.h>
 #include <fabric/core/LocalData.h>
 #include <fabric/core/Props.h>
 #include <fabric/core/ReactPrimitives.h>
 #include <fabric/core/Sealable.h>
 #include <fabric/debug/DebugStringConvertible.h>
+#include <fabric/events/EventEmitter.h>
 
 namespace facebook {
 namespace react {
 
+struct ShadowNodeFragment;
+
 class ShadowNode;
 
 using SharedShadowNode = std::shared_ptr<const ShadowNode>;
 using UnsharedShadowNode = std::shared_ptr<ShadowNode>;
-using SharedShadowNodeList = std::vector<std::shared_ptr<const ShadowNode>>;
+using SharedShadowNodeList = std::vector<SharedShadowNode>;
 using SharedShadowNodeSharedList = std::shared_ptr<const SharedShadowNodeList>;
 using SharedShadowNodeUnsharedList = std::shared_ptr<SharedShadowNodeList>;
-using WeakShadowNode = std::weak_ptr<const ShadowNode>;
-
-using ShadowNodeCloneFunction = std::function<SharedShadowNode(
-  const SharedShadowNode &shadowNode,
-  const SharedProps &props,
-  const SharedEventEmitter &eventEmitter,
-  const SharedShadowNodeSharedList &children
-)>;
-
-class ShadowNode:
-  public virtual Sealable,
-  public virtual DebugStringConvertible,
-  public std::enable_shared_from_this<ShadowNode> {
-public:
+
+using ShadowNodeCloneFunction = std::function<UnsharedShadowNode(
+    const ShadowNode &sourceShadowNode,
+    const ShadowNodeFragment &fragment)>;
+
+class ShadowNode : public virtual Sealable,
+                   public virtual DebugStringConvertible,
+                   public std::enable_shared_from_this<ShadowNode> {
+ public:
   static SharedShadowNodeSharedList emptySharedShadowNodeSharedList();
 
 #pragma mark - Constructors
 
+  /*
+   * Creates a Shadow Node based on fields specified in a `fragment`.
+   */
   ShadowNode(
-    const Tag &tag,
-    const Tag &rootTag,
-    const SharedProps &props,
-    const SharedEventEmitter &eventEmitter,
-    const SharedShadowNodeSharedList &children,
-    const ShadowNodeCloneFunction &cloneFunction
-  );
+      const ShadowNodeFragment &fragment,
+      const ShadowNodeCloneFunction &cloneFunction);
 
+  /*
+   * Creates a Shadow Node via cloning given `sourceShadowNode` and
+   * applying fields from given `fragment`.
+   */
   ShadowNode(
-    const SharedShadowNode &shadowNode,
-    const SharedProps &props,
-    const SharedEventEmitter &eventEmitter,
-    const SharedShadowNodeSharedList &children
-  );
+      const ShadowNode &sourceShadowNode,
+      const ShadowNodeFragment &fragment);
+
+  virtual ~ShadowNode() = default;
 
   /*
    * Clones the shadow node using stored `cloneFunction`.
    */
-  SharedShadowNode clone(
-    const SharedProps &props = nullptr,
-    const SharedShadowNodeSharedList &children = nullptr
-  ) const;
+  UnsharedShadowNode clone(const ShadowNodeFragment &fragment) const;
 
 #pragma mark - Getters
 
   virtual ComponentHandle getComponentHandle() const = 0;
   virtual ComponentName getComponentName() const = 0;
 
-  SharedShadowNodeSharedList getChildren() const;
+  const SharedShadowNodeList &getChildren() const;
   SharedProps getProps() const;
   SharedEventEmitter getEventEmitter() const;
   Tag getTag() const;
   Tag getRootTag() const;
 
-  /*
-   * Returns the node which was used as a prototype in clone constructor.
-   * The node is held as a weak reference so that the method may return
-   * `nullptr` in cases where the node was constructed using the explicit
-   * constructor or the node was already deallocated.
-   */
-  SharedShadowNode getSourceNode() const;
-
   /*
    * Returns a local data associated with the node.
    * `LocalData` object might be used for data exchange between native view and
@@ -102,7 +89,10 @@ class ShadowNode:
 #pragma mark - Mutating Methods
 
   void appendChild(const SharedShadowNode &child);
-  void replaceChild(const SharedShadowNode &oldChild, const SharedShadowNode &newChild);
+  void replaceChild(
+      const SharedShadowNode &oldChild,
+      const SharedShadowNode &newChild,
+      int suggestedIndex = -1);
   void clearSourceNode();
 
   /*
@@ -111,44 +101,29 @@ class ShadowNode:
    */
   void setLocalData(const SharedLocalData &localData);
 
-  /*
-   * Replaces the current source node with its source node.
-   * This method might be used for illuminating side-effects caused by the last
-   * cloning operation which are not desirable from the diffing algorithm
-   * perspective.
-   * The node must be unsealed at this point.
-   */
-  void shallowSourceNode();
-
-#pragma mark - Equality
-
-  /*
-   * Equality operators.
-   * Use this to compare `ShadowNode`s values for equality (and non-equality).
-   * Same values indicates that nodes must not produce mutation instructions
-   * during tree diffing process.
-   * Child nodes are not considered as part of the value.
-   */
-  virtual bool operator==(const ShadowNode& rhs) const;
-  virtual bool operator!=(const ShadowNode& rhs) const;
-
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   std::string getDebugName() const override;
   std::string getDebugValue() const override;
   SharedDebugStringConvertibleList getDebugChildren() const override;
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 
-protected:
+ protected:
   Tag tag_;
   Tag rootTag_;
   SharedProps props_;
   SharedEventEmitter eventEmitter_;
   SharedShadowNodeSharedList children_;
-  WeakShadowNode sourceNode_;
   SharedLocalData localData_;
 
-private:
+ private:
+  /*
+   * Clones the list of children (and creates a new `shared_ptr` to it) if
+   * `childrenAreShared_` flag is `true`.
+   */
+  void cloneChildrenIfShared();
 
   /*
    * A reference to a cloning function that understands how to clone
@@ -156,6 +131,12 @@ class ShadowNode:
    */
   ShadowNodeCloneFunction cloneFunction_;
 
+  /*
+   * Indicates that `children` list is shared between nodes and need
+   * to be cloned before the first mutation.
+   */
+  bool childrenAreShared_;
+
   /*
    * A number of the generation of the ShadowNode instance;
    * is used and useful for debug-printing purposes *only*.
diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.cpp b/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.cpp
new file mode 100644
index 00000000000000..494b9e6294616e
--- /dev/null
+++ b/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.cpp
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ShadowNodeFragment.h"
+
+namespace facebook {
+namespace react {
+
+SharedProps &ShadowNodeFragment::nullSharedProps() {
+  static auto &instance = *new SharedProps();
+  return instance;
+}
+
+SharedEventEmitter &ShadowNodeFragment::nullSharedEventEmitter() {
+  static auto &instance = *new SharedEventEmitter();
+  return instance;
+}
+
+SharedShadowNodeSharedList &ShadowNodeFragment::nullSharedChildren() {
+  static auto &instance = *new SharedShadowNodeSharedList();
+  return instance;
+}
+
+SharedLocalData &ShadowNodeFragment::nullLocalData() {
+  static auto &instance = *new SharedLocalData();
+  return instance;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h b/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h
new file mode 100644
index 00000000000000..28fe77f1f8de83
--- /dev/null
+++ b/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/core/LocalData.h>
+#include <fabric/core/Props.h>
+#include <fabric/core/ReactPrimitives.h>
+#include <fabric/core/ShadowNode.h>
+#include <fabric/events/EventEmitter.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * An object which supposed to be used as a parameter specifying a shape
+ * of created or cloned ShadowNode.
+ * Note: Most of the fields are `const &` references (essentially just raw
+ * pointers) which means that the Fragment does not copy/store them or
+ * retain ownership of them.
+ */
+struct ShadowNodeFragment {
+  Tag tag = 0;
+  Tag rootTag = 0;
+  const SharedProps &props = nullSharedProps();
+  const SharedEventEmitter &eventEmitter = nullSharedEventEmitter();
+  const SharedShadowNodeSharedList &children = nullSharedChildren();
+  const SharedLocalData &localData = nullLocalData();
+
+ private:
+  static SharedProps &nullSharedProps();
+  static SharedEventEmitter &nullSharedEventEmitter();
+  static SharedShadowNodeSharedList &nullSharedChildren();
+  static SharedLocalData &nullLocalData();
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/core/tests/ComponentDescriptorTest.cpp b/ReactCommon/fabric/core/tests/ComponentDescriptorTest.cpp
index 12e09787a7ad25..8dcd11fccfdfed 100644
--- a/ReactCommon/fabric/core/tests/ComponentDescriptorTest.cpp
+++ b/ReactCommon/fabric/core/tests/ComponentDescriptorTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,17 +12,26 @@
 using namespace facebook::react;
 
 TEST(ComponentDescriptorTest, createShadowNode) {
-  SharedComponentDescriptor descriptor = std::make_shared<TestComponentDescriptor>(nullptr);
+  SharedComponentDescriptor descriptor =
+      std::make_shared<TestComponentDescriptor>(nullptr);
 
-  ASSERT_EQ(descriptor->getComponentHandle(), typeid(TestShadowNode).hash_code());
+  ASSERT_EQ(descriptor->getComponentHandle(), TestShadowNode::Handle());
+  ASSERT_STREQ(
+      descriptor->getComponentName().c_str(), TestShadowNode::Name().c_str());
   ASSERT_STREQ(descriptor->getComponentName().c_str(), "Test");
 
   RawProps raw;
   raw["nativeID"] = "abc";
   SharedProps props = descriptor->cloneProps(nullptr, raw);
-  SharedShadowNode node = descriptor->createShadowNode(9, 1, descriptor->createEventEmitter(0, 9), props);
+  SharedShadowNode node = descriptor->createShadowNode(
+      ShadowNodeFragment{.tag = 9,
+                         .rootTag = 1,
+                         .props = props,
+                         .eventEmitter = descriptor->createEventEmitter(0, 9)});
 
-  ASSERT_EQ(node->getComponentHandle(), typeid(TestShadowNode).hash_code());
+  ASSERT_EQ(node->getComponentHandle(), TestShadowNode::Handle());
+  ASSERT_STREQ(
+      node->getComponentName().c_str(), TestShadowNode::Name().c_str());
   ASSERT_STREQ(node->getComponentName().c_str(), "Test");
   ASSERT_EQ(node->getTag(), 9);
   ASSERT_EQ(node->getRootTag(), 1);
@@ -30,15 +39,19 @@ TEST(ComponentDescriptorTest, createShadowNode) {
 }
 
 TEST(ComponentDescriptorTest, cloneShadowNode) {
-  SharedComponentDescriptor descriptor = std::make_shared<TestComponentDescriptor>(nullptr);
+  SharedComponentDescriptor descriptor =
+      std::make_shared<TestComponentDescriptor>(nullptr);
 
   RawProps raw;
   raw["nativeID"] = "abc";
   SharedProps props = descriptor->cloneProps(nullptr, raw);
-  SharedShadowNode node = descriptor->createShadowNode(9, 1, descriptor->createEventEmitter(0, 9), props);
-  SharedShadowNode cloned = descriptor->cloneShadowNode(node);
+  SharedShadowNode node = descriptor->createShadowNode(
+      ShadowNodeFragment{.tag = 9,
+                         .rootTag = 1,
+                         .props = props,
+                         .eventEmitter = descriptor->createEventEmitter(0, 9)});
+  SharedShadowNode cloned = descriptor->cloneShadowNode(*node, {});
 
-  ASSERT_EQ(cloned->getComponentHandle(), typeid(TestShadowNode).hash_code());
   ASSERT_STREQ(cloned->getComponentName().c_str(), "Test");
   ASSERT_EQ(cloned->getTag(), 9);
   ASSERT_EQ(cloned->getRootTag(), 1);
@@ -46,20 +59,33 @@ TEST(ComponentDescriptorTest, cloneShadowNode) {
 }
 
 TEST(ComponentDescriptorTest, appendChild) {
-  SharedComponentDescriptor descriptor = std::make_shared<TestComponentDescriptor>(nullptr);
+  SharedComponentDescriptor descriptor =
+      std::make_shared<TestComponentDescriptor>(nullptr);
 
   RawProps raw;
   raw["nativeID"] = "abc";
   SharedProps props = descriptor->cloneProps(nullptr, raw);
-  SharedShadowNode node1 = descriptor->createShadowNode(1, 1, descriptor->createEventEmitter(0, 1), props);
-  SharedShadowNode node2 = descriptor->createShadowNode(2, 1, descriptor->createEventEmitter(0, 2), props);
-  SharedShadowNode node3 = descriptor->createShadowNode(3, 1, descriptor->createEventEmitter(0, 3), props);
+  SharedShadowNode node1 = descriptor->createShadowNode(
+      ShadowNodeFragment{.tag = 1,
+                         .rootTag = 1,
+                         .props = props,
+                         .eventEmitter = descriptor->createEventEmitter(0, 1)});
+  SharedShadowNode node2 = descriptor->createShadowNode(
+      ShadowNodeFragment{.tag = 2,
+                         .rootTag = 1,
+                         .props = props,
+                         .eventEmitter = descriptor->createEventEmitter(0, 2)});
+  SharedShadowNode node3 = descriptor->createShadowNode(
+      ShadowNodeFragment{.tag = 3,
+                         .rootTag = 1,
+                         .props = props,
+                         .eventEmitter = descriptor->createEventEmitter(0, 3)});
 
   descriptor->appendChild(node1, node2);
   descriptor->appendChild(node1, node3);
 
-  SharedShadowNodeSharedList node1Children = node1->getChildren();
-  ASSERT_EQ(node1Children->size(), 2);
-  ASSERT_EQ(node1Children->at(0), node2);
-  ASSERT_EQ(node1Children->at(1), node3);
+  auto node1Children = node1->getChildren();
+  ASSERT_EQ(node1Children.size(), 2);
+  ASSERT_EQ(node1Children.at(0), node2);
+  ASSERT_EQ(node1Children.at(1), node3);
 }
diff --git a/ReactCommon/fabric/core/tests/PrimitivesTest.cpp b/ReactCommon/fabric/core/tests/PrimitivesTest.cpp
index 99ecae6bfc2827..fa0495f686e396 100644
--- a/ReactCommon/fabric/core/tests/PrimitivesTest.cpp
+++ b/ReactCommon/fabric/core/tests/PrimitivesTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -30,7 +30,8 @@ TEST(SealableTest, handleAssignmentsCorrectly) {
   Sealable other2;
   EXPECT_THROW(obj = other2, std::runtime_error);
 
-  // It doesn't matter if the other object is also sealed, it's still not allowed.
+  // It doesn't matter if the other object is also sealed, it's still not
+  // allowed.
   other2.seal();
   EXPECT_THROW(obj = other2, std::runtime_error);
 
diff --git a/ReactCommon/fabric/core/tests/ShadowNodeTest.cpp b/ReactCommon/fabric/core/tests/ShadowNodeTest.cpp
index a1f7d16b6ffa77..8caeff77742d55 100644
--- a/ReactCommon/fabric/core/tests/ShadowNodeTest.cpp
+++ b/ReactCommon/fabric/core/tests/ShadowNodeTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -28,17 +28,20 @@ TEST(ShadowNodeTest, handleProps) {
 }
 
 TEST(ShadowNodeTest, handleShadowNodeCreation) {
-  auto node = std::make_shared<TestShadowNode>(9, 1, std::make_shared<const TestProps>(), nullptr, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
+  auto node = std::make_shared<TestShadowNode>(
+      ShadowNodeFragment{
+          .tag = 9,
+          .rootTag = 1,
+          .props = std::make_shared<const TestProps>(),
+          .children = ShadowNode::emptySharedShadowNodeSharedList()},
+      nullptr);
 
   ASSERT_FALSE(node->getSealed());
   ASSERT_STREQ(node->getComponentName().c_str(), "Test");
   ASSERT_EQ(node->getTag(), 9);
   ASSERT_EQ(node->getRootTag(), 1);
   ASSERT_EQ(node->getEventEmitter(), nullptr);
-  TestShadowNode *nodePtr = node.get();
-  ASSERT_EQ(node->getComponentHandle(), typeid(*nodePtr).hash_code());
-  ASSERT_EQ(node->getSourceNode(), nullptr);
-  ASSERT_EQ(node->getChildren()->size(), 0);
+  ASSERT_EQ(node->getChildren().size(), 0);
 
   ASSERT_STREQ(node->getProps()->nativeId.c_str(), "testNativeID");
 
@@ -48,35 +51,58 @@ TEST(ShadowNodeTest, handleShadowNodeCreation) {
 }
 
 TEST(ShadowNodeTest, handleShadowNodeSimpleCloning) {
-  auto node = std::make_shared<TestShadowNode>(9, 1, std::make_shared<const TestProps>(), nullptr, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
-  auto node2 = std::make_shared<TestShadowNode>(node, nullptr, nullptr, nullptr);
+  auto node = std::make_shared<TestShadowNode>(
+      ShadowNodeFragment{
+          .tag = 9,
+          .rootTag = 1,
+          .props = std::make_shared<const TestProps>(),
+          .children = ShadowNode::emptySharedShadowNodeSharedList()},
+      nullptr);
+  auto node2 = std::make_shared<TestShadowNode>(*node, ShadowNodeFragment{});
 
   ASSERT_STREQ(node->getComponentName().c_str(), "Test");
   ASSERT_EQ(node->getTag(), 9);
   ASSERT_EQ(node->getRootTag(), 1);
   ASSERT_EQ(node->getEventEmitter(), nullptr);
-  ASSERT_EQ(node2->getSourceNode(), node);
 }
 
 TEST(ShadowNodeTest, handleShadowNodeMutation) {
   auto props = std::make_shared<const TestProps>();
-  auto node1 = std::make_shared<TestShadowNode>(1, 1, props, nullptr, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
-  auto node2 = std::make_shared<TestShadowNode>(2, 1, props, nullptr, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
-  auto node3 = std::make_shared<TestShadowNode>(3, 1, props, nullptr, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
+  auto node1 = std::make_shared<TestShadowNode>(
+      ShadowNodeFragment{
+          .tag = 1,
+          .rootTag = 1,
+          .props = std::make_shared<const TestProps>(),
+          .children = ShadowNode::emptySharedShadowNodeSharedList()},
+      nullptr);
+  auto node2 = std::make_shared<TestShadowNode>(
+      ShadowNodeFragment{
+          .tag = 2,
+          .rootTag = 1,
+          .props = std::make_shared<const TestProps>(),
+          .children = ShadowNode::emptySharedShadowNodeSharedList()},
+      nullptr);
+  auto node3 = std::make_shared<TestShadowNode>(
+      ShadowNodeFragment{
+          .tag = 3,
+          .rootTag = 1,
+          .props = std::make_shared<const TestProps>(),
+          .children = ShadowNode::emptySharedShadowNodeSharedList()},
+      nullptr);
 
   node1->appendChild(node2);
   node1->appendChild(node3);
-  SharedShadowNodeSharedList node1Children = node1->getChildren();
-  ASSERT_EQ(node1Children->size(), 2);
-  ASSERT_EQ(node1Children->at(0), node2);
-  ASSERT_EQ(node1Children->at(1), node3);
+  auto node1Children = node1->getChildren();
+  ASSERT_EQ(node1Children.size(), 2);
+  ASSERT_EQ(node1Children.at(0), node2);
+  ASSERT_EQ(node1Children.at(1), node3);
 
-  auto node4 = std::make_shared<TestShadowNode>(node2, nullptr, nullptr, nullptr);
+  auto node4 = std::make_shared<TestShadowNode>(*node2, ShadowNodeFragment{});
   node1->replaceChild(node2, node4);
   node1Children = node1->getChildren();
-  ASSERT_EQ(node1Children->size(), 2);
-  ASSERT_EQ(node1Children->at(0), node4);
-  ASSERT_EQ(node1Children->at(1), node3);
+  ASSERT_EQ(node1Children.size(), 2);
+  ASSERT_EQ(node1Children.at(0), node4);
+  ASSERT_EQ(node1Children.at(1), node3);
 
   // Seal the entire tree.
   node1->sealRecursive();
@@ -85,66 +111,44 @@ TEST(ShadowNodeTest, handleShadowNodeMutation) {
   ASSERT_TRUE(node4->getSealed());
 
   // No more mutation after sealing.
-  EXPECT_THROW(node4->clearSourceNode(), std::runtime_error);
+  EXPECT_THROW(node4->setLocalData(nullptr), std::runtime_error);
 
-  auto node5 = std::make_shared<TestShadowNode>(node4, nullptr, nullptr, nullptr);
-  node5->clearSourceNode();
-  ASSERT_EQ(node5->getSourceNode(), nullptr);
-}
-
-TEST(ShadowNodeTest, handleSourceNode) {
-  auto nodeFirstGeneration = std::make_shared<TestShadowNode>(9, 1, std::make_shared<const TestProps>(), nullptr, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
-  auto nodeSecondGeneration = std::make_shared<TestShadowNode>(nodeFirstGeneration, nullptr, nullptr, nullptr);
-  auto nodeThirdGeneration = std::make_shared<TestShadowNode>(nodeSecondGeneration, nullptr, nullptr, nullptr);
-  auto nodeForthGeneration = std::make_shared<TestShadowNode>(nodeThirdGeneration, nullptr, nullptr, nullptr);
-
-  // Ensure established shource nodes structure.
-  ASSERT_EQ(nodeForthGeneration->getSourceNode(), nodeThirdGeneration);
-  ASSERT_EQ(nodeThirdGeneration->getSourceNode(), nodeSecondGeneration);
-  ASSERT_EQ(nodeSecondGeneration->getSourceNode(), nodeFirstGeneration);
-
-  // Shallow source node for the forth generation node.
-  nodeForthGeneration->shallowSourceNode();
-  ASSERT_EQ(nodeForthGeneration->getSourceNode(), nodeSecondGeneration);
-
-  // Shallow it one more time.
-  nodeForthGeneration->shallowSourceNode();
-  ASSERT_EQ(nodeForthGeneration->getSourceNode(), nodeFirstGeneration);
-
-  // Ensure that 3th and 2nd were not affected.
-  ASSERT_EQ(nodeThirdGeneration->getSourceNode(), nodeSecondGeneration);
-  ASSERT_EQ(nodeSecondGeneration->getSourceNode(), nodeFirstGeneration);
+  auto node5 = std::make_shared<TestShadowNode>(*node4, ShadowNodeFragment{});
+  node5->setLocalData(nullptr);
+  ASSERT_EQ(node5->getLocalData(), nullptr);
 }
 
 TEST(ShadowNodeTest, handleCloneFunction) {
-  auto firstNode = std::make_shared<TestShadowNode>(9, 1, std::make_shared<const TestProps>(), nullptr, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
+  auto firstNode = std::make_shared<TestShadowNode>(
+      ShadowNodeFragment{
+          .tag = 9,
+          .rootTag = 1,
+          .props = std::make_shared<const TestProps>(),
+          .children = ShadowNode::emptySharedShadowNodeSharedList()},
+      nullptr);
 
   // The shadow node is not clonable if `cloneFunction` is not provided,
-  ASSERT_DEATH_IF_SUPPORTED(firstNode->clone(), "cloneFunction_");
+  ASSERT_DEATH_IF_SUPPORTED(firstNode->clone({}), "cloneFunction_");
 
   auto secondNode = std::make_shared<TestShadowNode>(
-    9,
-    1,
-    std::make_shared<const TestProps>(),
-    nullptr,
-    ShadowNode::emptySharedShadowNodeSharedList(),
-    [](const SharedShadowNode &shadowNode, const SharedProps &props, const SharedEventEmitter &eventEmitter, const SharedShadowNodeSharedList &children) {
-      return std::make_shared<const TestShadowNode>(
-        std::static_pointer_cast<const TestShadowNode>(shadowNode),
-        props,
-        nullptr,
-        children
-      );
-    }
-  );
-
-  auto secondNodeClone = secondNode->clone();
+      ShadowNodeFragment{
+          .tag = 9,
+          .rootTag = 1,
+          .props = std::make_shared<const TestProps>(),
+          .children = ShadowNode::emptySharedShadowNodeSharedList()},
+      [](const ShadowNode &shadowNode, const ShadowNodeFragment &fragment) {
+        return std::make_shared<TestShadowNode>(shadowNode, fragment);
+      });
+
+  auto secondNodeClone = secondNode->clone({});
 
   // Those two nodes are *not* same.
   ASSERT_NE(secondNode, secondNodeClone);
 
   // `secondNodeClone` is an instance of `TestShadowNode`.
-  ASSERT_NE(std::dynamic_pointer_cast<const TestShadowNode>(secondNodeClone), nullptr);
+  ASSERT_NE(
+      std::dynamic_pointer_cast<const TestShadowNode>(secondNodeClone),
+      nullptr);
 
   // Both nodes have same content.
   ASSERT_EQ(secondNode->getTag(), secondNodeClone->getTag());
@@ -162,19 +166,37 @@ TEST(ShadowNodeTest, handleLocalData) {
   auto localDataOver9000 = std::make_shared<TestLocalData>();
   localDataOver9000->setNumber(9001);
   auto props = std::make_shared<const TestProps>();
-  auto firstNode = std::make_shared<TestShadowNode>(9, 1, props, nullptr, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
-  auto secondNode = std::make_shared<TestShadowNode>(9, 1, props, nullptr, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
-  auto thirdNode = std::make_shared<TestShadowNode>(9, 1, props, nullptr, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
+  auto firstNode = std::make_shared<TestShadowNode>(
+      ShadowNodeFragment{
+          .tag = 9,
+          .rootTag = 1,
+          .props = props,
+          .children = ShadowNode::emptySharedShadowNodeSharedList()},
+      nullptr);
+  auto secondNode = std::make_shared<TestShadowNode>(
+      ShadowNodeFragment{
+          .tag = 9,
+          .rootTag = 1,
+          .props = props,
+          .children = ShadowNode::emptySharedShadowNodeSharedList()},
+      nullptr);
+  auto thirdNode = std::make_shared<TestShadowNode>(
+      ShadowNodeFragment{
+          .tag = 9,
+          .rootTag = 1,
+          .props = props,
+          .children = ShadowNode::emptySharedShadowNodeSharedList()},
+      nullptr);
 
   firstNode->setLocalData(localData42);
   secondNode->setLocalData(localData42);
   thirdNode->setLocalData(localDataOver9000);
 
   // LocalData object are compared by pointer, not by value.
-  ASSERT_EQ(*firstNode, *secondNode);
-  ASSERT_NE(*firstNode, *thirdNode);
+  ASSERT_EQ(firstNode->getLocalData(), secondNode->getLocalData());
+  ASSERT_NE(firstNode->getLocalData(), thirdNode->getLocalData());
   secondNode->setLocalData(anotherLocalData42);
-  ASSERT_NE(*firstNode, *secondNode);
+  ASSERT_NE(firstNode->getLocalData(), secondNode->getLocalData());
 
   // LocalData cannot be changed for sealed shadow node.
   secondNode->sealRecursive();
diff --git a/ReactCommon/fabric/core/tests/TestComponent.h b/ReactCommon/fabric/core/tests/TestComponent.h
index 8659b960ca34fe..c25e7864466ac1 100644
--- a/ReactCommon/fabric/core/tests/TestComponent.h
+++ b/ReactCommon/fabric/core/tests/TestComponent.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -18,12 +18,12 @@
 using namespace facebook::react;
 
 /**
- * This defines a set of TestComponent classes: Props, ShadowNode, ComponentDescriptor.
- * To be used for testing purpose.
+ * This defines a set of TestComponent classes: Props, ShadowNode,
+ * ComponentDescriptor. To be used for testing purpose.
  */
 
-class TestLocalData: public LocalData {
-public:
+class TestLocalData : public LocalData {
+ public:
   void setNumber(const int &number) {
     number_ = number;
   }
@@ -32,35 +32,28 @@ class TestLocalData: public LocalData {
     return number_;
   }
 
-private:
-  int number_ {0};
+ private:
+  int number_{0};
 };
 
+static const char TestComponentName[] = "Test";
+
 class TestProps : public Props {
-public:
+ public:
   using Props::Props;
-  TestProps():
-    Props(Props(), {{"nativeID", "testNativeID"}}) {}
+  TestProps() : Props(Props(), {{"nativeID", "testNativeID"}}) {}
 };
 using SharedTestProps = std::shared_ptr<const TestProps>;
 
 class TestShadowNode;
 using SharedTestShadowNode = std::shared_ptr<const TestShadowNode>;
-class TestShadowNode : public ConcreteShadowNode<TestProps> {
-public:
+class TestShadowNode : public ConcreteShadowNode<TestComponentName, TestProps> {
+ public:
   using ConcreteShadowNode::ConcreteShadowNode;
-
-  ComponentName getComponentName() const override {
-    return ComponentName("Test");
-  }
 };
 
-class TestComponentDescriptor: public ConcreteComponentDescriptor<TestShadowNode> {
-public:
+class TestComponentDescriptor
+    : public ConcreteComponentDescriptor<TestShadowNode> {
+ public:
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
-
-  // TODO (shergin): Why does this gets repeated here and the shadow node class?
-  ComponentName getComponentName() const override {
-    return "Test";
-  }
 };
diff --git a/ReactCommon/fabric/debug/BUCK b/ReactCommon/fabric/debug/BUCK
index c16bedf0381776..e13f71ed026bc4 100644
--- a/ReactCommon/fabric/debug/BUCK
+++ b/ReactCommon/fabric/debug/BUCK
@@ -1,13 +1,19 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
+load(
+    "@fbsource//tools/build_defs/apple:flag_defs.bzl",
+    "get_debug_preprocessor_flags",
+)
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
 
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "debug",
@@ -54,24 +60,21 @@ rn_xplat_cxx_library(
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":debug",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = (ANDROID, APPLE),
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":debug",
+    ],
+)
diff --git a/ReactCommon/fabric/debug/DebugStringConvertible.cpp b/ReactCommon/fabric/debug/DebugStringConvertible.cpp
index 08d885d9674687..20c182c483369d 100644
--- a/ReactCommon/fabric/debug/DebugStringConvertible.cpp
+++ b/ReactCommon/fabric/debug/DebugStringConvertible.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,11 @@
 namespace facebook {
 namespace react {
 
-std::string DebugStringConvertible::getDebugChildrenDescription(DebugStringConvertibleOptions options, int depth) const {
+#if RN_DEBUG_STRING_CONVERTIBLE
+
+std::string DebugStringConvertible::getDebugChildrenDescription(
+    DebugStringConvertibleOptions options,
+    int depth) const {
   if (depth >= options.maximumDepth) {
     return "";
   }
@@ -28,7 +32,9 @@ std::string DebugStringConvertible::getDebugChildrenDescription(DebugStringConve
   return childrenString;
 }
 
-std::string DebugStringConvertible::getDebugPropsDescription(DebugStringConvertibleOptions options, int depth) const {
+std::string DebugStringConvertible::getDebugPropsDescription(
+    DebugStringConvertibleOptions options,
+    int depth) const {
   if (depth >= options.maximumDepth) {
     return "";
   }
@@ -43,8 +49,10 @@ std::string DebugStringConvertible::getDebugPropsDescription(DebugStringConverti
     auto name = prop->getDebugName();
     auto value = prop->getDebugValue();
     auto children = prop->getDebugPropsDescription(options, depth + 1);
-    auto valueAndChildren = value + (children.empty() ? "" : "(" + children + ")");
-    propsString += " " + name + (valueAndChildren.empty() ? "" : "=" + valueAndChildren);
+    auto valueAndChildren =
+        value + (children.empty() ? "" : "(" + children + ")");
+    propsString +=
+        " " + name + (valueAndChildren.empty() ? "" : "=" + valueAndChildren);
   }
 
   if (!propsString.empty()) {
@@ -55,19 +63,23 @@ std::string DebugStringConvertible::getDebugPropsDescription(DebugStringConverti
   return propsString;
 }
 
-std::string DebugStringConvertible::getDebugDescription(DebugStringConvertibleOptions options, int depth) const {
-  std::string nameString = getDebugName();
-  std::string valueString = getDebugValue();
-  std::string childrenString = getDebugChildrenDescription(options, depth);
-  std::string propsString = getDebugPropsDescription(options, depth);
+std::string DebugStringConvertible::getDebugDescription(
+    DebugStringConvertibleOptions options,
+    int depth) const {
+  auto nameString = getDebugName();
+  auto valueString = getDebugValue();
+  auto childrenString = getDebugChildrenDescription(options, depth);
+  auto propsString = getDebugPropsDescription(options, depth);
 
-  std::string leading = options.format ? std::string(depth * 2, ' ') : "";
-  std::string trailing = options.format ? "\n" : "";
+  auto leading = options.format ? std::string(depth * 2, ' ') : std::string{""};
+  auto trailing = options.format ? std::string{"\n"} : std::string{""};
 
   return leading + "<" + nameString +
-    (valueString.empty() ? "" : "=" + valueString) +
-    (propsString.empty() ? "" : " " + propsString) +
-    (childrenString.empty() ? "/>" + trailing : ">" + trailing + childrenString + leading + "</" + nameString + ">" + trailing);
+      (valueString.empty() ? "" : "=" + valueString) +
+      (propsString.empty() ? "" : " " + propsString) +
+      (childrenString.empty() ? "/>" + trailing
+                              : ">" + trailing + childrenString + leading +
+               "</" + nameString + ">" + trailing);
 }
 
 std::string DebugStringConvertible::getDebugName() const {
@@ -78,7 +90,8 @@ std::string DebugStringConvertible::getDebugValue() const {
   return "";
 }
 
-SharedDebugStringConvertibleList DebugStringConvertible::getDebugChildren() const {
+SharedDebugStringConvertibleList DebugStringConvertible::getDebugChildren()
+    const {
   return SharedDebugStringConvertibleList();
 }
 
@@ -86,5 +99,7 @@ SharedDebugStringConvertibleList DebugStringConvertible::getDebugProps() const {
   return SharedDebugStringConvertibleList();
 }
 
+#endif
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/debug/DebugStringConvertible.h b/ReactCommon/fabric/debug/DebugStringConvertible.h
index d911072987a721..2c38093f1772fb 100644
--- a/ReactCommon/fabric/debug/DebugStringConvertible.h
+++ b/ReactCommon/fabric/debug/DebugStringConvertible.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,31 +7,38 @@
 
 #pragma once
 
-#include <string>
+#include <climits>
 #include <memory>
+#include <string>
 #include <vector>
 
 namespace facebook {
 namespace react {
 
+#ifndef NDEBUG
+#define RN_DEBUG_STRING_CONVERTIBLE 1
+#endif
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+
 class DebugStringConvertible;
 
-using SharedDebugStringConvertible = std::shared_ptr<const DebugStringConvertible>;
-using SharedDebugStringConvertibleList = std::vector<SharedDebugStringConvertible>;
+using SharedDebugStringConvertible =
+    std::shared_ptr<const DebugStringConvertible>;
+using SharedDebugStringConvertibleList =
+    std::vector<SharedDebugStringConvertible>;
 
 struct DebugStringConvertibleOptions {
-  bool format {true};
-  int maximumDepth {INT_MAX};
+  bool format{true};
+  int maximumDepth{INT_MAX};
 };
 
 // Abstract class describes conformance to DebugStringConvertible concept
 // and implements basic recursive debug string assembly algorithm.
 // Use this as a base class for providing a debugging textual representation
 // of your class.
-// TODO (#26770211): Clear up the naming.
 class DebugStringConvertible {
-
-public:
+ public:
   virtual ~DebugStringConvertible() = default;
 
   // Returns a name of the object.
@@ -55,13 +62,25 @@ class DebugStringConvertible {
   // Returns a string which represents the object in a human-readable way.
   // Default implementation returns a description of the subtree
   // rooted at this node, represented in XML-like format.
-  virtual std::string getDebugDescription(DebugStringConvertibleOptions options = {}, int depth = 0) const;
+  virtual std::string getDebugDescription(
+      DebugStringConvertibleOptions options = {},
+      int depth = 0) const;
 
   // Do same as `getDebugDescription` but return only *children* and
   // *properties* parts (which are used in `getDebugDescription`).
-  virtual std::string getDebugPropsDescription(DebugStringConvertibleOptions options = {}, int depth = 0) const;
-  virtual std::string getDebugChildrenDescription(DebugStringConvertibleOptions options = {}, int depth = 0) const;
+  virtual std::string getDebugPropsDescription(
+      DebugStringConvertibleOptions options = {},
+      int depth = 0) const;
+  virtual std::string getDebugChildrenDescription(
+      DebugStringConvertibleOptions options = {},
+      int depth = 0) const;
 };
 
+#else
+
+class DebugStringConvertible {};
+
+#endif
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp b/ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp
index 8baffb5b75d5a2..93961d06110d01 100644
--- a/ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp
+++ b/ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,16 +10,14 @@
 namespace facebook {
 namespace react {
 
+#if RN_DEBUG_STRING_CONVERTIBLE
+
 DebugStringConvertibleItem::DebugStringConvertibleItem(
-  const std::string &name,
-  const std::string &value,
-  const SharedDebugStringConvertibleList &props,
-  const SharedDebugStringConvertibleList &children
-):
-  name_(name),
-  value_(value),
-  props_(props),
-  children_(children) {}
+    const std::string &name,
+    const std::string &value,
+    const SharedDebugStringConvertibleList &props,
+    const SharedDebugStringConvertibleList &children)
+    : name_(name), value_(value), props_(props), children_(children) {}
 
 std::string DebugStringConvertibleItem::getDebugName() const {
   return name_;
@@ -29,13 +27,17 @@ std::string DebugStringConvertibleItem::getDebugValue() const {
   return value_;
 }
 
-SharedDebugStringConvertibleList DebugStringConvertibleItem::getDebugProps() const {
+SharedDebugStringConvertibleList DebugStringConvertibleItem::getDebugProps()
+    const {
   return props_;
 }
 
-SharedDebugStringConvertibleList DebugStringConvertibleItem::getDebugChildren() const {
+SharedDebugStringConvertibleList DebugStringConvertibleItem::getDebugChildren()
+    const {
   return children_;
 }
 
+#endif
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/debug/DebugStringConvertibleItem.h b/ReactCommon/fabric/debug/DebugStringConvertibleItem.h
index e0499cff0502ad..edb01c4ea1d609 100644
--- a/ReactCommon/fabric/debug/DebugStringConvertibleItem.h
+++ b/ReactCommon/fabric/debug/DebugStringConvertibleItem.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,34 +14,35 @@
 namespace facebook {
 namespace react {
 
+#if RN_DEBUG_STRING_CONVERTIBLE
+
 // Trivial implementation of `DebugStringConvertible` abstract class
 // with a stored output; useful for assembling `DebugStringConvertible` values
 // in custom implementations of `getDebugChildren` and `getDebugProps`.
-class DebugStringConvertibleItem:
-  public DebugStringConvertible {
-
-public:
+class DebugStringConvertibleItem : public DebugStringConvertible {
+ public:
   DebugStringConvertibleItem() = default;
   DebugStringConvertibleItem(const DebugStringConvertibleItem &item) = default;
 
   DebugStringConvertibleItem(
-    const std::string &name = "",
-    const std::string &value = "",
-    const SharedDebugStringConvertibleList &props = {},
-    const SharedDebugStringConvertibleList &children = {}
-  );
+      const std::string &name = "",
+      const std::string &value = "",
+      const SharedDebugStringConvertibleList &props = {},
+      const SharedDebugStringConvertibleList &children = {});
 
   std::string getDebugName() const override;
   std::string getDebugValue() const override;
   SharedDebugStringConvertibleList getDebugChildren() const override;
   SharedDebugStringConvertibleList getDebugProps() const override;
 
-private:
+ private:
   std::string name_;
   std::string value_;
   SharedDebugStringConvertibleList props_;
   SharedDebugStringConvertibleList children_;
 };
 
+#endif
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/debug/debugStringConvertibleUtils.h b/ReactCommon/fabric/debug/debugStringConvertibleUtils.h
index f0a26d0590ce16..928f267f6492db 100644
--- a/ReactCommon/fabric/debug/debugStringConvertibleUtils.h
+++ b/ReactCommon/fabric/debug/debugStringConvertibleUtils.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <string>
 #include <limits>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include <fabric/debug/DebugStringConvertible.h>
@@ -20,14 +20,27 @@
 namespace facebook {
 namespace react {
 
-inline std::string toString(const std::string &value) { return value; }
-inline std::string toString(const int &value) { return folly::to<std::string>(value); }
-inline std::string toString(const bool &value) { return folly::to<std::string>(value); }
-inline std::string toString(const float &value) { return folly::to<std::string>(value); }
-inline std::string toString(const double &value) { return folly::to<std::string>(value); }
+#if RN_DEBUG_STRING_CONVERTIBLE
+
+inline std::string toString(const std::string &value) {
+  return value;
+}
+inline std::string toString(const int &value) {
+  return folly::to<std::string>(value);
+}
+inline std::string toString(const bool &value) {
+  return folly::to<std::string>(value);
+}
+inline std::string toString(const float &value) {
+  return folly::to<std::string>(value);
+}
+inline std::string toString(const double &value) {
+  return folly::to<std::string>(value);
+}
 
 template <typename T>
-inline SharedDebugStringConvertible debugStringConvertibleItem(std::string name, T value, T defaultValue = {}) {
+inline SharedDebugStringConvertible
+debugStringConvertibleItem(std::string name, T value, T defaultValue = {}) {
   if (value == defaultValue) {
     return nullptr;
   }
@@ -36,24 +49,36 @@ inline SharedDebugStringConvertible debugStringConvertibleItem(std::string name,
 }
 
 template <typename T>
-inline SharedDebugStringConvertible debugStringConvertibleItem(std::string name, folly::Optional<T> value, T defaultValue = {}) {
+inline SharedDebugStringConvertible debugStringConvertibleItem(
+    std::string name,
+    folly::Optional<T> value,
+    T defaultValue = {}) {
   if (!value.hasValue()) {
     return nullptr;
   }
 
-  return debugStringConvertibleItem(name, value.value_or(defaultValue), defaultValue);
+  return debugStringConvertibleItem(
+      name, value.value_or(defaultValue), defaultValue);
 }
 
-inline SharedDebugStringConvertibleList operator+(const SharedDebugStringConvertibleList &lhs, const SharedDebugStringConvertibleList &rhs) {
-  SharedDebugStringConvertibleList result = {};
+inline SharedDebugStringConvertibleList operator+(
+    const SharedDebugStringConvertibleList &lhs,
+    const SharedDebugStringConvertibleList &rhs) {
+  auto result = SharedDebugStringConvertibleList{};
   std::move(lhs.begin(), lhs.end(), std::back_inserter(result));
   std::move(rhs.begin(), rhs.end(), std::back_inserter(result));
   return result;
 }
 
-inline SharedDebugStringConvertible debugStringConvertibleItem(std::string name, DebugStringConvertible value, std::string defaultValue) {
-  return debugStringConvertibleItem(name, value.getDebugDescription(), defaultValue);
+inline SharedDebugStringConvertible debugStringConvertibleItem(
+    std::string name,
+    DebugStringConvertible value,
+    std::string defaultValue) {
+  return debugStringConvertibleItem(
+      name, value.getDebugDescription(), defaultValue);
 }
 
+#endif
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/debug/tests/DebugStringConvertibleTest.cpp b/ReactCommon/fabric/debug/tests/DebugStringConvertibleTest.cpp
index 272255b39eb776..b8175c3a147eb3 100644
--- a/ReactCommon/fabric/debug/tests/DebugStringConvertibleTest.cpp
+++ b/ReactCommon/fabric/debug/tests/DebugStringConvertibleTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,7 +14,8 @@ using namespace facebook::react;
 
 TEST(DebugStringConvertibleTest, handleSimpleNode) {
   SharedDebugStringConvertibleList empty;
-  auto item = std::make_shared<DebugStringConvertibleItem>("View", "hello", empty, empty);
+  auto item = std::make_shared<DebugStringConvertibleItem>(
+      "View", "hello", empty, empty);
 
   ASSERT_STREQ(item->getDebugName().c_str(), "View");
   ASSERT_STREQ(item->getDebugValue().c_str(), "hello");
@@ -24,9 +25,9 @@ TEST(DebugStringConvertibleTest, handleSimpleNode) {
 TEST(DebugStringConvertibleTest, handleSimpleNodeWithProps) {
   SharedDebugStringConvertibleList empty;
   SharedDebugStringConvertibleList props = {
-    std::make_shared<DebugStringConvertibleItem>("x", "1", empty, empty)
-  };
-  auto item = std::make_shared<DebugStringConvertibleItem>("View", "hello", props, empty);
+      std::make_shared<DebugStringConvertibleItem>("x", "1", empty, empty)};
+  auto item = std::make_shared<DebugStringConvertibleItem>(
+      "View", "hello", props, empty);
 
   ASSERT_STREQ(item->getDebugName().c_str(), "View");
   ASSERT_STREQ(item->getDebugValue().c_str(), "hello");
@@ -36,42 +37,48 @@ TEST(DebugStringConvertibleTest, handleSimpleNodeWithProps) {
 TEST(DebugStringConvertibleTest, handleSimpleNodeWithChildren) {
   SharedDebugStringConvertibleList empty;
   SharedDebugStringConvertibleList children = {
-    std::make_shared<DebugStringConvertibleItem>("Child", "a", empty, empty)
-  };
-  auto item = std::make_shared<DebugStringConvertibleItem>("View", "hello", empty, children);
+      std::make_shared<DebugStringConvertibleItem>("Child", "a", empty, empty)};
+  auto item = std::make_shared<DebugStringConvertibleItem>(
+      "View", "hello", empty, children);
 
   ASSERT_STREQ(item->getDebugName().c_str(), "View");
   ASSERT_STREQ(item->getDebugValue().c_str(), "hello");
-  ASSERT_STREQ(item->getDebugDescription().c_str(), "<View=hello>\n  <Child=a/>\n</View>\n");
+  ASSERT_STREQ(
+      item->getDebugDescription().c_str(),
+      "<View=hello>\n  <Child=a/>\n</View>\n");
 }
 
 TEST(DebugStringConvertibleTest, handleNestedNode) {
   SharedDebugStringConvertibleList empty;
   SharedDebugStringConvertibleList props = {
-    std::make_shared<DebugStringConvertibleItem>("x", "1", empty, empty)
-  };
+      std::make_shared<DebugStringConvertibleItem>("x", "1", empty, empty)};
   SharedDebugStringConvertibleList children = {
-    std::make_shared<DebugStringConvertibleItem>("Child", "a", props, empty)
-  };
-  auto item = std::make_shared<DebugStringConvertibleItem>("View", "hello", props, children);
+      std::make_shared<DebugStringConvertibleItem>("Child", "a", props, empty)};
+  auto item = std::make_shared<DebugStringConvertibleItem>(
+      "View", "hello", props, children);
 
   ASSERT_STREQ(item->getDebugName().c_str(), "View");
   ASSERT_STREQ(item->getDebugValue().c_str(), "hello");
-  ASSERT_STREQ(item->getDebugDescription().c_str(), "<View=hello x=1>\n  <Child=a x=1/>\n</View>\n");
+  ASSERT_STREQ(
+      item->getDebugDescription().c_str(),
+      "<View=hello x=1>\n  <Child=a x=1/>\n</View>\n");
 }
 
 TEST(DebugStringConvertibleTest, handleNodeWithComplexProps) {
   SharedDebugStringConvertibleList empty;
   SharedDebugStringConvertibleList subProps = {
-    std::make_shared<DebugStringConvertibleItem>("height", "100", empty, empty),
-    std::make_shared<DebugStringConvertibleItem>("width", "200", empty, empty)
-  };
+      std::make_shared<DebugStringConvertibleItem>(
+          "height", "100", empty, empty),
+      std::make_shared<DebugStringConvertibleItem>(
+          "width", "200", empty, empty)};
   SharedDebugStringConvertibleList props = {
-    std::make_shared<DebugStringConvertibleItem>("x", "1", subProps, empty)
-  };
-  auto item = std::make_shared<DebugStringConvertibleItem>("View", "hello", props, empty);
+      std::make_shared<DebugStringConvertibleItem>("x", "1", subProps, empty)};
+  auto item = std::make_shared<DebugStringConvertibleItem>(
+      "View", "hello", props, empty);
 
   ASSERT_STREQ(item->getDebugName().c_str(), "View");
   ASSERT_STREQ(item->getDebugValue().c_str(), "hello");
-  ASSERT_STREQ(item->getDebugDescription().c_str(), "<View=hello x=1(height=100 width=200)/>\n");
+  ASSERT_STREQ(
+      item->getDebugDescription().c_str(),
+      "<View=hello x=1(height=100 width=200)/>\n");
 }
diff --git a/ReactCommon/fabric/events/BUCK b/ReactCommon/fabric/events/BUCK
new file mode 100644
index 00000000000000..1804100d089dde
--- /dev/null
+++ b/ReactCommon/fabric/events/BUCK
@@ -0,0 +1,80 @@
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "events",
+    srcs = glob(
+        ["**/*.cpp"],
+        exclude = glob(["tests/**/*.cpp"]),
+    ),
+    headers = glob(
+        ["**/*.h"],
+        exclude = glob(["tests/**/*.h"]),
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        prefix = "fabric/events",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
+    fbobjc_tests = [
+        ":tests",
+    ],
+    force_static = True,
+    macosx_tests_override = [],
+    platforms = (ANDROID, APPLE),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    tests = [],
+    visibility = ["PUBLIC"],
+    deps = [
+        "xplat//fbsystrace:fbsystrace",
+        "xplat//folly:headers_only",
+        "xplat//folly:memory",
+        "xplat//folly:molly",
+        "xplat//third-party/glog:glog",
+        react_native_xplat_target("fabric/debug:debug"),
+    ],
+)
+
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = (ANDROID,APPLE),
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":events",
+    ],
+)
diff --git a/ReactCommon/fabric/events/BatchedEventQueue.cpp b/ReactCommon/fabric/events/BatchedEventQueue.cpp
new file mode 100644
index 00000000000000..415958e70e00f8
--- /dev/null
+++ b/ReactCommon/fabric/events/BatchedEventQueue.cpp
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "BatchedEventQueue.h"
+
+namespace facebook {
+namespace react {
+
+void BatchedEventQueue::enqueueEvent(const RawEvent &rawEvent) const {
+  EventQueue::enqueueEvent(rawEvent);
+  eventBeat_->request();
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/BatchedEventQueue.h b/ReactCommon/fabric/events/BatchedEventQueue.h
new file mode 100644
index 00000000000000..da6fbf3b010bb0
--- /dev/null
+++ b/ReactCommon/fabric/events/BatchedEventQueue.h
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/events/EventQueue.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Event Queue that dispatches event in batches synchronizing them with
+ * an Event Beat.
+ */
+class BatchedEventQueue final : public EventQueue {
+ public:
+  using EventQueue::EventQueue;
+
+  void enqueueEvent(const RawEvent &rawEvent) const override;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/EventBeat.cpp b/ReactCommon/fabric/events/EventBeat.cpp
new file mode 100644
index 00000000000000..48d175ec5b9a24
--- /dev/null
+++ b/ReactCommon/fabric/events/EventBeat.cpp
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "EventBeat.h"
+
+namespace facebook {
+namespace react {
+
+void EventBeat::request() const {
+  isRequested_ = true;
+}
+
+void EventBeat::beat() const {
+  if (!this->isRequested_) {
+    return;
+  }
+
+  isRequested_ = false;
+
+  if (beatCallback_) {
+    beatCallback_();
+  }
+}
+
+void EventBeat::induce() const {
+  // Default implementation does nothing.
+}
+
+void EventBeat::setBeatCallback(const BeatCallback &beatCallback) {
+  beatCallback_ = beatCallback;
+}
+
+void EventBeat::setFailCallback(const FailCallback &failCallback) {
+  failCallback_ = failCallback;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/EventBeat.h b/ReactCommon/fabric/events/EventBeat.h
new file mode 100644
index 00000000000000..7a991a69ea8277
--- /dev/null
+++ b/ReactCommon/fabric/events/EventBeat.h
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <atomic>
+#include <functional>
+#include <memory>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Event Beat serves two interleaving purposes: synchronization of event queues
+ * and ensuring that event dispatching happens on propper threads.
+ */
+class EventBeat {
+ public:
+  virtual ~EventBeat() = default;
+
+  using BeatCallback = std::function<void()>;
+  using FailCallback = std::function<void()>;
+
+  /*
+   * Communicates to the Beat that a consumer is waiting for the coming beat.
+   * A consumer must request coming beat after the previous beat happened
+   * to receive a next coming one.
+   */
+  virtual void request() const;
+
+  /*
+   * Induces the next beat to happen as soon as possible. If the method
+   * is called on the proper thread, the beat must happen synchronously.
+   * Subclasses might override this method to implement specific
+   * out-of-turn beat scheduling.
+   * Some types of Event Beats do not support inducing, hence the default
+   * implementation does nothing.
+   * Receiver might ignore the call if a beat was not requested.
+   */
+  virtual void induce() const;
+
+  /*
+   * Sets the beat callback function.
+   * The callback is must be called on the proper thread.
+   */
+  void setBeatCallback(const BeatCallback &beatCallback);
+
+  /*
+   * Sets the fail callback function.
+   * Called in case if the beat cannot be performed anymore because of
+   * some external circumstances (e.g. execution thread is beling destructed).
+   * The callback can be called on any thread.
+   */
+  void setFailCallback(const FailCallback &failCallback);
+
+ protected:
+  /*
+   * Should be used by sublasses to send a beat.
+   * Receiver might ignore the call if a beat was not requested.
+   */
+  void beat() const;
+
+  BeatCallback beatCallback_;
+  FailCallback failCallback_;
+  mutable std::atomic<bool> isRequested_{false};
+};
+
+using EventBeatFactory = std::function<std::unique_ptr<EventBeat>()>;
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/EventBeatBasedExecutor.cpp b/ReactCommon/fabric/events/EventBeatBasedExecutor.cpp
new file mode 100644
index 00000000000000..d31f620de2af8b
--- /dev/null
+++ b/ReactCommon/fabric/events/EventBeatBasedExecutor.cpp
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <cassert>
+
+#include "EventBeatBasedExecutor.h"
+
+#include <cassert>
+
+namespace facebook {
+namespace react {
+
+using Mode = EventBeatBasedExecutor::Mode;
+
+EventBeatBasedExecutor::EventBeatBasedExecutor(
+    std::unique_ptr<EventBeat> eventBeat)
+    : eventBeat_(std::move(eventBeat)) {
+  eventBeat_->setBeatCallback(
+      std::bind(&EventBeatBasedExecutor::onBeat, this, true));
+  eventBeat_->setFailCallback(
+      std::bind(&EventBeatBasedExecutor::onBeat, this, false));
+}
+
+void EventBeatBasedExecutor::operator()(Routine routine, Mode mode) const {
+  if (mode == Mode::Asynchronous) {
+    execute({.routine = std::move(routine)});
+    return;
+  }
+
+  std::mutex mutex;
+  mutex.lock();
+
+  execute({.routine = std::move(routine),
+           .callback = [&mutex]() { mutex.unlock(); }});
+
+  mutex.lock();
+}
+
+void EventBeatBasedExecutor::execute(Task task) const {
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
+
+    tasks_.push_back(std::move(task));
+  }
+
+  eventBeat_->request();
+  eventBeat_->induce();
+}
+
+void EventBeatBasedExecutor::onBeat(bool success) const {
+  std::vector<Task> tasks;
+
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
+
+    if (tasks_.size() == 0) {
+      return;
+    }
+
+    tasks = std::move(tasks_);
+    assert(tasks_.size() == 0);
+  }
+
+  for (const auto task : tasks) {
+    if (success) {
+      task.routine();
+    }
+
+    if (task.callback) {
+      task.callback();
+    }
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/EventBeatBasedExecutor.h b/ReactCommon/fabric/events/EventBeatBasedExecutor.h
new file mode 100644
index 00000000000000..80a616891d505b
--- /dev/null
+++ b/ReactCommon/fabric/events/EventBeatBasedExecutor.h
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <memory>
+#include <mutex>
+#include <vector>
+
+#include <fabric/events/EventBeat.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * General purpose executor that uses EventBeat to ensure proper threading.
+ */
+class EventBeatBasedExecutor {
+ public:
+  using Routine = std::function<void()>;
+  using Callback = std::function<void()>;
+
+  struct Task {
+    Routine routine;
+    Callback callback;
+  };
+
+  enum class Mode { Synchronous, Asynchronous };
+
+  EventBeatBasedExecutor(std::unique_ptr<EventBeat> eventBeat);
+
+  /*
+   * Executes given routine with given mode.
+   */
+  void operator()(Routine routine, Mode mode = Mode::Asynchronous) const;
+
+ private:
+  void onBeat(bool success = true) const;
+  void execute(Task task) const;
+
+  std::unique_ptr<EventBeat> eventBeat_;
+  mutable std::vector<Task> tasks_; // Protected by `mutex_`.
+  mutable std::mutex mutex_;
+};
+
+using EventBeatFactory = std::function<std::unique_ptr<EventBeat>()>;
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/EventDispatcher.cpp b/ReactCommon/fabric/events/EventDispatcher.cpp
new file mode 100644
index 00000000000000..737b8a7a91d289
--- /dev/null
+++ b/ReactCommon/fabric/events/EventDispatcher.cpp
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "EventDispatcher.h"
+
+#include "BatchedEventQueue.h"
+#include "UnbatchedEventQueue.h"
+
+#define REACT_FABRIC_SYNC_EVENT_DISPATCHING_DISABLED
+
+namespace facebook {
+namespace react {
+
+EventDispatcher::EventDispatcher(
+    const EventPipe &eventPipe,
+    const EventBeatFactory &synchonousEventBeatFactory,
+    const EventBeatFactory &asynchonousEventBeatFactory) {
+  // Synchronous/Unbatched
+  eventQueues_[(int)EventPriority::SynchronousUnbatched] =
+      std::make_unique<UnbatchedEventQueue>(
+          eventPipe, synchonousEventBeatFactory());
+
+  // Synchronous/Batched
+  eventQueues_[(int)EventPriority::SynchronousBatched] =
+      std::make_unique<BatchedEventQueue>(
+          eventPipe, synchonousEventBeatFactory());
+
+  // Asynchronous/Unbatched
+  eventQueues_[(int)EventPriority::AsynchronousUnbatched] =
+      std::make_unique<UnbatchedEventQueue>(
+          eventPipe, asynchonousEventBeatFactory());
+
+  // Asynchronous/Batched
+  eventQueues_[(int)EventPriority::AsynchronousBatched] =
+      std::make_unique<BatchedEventQueue>(
+          eventPipe, asynchonousEventBeatFactory());
+}
+
+void EventDispatcher::dispatchEvent(
+    const RawEvent &rawEvent,
+    EventPriority priority) const {
+#ifdef REACT_FABRIC_SYNC_EVENT_DISPATCHING_DISABLED
+  // Synchronous dispatch works, but JavaScript interop layer does not have
+  // proper synchonization yet and it crashes.
+  if (priority == EventPriority::SynchronousUnbatched) {
+    priority = EventPriority::AsynchronousUnbatched;
+  }
+
+  if (priority == EventPriority::SynchronousBatched) {
+    priority = EventPriority::AsynchronousBatched;
+  }
+#endif
+
+  eventQueues_[(int)priority]->enqueueEvent(rawEvent);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/EventDispatcher.h b/ReactCommon/fabric/events/EventDispatcher.h
new file mode 100644
index 00000000000000..4a89c9d2234faf
--- /dev/null
+++ b/ReactCommon/fabric/events/EventDispatcher.h
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <memory>
+
+#include <fabric/events/EventBeat.h>
+#include <fabric/events/EventQueue.h>
+#include <fabric/events/RawEvent.h>
+#include <fabric/events/primitives.h>
+
+namespace facebook {
+namespace react {
+
+class EventDispatcher;
+using SharedEventDispatcher = std::shared_ptr<const EventDispatcher>;
+using WeakEventDispatcher = std::weak_ptr<const EventDispatcher>;
+
+/*
+ * Represents event-delivery infrastructure.
+ * Particular `EventEmitter` clases use this for sending events.
+ */
+class EventDispatcher {
+ public:
+  EventDispatcher(
+      const EventPipe &eventPipe,
+      const EventBeatFactory &synchonousEventBeatFactory,
+      const EventBeatFactory &asynchonousEventBeatFactory);
+
+  /*
+   * Dispatches a raw event with given priority using event-delivery pipe.
+   */
+  void dispatchEvent(const RawEvent &rawEvent, EventPriority priority) const;
+
+ private:
+  std::array<std::unique_ptr<EventQueue>, 4> eventQueues_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/EventEmitter.cpp b/ReactCommon/fabric/events/EventEmitter.cpp
new file mode 100644
index 00000000000000..51f547efed6895
--- /dev/null
+++ b/ReactCommon/fabric/events/EventEmitter.cpp
@@ -0,0 +1,84 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "EventEmitter.h"
+
+#include <folly/dynamic.h>
+
+#include "RawEvent.h"
+
+namespace facebook {
+namespace react {
+
+// TODO(T29874519): Get rid of "top" prefix once and for all.
+/*
+ * Capitalizes the first letter of the event type and adds "top" prefix if
+ * necessary (e.g. "layout" becames "topLayout").
+ */
+static std::string normalizeEventType(const std::string &type) {
+  auto prefixedType = type;
+  if (type.find("top", 0) != 0) {
+    prefixedType.insert(0, "top");
+    prefixedType[3] = toupper(prefixedType[3]);
+  }
+  return prefixedType;
+}
+
+std::recursive_mutex &EventEmitter::DispatchMutex() {
+  static std::recursive_mutex mutex;
+  return mutex;
+}
+
+EventEmitter::EventEmitter(
+    SharedEventTarget eventTarget,
+    Tag tag,
+    WeakEventDispatcher eventDispatcher)
+    : eventTarget_(std::move(eventTarget)),
+      weakEventTarget_({}),
+      tag_(tag),
+      eventDispatcher_(std::move(eventDispatcher)) {}
+
+void EventEmitter::dispatchEvent(
+    const std::string &type,
+    const folly::dynamic &payload,
+    const EventPriority &priority) const {
+  auto eventDispatcher = eventDispatcher_.lock();
+  if (!eventDispatcher) {
+    return;
+  }
+
+  // Mixing `target` into `payload`.
+  assert(payload.isObject());
+  folly::dynamic extendedPayload = folly::dynamic::object("target", tag_);
+  extendedPayload.merge_patch(payload);
+
+  eventDispatcher->dispatchEvent(
+      RawEvent(normalizeEventType(type), extendedPayload, eventTarget_),
+      priority);
+}
+
+void EventEmitter::setEnabled(bool enabled) const {
+  bool alreadyEnabled = eventTarget_ != nullptr;
+  if (enabled == alreadyEnabled) {
+    return;
+  }
+
+  if (enabled) {
+    eventTarget_ = weakEventTarget_.lock();
+    weakEventTarget_.reset();
+  } else {
+    weakEventTarget_ = eventTarget_;
+    eventTarget_.reset();
+  }
+}
+
+bool EventEmitter::getEnabled() const {
+  return eventTarget_ != nullptr;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/EventEmitter.h b/ReactCommon/fabric/events/EventEmitter.h
new file mode 100644
index 00000000000000..a3220eaed1b7c4
--- /dev/null
+++ b/ReactCommon/fabric/events/EventEmitter.h
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <memory>
+#include <mutex>
+
+#include <fabric/events/EventDispatcher.h>
+#include <fabric/events/primitives.h>
+#include <folly/dynamic.h>
+
+namespace facebook {
+namespace react {
+
+class EventEmitter;
+
+using SharedEventEmitter = std::shared_ptr<const EventEmitter>;
+
+/*
+ * Base class for all particular typed event handlers.
+ * Stores a pointer to `EventTarget` identifying a particular component and
+ * a weak pointer to `EventDispatcher` which is responsible for delivering the
+ * event.
+ *
+ * Note: Retaining an `EventTarget` does *not* guarantee that actual event
+ * target exists and/or valid in JavaScript realm. The `EventTarget` retains an
+ * `EventTargetWrapper` which wraps JavaScript object in `unsafe-unretained`
+ * manner. Retaining the `EventTarget` *does* indicate that we can use that to
+ * get an actual JavaScript object from that in the future *ensuring safety
+ * beforehand somehow*; JSI maintains `WeakObject` object as long as we retain
+ * the `EventTarget`. All `EventTarget` instances must be deallocated before
+ * stopping JavaScript machine.
+ */
+class EventEmitter {
+  /*
+   * We have to repeat `Tag` type definition here because `events` module does
+   * not depend on `core` module (and should not).
+   */
+  using Tag = int32_t;
+
+ public:
+  static std::recursive_mutex &DispatchMutex();
+
+  EventEmitter(
+      SharedEventTarget eventTarget,
+      Tag tag,
+      WeakEventDispatcher eventDispatcher);
+
+  virtual ~EventEmitter() = default;
+
+  /*
+   * Indicates that an event can be delivered to `eventTarget`.
+   * Callsite must acquire `DispatchMutex` to access those methods.
+   * The `setEnabled` operation is not guaranteed: sometimes `EventEmitter`
+   * can be re-enabled after disabling, sometimes not.
+   */
+  void setEnabled(bool enabled) const;
+  bool getEnabled() const;
+
+ protected:
+#ifdef ANDROID
+  // We need this temporarily due to lack of Java-counterparts for particular
+  // subclasses.
+ public:
+#endif
+
+  /*
+   * Initates an event delivery process.
+   * Is used by particular subclasses only.
+   */
+  void dispatchEvent(
+      const std::string &type,
+      const folly::dynamic &payload = folly::dynamic::object(),
+      const EventPriority &priority = EventPriority::AsynchronousBatched) const;
+
+ private:
+  mutable SharedEventTarget eventTarget_;
+  mutable WeakEventTarget weakEventTarget_;
+  Tag tag_;
+  WeakEventDispatcher eventDispatcher_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/EventQueue.cpp b/ReactCommon/fabric/events/EventQueue.cpp
new file mode 100644
index 00000000000000..e34bfd925608d8
--- /dev/null
+++ b/ReactCommon/fabric/events/EventQueue.cpp
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "EventQueue.h"
+
+#include "EventEmitter.h"
+
+namespace facebook {
+namespace react {
+
+EventQueue::EventQueue(
+    EventPipe eventPipe,
+    std::unique_ptr<EventBeat> eventBeat)
+    : eventPipe_(std::move(eventPipe)), eventBeat_(std::move(eventBeat)) {
+  eventBeat_->setBeatCallback(std::bind(&EventQueue::onBeat, this));
+}
+
+void EventQueue::enqueueEvent(const RawEvent &rawEvent) const {
+  std::lock_guard<std::mutex> lock(queueMutex_);
+  queue_.push_back(rawEvent);
+}
+
+void EventQueue::onBeat() const {
+  std::vector<RawEvent> queue;
+
+  {
+    std::lock_guard<std::mutex> lock(queueMutex_);
+
+    if (queue_.size() == 0) {
+      return;
+    }
+
+    queue = std::move(queue_);
+    assert(queue_.size() == 0);
+  }
+
+  {
+    std::lock_guard<std::recursive_mutex> lock(EventEmitter::DispatchMutex());
+
+    for (const auto &event : queue) {
+      eventPipe_(event.eventTarget.lock().get(), event.type, event.payload);
+    }
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/EventQueue.h b/ReactCommon/fabric/events/EventQueue.h
new file mode 100644
index 00000000000000..152937c83373bd
--- /dev/null
+++ b/ReactCommon/fabric/events/EventQueue.h
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <memory>
+#include <mutex>
+#include <vector>
+
+#include <fabric/events/EventBeat.h>
+#include <fabric/events/RawEvent.h>
+#include <fabric/events/primitives.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Event Queue synchronized with given Event Beat and dispatching event
+ * using given Event Pipe.
+ */
+class EventQueue {
+ public:
+  EventQueue(EventPipe eventPipe, std::unique_ptr<EventBeat> eventBeat);
+  virtual ~EventQueue() = default;
+
+  /*
+   * Enqueues and (probably later) dispatch a given event.
+   * Can be called on any thread.
+   */
+  virtual void enqueueEvent(const RawEvent &rawEvent) const;
+
+ protected:
+  void onBeat() const;
+
+  const EventPipe eventPipe_;
+  const std::unique_ptr<EventBeat> eventBeat_;
+  mutable std::vector<RawEvent>
+      queue_; // Thread-safe, protected by `queueMutex_`.
+  mutable std::mutex queueMutex_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/RawEvent.cpp b/ReactCommon/fabric/events/RawEvent.cpp
new file mode 100644
index 00000000000000..e73d06dcdc8aff
--- /dev/null
+++ b/ReactCommon/fabric/events/RawEvent.cpp
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "RawEvent.h"
+
+namespace facebook {
+namespace react {
+
+RawEvent::RawEvent(
+    std::string type,
+    folly::dynamic payload,
+    WeakEventTarget eventTarget)
+    : type(std::move(type)),
+      payload(std::move(payload)),
+      eventTarget(std::move(eventTarget)) {}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/RawEvent.h b/ReactCommon/fabric/events/RawEvent.h
new file mode 100644
index 00000000000000..ecb022af6e48be
--- /dev/null
+++ b/ReactCommon/fabric/events/RawEvent.h
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <memory>
+
+#include <fabric/events/primitives.h>
+#include <folly/dynamic.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Represents ready-to-dispatch event object.
+ */
+class RawEvent {
+ public:
+  RawEvent(
+      std::string type,
+      folly::dynamic payload,
+      WeakEventTarget eventTarget);
+
+  const std::string type;
+  const folly::dynamic payload;
+  const WeakEventTarget eventTarget;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/UnbatchedEventQueue.cpp b/ReactCommon/fabric/events/UnbatchedEventQueue.cpp
new file mode 100644
index 00000000000000..9c3b20670c8bed
--- /dev/null
+++ b/ReactCommon/fabric/events/UnbatchedEventQueue.cpp
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "UnbatchedEventQueue.h"
+
+namespace facebook {
+namespace react {
+
+void UnbatchedEventQueue::enqueueEvent(const RawEvent &rawEvent) const {
+  EventQueue::enqueueEvent(rawEvent);
+
+  eventBeat_->request();
+  eventBeat_->induce();
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/UnbatchedEventQueue.h b/ReactCommon/fabric/events/UnbatchedEventQueue.h
new file mode 100644
index 00000000000000..06c4a14de5043b
--- /dev/null
+++ b/ReactCommon/fabric/events/UnbatchedEventQueue.h
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <fabric/events/EventQueue.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Event Queue that dispatches events as granular as possible without waiting
+ * for the next beat.
+ */
+class UnbatchedEventQueue final : public EventQueue {
+ public:
+  using EventQueue::EventQueue;
+
+  void enqueueEvent(const RawEvent &rawEvent) const override;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/primitives.h b/ReactCommon/fabric/events/primitives.h
new file mode 100644
index 00000000000000..9428f446e2f8d2
--- /dev/null
+++ b/ReactCommon/fabric/events/primitives.h
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <folly/dynamic.h>
+
+namespace facebook {
+namespace react {
+
+enum class EventPriority : int {
+  SynchronousUnbatched,
+  SynchronousBatched,
+  AsynchronousUnbatched,
+  AsynchronousBatched,
+
+  Sync = SynchronousUnbatched,
+  Work = SynchronousBatched,
+  Interactive = AsynchronousUnbatched,
+  Deferred = AsynchronousBatched
+};
+
+/*
+ * We need this types only to ensure type-safety when we deal with them.
+ * Conceptually, they are opaque pointers to some types that derived from those
+ * classes.
+ *
+ * `EventHandler` is managed as a `unique_ptr`, so it must have a *virtual*
+ * destructor to allow proper deallocation having only a pointer
+ * to the base (`EventHandler`) class.
+ *
+ * `EventTarget` is managed as a `shared_ptr`, so it does not need to have a
+ * virtual destructor because `shared_ptr` stores a pointer to destructor
+ * inside.
+ */
+struct EventHandler {
+  virtual ~EventHandler() = default;
+};
+using UniqueEventHandler = std::unique_ptr<const EventHandler>;
+
+struct EventTarget {};
+using SharedEventTarget = std::shared_ptr<const EventTarget>;
+using WeakEventTarget = std::weak_ptr<const EventTarget>;
+
+using EventPipe = std::function<void(
+    const EventTarget *eventTarget,
+    const std::string &type,
+    const folly::dynamic &payload)>;
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/events/tests/EventsTest.cpp b/ReactCommon/fabric/events/tests/EventsTest.cpp
new file mode 100644
index 00000000000000..c6fe25b8413c95
--- /dev/null
+++ b/ReactCommon/fabric/events/tests/EventsTest.cpp
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <memory>
+
+#include <gtest/gtest.h>
+
+TEST(EventsTest, testSomething) {
+  // TODO
+}
diff --git a/ReactCommon/fabric/graphics/BUCK b/ReactCommon/fabric/graphics/BUCK
index 78061adc618bd1..c8ad013a5289c8 100644
--- a/ReactCommon/fabric/graphics/BUCK
+++ b/ReactCommon/fabric/graphics/BUCK
@@ -1,13 +1,16 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
 
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "graphics",
@@ -52,11 +55,6 @@ rn_xplat_cxx_library(
         ":tests",
     ],
     force_static = True,
-    frameworks = [
-        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
-        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
-        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
-    ],
     ios_deps = [
         "xplat//js:RCTImage",
         "xplat//js/react-native-github:RCTCxxBridge",
@@ -67,6 +65,11 @@ rn_xplat_cxx_library(
         ],
         prefix = "fabric/graphics",
     ),
+    ios_frameworks = [
+        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
     ios_srcs = glob(
         [
             "platform/ios/**/*.cpp",
@@ -90,24 +93,21 @@ rn_xplat_cxx_library(
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":graphics",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = (ANDROID,APPLE),
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":graphics",
+    ],
+)
diff --git a/ReactCommon/fabric/graphics/ColorComponents.h b/ReactCommon/fabric/graphics/ColorComponents.h
index 489e1888668f2e..3f3123862fb00d 100644
--- a/ReactCommon/fabric/graphics/ColorComponents.h
+++ b/ReactCommon/fabric/graphics/ColorComponents.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,10 +11,10 @@ namespace facebook {
 namespace react {
 
 struct ColorComponents {
-  float red {0};
-  float green {0};
-  float blue {0};
-  float alpha {0};
+  float red{0};
+  float green{0};
+  float blue{0};
+  float alpha{0};
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/graphics/Geometry.h b/ReactCommon/fabric/graphics/Geometry.h
index 3db79088609d80..2a29b1fc570f90 100644
--- a/ReactCommon/fabric/graphics/Geometry.h
+++ b/ReactCommon/fabric/graphics/Geometry.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -6,6 +6,7 @@
 #pragma once
 
 #include <algorithm>
+#include <functional>
 #include <tuple>
 
 #include <fabric/graphics/Float.h>
@@ -17,26 +18,30 @@ namespace react {
  * Point
  */
 struct Point {
-  Float x {0};
-  Float y {0};
+  Float x{0};
+  Float y{0};
 
-  Point& operator += (const Point& rhs) {
-    x += rhs.x;
-    y += rhs.y;
+  Point &operator+=(const Point &point) {
+    x += point.x;
+    y += point.y;
     return *this;
   }
 
-  friend Point operator + (Point lhs, const Point& rhs) {
+  Point &operator*=(const Point &point) {
+    x *= point.x;
+    y *= point.y;
+    return *this;
+  }
+
+  friend Point operator+(Point lhs, const Point &rhs) {
     return lhs += rhs;
   }
 
-  bool operator ==(const Point& rhs) const {
-    return
-      std::tie(this->x, this->y) ==
-      std::tie(rhs.x, rhs.y);
+  bool operator==(const Point &rhs) const {
+    return std::tie(this->x, this->y) == std::tie(rhs.x, rhs.y);
   }
 
-  bool operator !=(const Point& rhs) const {
+  bool operator!=(const Point &rhs) const {
     return !(*this == rhs);
   }
 };
@@ -45,16 +50,27 @@ struct Point {
  * Size
  */
 struct Size {
-  Float width {0};
-  Float height {0};
+  Float width{0};
+  Float height{0};
 
-  bool operator ==(const Size& rhs) const {
-    return
-      std::tie(this->width, this->height) ==
-      std::tie(rhs.width, rhs.height);
+  Size &operator+=(const Point &point) {
+    width += point.x;
+    height += point.y;
+    return *this;
   }
 
-  bool operator !=(const Size& rhs) const {
+  Size &operator*=(const Point &point) {
+    width *= point.x;
+    height *= point.y;
+    return *this;
+  }
+
+  bool operator==(const Size &rhs) const {
+    return std::tie(this->width, this->height) ==
+        std::tie(rhs.width, rhs.height);
+  }
+
+  bool operator!=(const Size &rhs) const {
     return !(*this == rhs);
   }
 };
@@ -63,85 +79,151 @@ struct Size {
  * Rect: Point and Size
  */
 struct Rect {
-  Point origin {0, 0};
-  Size size {0, 0};
+  Point origin{0, 0};
+  Size size{0, 0};
 
-  bool operator ==(const Rect& rhs) const {
-    return
-      std::tie(this->origin, this->size) ==
-      std::tie(rhs.origin, rhs.size);
+  bool operator==(const Rect &rhs) const {
+    return std::tie(this->origin, this->size) == std::tie(rhs.origin, rhs.size);
   }
 
-  bool operator !=(const Rect& rhs) const {
+  bool operator!=(const Rect &rhs) const {
     return !(*this == rhs);
   }
 
-  Float getMaxX() const { return size.width > 0 ? origin.x + size.width : origin.x; }
-  Float getMaxY() const { return size.height > 0 ? origin.y + size.height : origin.y; }
-  Float getMinX() const { return size.width >= 0 ? origin.x : origin.x + size.width; }
-  Float getMinY() const { return size.height >= 0 ? origin.y : origin.y + size.height; }
+  Float getMaxX() const {
+    return size.width > 0 ? origin.x + size.width : origin.x;
+  }
+  Float getMaxY() const {
+    return size.height > 0 ? origin.y + size.height : origin.y;
+  }
+  Float getMinX() const {
+    return size.width >= 0 ? origin.x : origin.x + size.width;
+  }
+  Float getMinY() const {
+    return size.height >= 0 ? origin.y : origin.y + size.height;
+  }
 
   void unionInPlace(const Rect &rect) {
-    Float x1 = std::min(getMinX(), rect.getMinX());
-    Float y1 = std::min(getMinY(), rect.getMinY());
-    Float x2 = std::max(getMaxX(), rect.getMaxX());
-    Float y2 = std::max(getMaxY(), rect.getMaxY());
+    auto x1 = std::min(getMinX(), rect.getMinX());
+    auto y1 = std::min(getMinY(), rect.getMinY());
+    auto x2 = std::max(getMaxX(), rect.getMaxX());
+    auto y2 = std::max(getMaxY(), rect.getMaxY());
     origin = {x1, y1};
     size = {x2 - x1, y2 - y1};
   }
 };
 
 /*
- * EdgeInsets
+ * Generic data structure describes some values associated with *edges*
+ * of a rectangle.
  */
-struct EdgeInsets {
-  Float left {0};
-  Float top {0};
-  Float right {0};
-  Float bottom {0};
-
-  bool operator ==(const EdgeInsets& rhs) const {
-    return
-      std::tie(this->left, this->top, this->right, this->bottom) ==
-      std::tie(rhs.left, rhs.top, rhs.right, rhs.bottom);
+template <typename T>
+struct RectangleEdges {
+  T left{};
+  T top{};
+  T right{};
+  T bottom{};
+
+  bool operator==(const RectangleEdges<T> &rhs) const {
+    return std::tie(this->left, this->top, this->right, this->bottom) ==
+        std::tie(rhs.left, rhs.top, rhs.right, rhs.bottom);
   }
 
-  bool operator !=(const EdgeInsets& rhs) const {
+  bool operator!=(const RectangleEdges<T> &rhs) const {
     return !(*this == rhs);
   }
 
   bool isUniform() const {
-    return left == top &&
-      left == right &&
-      left == bottom;
+    return left == top && left == right && left == bottom;
   }
 };
 
 /*
- * CornerInsets
+ * Generic data structure describes some values associated with *corners*
+ * of a rectangle.
  */
-struct CornerInsets {
-  Float topLeft {0};
-  Float topRight {0};
-  Float bottomLeft {0};
-  Float bottomRight {0};
-
-  bool operator ==(const CornerInsets& rhs) const {
-    return
-    std::tie(this->topLeft, this->topRight, this->bottomLeft, this->bottomRight) ==
-    std::tie(rhs.topLeft, rhs.topRight, rhs.bottomLeft, rhs.bottomRight);
+template <typename T>
+struct RectangleCorners {
+  T topLeft{};
+  T topRight{};
+  T bottomLeft{};
+  T bottomRight{};
+
+  bool operator==(const RectangleCorners<T> &rhs) const {
+    return std::tie(
+               this->topLeft,
+               this->topRight,
+               this->bottomLeft,
+               this->bottomRight) ==
+        std::tie(rhs.topLeft, rhs.topRight, rhs.bottomLeft, rhs.bottomRight);
   }
 
-  bool operator !=(const CornerInsets& rhs) const {
+  bool operator!=(const RectangleCorners<T> &rhs) const {
     return !(*this == rhs);
   }
 
   bool isUniform() const {
-    return topLeft == topRight &&
-      topLeft == bottomLeft &&
-      topLeft == bottomRight;
+    return topLeft == topRight && topLeft == bottomLeft &&
+        topLeft == bottomRight;
   }
 };
 
+/*
+ * EdgeInsets
+ */
+using EdgeInsets = RectangleEdges<Float>;
+
+/*
+ * CornerInsets
+ */
+using CornerInsets = RectangleCorners<Float>;
+
 } // namespace react
 } // namespace facebook
+
+namespace std {
+template <>
+struct hash<facebook::react::Point> {
+  size_t operator()(const facebook::react::Point &point) const {
+    return hash<decltype(point.x)>{}(point.x) +
+        hash<decltype(point.y)>{}(point.y);
+  }
+};
+
+template <>
+struct hash<facebook::react::Size> {
+  size_t operator()(const facebook::react::Size &size) const {
+    return hash<decltype(size.width)>{}(size.width) +
+        hash<decltype(size.height)>{}(size.height);
+  }
+};
+
+template <>
+struct hash<facebook::react::Rect> {
+  size_t operator()(const facebook::react::Rect &rect) const {
+    return hash<decltype(rect.origin)>{}(rect.origin) +
+        hash<decltype(rect.size)>{}(rect.size);
+  }
+};
+
+template <typename T>
+struct hash<facebook::react::RectangleEdges<T>> {
+  size_t operator()(const facebook::react::RectangleEdges<T> &edges) const {
+    return hash<decltype(edges.left)>{}(edges.left) +
+        hash<decltype(edges.right)>{}(edges.right) +
+        hash<decltype(edges.top)>{}(edges.top) +
+        hash<decltype(edges.bottom)>{}(edges.bottom);
+  }
+};
+
+template <typename T>
+struct hash<facebook::react::RectangleCorners<T>> {
+  size_t operator()(const facebook::react::RectangleCorners<T> &corners) const {
+    return hash<decltype(corners.topLeft)>{}(corners.topLeft) +
+        hash<decltype(corners.bottomLeft)>{}(corners.bottomLeft) +
+        hash<decltype(corners.topRight)>{}(corners.topRight) +
+        hash<decltype(corners.bottomRight)>{}(corners.bottomRight);
+  }
+};
+
+} // namespace std
diff --git a/ReactCommon/fabric/graphics/conversions.h b/ReactCommon/fabric/graphics/conversions.h
index 3d5cc42752890c..1298c7812eca2a 100644
--- a/ReactCommon/fabric/graphics/conversions.h
+++ b/ReactCommon/fabric/graphics/conversions.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <folly/dynamic.h>
 #include <fabric/graphics/Color.h>
 #include <fabric/graphics/Geometry.h>
+#include <folly/dynamic.h>
 
 namespace facebook {
 namespace react {
@@ -24,7 +24,7 @@ inline void fromDynamic(const folly::dynamic &value, SharedColor &result) {
 
   if (value.isNumber()) {
     auto argb = value.asInt();
-    float ratio = 256;
+    auto ratio = 256.f;
     alpha = ((argb >> 24) & 0xFF) / ratio;
     red = ((argb >> 16) & 0xFF) / ratio;
     green = ((argb >> 8) & 0xFF) / ratio;
@@ -43,25 +43,34 @@ inline void fromDynamic(const folly::dynamic &value, SharedColor &result) {
   result = colorFromComponents({red, green, blue, alpha});
 }
 
+inline folly::dynamic toDynamic(const SharedColor &color) {
+  ColorComponents components = colorComponentsFromColor(color);
+  auto ratio = 256.f;
+  return (
+      ((int)(components.alpha * ratio) & 0xff) << 24 |
+      ((int)(components.red * ratio) & 0xff) << 16 |
+      ((int)(components.green * ratio) & 0xff) << 8 |
+      ((int)(components.blue * ratio) & 0xff));
+}
+
 inline std::string toString(const SharedColor &value) {
   ColorComponents components = colorComponentsFromColor(value);
-  const float ratio = 256;
-  return "rgba(" +
-    folly::to<std::string>(round(components.red * ratio)) + ", " +
-    folly::to<std::string>(round(components.green * ratio)) + ", " +
-    folly::to<std::string>(round(components.blue * ratio)) + ", " +
-    folly::to<std::string>(round(components.alpha * ratio)) + ")";
+  auto ratio = 256.f;
+  return "rgba(" + folly::to<std::string>(round(components.red * ratio)) +
+      ", " + folly::to<std::string>(round(components.green * ratio)) + ", " +
+      folly::to<std::string>(round(components.blue * ratio)) + ", " +
+      folly::to<std::string>(round(components.alpha * ratio)) + ")";
 }
 
 #pragma mark - Geometry
 
 inline void fromDynamic(const folly::dynamic &value, Point &result) {
   if (value.isObject()) {
-    result = Point {(Float)value["x"].asDouble(), (Float)value["y"].asDouble()};
+    result = Point{(Float)value["x"].asDouble(), (Float)value["y"].asDouble()};
     return;
   }
   if (value.isArray()) {
-    result = Point {(Float)value[0].asDouble(), (Float)value[1].asDouble()};
+    result = Point{(Float)value[0].asDouble(), (Float)value[1].asDouble()};
     return;
   }
   abort();
@@ -69,11 +78,12 @@ inline void fromDynamic(const folly::dynamic &value, Point &result) {
 
 inline void fromDynamic(const folly::dynamic &value, Size &result) {
   if (value.isObject()) {
-    result = Size {(Float)value["width"].asDouble(), (Float)value["height"].asDouble()};
+    result = Size{(Float)value["width"].asDouble(),
+                  (Float)value["height"].asDouble()};
     return;
   }
   if (value.isArray()) {
-    result = Size {(Float)value[0].asDouble(), (Float)value[1].asDouble()};
+    result = Size{(Float)value[0].asDouble(), (Float)value[1].asDouble()};
     return;
   }
   abort();
@@ -82,25 +92,21 @@ inline void fromDynamic(const folly::dynamic &value, Size &result) {
 inline void fromDynamic(const folly::dynamic &value, EdgeInsets &result) {
   if (value.isNumber()) {
     const Float number = value.asDouble();
-    result = EdgeInsets {number, number, number, number};
+    result = EdgeInsets{number, number, number, number};
     return;
   }
   if (value.isObject()) {
-    result = EdgeInsets {
-      (Float)value["top"].asDouble(),
-      (Float)value["left"].asDouble(),
-      (Float)value["bottom"].asDouble(),
-      (Float)value["right"].asDouble()
-    };
+    result = EdgeInsets{(Float)value["top"].asDouble(),
+                        (Float)value["left"].asDouble(),
+                        (Float)value["bottom"].asDouble(),
+                        (Float)value["right"].asDouble()};
     return;
   }
   if (value.isArray()) {
-    result = EdgeInsets {
-      (Float)value[0].asDouble(),
-      (Float)value[1].asDouble(),
-      (Float)value[2].asDouble(),
-      (Float)value[3].asDouble()
-    };
+    result = EdgeInsets{(Float)value[0].asDouble(),
+                        (Float)value[1].asDouble(),
+                        (Float)value[2].asDouble(),
+                        (Float)value[3].asDouble()};
     return;
   }
   abort();
@@ -109,36 +115,34 @@ inline void fromDynamic(const folly::dynamic &value, EdgeInsets &result) {
 inline void fromDynamic(const folly::dynamic &value, CornerInsets &result) {
   if (value.isNumber()) {
     const Float number = value.asDouble();
-    result = CornerInsets {number, number, number, number};
+    result = CornerInsets{number, number, number, number};
     return;
   }
   if (value.isObject()) {
-    result = CornerInsets {
-      (Float)value["topLeft"].asDouble(),
-      (Float)value["topRight"].asDouble(),
-      (Float)value["bottomLeft"].asDouble(),
-      (Float)value["bottomRight"].asDouble()
-    };
+    result = CornerInsets{(Float)value["topLeft"].asDouble(),
+                          (Float)value["topRight"].asDouble(),
+                          (Float)value["bottomLeft"].asDouble(),
+                          (Float)value["bottomRight"].asDouble()};
     return;
   }
   if (value.isArray()) {
-    result = CornerInsets {
-      (Float)value[0].asDouble(),
-      (Float)value[1].asDouble(),
-      (Float)value[2].asDouble(),
-      (Float)value[3].asDouble()
-    };
+    result = CornerInsets{(Float)value[0].asDouble(),
+                          (Float)value[1].asDouble(),
+                          (Float)value[2].asDouble(),
+                          (Float)value[3].asDouble()};
     return;
   }
   abort();
 }
 
 inline std::string toString(const Point &point) {
-  return "{" + folly::to<std::string>(point.x) + ", " + folly::to<std::string>(point.y) + "}";
+  return "{" + folly::to<std::string>(point.x) + ", " +
+      folly::to<std::string>(point.y) + "}";
 }
 
 inline std::string toString(const Size &size) {
-  return "{" + folly::to<std::string>(size.width) + ", " + folly::to<std::string>(size.height) + "}";
+  return "{" + folly::to<std::string>(size.width) + ", " +
+      folly::to<std::string>(size.height) + "}";
 }
 
 inline std::string toString(const Rect &rect) {
@@ -146,19 +150,17 @@ inline std::string toString(const Rect &rect) {
 }
 
 inline std::string toString(const EdgeInsets &edgeInsets) {
-  return "{" +
-    folly::to<std::string>(edgeInsets.left) + ", " +
-    folly::to<std::string>(edgeInsets.top) + ", " +
-    folly::to<std::string>(edgeInsets.right) + ", " +
-    folly::to<std::string>(edgeInsets.bottom) + "}";
+  return "{" + folly::to<std::string>(edgeInsets.left) + ", " +
+      folly::to<std::string>(edgeInsets.top) + ", " +
+      folly::to<std::string>(edgeInsets.right) + ", " +
+      folly::to<std::string>(edgeInsets.bottom) + "}";
 }
 
 inline std::string toString(const CornerInsets &cornerInsets) {
-  return "{" +
-    folly::to<std::string>(cornerInsets.topLeft) + ", " +
-    folly::to<std::string>(cornerInsets.topRight) + ", " +
-    folly::to<std::string>(cornerInsets.bottomLeft) + ", " +
-    folly::to<std::string>(cornerInsets.bottomRight) + "}";
+  return "{" + folly::to<std::string>(cornerInsets.topLeft) + ", " +
+      folly::to<std::string>(cornerInsets.topRight) + ", " +
+      folly::to<std::string>(cornerInsets.bottomLeft) + ", " +
+      folly::to<std::string>(cornerInsets.bottomRight) + "}";
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/graphics/platform/android/Color.cpp b/ReactCommon/fabric/graphics/platform/android/Color.cpp
index 3511eeb3be86eb..35fc3e2af0b3ed 100644
--- a/ReactCommon/fabric/graphics/platform/android/Color.cpp
+++ b/ReactCommon/fabric/graphics/platform/android/Color.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,13 +11,36 @@ namespace facebook {
 namespace react {
 
 SharedColor colorFromComponents(ColorComponents components) {
-  // Not implemented.
-  return {};
+  float ratio = 255.9999;
+  return SharedColor(
+      ((int)(components.alpha * ratio) & 0xff) << 24 |
+      ((int)(components.red * ratio) & 0xff) << 16 |
+      ((int)(components.green * ratio) & 0xff) << 8 |
+      ((int)(components.blue * ratio) & 0xff));
 }
 
-ColorComponents colorComponentsFromColor(SharedColor color) {
-  // Not implemented.
-  return {};
+ColorComponents colorComponentsFromColor(SharedColor sharedColor) {
+  float ratio = 256;
+  Color color = *sharedColor;
+  return ColorComponents{(float)((color >> 16) & 0xff) / ratio,
+                         (float)((color >> 8) & 0xff) / ratio,
+                         (float)((color >> 0) & 0xff) / ratio,
+                         (float)((color >> 24) & 0xff) / ratio};
+}
+
+SharedColor clearColor() {
+  static SharedColor color = colorFromComponents(ColorComponents{0, 0, 0, 0});
+  return color;
+}
+
+SharedColor blackColor() {
+  static SharedColor color = colorFromComponents(ColorComponents{0, 0, 0, 1});
+  return color;
+}
+
+SharedColor whiteColor() {
+  static SharedColor color = colorFromComponents(ColorComponents{1, 1, 1, 1});
+  return color;
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/graphics/platform/android/Color.h b/ReactCommon/fabric/graphics/platform/android/Color.h
index 761af1d2de05fa..6928b018aa1fb4 100644
--- a/ReactCommon/fabric/graphics/platform/android/Color.h
+++ b/ReactCommon/fabric/graphics/platform/android/Color.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,18 +7,64 @@
 
 #pragma once
 
-#include <memory>
+#include <functional>
+#include <limits>
 
 #include <fabric/graphics/ColorComponents.h>
 
 namespace facebook {
 namespace react {
 
-using Color = float;
-using SharedColor = std::shared_ptr<Color>;
+using Color = int;
+
+/*
+ * On Android, a color can be represented as 32 bits integer, so there is no
+ * need to instantiate complex color objects and then pass them as shared
+ * pointers. Hense instead of using shared_ptr, we use a simple wrapper class
+ * which provides a pointer-like interface.
+ */
+class SharedColor {
+ public:
+  static const Color UndefinedColor = std::numeric_limits<Color>::max();
+
+  SharedColor() : color_(UndefinedColor) {}
+
+  SharedColor(const SharedColor &sharedColor) : color_(sharedColor.color_) {}
+
+  SharedColor(Color color) : color_(color) {}
+
+  SharedColor &operator=(const SharedColor &sharedColor) {
+    color_ = sharedColor.color_;
+    return *this;
+  }
+
+  Color operator*() const {
+    return color_;
+  }
+
+  operator bool() const {
+    return color_ != UndefinedColor;
+  }
+
+ private:
+  Color color_;
+};
 
 SharedColor colorFromComponents(ColorComponents components);
 ColorComponents colorComponentsFromColor(SharedColor color);
 
+SharedColor clearColor();
+SharedColor blackColor();
+SharedColor whiteColor();
+
 } // namespace react
 } // namespace facebook
+
+namespace std {
+template <>
+struct hash<facebook::react::SharedColor> {
+  size_t operator()(const facebook::react::SharedColor &sharedColor) const {
+    return hash<decltype(*sharedColor)>{}(*sharedColor);
+  }
+};
+} // namespace std
diff --git a/ReactCommon/fabric/graphics/platform/android/Float.h b/ReactCommon/fabric/graphics/platform/android/Float.h
index 8351a892322377..3a6460b65c25fe 100644
--- a/ReactCommon/fabric/graphics/platform/android/Float.h
+++ b/ReactCommon/fabric/graphics/platform/android/Float.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/graphics/platform/ios/Color.cpp b/ReactCommon/fabric/graphics/platform/ios/Color.cpp
index db03a0f4af2936..552cf5ceb64fb5 100644
--- a/ReactCommon/fabric/graphics/platform/ios/Color.cpp
+++ b/ReactCommon/fabric/graphics/platform/ios/Color.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,30 +12,42 @@ namespace react {
 
 SharedColor colorFromComponents(ColorComponents components) {
   const CGFloat componentsArray[] = {
-    components.red,
-    components.green,
-    components.blue,
-    components.alpha
-  };
+      components.red, components.green, components.blue, components.alpha};
 
-  CGColorRef color = CGColorCreate(
-    CGColorSpaceCreateDeviceRGB(),
-    componentsArray
-  );
+  auto color = CGColorCreate(CGColorSpaceCreateDeviceRGB(), componentsArray);
 
   return SharedColor(color, CFRelease);
 }
 
 ColorComponents colorComponentsFromColor(SharedColor color) {
-  int numberOfComponents = CGColorGetNumberOfComponents(color.get());
+  if (!color) {
+    // Empty color object can be considered as `clear` (black, fully
+    // transparent) color.
+    return ColorComponents{0, 0, 0, 0};
+  }
+
+  auto numberOfComponents = CGColorGetNumberOfComponents(color.get());
   assert(numberOfComponents == 4);
   const CGFloat *components = CGColorGetComponents(color.get());
-  return ColorComponents {
-    (float)components[0],
-    (float)components[1],
-    (float)components[2],
-    (float)components[3]
-  };
+  return ColorComponents{(float)components[0],
+                         (float)components[1],
+                         (float)components[2],
+                         (float)components[3]};
+}
+
+SharedColor clearColor() {
+  static SharedColor color = colorFromComponents(ColorComponents{0, 0, 0, 0});
+  return color;
+}
+
+SharedColor blackColor() {
+  static SharedColor color = colorFromComponents(ColorComponents{0, 0, 0, 1});
+  return color;
+}
+
+SharedColor whiteColor() {
+  static SharedColor color = colorFromComponents(ColorComponents{1, 1, 1, 1});
+  return color;
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/graphics/platform/ios/Color.h b/ReactCommon/fabric/graphics/platform/ios/Color.h
index 019663e734cc2a..73064db216e078 100644
--- a/ReactCommon/fabric/graphics/platform/ios/Color.h
+++ b/ReactCommon/fabric/graphics/platform/ios/Color.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,9 +9,9 @@
 
 #include <memory>
 
-#include <fabric/graphics/Float.h>
-
+#include <CoreGraphics/CoreGraphics.h>
 #include <fabric/graphics/ColorComponents.h>
+#include <fabric/graphics/Float.h>
 
 namespace facebook {
 namespace react {
@@ -22,5 +22,9 @@ using SharedColor = std::shared_ptr<Color>;
 SharedColor colorFromComponents(ColorComponents components);
 ColorComponents colorComponentsFromColor(SharedColor color);
 
+SharedColor clearColor();
+SharedColor blackColor();
+SharedColor whiteColor();
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/graphics/platform/ios/Float.h b/ReactCommon/fabric/graphics/platform/ios/Float.h
index fec03a6846d166..721922d16608a5 100644
--- a/ReactCommon/fabric/graphics/platform/ios/Float.h
+++ b/ReactCommon/fabric/graphics/platform/ios/Float.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its 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 <limits>
 #include <CoreGraphics/CoreGraphics.h>
+#include <limits>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/graphics/tests/GraphicsTest.cpp b/ReactCommon/fabric/graphics/tests/GraphicsTest.cpp
index 4684d4c5007955..53721e9ce62e3d 100644
--- a/ReactCommon/fabric/graphics/tests/GraphicsTest.cpp
+++ b/ReactCommon/fabric/graphics/tests/GraphicsTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/imagemanager/BUCK b/ReactCommon/fabric/imagemanager/BUCK
index a42904ea45fb2a..c2cbd42426127d 100644
--- a/ReactCommon/fabric/imagemanager/BUCK
+++ b/ReactCommon/fabric/imagemanager/BUCK
@@ -1,13 +1,17 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
 
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "imagemanager",
@@ -48,11 +52,6 @@ rn_xplat_cxx_library(
         ":tests",
     ],
     force_static = True,
-    frameworks = [
-        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
-        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
-        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
-    ],
     ios_deps = [
         "xplat//js:RCTImage",
         "xplat//js/react-native-github:RCTCxxBridge",
@@ -64,6 +63,11 @@ rn_xplat_cxx_library(
         ],
         prefix = "fabric/imagemanager",
     ),
+    ios_frameworks = [
+        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
     ios_headers = subdir_glob(
         [
             ("", "*.h"),
@@ -99,24 +103,21 @@ rn_xplat_cxx_library(
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":imagemanager",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = (ANDROID, APPLE),
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":imagemanager",
+    ],
+)
diff --git a/ReactCommon/fabric/imagemanager/ImageManager.h b/ReactCommon/fabric/imagemanager/ImageManager.h
index d3f37d0ff11b39..3bdbee79b0ecd6 100644
--- a/ReactCommon/fabric/imagemanager/ImageManager.h
+++ b/ReactCommon/fabric/imagemanager/ImageManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -23,14 +23,13 @@ using SharedImageManager = std::shared_ptr<ImageManager>;
  * Cross platform facade for iOS-specific RCTImageManager.
  */
 class ImageManager {
-public:
-
+ public:
   ImageManager(void *platformSpecificCounterpart);
   ~ImageManager();
 
   ImageRequest requestImage(const ImageSource &imageSource) const;
 
-private:
+ private:
   void *self_;
 };
 
diff --git a/ReactCommon/fabric/imagemanager/ImageRequest.cpp b/ReactCommon/fabric/imagemanager/ImageRequest.cpp
deleted file mode 100644
index e023f444d9c661..00000000000000
--- a/ReactCommon/fabric/imagemanager/ImageRequest.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "ImageRequest.h"
-
-namespace facebook {
-namespace react {
-
-class ImageRequest::ImageNoLongerNeededException:
-  public std::logic_error {
-public:
-  ImageNoLongerNeededException():
-    std::logic_error("Image no longer needed.") {}
-};
-
-ImageRequest::ImageRequest(const ImageSource &imageSource, folly::Future<ImageResponse> &&responseFuture):
-  imageSource_(imageSource),
-  responseFutureSplitter_(folly::splitFuture(std::move(responseFuture))) {}
-
-ImageRequest::ImageRequest(ImageRequest &&other) noexcept:
-  imageSource_(std::move(other.imageSource_)),
-  responseFutureSplitter_(std::move(other.responseFutureSplitter_)) {
-    other.moved_ = true;
-  };
-
-ImageRequest::~ImageRequest() {
-  if (!moved_) {
-    auto future = responseFutureSplitter_.getFuture();
-    if (!future.isReady()) {
-      future.raise(ImageNoLongerNeededException());
-    }
-  }
-}
-
-folly::Future<ImageResponse> ImageRequest::getResponseFuture() const {
-  if (moved_) {
-    abort();
-  }
-
-  std::lock_guard<std::mutex> lock(mutex_);
-  return responseFutureSplitter_.getFuture();
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/imagemanager/ImageRequest.h b/ReactCommon/fabric/imagemanager/ImageRequest.h
index 7d593f7be6c265..1a84a1833d2108 100644
--- a/ReactCommon/fabric/imagemanager/ImageRequest.h
+++ b/ReactCommon/fabric/imagemanager/ImageRequest.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -26,9 +26,7 @@ namespace react {
  * Destroy to cancel the underlying request.
  */
 class ImageRequest final {
-
-public:
-
+ public:
   /*
    * The exception which is thrown when `ImageRequest` is being deallocated
    * if the future is not ready yet.
@@ -39,7 +37,9 @@ class ImageRequest final {
    * `ImageRequest` is constructed with `ImageSource` and
    * `ImageResponse` future which must be moved in inside the object.
    */
-  ImageRequest(const ImageSource &imageSource, folly::Future<ImageResponse> &&responseFuture);
+  ImageRequest(
+      const ImageSource &imageSource,
+      folly::Future<ImageResponse> &&responseFuture);
 
   /*
    * The move constructor.
@@ -60,8 +60,7 @@ class ImageRequest final {
    */
   folly::Future<ImageResponse> getResponseFuture() const;
 
-private:
-
+ private:
   /*
    * Mutext to protect an access to the future.
    */
@@ -80,7 +79,7 @@ class ImageRequest final {
   /*
    * Indicates that the object was moved and hence cannot be used anymore.
    */
-  bool moved_ {false};
+  bool moved_{false};
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/imagemanager/ImageResponse.cpp b/ReactCommon/fabric/imagemanager/ImageResponse.cpp
index 39cea621884024..c9dae8d6d7ae52 100644
--- a/ReactCommon/fabric/imagemanager/ImageResponse.cpp
+++ b/ReactCommon/fabric/imagemanager/ImageResponse.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,8 +10,8 @@
 namespace facebook {
 namespace react {
 
-ImageResponse::ImageResponse(const std::shared_ptr<void> &image):
-  image_(image) {}
+ImageResponse::ImageResponse(const std::shared_ptr<void> &image)
+    : image_(image) {}
 
 std::shared_ptr<void> ImageResponse::getImage() const {
   return image_;
diff --git a/ReactCommon/fabric/imagemanager/ImageResponse.h b/ReactCommon/fabric/imagemanager/ImageResponse.h
index 1ce66af6c9396f..91f8722773f5a7 100644
--- a/ReactCommon/fabric/imagemanager/ImageResponse.h
+++ b/ReactCommon/fabric/imagemanager/ImageResponse.h
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <memory>
+#include <memory>
 
 namespace facebook {
 namespace react {
@@ -14,13 +14,12 @@ namespace react {
  * Represents retrieved image bitmap and any assotiated platform-specific info.
  */
 class ImageResponse final {
-
-public:
+ public:
   ImageResponse(const std::shared_ptr<void> &image);
 
   std::shared_ptr<void> getImage() const;
 
-private:
+ private:
   std::shared_ptr<void> image_;
 };
 
diff --git a/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp b/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp
index b1381eb0c5b525..4221aac1e200bb 100644
--- a/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp
+++ b/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,6 +20,7 @@ ImageManager::~ImageManager() {
 
 ImageRequest ImageManager::requestImage(const ImageSource &imageSource) const {
   // Not implemented.
+  abort();
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/imagemanager/platform/android/ImageRequest.cpp b/ReactCommon/fabric/imagemanager/platform/android/ImageRequest.cpp
new file mode 100644
index 00000000000000..ec88e31702866c
--- /dev/null
+++ b/ReactCommon/fabric/imagemanager/platform/android/ImageRequest.cpp
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ImageRequest.h"
+
+namespace facebook {
+namespace react {
+
+ImageRequest::ImageRequest(
+    const ImageSource &imageSource,
+    folly::Future<ImageResponse> &&responseFuture) {
+  // Not implemented.
+}
+
+ImageRequest::ImageRequest(ImageRequest &&other) noexcept
+    : imageSource_(std::move(other.imageSource_)),
+      responseFutureSplitter_(std::move(other.responseFutureSplitter_)) {
+  // Not implemented.
+}
+
+ImageRequest::~ImageRequest() {
+  // Not implemented.
+}
+
+folly::Future<ImageResponse> ImageRequest::getResponseFuture() const {
+  // Not implemented.
+  abort();
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/imagemanager/platform/ios/ImageManager.mm b/ReactCommon/fabric/imagemanager/platform/ios/ImageManager.mm
index 55281935cc7c3d..62255d9bdc033a 100644
--- a/ReactCommon/fabric/imagemanager/platform/ios/ImageManager.mm
+++ b/ReactCommon/fabric/imagemanager/platform/ios/ImageManager.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -15,7 +15,9 @@
 namespace react {
 
 ImageManager::ImageManager(void *platformSpecificCounterpart) {
-  self_ = (__bridge_retained void *)[[RCTImageManager alloc] initWithImageLoader:(__bridge_transfer RCTImageLoader *)platformSpecificCounterpart];
+  self_ = (__bridge_retained void *)[[RCTImageManager alloc]
+      initWithImageLoader:(__bridge RCTImageLoader *)
+                              platformSpecificCounterpart];
 }
 
 ImageManager::~ImageManager() {
diff --git a/ReactCommon/fabric/imagemanager/platform/ios/ImageRequest.cpp b/ReactCommon/fabric/imagemanager/platform/ios/ImageRequest.cpp
new file mode 100644
index 00000000000000..afa6cb3bd929c8
--- /dev/null
+++ b/ReactCommon/fabric/imagemanager/platform/ios/ImageRequest.cpp
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ImageRequest.h"
+
+namespace facebook {
+namespace react {
+
+class ImageRequest::ImageNoLongerNeededException : public std::logic_error {
+ public:
+  ImageNoLongerNeededException()
+      : std::logic_error("Image no longer needed.") {}
+};
+
+ImageRequest::ImageRequest(
+    const ImageSource &imageSource,
+    folly::Future<ImageResponse> &&responseFuture)
+    : imageSource_(imageSource),
+      responseFutureSplitter_(folly::splitFuture(std::move(responseFuture))) {}
+
+ImageRequest::ImageRequest(ImageRequest &&other) noexcept
+    : imageSource_(std::move(other.imageSource_)),
+      responseFutureSplitter_(std::move(other.responseFutureSplitter_)) {
+  other.moved_ = true;
+};
+
+ImageRequest::~ImageRequest() {
+  if (!moved_) {
+    auto future = responseFutureSplitter_.getFuture();
+    if (!future.isReady()) {
+      future.raise(ImageNoLongerNeededException());
+    }
+  }
+}
+
+folly::Future<ImageResponse> ImageRequest::getResponseFuture() const {
+  if (moved_) {
+    abort();
+  }
+
+  std::lock_guard<std::mutex> lock(mutex_);
+  return responseFutureSplitter_.getFuture();
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.h b/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.h
index 45d6d0a1a6f655..53a8eb567ffb34 100644
--- a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.h
+++ b/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -21,7 +21,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithImageLoader:(RCTImageLoader *)imageLoader;
 
-- (facebook::react::ImageRequest)requestImage:(const facebook::react::ImageSource &)imageSource;
+- (facebook::react::ImageRequest)requestImage:
+    (const facebook::react::ImageSource &)imageSource;
 
 @end
 
diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.mm b/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.mm
index 4adc90b722b21d..b3e97541b91b49 100644
--- a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.mm
+++ b/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -16,13 +16,11 @@
 
 using namespace facebook::react;
 
-@implementation RCTImageManager
-{
+@implementation RCTImageManager {
   RCTImageLoader *_imageLoader;
 }
 
-- (instancetype)initWithImageLoader:(RCTImageLoader *)imageLoader
-{
+- (instancetype)initWithImageLoader:(RCTImageLoader *)imageLoader {
   if (self = [super init]) {
     _imageLoader = imageLoader;
   }
@@ -30,14 +28,14 @@ - (instancetype)initWithImageLoader:(RCTImageLoader *)imageLoader
   return self;
 }
 
-- (ImageRequest)requestImage:(const ImageSource &)imageSource
-{
+- (ImageRequest)requestImage:(const ImageSource &)imageSource {
   __block auto promise = folly::Promise<ImageResponse>();
 
   NSURLRequest *request = NSURLRequestFromImageSource(imageSource);
 
   auto completionBlock = ^(NSError *error, UIImage *image) {
-    auto imageResponse = ImageResponse(std::shared_ptr<void>((__bridge_retained void *)image, CFRelease));
+    auto imageResponse = ImageResponse(
+        std::shared_ptr<void>((__bridge_retained void *)image, CFRelease));
     promise.setValue(std::move(imageResponse));
   };
 
@@ -48,19 +46,23 @@ - (ImageRequest)requestImage:(const ImageSource &)imageSource
   };
 
   RCTImageLoaderCancellationBlock cancellationBlock =
-    [_imageLoader loadImageWithURLRequest:request
-                                     size:CGSizeMake(imageSource.size.width, imageSource.size.height)
-                                    scale:imageSource.scale
-                                  clipped:YES
-                               resizeMode:RCTResizeModeStretch
-                            progressBlock:nil
-                         partialLoadBlock:nil
-                          completionBlock:completionBlock];
-
-  promise.setInterruptHandler([cancellationBlock, interruptBlock](const folly::exception_wrapper &exceptionWrapper) {
-    cancellationBlock();
-    interruptBlock(exceptionWrapper);
-  });
+      [_imageLoader loadImageWithURLRequest:request
+                                       size:CGSizeMake(
+                                                imageSource.size.width,
+                                                imageSource.size.height)
+                                      scale:imageSource.scale
+                                    clipped:YES
+                                 resizeMode:RCTResizeModeStretch
+                              progressBlock:nil
+                           partialLoadBlock:nil
+                            completionBlock:completionBlock];
+
+  promise.setInterruptHandler(
+      [cancellationBlock,
+       interruptBlock](const folly::exception_wrapper &exceptionWrapper) {
+        cancellationBlock();
+        interruptBlock(exceptionWrapper);
+      });
 
   return ImageRequest(imageSource, promise.getFuture());
 }
diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h b/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
index 8683a00894da18..13326635fce8a1 100644
--- a/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
+++ b/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,43 +7,100 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/imagemanager/primitives.h>
 #import <React/RCTImageLoader.h>
+#import <fabric/imagemanager/primitives.h>
 
 using namespace facebook::react;
 
-inline static RCTResizeMode RCTResizeModeFromImageResizeMode(ImageResizeMode imageResizeMode) {
+inline static RCTResizeMode RCTResizeModeFromImageResizeMode(
+    ImageResizeMode imageResizeMode) {
   switch (imageResizeMode) {
-    case ImageResizeMode::Cover: return RCTResizeModeCover;
-    case ImageResizeMode::Contain: return RCTResizeModeContain;
-    case ImageResizeMode::Stretch: return RCTResizeModeStretch;
-    case ImageResizeMode::Center: return RCTResizeModeCenter;
-    case ImageResizeMode::Repeat: return RCTResizeModeRepeat;
+    case ImageResizeMode::Cover:
+      return RCTResizeModeCover;
+    case ImageResizeMode::Contain:
+      return RCTResizeModeContain;
+    case ImageResizeMode::Stretch:
+      return RCTResizeModeStretch;
+    case ImageResizeMode::Center:
+      return RCTResizeModeCenter;
+    case ImageResizeMode::Repeat:
+      return RCTResizeModeRepeat;
   }
 }
 
 inline std::string toString(const ImageResizeMode &value) {
   switch (value) {
-    case ImageResizeMode::Cover: return "cover";
-    case ImageResizeMode::Contain: return "contain";
-    case ImageResizeMode::Stretch: return "stretch";
-    case ImageResizeMode::Center: return "center";
-    case ImageResizeMode::Repeat: return "repeat";
+    case ImageResizeMode::Cover:
+      return "cover";
+    case ImageResizeMode::Contain:
+      return "contain";
+    case ImageResizeMode::Stretch:
+      return "stretch";
+    case ImageResizeMode::Center:
+      return "center";
+    case ImageResizeMode::Repeat:
+      return "repeat";
   }
 }
 
-inline static NSURLRequest *NSURLRequestFromImageSource(const ImageSource &imageSource) {
+inline static NSURL *NSURLFromImageSource(const ImageSource &imageSource) {
+  // `NSURL` has a history of crashing with bad input, so let's be safe.
+  @try {
+    NSString *urlString = [NSString stringWithCString:imageSource.uri.c_str()
+                                             encoding:NSASCIIStringEncoding];
+
+    if (!imageSource.bundle.empty()) {
+      NSString *bundle = [NSString stringWithCString:imageSource.bundle.c_str()
+                                            encoding:NSASCIIStringEncoding];
+      urlString =
+          [NSString stringWithFormat:@"%@.bundle/%@", bundle, urlString];
+    }
+
+    NSURL *url = [[NSURL alloc] initWithString:urlString];
+
+    if (url.scheme) {
+      // Well-formed absolute URL.
+      return url;
+    }
+
+    if ([urlString rangeOfString:@":"].location != NSNotFound) {
+      // The URL has a scheme.
+      urlString = [urlString
+          stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+      url = [NSURL URLWithString:urlString];
+      return url;
+    }
 
-  NSString *urlString = [NSString stringWithCString:imageSource.uri.c_str()
-                                           encoding:NSASCIIStringEncoding];
+    // Assume that it's a local path.
+    urlString = [urlString stringByRemovingPercentEncoding];
 
-  if (!imageSource.bundle.empty()) {
-    NSString *bundle = [NSString stringWithCString:imageSource.bundle.c_str()
-                                          encoding:NSASCIIStringEncoding];
-    urlString = [NSString stringWithFormat:@"%@.bundle/%@", bundle, urlString];
+    if ([urlString hasPrefix:@"~"]) {
+      // Path is inside user directory.
+      urlString = [urlString stringByExpandingTildeInPath];
+    } else {
+      if (![urlString isAbsolutePath]) {
+        // Assume it's a resource path.
+        urlString = [[[NSBundle mainBundle] resourcePath]
+            stringByAppendingPathComponent:urlString];
+      }
+    }
+
+    url = [NSURL fileURLWithPath:urlString];
+
+    return url;
+  } @catch (__unused NSException *exception) {
+    return nil;
   }
+}
 
-  NSURL *url = [[NSURL alloc] initWithString:urlString];
+inline static NSURLRequest *NSURLRequestFromImageSource(
+    const ImageSource &imageSource) {
+  NSURL *url = NSURLFromImageSource(imageSource);
+
+  if (!url) {
+    RCTLogError(@"URI parsing error.");
+    return nil;
+  }
 
   NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:url];
 
diff --git a/ReactCommon/fabric/imagemanager/primitives.h b/ReactCommon/fabric/imagemanager/primitives.h
index 21932693ad845c..b9f02f4aa5441d 100644
--- a/ReactCommon/fabric/imagemanager/primitives.h
+++ b/ReactCommon/fabric/imagemanager/primitives.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -16,24 +16,17 @@ namespace facebook {
 namespace react {
 
 class ImageSource {
+ public:
+  enum class Type { Invalid, Remote, Local };
 
-public:
-  enum class Type {
-    Invalid,
-    Remote,
-    Local
-  };
-
-  Type type {};
-  std::string uri {};
-  std::string bundle {};
-  Float scale {3};
-  Size size {0};
+  Type type{};
+  std::string uri{};
+  std::string bundle{};
+  Float scale{3};
+  Size size{0};
 
   bool operator==(const ImageSource &rhs) const {
-    return
-      std::tie(this->type, this->uri) ==
-      std::tie(rhs.type, rhs.uri);
+    return std::tie(this->type, this->uri) == std::tie(rhs.type, rhs.uri);
   }
 
   bool operator!=(const ImageSource &rhs) const {
diff --git a/ReactCommon/fabric/imagemanager/tests/ImageManagerTest.cpp b/ReactCommon/fabric/imagemanager/tests/ImageManagerTest.cpp
index b872b698a83934..dedb2c1ea74c57 100644
--- a/ReactCommon/fabric/imagemanager/tests/ImageManagerTest.cpp
+++ b/ReactCommon/fabric/imagemanager/tests/ImageManagerTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp b/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp
index b3066e58f9bec8..e842c98ecd4b52 100644
--- a/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp
+++ b/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -16,9 +16,8 @@ namespace react {
  * This is a sample implementation. Each app should provide its own.
  */
 SharedComponentDescriptorRegistry ComponentDescriptorFactory::buildRegistry(
-  const SharedEventDispatcher &eventDispatcher,
-  const SharedContextContainer &contextContainer
-) {
+    const SharedEventDispatcher &eventDispatcher,
+    const SharedContextContainer &contextContainer) {
   auto registry = std::make_shared<ComponentDescriptorRegistry>();
   return registry;
 }
diff --git a/ReactCommon/fabric/scrollview/ScrollViewEventEmitter.cpp b/ReactCommon/fabric/scrollview/ScrollViewEventEmitter.cpp
deleted file mode 100644
index c416b98b4dde37..00000000000000
--- a/ReactCommon/fabric/scrollview/ScrollViewEventEmitter.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "ScrollViewEventEmitter.h"
-
-namespace facebook {
-namespace react {
-
-void ScrollViewEventEmitter::onScroll(const ScrollViewMetrics &scrollViewMetrics) const {
-  dispatchScrollViewEvent("scroll", scrollViewMetrics);
-}
-
-void ScrollViewEventEmitter::onScrollBeginDrag(const ScrollViewMetrics &scrollViewMetrics) const {
-  dispatchScrollViewEvent("scrollBeginDrag", scrollViewMetrics);
-}
-
-void ScrollViewEventEmitter::onScrollEndDrag(const ScrollViewMetrics &scrollViewMetrics) const {
-  dispatchScrollViewEvent("scrollEndDrag", scrollViewMetrics);
-}
-
-void ScrollViewEventEmitter::onMomentumScrollBegin(const ScrollViewMetrics &scrollViewMetrics) const {
-  dispatchScrollViewEvent("momentumScrollBegin", scrollViewMetrics);
-}
-
-void ScrollViewEventEmitter::onMomentumScrollEnd(const ScrollViewMetrics &scrollViewMetrics) const {
-  dispatchScrollViewEvent("momentumScrollEnd", scrollViewMetrics);
-}
-
-void ScrollViewEventEmitter::dispatchScrollViewEvent(const std::string &name, const ScrollViewMetrics &scrollViewMetrics, const folly::dynamic &payload) const {
-  folly::dynamic compoundPayload = folly::dynamic::object();
-
-  compoundPayload["contentOffset"] = folly::dynamic::object
-    ("x", scrollViewMetrics.contentOffset.x)
-    ("y", scrollViewMetrics.contentOffset.y);
-
-  compoundPayload["contentInset"] = folly::dynamic::object
-    ("top", scrollViewMetrics.contentInset.top)
-    ("left", scrollViewMetrics.contentInset.left)
-    ("bottom", scrollViewMetrics.contentInset.bottom)
-    ("right", scrollViewMetrics.contentInset.right);
-
-  compoundPayload["contentSize"] = folly::dynamic::object
-    ("width", scrollViewMetrics.contentSize.width)
-    ("height", scrollViewMetrics.contentSize.height);
-
-  compoundPayload["layoutMeasurement"] = folly::dynamic::object
-    ("width", scrollViewMetrics.containerSize.width)
-    ("height", scrollViewMetrics.containerSize.height);
-
-  compoundPayload["zoomScale"] = scrollViewMetrics.zoomScale;
-
-  if (!payload.isNull()) {
-    compoundPayload.merge_patch(payload);
-  }
-
-  dispatchEvent(name, compoundPayload);
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/scrollview/ScrollViewProps.cpp b/ReactCommon/fabric/scrollview/ScrollViewProps.cpp
deleted file mode 100644
index c3b1b4e7a7ed81..00000000000000
--- a/ReactCommon/fabric/scrollview/ScrollViewProps.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "ScrollViewProps.h"
-
-#include <fabric/graphics/conversions.h>
-#include <fabric/scrollview/conversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
-
-#include <fabric/core/propsConversions.h>
-
-namespace facebook {
-namespace react {
-
-ScrollViewProps::ScrollViewProps(const ScrollViewProps &sourceProps, const RawProps &rawProps):
-  ViewProps(sourceProps, rawProps),
-  alwaysBounceHorizontal(convertRawProp(rawProps, "alwaysBounceHorizontal", sourceProps.alwaysBounceHorizontal, true)),
-  alwaysBounceVertical(convertRawProp(rawProps, "alwaysBounceVertical", sourceProps.alwaysBounceVertical, true)),
-  bounces(convertRawProp(rawProps, "bounces", sourceProps.bounces, true)),
-  bouncesZoom(convertRawProp(rawProps, "bouncesZoom", sourceProps.bouncesZoom, true)),
-  canCancelContentTouches(convertRawProp(rawProps, "canCancelContentTouches", sourceProps.canCancelContentTouches)),
-  centerContent(convertRawProp(rawProps, "centerContent", sourceProps.centerContent)),
-  automaticallyAdjustContentInsets(convertRawProp(rawProps, "automaticallyAdjustContentInsets", sourceProps.automaticallyAdjustContentInsets)),
-  decelerationRate(convertRawProp(rawProps, "decelerationRate", sourceProps.decelerationRate, (Float)0.998)),
-  directionalLockEnabled(convertRawProp(rawProps, "directionalLockEnabled", sourceProps.directionalLockEnabled)),
-  indicatorStyle(convertRawProp(rawProps, "indicatorStyle", sourceProps.indicatorStyle)),
-  keyboardDismissMode(convertRawProp(rawProps, "keyboardDismissMode", sourceProps.keyboardDismissMode)),
-  maximumZoomScale(convertRawProp(rawProps, "maximumZoomScale", sourceProps.maximumZoomScale, (Float)1.0)),
-  minimumZoomScale(convertRawProp(rawProps, "minimumZoomScale", sourceProps.minimumZoomScale, (Float)1.0)),
-  scrollEnabled(convertRawProp(rawProps, "scrollEnabled", sourceProps.scrollEnabled, true)),
-  pagingEnabled(convertRawProp(rawProps, "pagingEnabled", sourceProps.pagingEnabled)),
-  pinchGestureEnabled(convertRawProp(rawProps, "pinchGestureEnabled", sourceProps.pinchGestureEnabled, true)),
-  scrollsToTop(convertRawProp(rawProps, "scrollsToTop", sourceProps.scrollsToTop, true)),
-  showsHorizontalScrollIndicator(convertRawProp(rawProps, "showsHorizontalScrollIndicator", sourceProps.showsHorizontalScrollIndicator, true)),
-  showsVerticalScrollIndicator(convertRawProp(rawProps, "showsVerticalScrollIndicator", sourceProps.showsVerticalScrollIndicator, true)),
-  scrollEventThrottle(convertRawProp(rawProps, "scrollEventThrottle", sourceProps.scrollEventThrottle)),
-  zoomScale(convertRawProp(rawProps, "zoomScale", sourceProps.zoomScale, (Float)1.0)),
-  contentInset(convertRawProp(rawProps, "contentInset", sourceProps.contentInset)),
-  scrollIndicatorInsets(convertRawProp(rawProps, "scrollIndicatorInsets", sourceProps.scrollIndicatorInsets)),
-  snapToInterval(convertRawProp(rawProps, "snapToInterval", sourceProps.snapToInterval)),
-  snapToAlignment(convertRawProp(rawProps, "snapToAlignment", sourceProps.snapToAlignment)) {}
-
-#pragma mark - DebugStringConvertible
-
-SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const {
-  ScrollViewProps defaultScrollViewProps;
-
-  return
-    ViewProps::getDebugProps() +
-    SharedDebugStringConvertibleList {
-      debugStringConvertibleItem("alwaysBounceHorizontal", alwaysBounceHorizontal, defaultScrollViewProps.alwaysBounceHorizontal),
-      debugStringConvertibleItem("alwaysBounceVertical", alwaysBounceVertical, defaultScrollViewProps.alwaysBounceVertical),
-      debugStringConvertibleItem("bounces", bounces, defaultScrollViewProps.bounces),
-      debugStringConvertibleItem("bouncesZoom", bouncesZoom, defaultScrollViewProps.bouncesZoom),
-      debugStringConvertibleItem("canCancelContentTouches", canCancelContentTouches, defaultScrollViewProps.canCancelContentTouches),
-      debugStringConvertibleItem("centerContent", centerContent, defaultScrollViewProps.centerContent),
-      debugStringConvertibleItem("automaticallyAdjustContentInsets", automaticallyAdjustContentInsets, defaultScrollViewProps.automaticallyAdjustContentInsets),
-      debugStringConvertibleItem("decelerationRate", decelerationRate, defaultScrollViewProps.decelerationRate),
-      debugStringConvertibleItem("directionalLockEnabled", directionalLockEnabled, defaultScrollViewProps.directionalLockEnabled),
-      debugStringConvertibleItem("indicatorStyle", indicatorStyle, defaultScrollViewProps.indicatorStyle),
-      debugStringConvertibleItem("keyboardDismissMode", keyboardDismissMode, defaultScrollViewProps.keyboardDismissMode),
-      debugStringConvertibleItem("maximumZoomScale", maximumZoomScale, defaultScrollViewProps.maximumZoomScale),
-      debugStringConvertibleItem("minimumZoomScale", minimumZoomScale, defaultScrollViewProps.minimumZoomScale),
-      debugStringConvertibleItem("scrollEnabled", scrollEnabled, defaultScrollViewProps.scrollEnabled),
-      debugStringConvertibleItem("pagingEnabled", pagingEnabled, defaultScrollViewProps.pagingEnabled),
-      debugStringConvertibleItem("pinchGestureEnabled", pinchGestureEnabled, defaultScrollViewProps.pinchGestureEnabled),
-      debugStringConvertibleItem("scrollsToTop", scrollsToTop, defaultScrollViewProps.scrollsToTop),
-      debugStringConvertibleItem("showsHorizontalScrollIndicator", showsHorizontalScrollIndicator, defaultScrollViewProps.showsHorizontalScrollIndicator),
-      debugStringConvertibleItem("showsVerticalScrollIndicator", showsVerticalScrollIndicator, defaultScrollViewProps.showsVerticalScrollIndicator),
-      debugStringConvertibleItem("scrollEventThrottle", scrollEventThrottle, defaultScrollViewProps.scrollEventThrottle),
-      debugStringConvertibleItem("zoomScale", zoomScale, defaultScrollViewProps.zoomScale),
-      debugStringConvertibleItem("contentInset", contentInset, defaultScrollViewProps.contentInset),
-      debugStringConvertibleItem("scrollIndicatorInsets", scrollIndicatorInsets, defaultScrollViewProps.scrollIndicatorInsets),
-      debugStringConvertibleItem("snapToInterval", snapToInterval, defaultScrollViewProps.snapToInterval),
-      debugStringConvertibleItem("snapToAlignment", snapToAlignment, defaultScrollViewProps.snapToAlignment),
-    };
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/scrollview/ScrollViewProps.h b/ReactCommon/fabric/scrollview/ScrollViewProps.h
deleted file mode 100644
index 219902470cb8f4..00000000000000
--- a/ReactCommon/fabric/scrollview/ScrollViewProps.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <fabric/scrollview/primitives.h>
-#include <fabric/view/ViewProps.h>
-
-namespace facebook {
-namespace react {
-
-// TODO (T28334063): Consider for codegen.
-class ScrollViewProps final:
-  public ViewProps {
-
-public:
-  ScrollViewProps() = default;
-  ScrollViewProps(const ScrollViewProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  const bool alwaysBounceHorizontal {true};
-  const bool alwaysBounceVertical {true};
-  const bool bounces {true};
-  const bool bouncesZoom {true};
-  const bool canCancelContentTouches {true};
-  const bool centerContent {};
-  const bool automaticallyAdjustContentInsets  {};
-  const Float decelerationRate {0.998};
-  const bool directionalLockEnabled {};
-  const ScrollViewIndicatorStyle indicatorStyle {};
-  const ScrollViewKeyboardDismissMode keyboardDismissMode {};
-  const Float maximumZoomScale {1.0};
-  const Float minimumZoomScale {1.0};
-  const bool scrollEnabled {true};
-  const bool pagingEnabled {};
-  const bool pinchGestureEnabled {true};
-  const bool scrollsToTop {true};
-  const bool showsHorizontalScrollIndicator {true};
-  const bool showsVerticalScrollIndicator {true};
-  const Float scrollEventThrottle {};
-  const Float zoomScale {1.0};
-  const EdgeInsets contentInset {};
-  const EdgeInsets scrollIndicatorInsets {};
-  const int snapToInterval {};
-  const ScrollViewSnapToAlignment snapToAlignment {};
-
-#pragma mark - DebugStringConvertible
-
-  SharedDebugStringConvertibleList getDebugProps() const override;
-};
-
-} // namespace react
-} // namespace facebook
-
diff --git a/ReactCommon/fabric/scrollview/ScrollViewShadowNode.h b/ReactCommon/fabric/scrollview/ScrollViewShadowNode.h
deleted file mode 100644
index c2db4ed66c8ff2..00000000000000
--- a/ReactCommon/fabric/scrollview/ScrollViewShadowNode.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <memory>
-
-#include <fabric/core/LayoutContext.h>
-#include <fabric/scrollview/ScrollViewEventEmitter.h>
-#include <fabric/scrollview/ScrollViewProps.h>
-#include <fabric/view/ConcreteViewShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-class ScrollViewShadowNode;
-
-using SharedScrollViewShadowNode = std::shared_ptr<const ScrollViewShadowNode>;
-
-/*
- * `ShadowNode` for <ScrollView> component.
- */
-class ScrollViewShadowNode final:
-  public ConcreteViewShadowNode<ScrollViewProps, ScrollViewEventEmitter> {
-
-public:
-
-  using ConcreteViewShadowNode::ConcreteViewShadowNode;
-
-  ComponentName getComponentName() const override;
-
-#pragma mark - LayoutableShadowNode
-
-  void layout(LayoutContext layoutContext) override;
-
-private:
-
-  void updateLocalData();
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/scrollview/conversions.h b/ReactCommon/fabric/scrollview/conversions.h
deleted file mode 100644
index e0fc07a6c50b8a..00000000000000
--- a/ReactCommon/fabric/scrollview/conversions.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <fabric/scrollview/primitives.h>
-#include <folly/dynamic.h>
-
-namespace facebook {
-namespace react {
-
-inline void fromDynamic(const folly::dynamic &value, ScrollViewSnapToAlignment &result) {
-  auto string = value.asString();
-  if (string == "start") { result = ScrollViewSnapToAlignment::Start; return; }
-  if (string == "center") { result = ScrollViewSnapToAlignment::Center; return; }
-  if (string == "end") { result = ScrollViewSnapToAlignment::End; return; }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, ScrollViewIndicatorStyle &result) {
-  auto string = value.asString();
-  if (string == "default") { result = ScrollViewIndicatorStyle::Default; return; }
-  if (string == "black") { result = ScrollViewIndicatorStyle::Black; return; }
-  if (string == "white") { result = ScrollViewIndicatorStyle::White; return; }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, ScrollViewKeyboardDismissMode &result) {
-  auto string = value.asString();
-  if (string == "none") { result = ScrollViewKeyboardDismissMode::None; return; }
-  if (string == "on-drag") { result = ScrollViewKeyboardDismissMode::OnDrag; return; }
-  if (string == "interactive") { result = ScrollViewKeyboardDismissMode::Interactive; return; }
-  abort();
-}
-
-inline std::string toString(const ScrollViewSnapToAlignment &value) {
-  switch (value) {
-    case ScrollViewSnapToAlignment::Start: return "start";
-    case ScrollViewSnapToAlignment::Center: return "center";
-    case ScrollViewSnapToAlignment::End: return "end";
-  }
-}
-
-inline std::string toString(const ScrollViewIndicatorStyle &value) {
-  switch (value) {
-    case ScrollViewIndicatorStyle::Default: return "default";
-    case ScrollViewIndicatorStyle::Black: return "black";
-    case ScrollViewIndicatorStyle::White: return "white";
-  }
-}
-
-inline std::string toString(const ScrollViewKeyboardDismissMode &value) {
-  switch (value) {
-    case ScrollViewKeyboardDismissMode::None: return "none";
-    case ScrollViewKeyboardDismissMode::OnDrag: return "on-drag";
-    case ScrollViewKeyboardDismissMode::Interactive: return "interactive";
-  }
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/scrollview/primitives.h b/ReactCommon/fabric/scrollview/primitives.h
deleted file mode 100644
index 73d1aa210f5012..00000000000000
--- a/ReactCommon/fabric/scrollview/primitives.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 {
-
-enum class ScrollViewSnapToAlignment {
-  Start,
-  Center,
-  End
-};
-
-enum class ScrollViewIndicatorStyle {
-  Default,
-  Black,
-  White
-};
-
-enum class ScrollViewKeyboardDismissMode {
-  None,
-  OnDrag,
-  Interactive
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/text/basetext/BaseTextProps.cpp b/ReactCommon/fabric/text/basetext/BaseTextProps.cpp
deleted file mode 100644
index 2b3a1e9c79b182..00000000000000
--- a/ReactCommon/fabric/text/basetext/BaseTextProps.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "BaseTextProps.h"
-
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/core/propsConversions.h>
-#include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/graphics/conversions.h>
-
-namespace facebook {
-namespace react {
-
-static TextAttributes convertRawProp(const RawProps &rawProps, const TextAttributes defaultTextAttributes) {
-  TextAttributes textAttributes;
-
-  // Color
-  textAttributes.foregroundColor = convertRawProp(rawProps, "color", defaultTextAttributes.foregroundColor);
-  textAttributes.backgroundColor = convertRawProp(rawProps, "backgroundColor", defaultTextAttributes.backgroundColor);
-  textAttributes.opacity = convertRawProp(rawProps, "opacity", defaultTextAttributes.opacity);
-
-  // Font
-  textAttributes.fontFamily = convertRawProp(rawProps, "fontFamily", defaultTextAttributes.fontFamily);
-  textAttributes.fontSize = convertRawProp(rawProps, "fontSize", defaultTextAttributes.fontSize);
-  textAttributes.fontSizeMultiplier = convertRawProp(rawProps, "fontSizeMultiplier", defaultTextAttributes.fontSizeMultiplier);
-  textAttributes.fontWeight = convertRawProp(rawProps, "fontWeight", defaultTextAttributes.fontWeight);
-  textAttributes.fontStyle = convertRawProp(rawProps, "fontStyle", defaultTextAttributes.fontStyle);
-  textAttributes.fontVariant = convertRawProp(rawProps, "fontVariant", defaultTextAttributes.fontVariant);
-  textAttributes.allowFontScaling = convertRawProp(rawProps, "allowFontScaling", defaultTextAttributes.allowFontScaling);
-  textAttributes.letterSpacing = convertRawProp(rawProps, "letterSpacing", defaultTextAttributes.letterSpacing);
-
-  // Paragraph
-  textAttributes.lineHeight = convertRawProp(rawProps, "lineHeight", defaultTextAttributes.lineHeight);
-  textAttributes.alignment = convertRawProp(rawProps, "alignment", defaultTextAttributes.alignment);
-  textAttributes.baseWritingDirection = convertRawProp(rawProps, "baseWritingDirection", defaultTextAttributes.baseWritingDirection);
-
-  // Decoration
-  textAttributes.textDecorationColor = convertRawProp(rawProps, "textDecorationColor", defaultTextAttributes.textDecorationColor);
-  textAttributes.textDecorationLineType = convertRawProp(rawProps, "textDecorationLineType", defaultTextAttributes.textDecorationLineType);
-  textAttributes.textDecorationLineStyle = convertRawProp(rawProps, "textDecorationLineStyle", defaultTextAttributes.textDecorationLineStyle);
-  textAttributes.textDecorationLinePattern = convertRawProp(rawProps, "textDecorationLinePattern", defaultTextAttributes.textDecorationLinePattern);
-
-  // Shadow
-  textAttributes.textShadowOffset = convertRawProp(rawProps, "textShadowOffset", defaultTextAttributes.textShadowOffset);
-  textAttributes.textShadowRadius = convertRawProp(rawProps, "textShadowRadius", defaultTextAttributes.textShadowRadius);
-  textAttributes.textShadowColor = convertRawProp(rawProps, "textShadowColor", defaultTextAttributes.textShadowColor);
-
-  // Special
-  textAttributes.isHighlighted = convertRawProp(rawProps, "isHighlighted", defaultTextAttributes.isHighlighted);
-
-  return textAttributes;
-}
-
-BaseTextProps::BaseTextProps(const BaseTextProps &sourceProps, const RawProps &rawProps):
-  textAttributes(convertRawProp(rawProps, sourceProps.textAttributes)) {};
-
-#pragma mark - DebugStringConvertible
-
-SharedDebugStringConvertibleList BaseTextProps::getDebugProps() const {
-  return textAttributes.getDebugProps();
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/text/basetext/BaseTextShadowNode.cpp b/ReactCommon/fabric/text/basetext/BaseTextShadowNode.cpp
deleted file mode 100644
index f2f2d08a7ee80e..00000000000000
--- a/ReactCommon/fabric/text/basetext/BaseTextShadowNode.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "BaseTextShadowNode.h"
-
-#include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/text/RawTextShadowNode.h>
-#include <fabric/text/RawTextProps.h>
-#include <fabric/text/TextShadowNode.h>
-#include <fabric/text/TextProps.h>
-
-namespace facebook {
-namespace react {
-
-AttributedString BaseTextShadowNode::getAttributedString(
-  const TextAttributes &textAttributes,
-  const SharedShadowNodeSharedList &childNodes
-) const {
-  // TODO: Implement caching.
-
-  AttributedString attributedString;
-
-  for (const auto &childNode : *childNodes) {
-    // RawShadowNode
-    SharedRawTextShadowNode rawTextShadowNode = std::dynamic_pointer_cast<const RawTextShadowNode>(childNode);
-    if (rawTextShadowNode) {
-      AttributedString::Fragment fragment;
-      fragment.string = rawTextShadowNode->getProps()->text;
-      fragment.textAttributes = textAttributes;
-      attributedString.appendFragment(fragment);
-      continue;
-    }
-
-    // TextShadowNode
-    SharedTextShadowNode textShadowNode = std::dynamic_pointer_cast<const TextShadowNode>(childNode);
-    if (textShadowNode) {
-      TextAttributes localTextAttributes = textAttributes;
-      localTextAttributes.apply(textShadowNode->getProps()->textAttributes);
-      attributedString.appendAttributedString(textShadowNode->getAttributedString(localTextAttributes, textShadowNode->getChildren()));
-      continue;
-    }
-
-    // Any other kind of ShadowNode
-    AttributedString::Fragment fragment;
-    fragment.shadowNode = childNode;
-    fragment.textAttributes = textAttributes;
-    attributedString.appendFragment(fragment);
-  }
-
-  return attributedString;
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphProps.cpp b/ReactCommon/fabric/text/paragraph/ParagraphProps.cpp
deleted file mode 100644
index ca4ff847c05ea3..00000000000000
--- a/ReactCommon/fabric/text/paragraph/ParagraphProps.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "ParagraphProps.h"
-
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/core/propsConversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
-
-namespace facebook {
-namespace react {
-
-static ParagraphAttributes convertRawProp(const RawProps &rawProps, const ParagraphAttributes &defaultParagraphAttributes) {
-  ParagraphAttributes paragraphAttributes;
-
-  paragraphAttributes.maximumNumberOfLines = convertRawProp(rawProps, "numberOfLines", defaultParagraphAttributes.maximumNumberOfLines);
-  paragraphAttributes.ellipsizeMode = convertRawProp(rawProps, "ellipsizeMode", defaultParagraphAttributes.ellipsizeMode);
-  paragraphAttributes.adjustsFontSizeToFit = convertRawProp(rawProps, "adjustsFontSizeToFit", defaultParagraphAttributes.adjustsFontSizeToFit);
-  paragraphAttributes.minimumFontSize = convertRawProp(rawProps, "minimumFontSize", defaultParagraphAttributes.minimumFontSize, std::numeric_limits<Float>::quiet_NaN());
-  paragraphAttributes.maximumFontSize = convertRawProp(rawProps, "maximumFontSize", defaultParagraphAttributes.maximumFontSize, std::numeric_limits<Float>::quiet_NaN());
-
-  return paragraphAttributes;
-}
-
-ParagraphProps::ParagraphProps(const ParagraphProps &sourceProps, const RawProps &rawProps):
-  ViewProps(sourceProps, rawProps),
-  BaseTextProps(sourceProps, rawProps),
-  paragraphAttributes(convertRawProp(rawProps, sourceProps.paragraphAttributes)),
-  isSelectable(convertRawProp(rawProps, "selectable", sourceProps.isSelectable)) {};
-
-#pragma mark - DebugStringConvertible
-
-SharedDebugStringConvertibleList ParagraphProps::getDebugProps() const {
-  return
-    ViewProps::getDebugProps() +
-    BaseTextProps::getDebugProps() +
-    paragraphAttributes.getDebugProps() +
-    SharedDebugStringConvertibleList {
-      debugStringConvertibleItem("isSelectable", isSelectable)
-    };
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/text/rawtext/RawTextShadowNode.cpp b/ReactCommon/fabric/text/rawtext/RawTextShadowNode.cpp
deleted file mode 100644
index 730e4aabb26460..00000000000000
--- a/ReactCommon/fabric/text/rawtext/RawTextShadowNode.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "RawTextShadowNode.h"
-
-#include <fabric/debug/DebugStringConvertibleItem.h>
-
-namespace facebook {
-namespace react {
-
-ComponentName RawTextShadowNode::getComponentName() const {
-  return ComponentName("RawText");
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/text/text/TextShadowNode.h b/ReactCommon/fabric/text/text/TextShadowNode.h
deleted file mode 100644
index 12c73e1a17e30c..00000000000000
--- a/ReactCommon/fabric/text/text/TextShadowNode.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <fabric/attributedstring/AttributedString.h>
-#include <fabric/attributedstring/TextAttributes.h>
-#include <fabric/core/ConcreteShadowNode.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/text/BaseTextShadowNode.h>
-#include <fabric/text/TextProps.h>
-#include <fabric/text/TextShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-class TextShadowNode;
-
-using SharedTextShadowNode = std::shared_ptr<const TextShadowNode>;
-
-class TextShadowNode:
-  public ConcreteShadowNode<TextProps>,
-  public BaseTextShadowNode {
-
-public:
-
-  using ConcreteShadowNode::ConcreteShadowNode;
-
-  ComponentName getComponentName() const override;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/textlayoutmanager/BUCK b/ReactCommon/fabric/textlayoutmanager/BUCK
index 3ea41084b11dd5..331ea5f5a1f973 100644
--- a/ReactCommon/fabric/textlayoutmanager/BUCK
+++ b/ReactCommon/fabric/textlayoutmanager/BUCK
@@ -1,13 +1,18 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "react_native_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
 
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "textlayoutmanager",
@@ -35,6 +40,9 @@ rn_xplat_cxx_library(
         "-std=c++14",
         "-Wall",
     ],
+    fbandroid_deps = [
+        react_native_target("jni/react/jni:jni"),
+    ],
     fbandroid_exported_headers = subdir_glob(
         [
             ("", "*.h"),
@@ -59,11 +67,6 @@ rn_xplat_cxx_library(
         ":tests",
     ],
     force_static = True,
-    frameworks = [
-        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
-        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
-        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
-    ],
     ios_deps = [
     ],
     ios_exported_headers = subdir_glob(
@@ -72,6 +75,11 @@ rn_xplat_cxx_library(
         ],
         prefix = "fabric/textlayoutmanager",
     ),
+    ios_frameworks = [
+        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
     ios_headers = subdir_glob(
         [
             ("platform/ios", "**/*.h"),
@@ -103,27 +111,25 @@ rn_xplat_cxx_library(
         react_native_xplat_target("fabric/core:core"),
         react_native_xplat_target("fabric/debug:debug"),
         react_native_xplat_target("fabric/graphics:graphics"),
+        react_native_xplat_target("fabric/uimanager:uimanager"),
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":textlayoutmanager",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = APPLE,
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":textlayoutmanager",
+    ],
+)
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp
index fd98bfa6b708df..e3ae34f373a2e1 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp
+++ b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,26 +7,56 @@
 
 #include "TextLayoutManager.h"
 
+#include <fabric/attributedstring/conversions.h>
+#include <react/jni/ReadableNativeMap.h>
+
+using namespace facebook::jni;
+
 namespace facebook {
 namespace react {
 
-TextLayoutManager::TextLayoutManager() {
-}
-
-TextLayoutManager::~TextLayoutManager() {
-}
+TextLayoutManager::~TextLayoutManager() {}
 
 void *TextLayoutManager::getNativeTextLayoutManager() const {
   return self_;
 }
 
 Size TextLayoutManager::measure(
-  AttributedString attributedString,
-  ParagraphAttributes paragraphAttributes,
-  LayoutConstraints layoutConstraints
-) const {
-  // Not implemented.
-  return {};
+    Tag reactTag,
+    AttributedString attributedString,
+    ParagraphAttributes paragraphAttributes,
+    LayoutConstraints layoutConstraints) const {
+  const jni::global_ref<jobject> &fabricUIManager =
+      contextContainer_->getInstance<jni::global_ref<jobject>>(
+          "FabricUIManager");
+
+  auto clazz =
+      jni::findClassStatic("com/facebook/fbreact/fabric/FabricUIManager");
+  static auto measure = clazz->getMethod<JArrayFloat::javaobject(
+      jint,
+      jstring,
+      ReadableNativeMap::javaobject,
+      ReadableNativeMap::javaobject,
+      jint,
+      jint)>("measure");
+
+  int width = (int)layoutConstraints.maximumSize.width;
+  int height = (int)layoutConstraints.maximumSize.height;
+  local_ref<JString> componentName = make_jstring("RCTText");
+  auto values = measure(
+      fabricUIManager,
+      reactTag,
+      componentName.get(),
+      ReadableNativeMap::newObjectCxxArgs(toDynamic(attributedString)).get(),
+      ReadableNativeMap::newObjectCxxArgs(toDynamic(paragraphAttributes)).get(),
+      width,
+      height);
+
+  std::vector<float> indices;
+  indices.resize(values->size());
+  values->getRegion(0, values->size(), indices.data());
+
+  return {(float)indices[0], (float)indices[1]};
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h
index 9da164f30f84ce..aa94601b718a8b 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,6 +12,7 @@
 #include <fabric/attributedstring/AttributedString.h>
 #include <fabric/attributedstring/ParagraphAttributes.h>
 #include <fabric/core/LayoutConstraints.h>
+#include <fabric/uimanager/ContextContainer.h>
 
 namespace facebook {
 namespace react {
@@ -24,20 +25,19 @@ using SharedTextLayoutManager = std::shared_ptr<const TextLayoutManager>;
  * Cross platform facade for Android-specific TextLayoutManager.
  */
 class TextLayoutManager {
-
-public:
-
-  TextLayoutManager();
+ public:
+  TextLayoutManager(const SharedContextContainer &contextContainer)
+      : contextContainer_(contextContainer){};
   ~TextLayoutManager();
 
   /*
    * Measures `attributedString` using native text rendering infrastructure.
    */
   Size measure(
-    AttributedString attributedString,
-    ParagraphAttributes paragraphAttributes,
-    LayoutConstraints layoutConstraints
-  ) const;
+      Tag reactTag,
+      AttributedString attributedString,
+      ParagraphAttributes paragraphAttributes,
+      LayoutConstraints layoutConstraints) const;
 
   /*
    * Returns an opaque pointer to platform-specific TextLayoutManager.
@@ -45,9 +45,10 @@ class TextLayoutManager {
    */
   void *getNativeTextLayoutManager() const;
 
-private:
-  
+ private:
   void *self_;
+
+  SharedContextContainer contextContainer_;
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h
index 8372a0d2be9183..1ec019ef673b15 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.m b/ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.m
index 5002dddd8a425c..01f6c8a1a76bcf 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.m
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h
index 32b0a387d85601..6f190e7cade9a8 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,12 +12,18 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-NSString *const RCTAttributedStringIsHighlightedAttributeName = @"IsHighlighted";
-NSString *const RCTAttributedStringReactTagAttributeName = @"ReactTag";
+NSString *const RCTAttributedStringIsHighlightedAttributeName =
+    @"IsHighlighted";
+NSString *const RCTAttributedStringParentShadowNode = @"ParentShadowNode";
 
 /**
  * Constructs ready-to-render `NSAttributedString` by given `AttributedString`.
  */
-NSAttributedString *RCTNSAttributedStringFromAttributedString(const facebook::react::AttributedString &attributedString);
+NSAttributedString *RCTNSAttributedStringFromAttributedString(
+    const facebook::react::AttributedString &attributedString);
+
+@interface RCTSharedShadowNodeWrapper : NSObject
+@property(nonatomic, assign) facebook::react::SharedShadowNode node;
+@end
 
 NS_ASSUME_NONNULL_END
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
index c58a644f90e46c..8b21215d7ce4e4 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,50 +12,75 @@
 #include <fabric/textlayoutmanager/RCTFontUtils.h>
 #include <fabric/textlayoutmanager/RCTTextPrimitivesConversions.h>
 
-inline static UIFont *RCTEffectiveFontFromTextAttributes(const TextAttributes &textAttributes) {
-  NSString *fontFamily = [NSString stringWithCString:textAttributes.fontFamily.c_str()
-                                            encoding:NSUTF8StringEncoding];
+@implementation RCTSharedShadowNodeWrapper
+@end
+
+inline static UIFont *RCTEffectiveFontFromTextAttributes(
+    const TextAttributes &textAttributes) {
+  NSString *fontFamily =
+      [NSString stringWithCString:textAttributes.fontFamily.c_str()
+                         encoding:NSUTF8StringEncoding];
 
   RCTFontProperties fontProperties;
   fontProperties.family = fontFamily;
   fontProperties.size = textAttributes.fontSize;
-  fontProperties.style = textAttributes.fontStyle.hasValue() ? RCTFontStyleFromFontStyle(textAttributes.fontStyle.value()) : RCTFontStyleUndefined;
-  fontProperties.variant = textAttributes.fontVariant.hasValue() ? RCTFontVariantFromFontVariant(textAttributes.fontVariant.value()) : RCTFontVariantDefault;
-  fontProperties.weight = textAttributes.fontWeight.hasValue() ? CGFloat(textAttributes.fontWeight.value()) : NAN;
+  fontProperties.style = textAttributes.fontStyle.hasValue()
+      ? RCTFontStyleFromFontStyle(textAttributes.fontStyle.value())
+      : RCTFontStyleUndefined;
+  fontProperties.variant = textAttributes.fontVariant.hasValue()
+      ? RCTFontVariantFromFontVariant(textAttributes.fontVariant.value())
+      : RCTFontVariantDefault;
+  fontProperties.weight = textAttributes.fontWeight.hasValue()
+      ? CGFloat(textAttributes.fontWeight.value())
+      : NAN;
   fontProperties.sizeMultiplier = textAttributes.fontSizeMultiplier;
 
   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 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];
+inline static UIColor *RCTEffectiveForegroundColorFromTextAttributes(
+    const TextAttributes &textAttributes) {
+  UIColor *effectiveForegroundColor =
+      RCTUIColorFromSharedColor(textAttributes.foregroundColor)
+      ?: [UIColor blackColor];
 
   if (!isnan(textAttributes.opacity)) {
-    effectiveForegroundColor =
-      [effectiveForegroundColor colorWithAlphaComponent:CGColorGetAlpha(effectiveForegroundColor.CGColor) * textAttributes.opacity];
+    effectiveForegroundColor = [effectiveForegroundColor
+        colorWithAlphaComponent:CGColorGetAlpha(
+                                    effectiveForegroundColor.CGColor) *
+        textAttributes.opacity];
   }
 
   return effectiveForegroundColor;
 }
 
-inline static UIColor *RCTEffectiveBackgroundColorFromTextAttributes(const TextAttributes &textAttributes) {
-  UIColor *effectiveBackgroundColor = RCTUIColorFromSharedColor(textAttributes.backgroundColor);
+inline static UIColor *RCTEffectiveBackgroundColorFromTextAttributes(
+    const TextAttributes &textAttributes) {
+  UIColor *effectiveBackgroundColor =
+      RCTUIColorFromSharedColor(textAttributes.backgroundColor);
 
   if (effectiveBackgroundColor && !isnan(textAttributes.opacity)) {
-    effectiveBackgroundColor =
-      [effectiveBackgroundColor colorWithAlphaComponent:CGColorGetAlpha(effectiveBackgroundColor.CGColor) * textAttributes.opacity];
+    effectiveBackgroundColor = [effectiveBackgroundColor
+        colorWithAlphaComponent:CGColorGetAlpha(
+                                    effectiveBackgroundColor.CGColor) *
+        textAttributes.opacity];
   }
 
   return effectiveBackgroundColor ?: [UIColor clearColor];
 }
 
-static NSDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(const TextAttributes &textAttributes) {
+static NSDictionary<NSAttributedStringKey, id> *
+RCTNSTextAttributesFromTextAttributes(const TextAttributes &textAttributes) {
   NSMutableDictionary<NSAttributedStringKey, id> *attributes =
-    [NSMutableDictionary dictionaryWithCapacity:10];
+      [NSMutableDictionary dictionaryWithCapacity:10];
 
   // Font
   UIFont *font = RCTEffectiveFontFromTextAttributes(textAttributes);
@@ -64,14 +89,16 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
   }
 
   // Colors
-  UIColor *effectiveForegroundColor = RCTEffectiveForegroundColorFromTextAttributes(textAttributes);
+  UIColor *effectiveForegroundColor =
+      RCTEffectiveForegroundColorFromTextAttributes(textAttributes);
 
   if (textAttributes.foregroundColor || !isnan(textAttributes.opacity)) {
     attributes[NSForegroundColorAttributeName] = effectiveForegroundColor;
   }
 
   if (textAttributes.backgroundColor || !isnan(textAttributes.opacity)) {
-    attributes[NSBackgroundColorAttributeName] = RCTEffectiveBackgroundColorFromTextAttributes(textAttributes);
+    attributes[NSBackgroundColorAttributeName] =
+        RCTEffectiveBackgroundColorFromTextAttributes(textAttributes);
   }
 
   // Kerning
@@ -83,8 +110,10 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
   NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
   BOOL isParagraphStyleUsed = NO;
   if (textAttributes.alignment.hasValue()) {
-    TextAlignment textAlignment = textAttributes.alignment.value_or(TextAlignment::Natural);
-    if (textAttributes.layoutDirection.value_or(LayoutDirection::LeftToRight) == LayoutDirection::RightToLeft) {
+    TextAlignment textAlignment =
+        textAttributes.alignment.value_or(TextAlignment::Natural);
+    if (textAttributes.layoutDirection.value_or(LayoutDirection::LeftToRight) ==
+        LayoutDirection::RightToLeft) {
       if (textAlignment == TextAlignment::Right) {
         textAlignment = TextAlignment::Left;
       } else if (textAlignment == TextAlignment::Left) {
@@ -93,19 +122,20 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
     }
 
     paragraphStyle.alignment =
-      RCTNSTextAlignmentFromTextAlignment(textAlignment);
+        RCTNSTextAlignmentFromTextAlignment(textAlignment);
     isParagraphStyleUsed = YES;
   }
 
   if (textAttributes.baseWritingDirection.hasValue()) {
     paragraphStyle.baseWritingDirection =
-      RCTNSWritingDirectionFromWritingDirection(textAttributes.baseWritingDirection.value());
+        RCTNSWritingDirectionFromWritingDirection(
+            textAttributes.baseWritingDirection.value());
     isParagraphStyleUsed = YES;
   }
 
   if (!isnan(textAttributes.lineHeight)) {
-    CGFloat lineHeight =
-      textAttributes.lineHeight * RCTEffectiveFontSizeMultiplierFromTextAttributes(textAttributes);
+    CGFloat lineHeight = textAttributes.lineHeight *
+        RCTEffectiveFontSizeMultiplierFromTextAttributes(textAttributes);
     paragraphStyle.minimumLineHeight = lineHeight;
     paragraphStyle.maximumLineHeight = lineHeight;
     isParagraphStyleUsed = YES;
@@ -116,21 +146,23 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
   }
 
   // Decoration
-  if (textAttributes.textDecorationLineType.value_or(TextDecorationLineType::None) != TextDecorationLineType::None) {
+  if (textAttributes.textDecorationLineType.value_or(
+          TextDecorationLineType::None) != TextDecorationLineType::None) {
     auto textDecorationLineType = textAttributes.textDecorationLineType.value();
 
-    NSUnderlineStyle style =
-      RCTNSUnderlineStyleFromStyleAndPattern(
-        textAttributes.textDecorationLineStyle.value_or(TextDecorationLineStyle::Single),
-        textAttributes.textDecorationLinePattern.value_or(TextDecorationLinePattern::Solid)
-      );
+    NSUnderlineStyle style = RCTNSUnderlineStyleFromStyleAndPattern(
+        textAttributes.textDecorationLineStyle.value_or(
+            TextDecorationLineStyle::Single),
+        textAttributes.textDecorationLinePattern.value_or(
+            TextDecorationLinePattern::Solid));
 
-    UIColor *textDecorationColor = RCTUIColorFromSharedColor(textAttributes.textDecorationColor);
+    UIColor *textDecorationColor =
+        RCTUIColorFromSharedColor(textAttributes.textDecorationColor);
 
     // Underline
     if (textDecorationLineType == TextDecorationLineType::Underline ||
-        textDecorationLineType == TextDecorationLineType::UnderlineStrikethrough) {
-
+        textDecorationLineType ==
+            TextDecorationLineType::UnderlineStrikethrough) {
       attributes[NSUnderlineStyleAttributeName] = @(style);
 
       if (textDecorationColor) {
@@ -140,8 +172,8 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
 
     // Strikethrough
     if (textDecorationLineType == TextDecorationLineType::Strikethrough ||
-        textDecorationLineType == TextDecorationLineType::UnderlineStrikethrough) {
-
+        textDecorationLineType ==
+            TextDecorationLineType::UnderlineStrikethrough) {
       attributes[NSStrikethroughStyleAttributeName] = @(style);
 
       if (textDecorationColor) {
@@ -154,9 +186,11 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
   if (textAttributes.textShadowOffset.hasValue()) {
     auto textShadowOffset = textAttributes.textShadowOffset.value();
     NSShadow *shadow = [NSShadow new];
-    shadow.shadowOffset = CGSize {textShadowOffset.width, textShadowOffset.height};
+    shadow.shadowOffset =
+        CGSize{textShadowOffset.width, textShadowOffset.height};
     shadow.shadowBlurRadius = textAttributes.textShadowRadius;
-    shadow.shadowColor = RCTUIColorFromSharedColor(textAttributes.textShadowColor);
+    shadow.shadowColor =
+        RCTUIColorFromSharedColor(textAttributes.textShadowColor);
     attributes[NSShadowAttributeName] = shadow;
   }
 
@@ -168,57 +202,62 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
   return [attributes copy];
 }
 
-NSAttributedString *RCTNSAttributedStringFromAttributedString(const AttributedString &attributedString) {
-  NSMutableAttributedString *nsAttributedString = [[NSMutableAttributedString alloc] init];
+NSAttributedString *RCTNSAttributedStringFromAttributedString(
+    const AttributedString &attributedString) {
+  NSMutableAttributedString *nsAttributedString =
+      [[NSMutableAttributedString alloc] init];
 
   [nsAttributedString beginEditing];
 
   for (auto fragment : attributedString.getFragments()) {
     NSAttributedString *nsAttributedStringFragment;
 
-    SharedLayoutableShadowNode layoutableShadowNode =
-      std::dynamic_pointer_cast<const LayoutableShadowNode>(fragment.shadowNode);
+    auto layoutableShadowNode =
+        std::dynamic_pointer_cast<const LayoutableShadowNode>(
+            fragment.shadowNode);
 
     if (layoutableShadowNode) {
       auto layoutMetrics = layoutableShadowNode->getLayoutMetrics();
-      CGRect bounds = {
-        .origin = {
-          .x = layoutMetrics.frame.origin.x,
-          .y = layoutMetrics.frame.origin.y
-        },
-        .size = {
-          .width = layoutMetrics.frame.size.width,
-          .height = layoutMetrics.frame.size.height
-        }
-      };
+      CGRect bounds = {.origin = {.x = layoutMetrics.frame.origin.x,
+                                  .y = layoutMetrics.frame.origin.y},
+                       .size = {.width = layoutMetrics.frame.size.width,
+                                .height = layoutMetrics.frame.size.height}};
 
       NSTextAttachment *attachment = [NSTextAttachment new];
       attachment.bounds = bounds;
 
-      nsAttributedStringFragment = [NSAttributedString attributedStringWithAttachment:attachment];
+      nsAttributedStringFragment =
+          [NSAttributedString attributedStringWithAttachment:attachment];
     } else {
-      NSString *string =
-        [NSString stringWithCString:fragment.string.c_str()
-                           encoding:NSUTF8StringEncoding];
+      NSString *string = [NSString stringWithCString:fragment.string.c_str()
+                                            encoding:NSUTF8StringEncoding];
 
-      nsAttributedStringFragment =
-        [[NSAttributedString alloc] initWithString:string
-                                        attributes:RCTNSTextAttributesFromTextAttributes(fragment.textAttributes)];
+      nsAttributedStringFragment = [[NSAttributedString alloc]
+          initWithString:string
+              attributes:RCTNSTextAttributesFromTextAttributes(
+                             fragment.textAttributes)];
     }
 
     NSMutableAttributedString *nsMutableAttributedStringFragment =
-      [[NSMutableAttributedString alloc] initWithAttributedString:nsAttributedStringFragment];
+        [[NSMutableAttributedString alloc]
+            initWithAttributedString:nsAttributedStringFragment];
+
+    if (fragment.parentShadowNode) {
+      RCTSharedShadowNodeWrapper *parentShadowNode =
+          [RCTSharedShadowNodeWrapper new];
+      parentShadowNode.node = fragment.parentShadowNode;
 
-    if (fragment.shadowNode) {
-      NSDictionary<NSAttributedStringKey, id> *additionalTextAttributes = @{
-        RCTAttributedStringReactTagAttributeName: @(fragment.shadowNode->getTag())
-      };
+      NSDictionary<NSAttributedStringKey, id> *additionalTextAttributes =
+          @{RCTAttributedStringParentShadowNode : parentShadowNode};
 
-      [nsMutableAttributedStringFragment setAttributes:additionalTextAttributes
-                                                 range:NSMakeRange(0, nsMutableAttributedStringFragment.length)];
+      [nsMutableAttributedStringFragment
+          addAttributes:additionalTextAttributes
+                  range:NSMakeRange(
+                            0, nsMutableAttributedStringFragment.length)];
     }
 
-    [nsAttributedString appendAttributedString:nsMutableAttributedStringFragment];
+    [nsAttributedString
+        appendAttributedString:nsMutableAttributedStringFragment];
   }
 
   [nsAttributedString endEditing];
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontProperties.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontProperties.h
index 9f8680b47a4a56..c4323c4a1f9bf6 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontProperties.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontProperties.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.h
index 084a2b24dd0b45..30d0832ed835b8 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.mm b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.mm
index 954051f864bd3a..3167a5d1268600 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.mm
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,7 +17,7 @@ static RCTFontProperties RCTDefaultFontProperties() {
   dispatch_once(&onceToken, ^{
     defaultFontProperties.size = 14;
     defaultFontProperties.family =
-      [UIFont systemFontOfSize:defaultFontProperties.size].familyName;
+        [UIFont systemFontOfSize:defaultFontProperties.size].familyName;
     defaultFontProperties.style = RCTFontStyleNormal;
     defaultFontProperties.variant = RCTFontVariantDefault;
     defaultFontProperties.sizeMultiplier = 1.0;
@@ -26,24 +26,39 @@ static RCTFontProperties RCTDefaultFontProperties() {
   return defaultFontProperties;
 }
 
-static RCTFontProperties RCTResolveFontProperties(RCTFontProperties fontProperties) {
+static RCTFontProperties RCTResolveFontProperties(
+    RCTFontProperties fontProperties) {
   RCTFontProperties defaultFontProperties = RCTDefaultFontProperties();
-  fontProperties.family = fontProperties.family.length && ![fontProperties.family isEqualToString:@"System"] ? fontProperties.family : defaultFontProperties.family;
-  fontProperties.size = !isnan(fontProperties.size) ? fontProperties.size : defaultFontProperties.size;
-  fontProperties.weight = !isnan(fontProperties.weight) ? fontProperties.weight : defaultFontProperties.weight;
-  fontProperties.style = fontProperties.style != RCTFontStyleUndefined  ? fontProperties.style : defaultFontProperties.style;
-  fontProperties.variant = fontProperties.variant != RCTFontVariantUndefined  ? fontProperties.variant : defaultFontProperties.variant;
+  fontProperties.family = fontProperties.family.length &&
+          ![fontProperties.family isEqualToString:@"System"]
+      ? fontProperties.family
+      : defaultFontProperties.family;
+  fontProperties.size = !isnan(fontProperties.size)
+      ? fontProperties.size
+      : defaultFontProperties.size;
+  fontProperties.weight = !isnan(fontProperties.weight)
+      ? fontProperties.weight
+      : defaultFontProperties.weight;
+  fontProperties.style = fontProperties.style != RCTFontStyleUndefined
+      ? fontProperties.style
+      : defaultFontProperties.style;
+  fontProperties.variant = fontProperties.variant != RCTFontVariantUndefined
+      ? fontProperties.variant
+      : defaultFontProperties.variant;
   return fontProperties;
 }
 
 static UIFontWeight RCTGetFontWeight(UIFont *font) {
-  NSDictionary *traits = [font.fontDescriptor objectForKey:UIFontDescriptorTraitsAttribute];
+  NSDictionary *traits =
+      [font.fontDescriptor objectForKey:UIFontDescriptorTraitsAttribute];
   return [traits[UIFontWeightTrait] doubleValue];
 }
 
 static RCTFontStyle RCTGetFontStyle(UIFont *font) {
-  NSDictionary *traits = [font.fontDescriptor objectForKey:UIFontDescriptorTraitsAttribute];
-  UIFontDescriptorSymbolicTraits symbolicTraits = [traits[UIFontSymbolicTrait] unsignedIntValue];
+  NSDictionary *traits =
+      [font.fontDescriptor objectForKey:UIFontDescriptorTraitsAttribute];
+  UIFontDescriptorSymbolicTraits symbolicTraits =
+      [traits[UIFontSymbolicTrait] unsignedIntValue];
   if (symbolicTraits & UIFontDescriptorTraitItalic) {
     return RCTFontStyleItalic;
   }
@@ -61,25 +76,26 @@ static UIFontWeight RCTUIFontWeightFromFloat(CGFloat fontWeight) {
   // and UIKit uses the same numerical notation, we have to use exact
   // `UIFontWeight*` constants to make it work properly (because
   // float values comparison is tricky).
-  static UIFontWeight weights[] = {
-    /* ~100 */ UIFontWeightUltraLight,
-    /* ~200 */ UIFontWeightThin,
-    /* ~300 */ UIFontWeightLight,
-    /* ~400 */ UIFontWeightRegular,
-    /* ~500 */ UIFontWeightMedium,
-    /* ~600 */ UIFontWeightSemibold,
-    /* ~700 */ UIFontWeightBold,
-    /* ~800 */ UIFontWeightHeavy,
-    /* ~900 */ UIFontWeightBlack
-  };
+  static UIFontWeight weights[] = {/* ~100 */ UIFontWeightUltraLight,
+                                   /* ~200 */ UIFontWeightThin,
+                                   /* ~300 */ UIFontWeightLight,
+                                   /* ~400 */ UIFontWeightRegular,
+                                   /* ~500 */ UIFontWeightMedium,
+                                   /* ~600 */ UIFontWeightSemibold,
+                                   /* ~700 */ UIFontWeightBold,
+                                   /* ~800 */ UIFontWeightHeavy,
+                                   /* ~900 */ UIFontWeightBlack};
   return weights[std::llround((fontWeight / 100) - 1)];
 }
 
-static UIFont *RCTDefaultFontWithFontProperties(RCTFontProperties fontProperties) {
+static UIFont *RCTDefaultFontWithFontProperties(
+    RCTFontProperties fontProperties) {
   static NSCache *fontCache;
   static std::mutex fontCacheMutex;
 
-  NSString *cacheKey = [NSString stringWithFormat:@"%.1f/%.2f", fontProperties.size, fontProperties.weight];
+  NSString *cacheKey = [NSString stringWithFormat:@"%.1f/%.2f",
+                                                  fontProperties.size,
+                                                  fontProperties.weight];
   UIFont *font;
 
   {
@@ -91,17 +107,21 @@ static UIFontWeight RCTUIFontWeightFromFloat(CGFloat fontWeight) {
   }
 
   if (!font) {
-    font = [UIFont systemFontOfSize:fontProperties.size
-                             weight:RCTUIFontWeightFromFloat(fontProperties.weight)];
+    font = [UIFont
+        systemFontOfSize:fontProperties.size
+                  weight:RCTUIFontWeightFromFloat(fontProperties.weight)];
 
     if (fontProperties.variant == RCTFontStyleItalic) {
       UIFontDescriptor *fontDescriptor = [font fontDescriptor];
-      UIFontDescriptorSymbolicTraits symbolicTraits = fontDescriptor.symbolicTraits;
+      UIFontDescriptorSymbolicTraits symbolicTraits =
+          fontDescriptor.symbolicTraits;
 
       symbolicTraits |= UIFontDescriptorTraitItalic;
 
-      fontDescriptor = [fontDescriptor fontDescriptorWithSymbolicTraits:symbolicTraits];
-      font = [UIFont fontWithDescriptor:fontDescriptor size:fontProperties.size];
+      fontDescriptor =
+          [fontDescriptor fontDescriptorWithSymbolicTraits:symbolicTraits];
+      font =
+          [UIFont fontWithDescriptor:fontDescriptor size:fontProperties.size];
     }
 
     {
@@ -117,7 +137,8 @@ static UIFontWeight RCTUIFontWeightFromFloat(CGFloat fontWeight) {
   RCTFontProperties defaultFontProperties = RCTDefaultFontProperties();
   fontProperties = RCTResolveFontProperties(fontProperties);
 
-  CGFloat effectiveFontSize = fontProperties.sizeMultiplier * fontProperties.size;
+  CGFloat effectiveFontSize =
+      fontProperties.sizeMultiplier * fontProperties.size;
   UIFont *font;
   if ([fontProperties.family isEqualToString:defaultFontProperties.family]) {
     // Handle system font as special case. This ensures that we preserve
@@ -125,7 +146,7 @@ static UIFontWeight RCTUIFontWeightFromFloat(CGFloat fontWeight) {
     font = RCTDefaultFontWithFontProperties(fontProperties);
   } else {
     NSArray<NSString *> *fontNames =
-      [UIFont fontNamesForFamilyName:fontProperties.family];
+        [UIFont fontNamesForFamilyName:fontProperties.family];
 
     if (fontNames.count == 0) {
       // Gracefully handle being given a font name rather than font family, for
@@ -134,7 +155,9 @@ static UIFontWeight RCTUIFontWeightFromFloat(CGFloat fontWeight) {
 
       if (!font) {
         // Failback to system font.
-        font = [UIFont systemFontOfSize:effectiveFontSize weight:RCTUIFontWeightFromFloat(fontProperties.weight)];
+        font = [UIFont
+            systemFontOfSize:effectiveFontSize
+                      weight:RCTUIFontWeightFromFloat(fontProperties.weight)];
       }
     } else {
       // Get the closest font that matches the given weight for the fontFamily
@@ -147,15 +170,17 @@ static UIFontWeight RCTUIFontWeightFromFloat(CGFloat fontWeight) {
         }
 
         CGFloat testWeight = RCTGetFontWeight(fontMatch);
-        if (ABS(testWeight - fontProperties.weight) < ABS(closestWeight - fontProperties.weight)) {
+        if (ABS(testWeight - fontProperties.weight) <
+            ABS(closestWeight - fontProperties.weight)) {
           font = fontMatch;
           closestWeight = testWeight;
         }
       }
 
       if (!font) {
-        // If we still don't have a match at least return the first font in the fontFamily
-        // This is to support built-in font Zapfino and other custom single font families like Impact
+        // If we still don't have a match at least return the first font in the
+        // fontFamily This is to support built-in font Zapfino and other custom
+        // single font families like Impact
         font = [UIFont fontWithName:fontNames[0] size:effectiveFontSize];
       }
     }
@@ -165,7 +190,9 @@ static UIFontWeight RCTUIFontWeightFromFloat(CGFloat fontWeight) {
   if (fontProperties.variant != RCTFontVariantDefault) {
     NSArray *fontFeatures = RCTFontFeatures(fontProperties.variant);
     UIFontDescriptor *fontDescriptor =
-      [font.fontDescriptor fontDescriptorByAddingAttributes:@{UIFontDescriptorFeatureSettingsAttribute: fontFeatures}];
+        [font.fontDescriptor fontDescriptorByAddingAttributes:@{
+          UIFontDescriptorFeatureSettingsAttribute : fontFeatures
+        }];
     font = [UIFont fontWithDescriptor:fontDescriptor size:effectiveFontSize];
   }
 
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.h
index 8a745aa4a60b9b..d44e05fdd3927c 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,10 +7,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/core/LayoutConstraints.h>
-#import <fabric/graphics/Geometry.h>
 #import <fabric/attributedstring/AttributedString.h>
 #import <fabric/attributedstring/ParagraphAttributes.h>
+#import <fabric/core/LayoutConstraints.h>
+#import <fabric/graphics/Geometry.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -19,14 +19,28 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface RCTTextLayoutManager : NSObject
 
-- (facebook::react::Size)measureWithAttributedString:(facebook::react::AttributedString)attributedString
-                                 paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
-                                   layoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints;
+- (facebook::react::Size)
+    measureWithAttributedString:
+        (facebook::react::AttributedString)attributedString
+            paragraphAttributes:
+                (facebook::react::ParagraphAttributes)paragraphAttributes
+              layoutConstraints:
+                  (facebook::react::LayoutConstraints)layoutConstraints;
 
 - (void)drawAttributedString:(facebook::react::AttributedString)attributedString
-         paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
+         paragraphAttributes:
+             (facebook::react::ParagraphAttributes)paragraphAttributes
                        frame:(CGRect)frame;
 
+- (facebook::react::SharedShadowNode)
+    getParentShadowNodeWithAttributeString:
+        (facebook::react::AttributedString)attributedString
+                       paragraphAttributes:
+                           (facebook::react::ParagraphAttributes)
+                               paragraphAttributes
+                                     frame:(CGRect)frame
+                                   atPoint:(CGPoint)point;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm
index 33a2fdb702d85f..0f206ceaaba4b2 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,24 +14,31 @@
 
 @implementation RCTTextLayoutManager
 
-static NSLineBreakMode RCTNSLineBreakModeFromWritingDirection(EllipsizeMode ellipsizeMode) {
+static NSLineBreakMode RCTNSLineBreakModeFromWritingDirection(
+    EllipsizeMode ellipsizeMode) {
   switch (ellipsizeMode) {
-    case EllipsizeMode::Clip: return NSLineBreakByClipping;
-    case EllipsizeMode::Head: return NSLineBreakByTruncatingHead;
-    case EllipsizeMode::Tail: return NSLineBreakByTruncatingTail;
-    case EllipsizeMode::Middle: return NSLineBreakByTruncatingMiddle;
+    case EllipsizeMode::Clip:
+      return NSLineBreakByClipping;
+    case EllipsizeMode::Head:
+      return NSLineBreakByTruncatingHead;
+    case EllipsizeMode::Tail:
+      return NSLineBreakByTruncatingTail;
+    case EllipsizeMode::Middle:
+      return NSLineBreakByTruncatingMiddle;
   }
 }
 
-- (facebook::react::Size)measureWithAttributedString:(AttributedString)attributedString
-                                 paragraphAttributes:(ParagraphAttributes)paragraphAttributes
-                                   layoutConstraints:(LayoutConstraints)layoutConstraints
-{
-  CGSize maximumSize = CGSize {layoutConstraints.maximumSize.width, layoutConstraints.maximumSize.height};
+- (facebook::react::Size)
+    measureWithAttributedString:(AttributedString)attributedString
+            paragraphAttributes:(ParagraphAttributes)paragraphAttributes
+              layoutConstraints:(LayoutConstraints)layoutConstraints {
+  CGSize maximumSize = CGSize{layoutConstraints.maximumSize.width,
+                              layoutConstraints.maximumSize.height};
   NSTextStorage *textStorage =
-    [self _textStorageAndLayoutManagerWithAttributesString:RCTNSAttributedStringFromAttributedString(attributedString)
-                                       paragraphAttributes:paragraphAttributes
-                                                      size:maximumSize];
+      [self _textStorageAndLayoutManagerWithAttributesString:
+                RCTNSAttributedStringFromAttributedString(attributedString)
+                                         paragraphAttributes:paragraphAttributes
+                                                        size:maximumSize];
 
   NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
@@ -39,52 +46,58 @@ static NSLineBreakMode RCTNSLineBreakModeFromWritingDirection(EllipsizeMode elli
 
   CGSize size = [layoutManager usedRectForTextContainer:textContainer].size;
 
-  size = (CGSize){
-    MIN(size.width, maximumSize.width),
-    MIN(size.height, maximumSize.height)
-  };
+  size = (CGSize){MIN(size.width, maximumSize.width),
+                  MIN(size.height, maximumSize.height)};
 
-  return facebook::react::Size {size.width, size.height};
+  return facebook::react::Size{size.width, size.height};
 }
 
 - (void)drawAttributedString:(AttributedString)attributedString
          paragraphAttributes:(ParagraphAttributes)paragraphAttributes
-                       frame:(CGRect)frame
-{
+                       frame:(CGRect)frame {
   NSTextStorage *textStorage =
-    [self _textStorageAndLayoutManagerWithAttributesString:RCTNSAttributedStringFromAttributedString(attributedString)
-                                       paragraphAttributes:paragraphAttributes
-                                                      size:frame.size];
-   NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
-   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
-
-   NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
-   [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:frame.origin];
-   [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:frame.origin];
+      [self _textStorageAndLayoutManagerWithAttributesString:
+                RCTNSAttributedStringFromAttributedString(attributedString)
+                                         paragraphAttributes:paragraphAttributes
+                                                        size:frame.size];
+  NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
+  NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
+
+  NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
+  [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:frame.origin];
+  [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:frame.origin];
 }
 
-- (NSTextStorage *)_textStorageAndLayoutManagerWithAttributesString:(NSAttributedString *)attributedString
-                                                paragraphAttributes:(ParagraphAttributes)paragraphAttributes
-                                                               size:(CGSize)size
-{
+- (NSTextStorage *)
+    _textStorageAndLayoutManagerWithAttributesString:
+        (NSAttributedString *)attributedString
+                                 paragraphAttributes:
+                                     (ParagraphAttributes)paragraphAttributes
+                                                size:(CGSize)size {
   NSTextContainer *textContainer = [[NSTextContainer alloc] initWithSize:size];
 
   textContainer.lineFragmentPadding = 0.0; // Note, the default value is 5.
-  textContainer.lineBreakMode =
-    paragraphAttributes.maximumNumberOfLines > 0 ? RCTNSLineBreakModeFromWritingDirection(paragraphAttributes.ellipsizeMode) : NSLineBreakByClipping;
+  textContainer.lineBreakMode = paragraphAttributes.maximumNumberOfLines > 0
+      ? RCTNSLineBreakModeFromWritingDirection(
+            paragraphAttributes.ellipsizeMode)
+      : NSLineBreakByClipping;
   textContainer.maximumNumberOfLines = paragraphAttributes.maximumNumberOfLines;
 
   NSLayoutManager *layoutManager = [NSLayoutManager new];
   [layoutManager addTextContainer:textContainer];
 
   NSTextStorage *textStorage =
-    [[NSTextStorage alloc] initWithAttributedString:attributedString];
+      [[NSTextStorage alloc] initWithAttributedString:attributedString];
 
   [textStorage addLayoutManager:layoutManager];
 
   if (paragraphAttributes.adjustsFontSizeToFit) {
-    CGFloat minimumFontSize = !isnan(paragraphAttributes.minimumFontSize) ? paragraphAttributes.minimumFontSize : 4.0;
-    CGFloat maximumFontSize = !isnan(paragraphAttributes.maximumFontSize) ? paragraphAttributes.maximumFontSize : 96.0;
+    CGFloat minimumFontSize = !isnan(paragraphAttributes.minimumFontSize)
+        ? paragraphAttributes.minimumFontSize
+        : 4.0;
+    CGFloat maximumFontSize = !isnan(paragraphAttributes.maximumFontSize)
+        ? paragraphAttributes.maximumFontSize
+        : 96.0;
     [textStorage scaleFontSizeToFitSize:size
                         minimumFontSize:minimumFontSize
                         maximumFontSize:maximumFontSize];
@@ -93,4 +106,39 @@ - (NSTextStorage *)_textStorageAndLayoutManagerWithAttributesString:(NSAttribute
   return textStorage;
 }
 
+- (SharedShadowNode)
+    getParentShadowNodeWithAttributeString:(AttributedString)attributedString
+                       paragraphAttributes:
+                           (ParagraphAttributes)paragraphAttributes
+                                     frame:(CGRect)frame
+                                   atPoint:(CGPoint)point {
+  NSTextStorage *textStorage =
+      [self _textStorageAndLayoutManagerWithAttributesString:
+                RCTNSAttributedStringFromAttributedString(attributedString)
+                                         paragraphAttributes:paragraphAttributes
+                                                        size:frame.size];
+  NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
+  NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
+
+  CGFloat fraction;
+  NSUInteger characterIndex =
+      [layoutManager characterIndexForPoint:point
+                                   inTextContainer:textContainer
+          fractionOfDistanceBetweenInsertionPoints:&fraction];
+
+  // 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)) {
+    RCTSharedShadowNodeWrapper *parentShadowNode =
+        (RCTSharedShadowNodeWrapper *)[textStorage
+                 attribute:RCTAttributedStringParentShadowNode
+                   atIndex:characterIndex
+            effectiveRange:NULL];
+    return parentShadowNode.node;
+  }
+
+  return nil;
+}
+
 @end
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
index 354952d9c8335d..2ac7a295d6d848 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,59 +12,83 @@
 
 using namespace facebook::react;
 
-inline static NSTextAlignment RCTNSTextAlignmentFromTextAlignment(TextAlignment textAlignment) {
+inline static NSTextAlignment RCTNSTextAlignmentFromTextAlignment(
+    TextAlignment textAlignment) {
   switch (textAlignment) {
-    case TextAlignment::Natural: return NSTextAlignmentNatural;
-    case TextAlignment::Left: return NSTextAlignmentLeft;
-    case TextAlignment::Right: return NSTextAlignmentRight;
-    case TextAlignment::Center: return NSTextAlignmentCenter;
-    case TextAlignment::Justified: return NSTextAlignmentJustified;
+    case TextAlignment::Natural:
+      return NSTextAlignmentNatural;
+    case TextAlignment::Left:
+      return NSTextAlignmentLeft;
+    case TextAlignment::Right:
+      return NSTextAlignmentRight;
+    case TextAlignment::Center:
+      return NSTextAlignmentCenter;
+    case TextAlignment::Justified:
+      return NSTextAlignmentJustified;
   }
 }
 
-inline static NSWritingDirection RCTNSWritingDirectionFromWritingDirection(WritingDirection writingDirection) {
+inline static NSWritingDirection RCTNSWritingDirectionFromWritingDirection(
+    WritingDirection writingDirection) {
   switch (writingDirection) {
-    case WritingDirection::Natural: return NSWritingDirectionNatural;
-    case WritingDirection::LeftToRight: return NSWritingDirectionLeftToRight;
-    case WritingDirection::RightToLeft: return NSWritingDirectionRightToLeft;
+    case WritingDirection::Natural:
+      return NSWritingDirectionNatural;
+    case WritingDirection::LeftToRight:
+      return NSWritingDirectionLeftToRight;
+    case WritingDirection::RightToLeft:
+      return NSWritingDirectionRightToLeft;
   }
 }
 
 inline static RCTFontStyle RCTFontStyleFromFontStyle(FontStyle fontStyle) {
   switch (fontStyle) {
-    case FontStyle::Normal: return RCTFontStyleNormal;
-    case FontStyle::Italic: return RCTFontStyleItalic;
-    case FontStyle::Oblique: return RCTFontStyleOblique;
+    case FontStyle::Normal:
+      return RCTFontStyleNormal;
+    case FontStyle::Italic:
+      return RCTFontStyleItalic;
+    case FontStyle::Oblique:
+      return RCTFontStyleOblique;
   }
 }
 
-inline static RCTFontVariant RCTFontVariantFromFontVariant(FontVariant fontVariant) {
+inline static RCTFontVariant RCTFontVariantFromFontVariant(
+    FontVariant fontVariant) {
   return (RCTFontVariant)fontVariant;
 }
 
-inline static NSUnderlineStyle RCTNSUnderlineStyleFromStyleAndPattern(TextDecorationLineStyle textDecorationLineStyle, TextDecorationLinePattern textDecorationLinePattern) {
+inline static NSUnderlineStyle RCTNSUnderlineStyleFromStyleAndPattern(
+    TextDecorationLineStyle textDecorationLineStyle,
+    TextDecorationLinePattern textDecorationLinePattern) {
   NSUnderlineStyle style = NSUnderlineStyleNone;
 
   switch (textDecorationLineStyle) {
     case TextDecorationLineStyle::Single:
-      style = NSUnderlineStyle(style | NSUnderlineStyleSingle); break;
+      style = NSUnderlineStyle(style | NSUnderlineStyleSingle);
+      break;
     case TextDecorationLineStyle::Thick:
-      style = NSUnderlineStyle(style | NSUnderlineStyleThick); break;
+      style = NSUnderlineStyle(style | NSUnderlineStyleThick);
+      break;
     case TextDecorationLineStyle::Double:
-      style = NSUnderlineStyle(style | NSUnderlineStyleDouble); break;
+      style = NSUnderlineStyle(style | NSUnderlineStyleDouble);
+      break;
   }
 
   switch (textDecorationLinePattern) {
     case TextDecorationLinePattern::Solid:
-      style = NSUnderlineStyle(style | NSUnderlinePatternSolid); break;
+      style = NSUnderlineStyle(style | NSUnderlinePatternSolid);
+      break;
     case TextDecorationLinePattern::Dash:
-      style = NSUnderlineStyle(style | NSUnderlinePatternDash); break;
+      style = NSUnderlineStyle(style | NSUnderlinePatternDash);
+      break;
     case TextDecorationLinePattern::Dot:
-      style = NSUnderlineStyle(style | NSUnderlinePatternDot); break;
+      style = NSUnderlineStyle(style | NSUnderlinePatternDot);
+      break;
     case TextDecorationLinePattern::DashDot:
-      style = NSUnderlineStyle(style | NSUnderlinePatternDashDot); break;
+      style = NSUnderlineStyle(style | NSUnderlinePatternDashDot);
+      break;
     case TextDecorationLinePattern::DashDotDot:
-      style = NSUnderlineStyle(style | NSUnderlinePatternDashDotDot); break;
+      style = NSUnderlineStyle(style | NSUnderlinePatternDashDotDot);
+      break;
   }
 
   return style;
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h
index dd54980ffd737e..dc7baea7516008 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,6 +12,7 @@
 #include <fabric/attributedstring/AttributedString.h>
 #include <fabric/attributedstring/ParagraphAttributes.h>
 #include <fabric/core/LayoutConstraints.h>
+#include <fabric/uimanager/ContextContainer.h>
 
 namespace facebook {
 namespace react {
@@ -24,18 +25,18 @@ using SharedTextLayoutManager = std::shared_ptr<const TextLayoutManager>;
  * Cross platform facade for iOS-specific RCTTTextLayoutManager.
  */
 class TextLayoutManager {
-public:
-  TextLayoutManager();
+ public:
+  TextLayoutManager(const SharedContextContainer &contextContainer);
   ~TextLayoutManager();
 
   /*
    * Measures `attributedString` using native text rendering infrastructure.
    */
   Size measure(
-    AttributedString attributedString,
-    ParagraphAttributes paragraphAttributes,
-    LayoutConstraints layoutConstraints
-  ) const;
+      Tag reactTag,
+      AttributedString attributedString,
+      ParagraphAttributes paragraphAttributes,
+      LayoutConstraints layoutConstraints) const;
 
   /*
    * Returns an opaque pointer to platform-specific TextLayoutManager.
@@ -43,7 +44,7 @@ class TextLayoutManager {
    */
   void *getNativeTextLayoutManager() const;
 
-private:
+ private:
   void *self_;
 };
 
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm b/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm
index f7658211522fb7..2c082e9e1677db 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,7 +12,8 @@
 namespace facebook {
 namespace react {
 
-TextLayoutManager::TextLayoutManager() {
+TextLayoutManager::TextLayoutManager(
+    const SharedContextContainer &contextContainer) {
   self_ = (__bridge_retained void *)[RCTTextLayoutManager new];
 }
 
@@ -26,11 +27,12 @@
 }
 
 Size TextLayoutManager::measure(
-  AttributedString attributedString,
-  ParagraphAttributes paragraphAttributes,
-  LayoutConstraints layoutConstraints
-) const {
-  RCTTextLayoutManager *textLayoutManager = (__bridge RCTTextLayoutManager *)self_;
+    Tag reactTag,
+    AttributedString attributedString,
+    ParagraphAttributes paragraphAttributes,
+    LayoutConstraints layoutConstraints) const {
+  RCTTextLayoutManager *textLayoutManager =
+      (__bridge RCTTextLayoutManager *)self_;
   return [textLayoutManager measureWithAttributedString:attributedString
                                     paragraphAttributes:paragraphAttributes
                                       layoutConstraints:layoutConstraints];
diff --git a/ReactCommon/fabric/textlayoutmanager/tests/TextLayoutManagerTest.cpp b/ReactCommon/fabric/textlayoutmanager/tests/TextLayoutManagerTest.cpp
index d873c6eed80e86..d534fb699a7635 100644
--- a/ReactCommon/fabric/textlayoutmanager/tests/TextLayoutManagerTest.cpp
+++ b/ReactCommon/fabric/textlayoutmanager/tests/TextLayoutManagerTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK
index 1b091a56325f57..83c98d133f4da2 100644
--- a/ReactCommon/fabric/uimanager/BUCK
+++ b/ReactCommon/fabric/uimanager/BUCK
@@ -1,13 +1,17 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "ANDROID", "APPLE", "IS_OSS_BUILD", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-APPLE_COMPILER_FLAGS = []
-
-if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "flags", "get_static_library_ios_flags")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
 
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), "compiler_flags")
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
     name = "uimanager",
@@ -52,33 +56,29 @@ rn_xplat_cxx_library(
         "xplat//folly:memory",
         "xplat//folly:molly",
         "xplat//third-party/glog:glog",
+        react_native_xplat_target("fabric/components/root:root"),
+        react_native_xplat_target("fabric/components/view:view"),
         react_native_xplat_target("fabric/core:core"),
         react_native_xplat_target("fabric/debug:debug"),
-        react_native_xplat_target("fabric/text:text"),
-        react_native_xplat_target("fabric/view:view"),
-        react_native_xplat_target("fabric/scrollview:scrollview"),
-        react_native_xplat_target("fabric/text:text"),
+        react_native_xplat_target("fabric/events:events"),
     ],
 )
 
-if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-
-    fb_xplat_cxx_test(
-        name = "tests",
-        srcs = glob(["tests/**/*.cpp"]),
-        headers = glob(["tests/**/*.h"]),
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        platforms = APPLE,
-        deps = [
-            "xplat//folly:molly",
-            "xplat//third-party/gmock:gtest",
-            ":uimanager",
-        ],
-    )
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = (ANDROID, APPLE),
+    deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/gmock:gtest",
+        ":uimanager",
+    ],
+)
diff --git a/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h b/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h
index d4c4b965cec0ec..3ef02294c38d6d 100644
--- a/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h
+++ b/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,7 @@
 #include <memory>
 
 #include <fabric/core/ComponentDescriptor.h>
-#include <fabric/core/EventDispatcher.h>
+#include <fabric/events/EventDispatcher.h>
 #include <fabric/uimanager/ContextContainer.h>
 
 #include "ComponentDescriptorRegistry.h"
@@ -24,9 +24,10 @@ namespace react {
  * should register its specific set of supported components.
  */
 class ComponentDescriptorFactory {
-
-public:
-  static SharedComponentDescriptorRegistry buildRegistry(const SharedEventDispatcher &eventDispatcher, const SharedContextContainer &contextContainer);
+ public:
+  static SharedComponentDescriptorRegistry buildRegistry(
+      const SharedEventDispatcher &eventDispatcher,
+      const SharedContextContainer &contextContainer);
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp
index a41c4311a6bde9..967397367fb268 100644
--- a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp
+++ b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp
@@ -1,14 +1,17 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
 #include "ComponentDescriptorRegistry.h"
 
+#include <fabric/core/ShadowNodeFragment.h>
+
 namespace facebook {
 namespace react {
 
-void ComponentDescriptorRegistry::registerComponentDescriptor(SharedComponentDescriptor componentDescriptor) {
+void ComponentDescriptorRegistry::registerComponentDescriptor(
+    SharedComponentDescriptor componentDescriptor) {
   ComponentHandle componentHandle = componentDescriptor->getComponentHandle();
   _registryByHandle[componentHandle] = componentDescriptor;
 
@@ -16,13 +19,98 @@ void ComponentDescriptorRegistry::registerComponentDescriptor(SharedComponentDes
   _registryByName[componentName] = componentDescriptor;
 }
 
-const SharedComponentDescriptor ComponentDescriptorRegistry::operator[](const SharedShadowNode &shadowNode) const {
+const SharedComponentDescriptor ComponentDescriptorRegistry::operator[](
+    const SharedShadowNode &shadowNode) const {
   ComponentHandle componentHandle = shadowNode->getComponentHandle();
   return _registryByHandle.at(componentHandle);
 }
 
-const SharedComponentDescriptor ComponentDescriptorRegistry::operator[](const ComponentName &componentName) const {
-  return _registryByName.at(componentName);
+const SharedComponentDescriptor ComponentDescriptorRegistry::operator[](
+    const ComponentName &componentName) const {
+  auto it = _registryByName.find(componentName);
+  if (it == _registryByName.end()) {
+    throw std::invalid_argument(
+        ("Unable to find componentDescriptor for " + componentName).c_str());
+  }
+  return it->second;
+}
+
+static const std::string componentNameByReactViewName(std::string viewName) {
+  // We need this function only for the transition period;
+  // eventually, all names will be unified.
+
+  std::string rctPrefix("RCT");
+  if (std::mismatch(rctPrefix.begin(), rctPrefix.end(), viewName.begin())
+          .first == rctPrefix.end()) {
+    // If `viewName` has "RCT" prefix, remove it.
+    viewName.erase(0, rctPrefix.length());
+  }
+
+  // Fabric uses slightly new names for Text components because of differences
+  // in semantic.
+  if (viewName == "Text") {
+    return "Paragraph";
+  }
+  if (viewName == "VirtualText") {
+    return "Text";
+  }
+
+  if (viewName == "ImageView") {
+    return "Image";
+  }
+
+  if (viewName == "AndroidHorizontalScrollView") {
+    return "ScrollView";
+  }
+
+  if (viewName == "AndroidProgressBar") {
+    return "ActivityIndicatorView";
+  }
+
+  // We need this temporarly for testing purposes until we have proper
+  // implementation of core components.
+  if (viewName == "SinglelineTextInputView" ||
+      viewName == "MultilineTextInputView" || viewName == "RefreshControl" ||
+      viewName == "SafeAreaView" || viewName == "ScrollContentView" ||
+      viewName == "AndroidHorizontalScrollContentView" // Android
+  ) {
+    return "View";
+  }
+
+  return viewName;
+}
+
+static const RawProps rawPropsFromDynamic(const folly::dynamic object) {
+  // TODO: Convert this to something smarter, probably returning `std::iterator`.
+  RawProps result;
+
+  if (object.isNull()) {
+    return result;
+  }
+
+  assert(object.isObject());
+
+  for (const auto &pair : object.items()) {
+    assert(pair.first.isString());
+    result[pair.first.asString()] = pair.second;
+  }
+
+  return result;
+}
+
+SharedShadowNode ComponentDescriptorRegistry::createNode(Tag tag, const std::string &viewName, Tag rootTag, const folly::dynamic &props, const SharedEventTarget &eventTarget) const {
+  ComponentName componentName = componentNameByReactViewName(viewName);
+  const SharedComponentDescriptor &componentDescriptor = (*this)[componentName];
+  RawProps rawProps = rawPropsFromDynamic(props);
+
+  SharedShadowNode shadowNode =
+    componentDescriptor->createShadowNode({
+      .tag = tag,
+      .rootTag = rootTag,
+      .eventEmitter = componentDescriptor->createEventEmitter(std::move(eventTarget), tag),
+      .props = componentDescriptor->cloneProps(nullptr, rawProps)
+    });
+  return shadowNode;
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h
index 4fec41dff1ea0d..4a4100e7966303 100644
--- a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h
+++ b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -14,21 +14,27 @@ namespace react {
 
 class ComponentDescriptorRegistry;
 
-using SharedComponentDescriptorRegistry = std::shared_ptr<const ComponentDescriptorRegistry>;
+using SharedComponentDescriptorRegistry =
+    std::shared_ptr<const ComponentDescriptorRegistry>;
 
 /*
  * Registry of particular `ComponentDescriptor`s.
  */
 class ComponentDescriptorRegistry {
-
-public:
-  void registerComponentDescriptor(SharedComponentDescriptor componentDescriptor);
-
-  const SharedComponentDescriptor operator[](const SharedShadowNode &shadowNode) const;
-  const SharedComponentDescriptor operator[](const ComponentName &componentName) const;
-
-private:
-  std::unordered_map<ComponentHandle, SharedComponentDescriptor> _registryByHandle;
+ public:
+  void registerComponentDescriptor(
+      SharedComponentDescriptor componentDescriptor);
+
+  const SharedComponentDescriptor operator[](
+      const SharedShadowNode &shadowNode) const;
+  const SharedComponentDescriptor operator[](
+      const ComponentName &componentName) const;
+  SharedShadowNode createNode(
+    Tag tag, const std::string &viewName, Tag rootTag, const folly::dynamic &props, const SharedEventTarget &eventTarget) const;
+
+ private:
+  std::unordered_map<ComponentHandle, SharedComponentDescriptor>
+      _registryByHandle;
   std::unordered_map<ComponentName, SharedComponentDescriptor> _registryByName;
 };
 
diff --git a/ReactCommon/fabric/uimanager/ContextContainer.cpp b/ReactCommon/fabric/uimanager/ContextContainer.cpp
deleted file mode 100644
index ef2ceb473dc577..00000000000000
--- a/ReactCommon/fabric/uimanager/ContextContainer.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "ContextContainer.h"
-
-namespace facebook {
-namespace react {
-
-void ContextContainer::registerInstance(const ClassHandle &handle, SharedInstance instance) {
-  std::lock_guard<std::mutex> lock(mutex_);
-  instances_.insert({handle, instance});
-}
-
-const ContextContainer::SharedInstance &ContextContainer::at(const ClassHandle &handle) const {
-  std::lock_guard<std::mutex> lock(mutex_);
-  return instances_.at(handle);
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/uimanager/ContextContainer.h b/ReactCommon/fabric/uimanager/ContextContainer.h
index bec29b6bf45d01..8c0819c85326af 100644
--- a/ReactCommon/fabric/uimanager/ContextContainer.h
+++ b/ReactCommon/fabric/uimanager/ContextContainer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -7,9 +7,11 @@
 
 #include <memory>
 #include <mutex>
+#include <string>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
+#include <utility>
 
 namespace facebook {
 namespace react {
@@ -20,19 +22,42 @@ using SharedContextContainer = std::shared_ptr<ContextContainer>;
 
 /*
  * General purpose dependecy injection container.
+ * Instance types must be copyable.
  */
 class ContextContainer final {
+ public:
+  /*
+   * Registers an instance of the particular type `T` in the container.
+   * If `key` parameter is specified, the instance is registered
+   * by `{type, key}` pair.
+   */
+  template <typename T>
+  void registerInstance(const T &instance, const std::string &key = {}) {
+    std::lock_guard<std::mutex> lock(mutex_);
 
-public:
-  using ClassHandle = std::type_index;
-  using SharedInstance = std::shared_ptr<void>;
+    instances_.insert(
+        {{std::type_index(typeid(T)), key}, std::make_shared<T>(instance)});
+  }
 
-  void registerInstance(const ClassHandle &handle, SharedInstance instance);
+  /*
+   * Returns a previously registered instance of the particular type `T`.
+   * If `key` parameter is specified, the lookup will be performed
+   * by {type, key} pair.
+   */
+  template <typename T>
+  T getInstance(const std::string &key = {}) const {
+    std::lock_guard<std::mutex> lock(mutex_);
 
-  const SharedInstance &at(const ClassHandle &handle) const;
+    return *std::static_pointer_cast<T>(
+        instances_.at({std::type_index(typeid(T)), key}));
+  }
+
+ private:
+  std::unordered_map<
+      std::pair<std::type_index, std::string>,
+      std::shared_ptr<void>>
+      instances_;
 
-private:
-  std::unordered_map<ClassHandle, SharedInstance> instances_;
   mutable std::mutex mutex_;
 };
 
diff --git a/ReactCommon/fabric/uimanager/Differentiator.cpp b/ReactCommon/fabric/uimanager/Differentiator.cpp
index 641a33a39ff011..e3e26739df4bc9 100644
--- a/ReactCommon/fabric/uimanager/Differentiator.cpp
+++ b/ReactCommon/fabric/uimanager/Differentiator.cpp
@@ -1,206 +1,229 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
 #include "Differentiator.h"
 
+#include <fabric/core/LayoutableShadowNode.h>
+#include "ShadowView.h"
+
 namespace facebook {
 namespace react {
 
-static void calculateMutationInstructions(
-  TreeMutationInstructionList &instructions,
-  SharedShadowNode parentNode,
-  SharedShadowNodeSharedList oldChildNodes,
-  SharedShadowNodeSharedList newChildNodes
-) {
-  // The current version of the algorithm is otimized for simplicity,
-  // not for performance of optimal result.
+static void sliceChildShadowNodeViewPairsRecursively(
+    ShadowViewNodePairList &pairList,
+    Point layoutOffset,
+    const ShadowNode &shadowNode) {
+  for (const auto &childShadowNode : shadowNode.getChildren()) {
+    auto shadowView = ShadowView(*childShadowNode);
+
+    const auto layoutableShadowNode =
+        dynamic_cast<const LayoutableShadowNode *>(childShadowNode.get());
+    if (layoutableShadowNode && layoutableShadowNode->isLayoutOnly()) {
+      sliceChildShadowNodeViewPairsRecursively(
+          pairList,
+          layoutOffset + shadowView.layoutMetrics.frame.origin,
+          *childShadowNode);
+    } else {
+      shadowView.layoutMetrics.frame.origin += layoutOffset;
+      pairList.push_back({shadowView, *childShadowNode});
+    }
+  }
+}
 
-  // TODO(shergin): Consider to use Minimal Edit Distance algorithm to produce
-  // optimal set of instructions and improve mounting performance.
-  // https://en.wikipedia.org/wiki/Edit_distance
-  // https://www.geeksforgeeks.org/dynamic-programming-set-5-edit-distance/
+static ShadowViewNodePairList sliceChildShadowNodeViewPairs(
+    const ShadowNode &shadowNode) {
+  ShadowViewNodePairList pairList;
+  sliceChildShadowNodeViewPairsRecursively(pairList, {0, 0}, shadowNode);
+  return pairList;
+}
 
-  if (oldChildNodes == newChildNodes) {
+static void calculateShadowViewMutations(
+    ShadowViewMutationList &mutations,
+    const ShadowView &parentShadowView,
+    const ShadowViewNodePairList &oldChildPairs,
+    const ShadowViewNodePairList &newChildPairs) {
+  // The current version of the algorithm is otimized for simplicity,
+  // not for performance or optimal result.
+
+  if (oldChildPairs == newChildPairs) {
     return;
   }
 
-  if (oldChildNodes->size() == 0 && newChildNodes->size() == 0) {
+  if (oldChildPairs.size() == 0 && newChildPairs.size() == 0) {
     return;
   }
 
-  std::unordered_map<Tag, SharedShadowNode> insertedNodes;
+  std::unordered_map<Tag, ShadowViewNodePair> insertedPaires;
   int index = 0;
 
-  TreeMutationInstructionList createInstructions = {};
-  TreeMutationInstructionList deleteInstructions = {};
-  TreeMutationInstructionList insertInstructions = {};
-  TreeMutationInstructionList removeInstructions = {};
-  TreeMutationInstructionList replaceInstructions = {};
-  TreeMutationInstructionList downwardInstructions = {};
-  TreeMutationInstructionList destructionDownwardInstructions = {};
-
-  // Stage 1: Collectings Updates
-  for (index = 0; index < oldChildNodes->size() && index < newChildNodes->size(); index++) {
-    const auto &oldChildNode = oldChildNodes->at(index);
-    const auto &newChildNode = newChildNodes->at(index);
-
-    if (oldChildNode->getTag() != newChildNode->getTag()) {
+  ShadowViewMutationList createMutations = {};
+  ShadowViewMutationList deleteMutations = {};
+  ShadowViewMutationList insertMutations = {};
+  ShadowViewMutationList removeMutations = {};
+  ShadowViewMutationList updateMutations = {};
+  ShadowViewMutationList downwardMutations = {};
+  ShadowViewMutationList destructiveDownwardMutations = {};
+
+  // Stage 1: Collecting `Update` mutations
+  for (index = 0; index < oldChildPairs.size() && index < newChildPairs.size();
+       index++) {
+    const auto &oldChildPair = oldChildPairs[index];
+    const auto &newChildPair = newChildPairs[index];
+
+    if (oldChildPair.shadowView.tag != newChildPair.shadowView.tag) {
       // Totally different nodes, updating is impossible.
       break;
     }
 
-    if (*oldChildNode != *newChildNode) {
-      replaceInstructions.push_back(
-        TreeMutationInstruction::Replace(
-          parentNode,
-          oldChildNode,
-          newChildNode,
-          index
-        )
-      );
+    if (oldChildPair.shadowView != newChildPair.shadowView) {
+      updateMutations.push_back(ShadowViewMutation::UpdateMutation(
+          parentShadowView,
+          oldChildPair.shadowView,
+          newChildPair.shadowView,
+          index));
     }
 
-    calculateMutationInstructions(
-      *(newChildNode->getChildren()->size() ? &downwardInstructions : &destructionDownwardInstructions),
-      oldChildNode,
-      oldChildNode->getChildren(),
-      newChildNode->getChildren()
-    );
+    const auto oldGrandChildPairs =
+        sliceChildShadowNodeViewPairs(oldChildPair.shadowNode);
+    const auto newGrandChildPairs =
+        sliceChildShadowNodeViewPairs(newChildPair.shadowNode);
+    calculateShadowViewMutations(
+        *(newGrandChildPairs.size() ? &downwardMutations
+                                    : &destructiveDownwardMutations),
+        oldChildPair.shadowView,
+        oldGrandChildPairs,
+        newGrandChildPairs);
   }
 
   int lastIndexAfterFirstStage = index;
 
-  // Stage 2: Collectings Insertions
-  for (; index < newChildNodes->size(); index++) {
-    const auto &newChildNode = newChildNodes->at(index);
+  // Stage 2: Collecting `Insert` mutations
+  for (; index < newChildPairs.size(); index++) {
+    const auto &newChildPair = newChildPairs[index];
 
-    insertInstructions.push_back(
-      TreeMutationInstruction::Insert(
-        parentNode,
-        newChildNode,
-        index
-      )
-    );
+    insertMutations.push_back(ShadowViewMutation::InsertMutation(
+        parentShadowView, newChildPair.shadowView, index));
 
-    insertedNodes.insert({newChildNode->getTag(), newChildNode});
+    insertedPaires.insert({newChildPair.shadowView.tag, newChildPair});
   }
 
-  // Stage 3: Collectings Deletions and Removals
-  for (index = lastIndexAfterFirstStage; index < oldChildNodes->size(); index++) {
-    const auto &oldChildNode = oldChildNodes->at(index);
-
-    // Even if the old node was (re)inserted, we have to generate `remove`
-    // instruction.
-    removeInstructions.push_back(
-      TreeMutationInstruction::Remove(
-        parentNode,
-        oldChildNode,
-        index
-      )
-    );
-
-    const auto &it = insertedNodes.find(oldChildNode->getTag());
-
-    if (it == insertedNodes.end()) {
-      // The old node was *not* (re)inserted.
-      // We have to generate `delete` instruction and apply the algorithm
+  // Stage 3: Collecting `Delete` and `Remove` mutations
+  for (index = lastIndexAfterFirstStage; index < oldChildPairs.size();
+       index++) {
+    const auto &oldChildPair = oldChildPairs[index];
+
+    // Even if the old view was (re)inserted, we have to generate `remove`
+    // mutation.
+    removeMutations.push_back(ShadowViewMutation::RemoveMutation(
+        parentShadowView, oldChildPair.shadowView, index));
+
+    const auto &it = insertedPaires.find(oldChildPair.shadowView.tag);
+
+    if (it == insertedPaires.end()) {
+      // The old view was *not* (re)inserted.
+      // We have to generate `delete` mutation and apply the algorithm
       // recursively.
-      deleteInstructions.push_back(
-        TreeMutationInstruction::Delete(
-          oldChildNode
-        )
-      );
+      deleteMutations.push_back(
+          ShadowViewMutation::DeleteMutation(oldChildPair.shadowView));
 
       // We also have to call the algorithm recursively to clean up the entire
-      // subtree starting from the removed node.
-      calculateMutationInstructions(
-        destructionDownwardInstructions,
-        oldChildNode,
-        oldChildNode->getChildren(),
-        ShadowNode::emptySharedShadowNodeSharedList()
-      );
+      // subtree starting from the removed view.
+      calculateShadowViewMutations(
+          destructiveDownwardMutations,
+          oldChildPair.shadowView,
+          sliceChildShadowNodeViewPairs(oldChildPair.shadowNode),
+          {});
     } else {
-      // The old node *was* (re)inserted.
-      // We have to call the algorithm recursively if the inserted node
+      // The old view *was* (re)inserted.
+      // We have to call the algorithm recursively if the inserted view
       // is *not* the same as removed one.
-      const auto &newChildNode = it->second;
-      if (newChildNode != oldChildNode) {
-        calculateMutationInstructions(
-          *(newChildNode->getChildren()->size() ? &downwardInstructions : &destructionDownwardInstructions),
-          newChildNode,
-          oldChildNode->getChildren(),
-          newChildNode->getChildren()
-        );
+      const auto &newChildPair = it->second;
+      if (newChildPair.shadowView != oldChildPair.shadowView) {
+        const auto oldGrandChildPairs =
+            sliceChildShadowNodeViewPairs(oldChildPair.shadowNode);
+        const auto newGrandChildPairs =
+            sliceChildShadowNodeViewPairs(newChildPair.shadowNode);
+        calculateShadowViewMutations(
+            *(newGrandChildPairs.size() ? &downwardMutations
+                                        : &destructiveDownwardMutations),
+            newChildPair.shadowView,
+            oldGrandChildPairs,
+            newGrandChildPairs);
       }
 
-      // In any case we have to remove the node from `insertedNodes` as
-      // indication that the node was actually removed (which means that
-      // the node existed before), hence we don't have to generate
-      // `create` instruction.
-      insertedNodes.erase(it);
+      // In any case we have to remove the view from `insertedPaires` as
+      // indication that the view was actually removed (which means that
+      // the view existed before), hence we don't have to generate
+      // `create` mutation.
+      insertedPaires.erase(it);
     }
   }
 
-  // Stage 4: Collectings Creations
-  for (index = lastIndexAfterFirstStage; index < newChildNodes->size(); index++) {
-    const auto &newChildNode = newChildNodes->at(index);
+  // Stage 4: Collecting `Create` mutations
+  for (index = lastIndexAfterFirstStage; index < newChildPairs.size();
+       index++) {
+    const auto &newChildPair = newChildPairs[index];
 
-    if (insertedNodes.find(newChildNode->getTag()) == insertedNodes.end()) {
-      // The new node was (re)inserted, so there is no need to create it.
+    if (insertedPaires.find(newChildPair.shadowView.tag) ==
+        insertedPaires.end()) {
+      // The new view was (re)inserted, so there is no need to create it.
       continue;
     }
 
-    createInstructions.push_back(
-      TreeMutationInstruction::Create(
-        newChildNode
-      )
-    );
-
-    calculateMutationInstructions(
-      downwardInstructions,
-      newChildNode,
-      ShadowNode::emptySharedShadowNodeSharedList(),
-      newChildNode->getChildren()
-    );
+    createMutations.push_back(
+        ShadowViewMutation::CreateMutation(newChildPair.shadowView));
+
+    calculateShadowViewMutations(
+        downwardMutations,
+        newChildPair.shadowView,
+        {},
+        sliceChildShadowNodeViewPairs(newChildPair.shadowNode));
   }
 
-  // All instructions in an optimal order:
-  instructions.insert(instructions.end(), destructionDownwardInstructions.begin(), destructionDownwardInstructions.end());
-  instructions.insert(instructions.end(), replaceInstructions.begin(), replaceInstructions.end());
-  instructions.insert(instructions.end(), removeInstructions.rbegin(), removeInstructions.rend());
-  instructions.insert(instructions.end(), createInstructions.begin(), createInstructions.end());
-  instructions.insert(instructions.end(), downwardInstructions.begin(), downwardInstructions.end());
-  instructions.insert(instructions.end(), insertInstructions.begin(), insertInstructions.end());
-  instructions.insert(instructions.end(), deleteInstructions.begin(), deleteInstructions.end());
+  // All mutations in an optimal order:
+  mutations.insert(
+      mutations.end(),
+      destructiveDownwardMutations.begin(),
+      destructiveDownwardMutations.end());
+  mutations.insert(
+      mutations.end(), updateMutations.begin(), updateMutations.end());
+  mutations.insert(
+      mutations.end(), removeMutations.rbegin(), removeMutations.rend());
+  mutations.insert(
+      mutations.end(), deleteMutations.begin(), deleteMutations.end());
+  mutations.insert(
+      mutations.end(), createMutations.begin(), createMutations.end());
+  mutations.insert(
+      mutations.end(), insertMutations.begin(), insertMutations.end());
+  mutations.insert(
+      mutations.end(), downwardMutations.begin(), downwardMutations.end());
 }
 
-void calculateMutationInstructions(
-  TreeMutationInstructionList &instructions,
-  SharedShadowNode oldRootShadowNode,
-  SharedShadowNode newRootShadowNode
-) {
+ShadowViewMutationList calculateShadowViewMutations(
+    const ShadowNode &oldRootShadowNode,
+    const ShadowNode &newRootShadowNode) {
   // Root shadow nodes must have same tag.
-  assert(oldRootShadowNode->getTag() == newRootShadowNode->getTag());
-
-  if (*oldRootShadowNode != *newRootShadowNode) {
-    instructions.push_back(
-      TreeMutationInstruction::Replace(
-        nullptr,
-        oldRootShadowNode,
-        newRootShadowNode,
-        -1
-      )
-    );
+  assert(oldRootShadowNode.getTag() == newRootShadowNode.getTag());
+
+  ShadowViewMutationList mutations;
+
+  auto oldRootShadowView = ShadowView(oldRootShadowNode);
+  auto newRootShadowView = ShadowView(newRootShadowNode);
+
+  if (oldRootShadowView != newRootShadowView) {
+    mutations.push_back(ShadowViewMutation::UpdateMutation(
+        ShadowView(), oldRootShadowView, newRootShadowView, -1));
   }
 
-  calculateMutationInstructions(
-    instructions,
-    oldRootShadowNode,
-    oldRootShadowNode->getChildren(),
-    newRootShadowNode->getChildren()
-  );
+  calculateShadowViewMutations(
+      mutations,
+      ShadowView(oldRootShadowNode),
+      sliceChildShadowNodeViewPairs(oldRootShadowNode),
+      sliceChildShadowNodeViewPairs(newRootShadowNode));
+
+  return mutations;
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/uimanager/Differentiator.h b/ReactCommon/fabric/uimanager/Differentiator.h
index fe2caf5e913b3b..384b5570dc0c86 100644
--- a/ReactCommon/fabric/uimanager/Differentiator.h
+++ b/ReactCommon/fabric/uimanager/Differentiator.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -6,21 +6,19 @@
 #pragma once
 
 #include <fabric/core/ShadowNode.h>
-#include <fabric/uimanager/TreeMutationInstruction.h>
+#include <fabric/uimanager/ShadowViewMutation.h>
 
 namespace facebook {
 namespace react {
 
 /*
- * Calculates set of mutation instuctions which describe how the old
- * ShadowNode tree can be transformed to the new ShadowNode tree.
- * The set of instuctions might be and might not be optimal.
+ * Calculates a list of view mutations which describes how the old
+ * `ShadowTree` can be transformed to the new one.
+ * The list of mutations might be and might not be optimal.
  */
-void calculateMutationInstructions(
-  TreeMutationInstructionList &instructions,
-  SharedShadowNode oldNode,
-  SharedShadowNode newNode
-);
+ShadowViewMutationList calculateShadowViewMutations(
+    const ShadowNode &oldRootShadowNode,
+    const ShadowNode &newRootShadowNode);
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/uimanager/FabricUIManager.cpp b/ReactCommon/fabric/uimanager/FabricUIManager.cpp
index 23dd8f8c60bb81..73767281f81ddd 100644
--- a/ReactCommon/fabric/uimanager/FabricUIManager.cpp
+++ b/ReactCommon/fabric/uimanager/FabricUIManager.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,22 +9,21 @@
 
 #include <glog/logging.h>
 
-#include <fabric/core/componentDescriptor.h>
+#include <fabric/components/view/ViewComponentDescriptor.h>
+#include <fabric/components/view/ViewProps.h>
+#include <fabric/components/view/ViewShadowNode.h>
 #include <fabric/core/LayoutContext.h>
+#include <fabric/core/ShadowNodeFragment.h>
+#include <fabric/core/componentDescriptor.h>
 #include <fabric/debug/DebugStringConvertible.h>
 #include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/view/ViewComponentDescriptor.h>
-#include <fabric/view/ViewProps.h>
-#include <fabric/view/ViewShadowNode.h>
 
 namespace facebook {
 namespace react {
 
-// TODO: Kill this flag and remove debug logging.
-const bool isLoggingEnabled = false;
-
 static const RawProps rawPropsFromDynamic(const folly::dynamic object) {
-  // TODO: Convert this to something smarter, probably returning `std::iterator`.
+  // TODO: Convert this to something smarter, probably returning
+  // `std::iterator`.
   RawProps result;
 
   if (object.isNull()) {
@@ -41,54 +40,30 @@ static const RawProps rawPropsFromDynamic(const folly::dynamic object) {
   return result;
 }
 
-static const std::string componentNameByReactViewName(std::string viewName) {
-  // We need this function only for the transition period;
-  // eventually, all names will be unified.
-
-  std::string rctPrefix("RCT");
-  if (std::mismatch(rctPrefix.begin(), rctPrefix.end(), viewName.begin()).first == rctPrefix.end()) {
-    // If `viewName` has "RCT" prefix, remove it.
-    viewName.erase(0, rctPrefix.length());
-  }
-
-  // Fabric uses slightly new names for Text components because of differences
-  // in semantic.
-  if (viewName == "Text") {
-    return "Paragraph";
-  }
-  if (viewName == "VirtualText") {
-    return "Text";
-  }
-
-  if (viewName == "ImageView") {
-    return "Image";
-  }
+FabricUIManager::FabricUIManager(
+    std::unique_ptr<EventBeatBasedExecutor> executor,
+    std::function<UIManagerInstaller> installer,
+    std::function<UIManagerUninstaller> uninstaller)
+    : executor_(std::move(executor)),
+      installer_(std::move(installer)),
+      uninstaller_(std::move(uninstaller)) {
+  (*executor_)([this] { installer_(*this); });
+}
 
-  // We need this temporarly for testing purposes until we have proper
-  // implementation of core components.
-  if (
-    viewName == "SinglelineTextInputView" ||
-    viewName == "MultilineTextInputView" ||
-    viewName == "RefreshControl" ||
-    viewName == "SafeAreaView" ||
-    viewName == "ScrollContentView"
-  ) {
-    return "View";
-  }
+FabricUIManager::~FabricUIManager() {
+  // We move `executor_` and `uninstaller_` inside a lambda to extend their
+  // life-time until the lambda finishes.
+  auto executor = std::shared_ptr<EventBeatBasedExecutor>{std::move(executor_)};
+  auto uninstaller = std::move(uninstaller_);
 
-  return viewName;
+  (*executor)([uninstaller, executor]() { uninstaller(); });
 }
 
-FabricUIManager::FabricUIManager(SharedComponentDescriptorRegistry componentDescriptorRegistry) {
+void FabricUIManager::setComponentDescriptorRegistry(
+    const SharedComponentDescriptorRegistry &componentDescriptorRegistry) {
   componentDescriptorRegistry_ = componentDescriptorRegistry;
 }
 
-FabricUIManager::~FabricUIManager() {
-  if (eventHandler_) {
-    releaseEventHandlerFunction_(eventHandler_);
-  }
-}
-
 void FabricUIManager::setDelegate(UIManagerDelegate *delegate) {
   delegate_ = delegate;
 }
@@ -97,173 +72,153 @@ UIManagerDelegate *FabricUIManager::getDelegate() {
   return delegate_;
 }
 
-void FabricUIManager::setDispatchEventToEmptyTargetFunction(std::function<DispatchEventToEmptyTargetFunction> dispatchEventFunction) {
+void FabricUIManager::setDispatchEventToEmptyTargetFunction(
+    std::function<DispatchEventToEmptyTargetFunction> dispatchEventFunction) {
   dispatchEventToEmptyTargetFunction_ = dispatchEventFunction;
 }
 
-void FabricUIManager::setDispatchEventToTargetFunction(std::function<DispatchEventToTargetFunction> dispatchEventFunction) {
+void FabricUIManager::setDispatchEventToTargetFunction(
+    std::function<DispatchEventToTargetFunction> dispatchEventFunction) {
   dispatchEventToTargetFunction_ = dispatchEventFunction;
 }
 
-void FabricUIManager::setReleaseEventHandlerFunction(std::function<ReleaseEventHandlerFunction> releaseEventHandlerFunction) {
-  releaseEventHandlerFunction_ = releaseEventHandlerFunction;
+void FabricUIManager::setStartSurfaceFunction(
+    std::function<StartSurface> startSurfaceFunction) {
+  startSurfaceFunction_ = startSurfaceFunction;
 }
 
-void FabricUIManager::setReleaseEventTargetFunction(std::function<ReleaseEventTargetFunction> releaseEventTargetFunction) {
-  releaseEventTargetFunction_ = releaseEventTargetFunction;
+void FabricUIManager::setStopSurfaceFunction(
+    std::function<StopSurface> stopSurfaceFunction) {
+  stopSurfaceFunction_ = stopSurfaceFunction;
 }
 
-void FabricUIManager::dispatchEventToEmptyTarget(const std::string &type, const folly::dynamic &payload) const {
-  dispatchEventToEmptyTargetFunction_(
-    eventHandler_,
-    const_cast<std::string &>(type),
-    const_cast<folly::dynamic &>(payload)
-  );
+void FabricUIManager::dispatchEventToTarget(
+    const EventTarget *eventTarget,
+    const std::string &type,
+    const folly::dynamic &payload) const {
+  if (eventTarget) {
+    dispatchEventToTargetFunction_(
+        *eventHandler_,
+        *eventTarget,
+        const_cast<std::string &>(type),
+        const_cast<folly::dynamic &>(payload));
+  } else {
+    dispatchEventToEmptyTargetFunction_(
+        *eventHandler_,
+        const_cast<std::string &>(type),
+        const_cast<folly::dynamic &>(payload));
+  }
 }
 
-void FabricUIManager::dispatchEventToTarget(const EventTarget &eventTarget, const std::string &type, const folly::dynamic &payload) const {
-  dispatchEventToTargetFunction_(
-    eventHandler_,
-    eventTarget,
-    const_cast<std::string &>(type),
-    const_cast<folly::dynamic &>(payload)
-  );
+void FabricUIManager::startSurface(
+    SurfaceId surfaceId,
+    const std::string &moduleName,
+    const folly::dynamic &initialProps) const {
+  (*executor_)([this, surfaceId, moduleName, initialProps] {
+    startSurfaceFunction_(surfaceId, moduleName, initialProps);
+  });
 }
 
-void FabricUIManager::releaseEventTarget(const EventTarget &eventTarget) const {
-  releaseEventTargetFunction_(eventTarget);
+void FabricUIManager::stopSurface(SurfaceId surfaceId) const {
+  (*executor_)([this, surfaceId] { stopSurfaceFunction_(surfaceId); });
 }
 
-SharedShadowNode FabricUIManager::createNode(int tag, std::string viewName, int rootTag, folly::dynamic props, EventTarget eventTarget) {
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::createNode(tag: " << tag << ", name: " << viewName << ", rootTag: " << rootTag << ", props: " << props << ")";
-
-  ComponentName componentName = componentNameByReactViewName(viewName);
-  const SharedComponentDescriptor &componentDescriptor = (*componentDescriptorRegistry_)[componentName];
-  RawProps rawProps = rawPropsFromDynamic(props);
-
-  SharedShadowNode shadowNode =
-    componentDescriptor->createShadowNode(
-      tag,
-      rootTag,
-      componentDescriptor->createEventEmitter(eventTarget, tag),
-      componentDescriptor->cloneProps(nullptr, rawProps)
-    );
-
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::createNode() -> " << shadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false});
-
+SharedShadowNode FabricUIManager::createNode(int tag, std::string viewName, int rootTag, folly::dynamic props, SharedEventTarget eventTarget) const {
+  SharedShadowNode shadowNode = componentDescriptorRegistry_->createNode(tag, viewName, rootTag, props, eventTarget);
   if (delegate_) {
     delegate_->uiManagerDidCreateShadowNode(shadowNode);
   }
-
   return shadowNode;
 }
 
-SharedShadowNode FabricUIManager::cloneNode(const SharedShadowNode &shadowNode) {
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::cloneNode(shadowNode: " << shadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false}) << ")";
-  const SharedComponentDescriptor &componentDescriptor = (*componentDescriptorRegistry_)[shadowNode];
+SharedShadowNode FabricUIManager::cloneNode(
+    const SharedShadowNode &shadowNode) const {
+  const SharedComponentDescriptor &componentDescriptor =
+      (*componentDescriptorRegistry_)[shadowNode];
 
   SharedShadowNode clonedShadowNode =
-    componentDescriptor->cloneShadowNode(
-      shadowNode,
-      nullptr,
-      shadowNode->getEventEmitter(),
-      nullptr
-    );
-
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::cloneNode() -> " << clonedShadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false});
+      componentDescriptor->cloneShadowNode(*shadowNode, {});
+
   return clonedShadowNode;
 }
 
-SharedShadowNode FabricUIManager::cloneNodeWithNewChildren(const SharedShadowNode &shadowNode) {
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::cloneNodeWithNewChildren(shadowNode: " << shadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false}) << ")";
+SharedShadowNode FabricUIManager::cloneNodeWithNewChildren(
+    const SharedShadowNode &shadowNode) const {
   // Assuming semantic: Cloning with same props but empty children.
-  const SharedComponentDescriptor &componentDescriptor = (*componentDescriptorRegistry_)[shadowNode];
+  const SharedComponentDescriptor &componentDescriptor =
+      (*componentDescriptorRegistry_)[shadowNode];
+
+  SharedShadowNode clonedShadowNode = componentDescriptor->cloneShadowNode(
+      *shadowNode, {.children = ShadowNode::emptySharedShadowNodeSharedList()});
 
-  SharedShadowNode clonedShadowNode =
-    componentDescriptor->cloneShadowNode(
-      shadowNode,
-      nullptr,
-      shadowNode->getEventEmitter(),
-      ShadowNode::emptySharedShadowNodeSharedList()
-    );
-
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::cloneNodeWithNewChildren() -> " << clonedShadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false});
   return clonedShadowNode;
 }
 
-SharedShadowNode FabricUIManager::cloneNodeWithNewProps(const SharedShadowNode &shadowNode, folly::dynamic props) {
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::cloneNodeWithNewProps(shadowNode: " << shadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false}) << ", props: " << props << ")";
+SharedShadowNode FabricUIManager::cloneNodeWithNewProps(
+    const SharedShadowNode &shadowNode,
+    folly::dynamic props) const {
   // Assuming semantic: Cloning with same children and specified props.
-  const SharedComponentDescriptor &componentDescriptor = (*componentDescriptorRegistry_)[shadowNode];
+  const SharedComponentDescriptor &componentDescriptor =
+      (*componentDescriptorRegistry_)[shadowNode];
   RawProps rawProps = rawPropsFromDynamic(props);
 
-  SharedShadowNode clonedShadowNode =
-    componentDescriptor->cloneShadowNode(
-      shadowNode,
-      componentDescriptor->cloneProps(shadowNode->getProps(), rawProps),
-      shadowNode->getEventEmitter(),
-      nullptr
-    );
-
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::cloneNodeWithNewProps() -> " << clonedShadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false});
+  SharedShadowNode clonedShadowNode = componentDescriptor->cloneShadowNode(
+      *shadowNode,
+      {.props =
+           componentDescriptor->cloneProps(shadowNode->getProps(), rawProps)});
+
   return clonedShadowNode;
 }
 
-SharedShadowNode FabricUIManager::cloneNodeWithNewChildrenAndProps(const SharedShadowNode &shadowNode, folly::dynamic props) {
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::cloneNodeWithNewChildrenAndProps(shadowNode: " << shadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false}) << ", props: " << props << ")";
+SharedShadowNode FabricUIManager::cloneNodeWithNewChildrenAndProps(
+    const SharedShadowNode &shadowNode,
+    folly::dynamic props) const {
   // Assuming semantic: Cloning with empty children and specified props.
-  const SharedComponentDescriptor &componentDescriptor = (*componentDescriptorRegistry_)[shadowNode];
+  const SharedComponentDescriptor &componentDescriptor =
+      (*componentDescriptorRegistry_)[shadowNode];
   RawProps rawProps = rawPropsFromDynamic(props);
 
-  SharedShadowNode clonedShadowNode =
-    componentDescriptor->cloneShadowNode(
-      shadowNode,
-      componentDescriptor->cloneProps(shadowNode->getProps(), rawProps),
-      shadowNode->getEventEmitter(),
-      ShadowNode::emptySharedShadowNodeSharedList()
-    );
-
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::cloneNodeWithNewChildrenAndProps() -> " << clonedShadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false});
+  SharedShadowNode clonedShadowNode = componentDescriptor->cloneShadowNode(
+      *shadowNode,
+      {.props =
+           componentDescriptor->cloneProps(shadowNode->getProps(), rawProps),
+       .children = ShadowNode::emptySharedShadowNodeSharedList()});
+
   return clonedShadowNode;
 }
 
-void FabricUIManager::appendChild(const SharedShadowNode &parentShadowNode, const SharedShadowNode &childShadowNode) {
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::appendChild(parentShadowNode: " << parentShadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false}) << ", childShadowNode: " << childShadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false}) << ")";
-  const SharedComponentDescriptor &componentDescriptor = (*componentDescriptorRegistry_)[parentShadowNode];
-
-  // TODO: Remove this after we move this to JS side.
-  if (childShadowNode->getSealed()) {
-    auto childComponentDescriptor = (*componentDescriptorRegistry_)[childShadowNode];
-    auto clonedChildShadowNode = childComponentDescriptor->cloneShadowNode(childShadowNode);
-    auto nonConstClonedChildShadowNode = std::const_pointer_cast<ShadowNode>(clonedChildShadowNode);
-    componentDescriptor->appendChild(parentShadowNode, clonedChildShadowNode);
-    return;
-  }
-
+void FabricUIManager::appendChild(
+    const SharedShadowNode &parentShadowNode,
+    const SharedShadowNode &childShadowNode) const {
+  const SharedComponentDescriptor &componentDescriptor =
+      (*componentDescriptorRegistry_)[parentShadowNode];
   componentDescriptor->appendChild(parentShadowNode, childShadowNode);
 }
 
-SharedShadowNodeUnsharedList FabricUIManager::createChildSet(int rootTag) {
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::createChildSet(rootTag: " << rootTag << ")";
+SharedShadowNodeUnsharedList FabricUIManager::createChildSet(
+    int rootTag) const {
   return std::make_shared<SharedShadowNodeList>(SharedShadowNodeList({}));
 }
 
-void FabricUIManager::appendChildToSet(const SharedShadowNodeUnsharedList &shadowNodeList, const SharedShadowNode &shadowNode) {
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::appendChildToSet(shadowNodeList: " << shadowNodeList << ", shadowNode: " << shadowNode->getDebugDescription(DebugStringConvertibleOptions {.format = false}) << ")";
+void FabricUIManager::appendChildToSet(
+    const SharedShadowNodeUnsharedList &shadowNodeList,
+    const SharedShadowNode &shadowNode) const {
   shadowNodeList->push_back(shadowNode);
 }
 
-void FabricUIManager::completeRoot(int rootTag, const SharedShadowNodeUnsharedList &children) {
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::completeRoot(rootTag: " << rootTag << ", shadowNodeList: " << children << ")";
-
+void FabricUIManager::completeRoot(
+    int rootTag,
+    const SharedShadowNodeUnsharedList &children) const {
   if (delegate_) {
     delegate_->uiManagerDidFinishTransaction(rootTag, children);
   }
 }
 
-void FabricUIManager::registerEventHandler(const EventHandler &eventHandler) {
-  isLoggingEnabled && LOG(INFO) << "FabricUIManager::registerEventHandler(eventHandler: " << eventHandler << ")";
-  eventHandler_ = eventHandler;
+void FabricUIManager::registerEventHandler(
+    UniqueEventHandler eventHandler) const {
+  // Technically, it should be protected by a mutex but regularly it should
+  // be safe because it used only during initialization process.
+  eventHandler_ = std::move(eventHandler);
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/uimanager/FabricUIManager.h b/ReactCommon/fabric/uimanager/FabricUIManager.h
index e33501e3197a6e..000119968498ec 100644
--- a/ReactCommon/fabric/uimanager/FabricUIManager.h
+++ b/ReactCommon/fabric/uimanager/FabricUIManager.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,24 +12,51 @@
 #include <folly/dynamic.h>
 
 #include <fabric/core/ShadowNode.h>
+#include <fabric/events/EventBeatBasedExecutor.h>
 #include <fabric/uimanager/ComponentDescriptorRegistry.h>
 #include <fabric/uimanager/UIManagerDelegate.h>
 
 namespace facebook {
 namespace react {
 
-using DispatchEventToEmptyTargetFunction = void (EventHandler eventHandler, std::string type, folly::dynamic payload);
-using DispatchEventToTargetFunction = void (EventHandler eventHandler, EventTarget eventTarget, std::string type, folly::dynamic payload);
-using ReleaseEventHandlerFunction = void (EventHandler eventHandler);
-using ReleaseEventTargetFunction = void (EventTarget eventTarget);
+class FabricUIManager;
+using UIManager = FabricUIManager;
+
+/*
+ * Particular implementations of those functions should capture references to
+ * the runtime and ensure proper threading.
+ */
+using UIManagerInstaller = void(UIManager &uiManager);
+using UIManagerUninstaller = void();
+
+using DispatchEventToEmptyTargetFunction = void(
+    const EventHandler &eventHandler,
+    const std::string &type,
+    const folly::dynamic &payload);
+using DispatchEventToTargetFunction = void(
+    const EventHandler &eventHandler,
+    const EventTarget &eventTarget,
+    const std::string &type,
+    const folly::dynamic &payload);
+
+using StartSurface = void(
+    SurfaceId surfaceId,
+    const std::string &moduleName,
+    const folly::dynamic &initalProps);
+using StopSurface = void(SurfaceId surfaceId);
 
 class FabricUIManager {
-public:
+ public:
+  FabricUIManager(
+      std::unique_ptr<EventBeatBasedExecutor> executor,
+      std::function<UIManagerInstaller> installer,
+      std::function<UIManagerUninstaller> uninstaller);
+  ~FabricUIManager();
 
 #pragma mark - Native-facing Interface
 
-  FabricUIManager(SharedComponentDescriptorRegistry componentDescriptorRegistry);
-  ~FabricUIManager();
+  void setComponentDescriptorRegistry(
+      const SharedComponentDescriptorRegistry &componentDescriptorRegistry);
 
   /*
    * Sets and gets the UIManager's delegate.
@@ -44,39 +71,72 @@ class FabricUIManager {
   /*
    * Registers callback functions.
    */
-  void setDispatchEventToEmptyTargetFunction(std::function<DispatchEventToEmptyTargetFunction> dispatchEventFunction);
-  void setDispatchEventToTargetFunction(std::function<DispatchEventToTargetFunction> dispatchEventFunction);
-  void setReleaseEventHandlerFunction(std::function<ReleaseEventHandlerFunction> releaseEventHandlerFunction);
-  void setReleaseEventTargetFunction(std::function<ReleaseEventTargetFunction> releaseEventTargetFunction);
+  void setDispatchEventToEmptyTargetFunction(
+      std::function<DispatchEventToEmptyTargetFunction> dispatchEventFunction);
+  void setDispatchEventToTargetFunction(
+      std::function<DispatchEventToTargetFunction> dispatchEventFunction);
+  void setStartSurfaceFunction(std::function<StartSurface>);
+  void setStopSurfaceFunction(std::function<StopSurface>);
 
 #pragma mark - Native-facing Interface
 
-  void dispatchEventToEmptyTarget(const std::string &type, const folly::dynamic &payload) const;
-  void dispatchEventToTarget(const EventTarget &eventTarget, const std::string &type, const folly::dynamic &payload) const;
-  void releaseEventTarget(const EventTarget &eventTarget) const;
+  void dispatchEventToTarget(
+      const EventTarget *eventTarget,
+      const std::string &type,
+      const folly::dynamic &payload) const;
+  void startSurface(
+      SurfaceId surfaceId,
+      const std::string &moduleName,
+      const folly::dynamic &initialProps) const;
+  void stopSurface(SurfaceId surfaceId) const;
 
 #pragma mark - JavaScript/React-facing Interface
 
-  SharedShadowNode createNode(Tag reactTag, std::string viewName, Tag rootTag, folly::dynamic props, EventTarget eventTarget);
-  SharedShadowNode cloneNode(const SharedShadowNode &node);
-  SharedShadowNode cloneNodeWithNewChildren(const SharedShadowNode &node);
-  SharedShadowNode cloneNodeWithNewProps(const SharedShadowNode &node, folly::dynamic props);
-  SharedShadowNode cloneNodeWithNewChildrenAndProps(const SharedShadowNode &node, folly::dynamic newProps);
-  void appendChild(const SharedShadowNode &parentNode, const SharedShadowNode &childNode);
-  SharedShadowNodeUnsharedList createChildSet(Tag rootTag);
-  void appendChildToSet(const SharedShadowNodeUnsharedList &childSet, const SharedShadowNode &childNode);
-  void completeRoot(Tag rootTag, const SharedShadowNodeUnsharedList &childSet);
-  void registerEventHandler(const EventHandler &eventHandler);
-
-private:
-
+  /*
+   * All those JavaScript-facing methods call be called from any thread.
+   * `UIManager` guarantees its own thread-safety, but it does *not* guarantee
+   * thread-safety of `ShadowNode`s that it operates on. The caller should
+   * enforce logical correctness and thread-safety of the unsealed
+   * `ShadowNode`s.
+   */
+  SharedShadowNode createNode(
+      Tag reactTag,
+      std::string viewName,
+      Tag rootTag,
+      folly::dynamic props,
+      SharedEventTarget eventTarget) const;
+  SharedShadowNode cloneNode(const SharedShadowNode &node) const;
+  SharedShadowNode cloneNodeWithNewChildren(const SharedShadowNode &node) const;
+  SharedShadowNode cloneNodeWithNewProps(
+      const SharedShadowNode &node,
+      folly::dynamic props) const;
+  SharedShadowNode cloneNodeWithNewChildrenAndProps(
+      const SharedShadowNode &node,
+      folly::dynamic newProps) const;
+  void appendChild(
+      const SharedShadowNode &parentNode,
+      const SharedShadowNode &childNode) const;
+  SharedShadowNodeUnsharedList createChildSet(Tag rootTag) const;
+  void appendChildToSet(
+      const SharedShadowNodeUnsharedList &childSet,
+      const SharedShadowNode &childNode) const;
+  void completeRoot(Tag rootTag, const SharedShadowNodeUnsharedList &childSet)
+      const;
+  void registerEventHandler(UniqueEventHandler eventHandler) const;
+
+ private:
   SharedComponentDescriptorRegistry componentDescriptorRegistry_;
   UIManagerDelegate *delegate_;
-  EventHandler eventHandler_;
-  std::function<DispatchEventToEmptyTargetFunction> dispatchEventToEmptyTargetFunction_;
+  mutable UniqueEventHandler eventHandler_;
+  std::function<DispatchEventToEmptyTargetFunction>
+      dispatchEventToEmptyTargetFunction_;
   std::function<DispatchEventToTargetFunction> dispatchEventToTargetFunction_;
-  std::function<ReleaseEventHandlerFunction> releaseEventHandlerFunction_;
-  std::function<ReleaseEventTargetFunction> releaseEventTargetFunction_;
+  std::function<StartSurface> startSurfaceFunction_;
+  std::function<StopSurface> stopSurfaceFunction_;
+
+  std::unique_ptr<EventBeatBasedExecutor> executor_;
+  std::function<UIManagerInstaller> installer_;
+  std::function<UIManagerUninstaller> uninstaller_;
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/uimanager/Scheduler.cpp b/ReactCommon/fabric/uimanager/Scheduler.cpp
index c7e3f51100a356..6867e3f889d627 100644
--- a/ReactCommon/fabric/uimanager/Scheduler.cpp
+++ b/ReactCommon/fabric/uimanager/Scheduler.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -6,15 +6,9 @@
 #include "Scheduler.h"
 
 #include <fabric/core/LayoutContext.h>
-#include <fabric/scrollview/ScrollViewComponentDescriptor.h>
-#include <fabric/text/ParagraphComponentDescriptor.h>
-#include <fabric/text/RawTextComponentDescriptor.h>
-#include <fabric/text/TextComponentDescriptor.h>
 #include <fabric/uimanager/ComponentDescriptorRegistry.h>
 #include <fabric/uimanager/FabricUIManager.h>
-#include <fabric/view/ViewComponentDescriptor.h>
-#include <fabric/view/ViewProps.h>
-#include <fabric/view/ViewShadowNode.h>
+#include <fabric/uimanager/TemplateRenderer.h>
 
 #include "ComponentDescriptorFactory.h"
 #include "Differentiator.h"
@@ -22,47 +16,119 @@
 namespace facebook {
 namespace react {
 
-Scheduler::Scheduler(const SharedContextContainer &contextContainer):
-  contextContainer_(contextContainer) {
-  const auto &eventDispatcher = std::make_shared<SchedulerEventDispatcher>();
-  const auto &componentDescriptorRegistry = ComponentDescriptorFactory::buildRegistry(eventDispatcher, contextContainer);
+Scheduler::Scheduler(const SharedContextContainer &contextContainer)
+    : contextContainer_(contextContainer) {
+  const auto asynchronousEventBeatFactory =
+      contextContainer->getInstance<EventBeatFactory>("asynchronous");
+  const auto synchronousEventBeatFactory =
+      contextContainer->getInstance<EventBeatFactory>("synchronous");
+
+  uiManager_ = std::make_shared<FabricUIManager>(
+      std::make_unique<EventBeatBasedExecutor>(asynchronousEventBeatFactory()),
+      contextContainer->getInstance<std::function<UIManagerInstaller>>(
+          "uimanager-installer"),
+      contextContainer->getInstance<std::function<UIManagerUninstaller>>(
+          "uimanager-uninstaller"));
+
+  auto eventDispatcher = std::make_shared<EventDispatcher>(
+      std::bind(
+          &FabricUIManager::dispatchEventToTarget,
+          uiManager_.get(),
+          std::placeholders::_1,
+          std::placeholders::_2,
+          std::placeholders::_3),
+      synchronousEventBeatFactory,
+      asynchronousEventBeatFactory);
+
+  componentDescriptorRegistry_ = ComponentDescriptorFactory::buildRegistry(
+    eventDispatcher, contextContainer);
+  uiManager_->setComponentDescriptorRegistry(
+    componentDescriptorRegistry_
+  );
 
-  uiManager_ = std::make_shared<FabricUIManager>(componentDescriptorRegistry);
   uiManager_->setDelegate(this);
-
-  eventDispatcher->setUIManager(uiManager_);
-  eventDispatcher_ = eventDispatcher;
 }
 
 Scheduler::~Scheduler() {
   uiManager_->setDelegate(nullptr);
-  eventDispatcher_->setUIManager(nullptr);
 }
 
-void Scheduler::registerRootTag(Tag rootTag) {
-  const auto &shadowTree = std::make_shared<ShadowTree>(rootTag);
+void Scheduler::startSurface(
+    SurfaceId surfaceId,
+    const std::string &moduleName,
+    const folly::dynamic &initialProps,
+    const LayoutConstraints &layoutConstraints,
+    const LayoutContext &layoutContext) {
+  std::lock_guard<std::mutex> lock(mutex_);
+
+  auto shadowTree =
+      std::make_unique<ShadowTree>(surfaceId, layoutConstraints, layoutContext);
   shadowTree->setDelegate(this);
-  shadowTreeRegistry_.insert({rootTag, shadowTree});
+  shadowTreeRegistry_.emplace(surfaceId, std::move(shadowTree));
+
+#ifndef ANDROID
+
+  // TODO: Is this an ok place to do this?
+  auto serializedCommands = initialProps.find("serializedCommands");
+  if (serializedCommands != initialProps.items().end()) {
+    auto tree = TemplateRenderer::buildShadowTree(serializedCommands->second.asString(), surfaceId, folly::dynamic::object(), *componentDescriptorRegistry_);
+
+    uiManagerDidFinishTransactionWithoutLock(surfaceId, std::make_shared<SharedShadowNodeList>(SharedShadowNodeList {tree}));
+    // TODO: hydrate rather than replace
+    uiManager_->startSurface(surfaceId, moduleName, initialProps);
+  } else {
+    uiManager_->startSurface(surfaceId, moduleName, initialProps);
+  }
+#endif
 }
 
-void Scheduler::unregisterRootTag(Tag rootTag) {
-  const auto &iterator = shadowTreeRegistry_.find(rootTag);
+void Scheduler::stopSurface(SurfaceId surfaceId) const {
+  std::lock_guard<std::mutex> lock(mutex_);
+
+#ifndef ANDROID
+  uiManager_->stopSurface(surfaceId);
+#endif
+
+  const auto &iterator = shadowTreeRegistry_.find(surfaceId);
   const auto &shadowTree = iterator->second;
   assert(shadowTree);
+  // As part of stopping the Surface, we have to commit an empty tree.
+  shadowTree->complete(std::const_pointer_cast<SharedShadowNodeList>(
+      ShadowNode::emptySharedShadowNodeSharedList()));
   shadowTree->setDelegate(nullptr);
   shadowTreeRegistry_.erase(iterator);
 }
 
-Size Scheduler::measure(const Tag &rootTag, const LayoutConstraints &layoutConstraints, const LayoutContext &layoutContext) const {
-  const auto &shadowTree = shadowTreeRegistry_.at(rootTag);
+Size Scheduler::measureSurface(
+    SurfaceId surfaceId,
+    const LayoutConstraints &layoutConstraints,
+    const LayoutContext &layoutContext) const {
+  std::lock_guard<std::mutex> lock(mutex_);
+  const auto &shadowTree = shadowTreeRegistry_.at(surfaceId);
   assert(shadowTree);
   return shadowTree->measure(layoutConstraints, layoutContext);
 }
 
-void Scheduler::constraintLayout(const Tag &rootTag, const LayoutConstraints &layoutConstraints, const LayoutContext &layoutContext) {
-  const auto &shadowTree = shadowTreeRegistry_.at(rootTag);
+void Scheduler::constraintSurfaceLayout(
+    SurfaceId surfaceId,
+    const LayoutConstraints &layoutConstraints,
+    const LayoutContext &layoutContext) const {
+  std::lock_guard<std::mutex> lock(mutex_);
+  const auto &shadowTree = shadowTreeRegistry_.at(surfaceId);
   assert(shadowTree);
-  return shadowTree->constraintLayout(layoutConstraints, layoutContext);
+  shadowTree->synchronize([&]() {
+    shadowTree->constraintLayout(layoutConstraints, layoutContext);
+  });
+}
+
+void Scheduler::uiManagerDidFinishTransactionWithoutLock(Tag rootTag, const SharedShadowNodeUnsharedList &rootChildNodes) {
+  const auto iterator = shadowTreeRegistry_.find(rootTag);
+  if (iterator == shadowTreeRegistry_.end()) {
+    // This might happen during surface unmounting/deallocation process
+    // due to the asynchronous nature of JS calls.
+    return;
+  }
+  iterator->second->complete(rootChildNodes);
 }
 
 #pragma mark - Delegate
@@ -77,24 +143,29 @@ SchedulerDelegate *Scheduler::getDelegate() const {
 
 #pragma mark - ShadowTreeDelegate
 
-void Scheduler::shadowTreeDidCommit(const SharedShadowTree &shadowTree, const TreeMutationInstructionList &instructions) {
+void Scheduler::shadowTreeDidCommit(
+    const ShadowTree &shadowTree,
+    const ShadowViewMutationList &mutations) const {
   if (delegate_) {
-    delegate_->schedulerDidComputeMutationInstructions(shadowTree->getRootTag(), instructions);
+    delegate_->schedulerDidFinishTransaction(
+        shadowTree.getSurfaceId(), mutations);
   }
 }
 
 #pragma mark - UIManagerDelegate
 
-void Scheduler::uiManagerDidFinishTransaction(Tag rootTag, const SharedShadowNodeUnsharedList &rootChildNodes) {
-  const auto &iterator = shadowTreeRegistry_.find(rootTag);
-  const auto &shadowTree = iterator->second;
-  assert(shadowTree);
-  return shadowTree->complete(rootChildNodes);
+void Scheduler::uiManagerDidFinishTransaction(
+    Tag rootTag,
+    const SharedShadowNodeUnsharedList &rootChildNodes) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  uiManagerDidFinishTransactionWithoutLock(rootTag, rootChildNodes);
 }
 
-void Scheduler::uiManagerDidCreateShadowNode(const SharedShadowNode &shadowNode) {
+void Scheduler::uiManagerDidCreateShadowNode(
+    const SharedShadowNode &shadowNode) {
   if (delegate_) {
-    delegate_->schedulerDidRequestPreliminaryViewAllocation(shadowNode->getComponentName());
+    delegate_->schedulerDidRequestPreliminaryViewAllocation(
+        shadowNode->getComponentName());
   }
 }
 
diff --git a/ReactCommon/fabric/uimanager/Scheduler.h b/ReactCommon/fabric/uimanager/Scheduler.h
index 036d3cef48653a..681b20f49f0123 100644
--- a/ReactCommon/fabric/uimanager/Scheduler.h
+++ b/ReactCommon/fabric/uimanager/Scheduler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -6,17 +6,16 @@
 #pragma once
 
 #include <memory>
+#include <mutex>
 
 #include <fabric/core/ComponentDescriptor.h>
 #include <fabric/core/LayoutConstraints.h>
+#include <fabric/uimanager/ComponentDescriptorRegistry.h>
 #include <fabric/uimanager/ContextContainer.h>
 #include <fabric/uimanager/SchedulerDelegate.h>
-#include <fabric/uimanager/SchedulerEventDispatcher.h>
-#include <fabric/uimanager/UIManagerDelegate.h>
 #include <fabric/uimanager/ShadowTree.h>
 #include <fabric/uimanager/ShadowTreeDelegate.h>
-#include <fabric/view/ViewShadowNode.h>
-#include <fabric/view/RootShadowNode.h>
+#include <fabric/uimanager/UIManagerDelegate.h>
 
 namespace facebook {
 namespace react {
@@ -26,22 +25,38 @@ class FabricUIManager;
 /*
  * Scheduler coordinates Shadow Tree updates and event flows.
  */
-class Scheduler final:
-  public UIManagerDelegate,
-  public ShadowTreeDelegate {
-
-public:
-
+class Scheduler final : public UIManagerDelegate, public ShadowTreeDelegate {
+ public:
   Scheduler(const SharedContextContainer &contextContainer);
   ~Scheduler();
 
-#pragma mark - Shadow Tree Management
+#pragma mark - Surface Management
+
+  void startSurface(
+      SurfaceId surfaceId,
+      const std::string &moduleName,
+      const folly::dynamic &initialProps,
+      const LayoutConstraints &layoutConstraints = {},
+      const LayoutContext &layoutContext = {});
 
-  void registerRootTag(Tag rootTag);
-  void unregisterRootTag(Tag rootTag);
+  void stopSurface(SurfaceId surfaceId) const;
 
-  Size measure(const Tag &rootTag, const LayoutConstraints &layoutConstraints, const LayoutContext &layoutContext) const;
-  void constraintLayout(const Tag &rootTag, const LayoutConstraints &layoutConstraints, const LayoutContext &layoutContext);
+  Size measureSurface(
+      SurfaceId surfaceId,
+      const LayoutConstraints &layoutConstraints,
+      const LayoutContext &layoutContext) const;
+
+  /*
+   * Applies given `layoutConstraints` and `layoutContext` to a Surface.
+   * The user interface will be relaid out as a result. The operation will be
+   * performed synchronously (including mounting) if the method is called
+   * on the main thread.
+   * Can be called from any thread.
+   */
+  void constraintSurfaceLayout(
+      SurfaceId surfaceId,
+      const LayoutConstraints &layoutConstraints,
+      const LayoutContext &layoutContext) const;
 
 #pragma mark - Delegate
 
@@ -55,12 +70,17 @@ class Scheduler final:
 
 #pragma mark - UIManagerDelegate
 
-  void uiManagerDidFinishTransaction(Tag rootTag, const SharedShadowNodeUnsharedList &rootChildNodes) override;
-  void uiManagerDidCreateShadowNode(const SharedShadowNode &shadowNode) override;
+  void uiManagerDidFinishTransaction(
+      Tag rootTag,
+      const SharedShadowNodeUnsharedList &rootChildNodes) override;
+  void uiManagerDidCreateShadowNode(
+      const SharedShadowNode &shadowNode) override;
 
 #pragma mark - ShadowTreeDelegate
 
-  void shadowTreeDidCommit(const SharedShadowTree &shadowTree, const TreeMutationInstructionList &instructions) override;
+  void shadowTreeDidCommit(
+      const ShadowTree &shadowTree,
+      const ShadowViewMutationList &mutations) const override;
 
 #pragma mark - Deprecated
 
@@ -69,13 +89,18 @@ class Scheduler final:
    */
   std::shared_ptr<FabricUIManager> getUIManager_DO_NOT_USE();
 
-private:
-
+ private:
   SchedulerDelegate *delegate_;
   std::shared_ptr<FabricUIManager> uiManager_;
-  std::unordered_map<Tag, SharedShadowTree> shadowTreeRegistry_;
-  SharedSchedulerEventDispatcher eventDispatcher_;
+  SharedComponentDescriptorRegistry componentDescriptorRegistry_;
+  mutable std::mutex mutex_;
+  mutable std::unordered_map<SurfaceId, std::unique_ptr<ShadowTree>>
+      shadowTreeRegistry_; // Protected by `mutex_`.
+  SharedEventDispatcher eventDispatcher_;
   SharedContextContainer contextContainer_;
+
+  void uiManagerDidFinishTransactionWithoutLock(Tag rootTag, const SharedShadowNodeUnsharedList &rootChildNodes);
+
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/uimanager/SchedulerDelegate.h b/ReactCommon/fabric/uimanager/SchedulerDelegate.h
index a6e98dae6cb4b6..2a50c29061b1f1 100644
--- a/ReactCommon/fabric/uimanager/SchedulerDelegate.h
+++ b/ReactCommon/fabric/uimanager/SchedulerDelegate.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -9,7 +9,7 @@
 
 #include <fabric/core/ReactPrimitives.h>
 #include <fabric/core/ShadowNode.h>
-#include <fabric/uimanager/TreeMutationInstruction.h>
+#include <fabric/uimanager/ShadowViewMutation.h>
 
 namespace facebook {
 namespace react {
@@ -18,21 +18,23 @@ namespace react {
  * Abstract class for Scheduler's delegate.
  */
 class SchedulerDelegate {
-public:
-
-  virtual ~SchedulerDelegate() = default;
-
+ public:
   /*
    * Called right after Scheduler computed (and laid out) a new updated version
-   * of the tree and calculated a set of mutation instructions which are
-   * suffisient to construct a new one.
+   * of the tree and calculated a set of mutations which are suffisient
+   * to construct a new one.
    */
-  virtual void schedulerDidComputeMutationInstructions(Tag rootTag, const TreeMutationInstructionList &instructions) = 0;
+  virtual void schedulerDidFinishTransaction(
+      Tag rootTag,
+      const ShadowViewMutationList &mutations) = 0;
 
   /*
    * Called right after a new ShadowNode was created.
    */
-  virtual void schedulerDidRequestPreliminaryViewAllocation(ComponentName componentName) = 0;
+  virtual void schedulerDidRequestPreliminaryViewAllocation(
+      ComponentName componentName) = 0;
+
+  virtual ~SchedulerDelegate() noexcept = default;
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/uimanager/SchedulerEventDispatcher.cpp b/ReactCommon/fabric/uimanager/SchedulerEventDispatcher.cpp
deleted file mode 100644
index f261499326ba83..00000000000000
--- a/ReactCommon/fabric/uimanager/SchedulerEventDispatcher.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "SchedulerEventDispatcher.h"
-
-namespace facebook {
-namespace react {
-
-// TODO(T29874519): Get rid of "top" prefix once and for all.
-/*
- * Capitalizes the first letter of the event type and adds "top" prefix
- * (e.g. "layout" becames "topLayout").
- */
-static std::string normalizeEventType(const std::string &type) {
-  std::string prefixedType = type;
-  prefixedType[0] = toupper(prefixedType[0]);
-  prefixedType.insert(0, "top");
-  return prefixedType;
-}
-
-void SchedulerEventDispatcher::setUIManager(std::shared_ptr<const FabricUIManager> uiManager) const {
-  uiManager_ = uiManager;
-}
-
-void SchedulerEventDispatcher::dispatchEvent(
-  const EventTarget &eventTarget,
-  const std::string &type,
-  const folly::dynamic &payload,
-  const EventPriority &priority
-) const {
-  if (!uiManager_) {
-    return;
-  }
-  // TODO: Schedule the event based on priority.
-  uiManager_->dispatchEventToTarget(eventTarget, normalizeEventType(type), payload);
-}
-
-void SchedulerEventDispatcher::releaseEventTarget(const EventTarget &eventTarget) const {
-  if (!uiManager_) {
-    return;
-  }
-  // TODO(shergin): This needs to move to the destructor of EventEmitter. For now we'll leak.
-  // uiManager_->releaseEventTarget(eventTarget);
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/uimanager/SchedulerEventDispatcher.h b/ReactCommon/fabric/uimanager/SchedulerEventDispatcher.h
deleted file mode 100644
index e89735ad9981ce..00000000000000
--- a/ReactCommon/fabric/uimanager/SchedulerEventDispatcher.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <fabric/core/EventDispatcher.h>
-#include <fabric/core/EventPrimitives.h>
-#include <fabric/uimanager/FabricUIManager.h>
-#include <folly/dynamic.h>
-
-namespace facebook {
-namespace react {
-
-class SchedulerEventDispatcher;
-
-using SharedSchedulerEventDispatcher = std::shared_ptr<const SchedulerEventDispatcher>;
-
-/*
- * Concrete EventDispatcher.
- */
-class SchedulerEventDispatcher final:
-  public EventDispatcher {
-
-public:
-
-  void setUIManager(std::shared_ptr<const FabricUIManager> uiManager) const;
-
-#pragma mark - EventDispatcher
-
-  void dispatchEvent(
-    const EventTarget &eventTarget,
-    const std::string &type,
-    const folly::dynamic &payload,
-    const EventPriority &priority
-  ) const override;
-
-
-  void releaseEventTarget(const EventTarget &eventTarget) const override;
-
-private:
-
-  // TODO: consider using std::weak_ptr<> instead for better memory management.
-  mutable std::shared_ptr<const FabricUIManager> uiManager_;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/uimanager/ShadowTree.cpp b/ReactCommon/fabric/uimanager/ShadowTree.cpp
index 5dd54ecfa933f7..4207206a73922e 100644
--- a/ReactCommon/fabric/uimanager/ShadowTree.cpp
+++ b/ReactCommon/fabric/uimanager/ShadowTree.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -8,150 +8,198 @@
 #include <fabric/core/LayoutContext.h>
 #include <fabric/core/LayoutPrimitives.h>
 
-#include "ShadowTreeDelegate.h"
 #include "Differentiator.h"
-#include "TreeMutationInstruction.h"
+#include "ShadowTreeDelegate.h"
+#include "ShadowViewMutation.h"
 
 namespace facebook {
 namespace react {
 
-ShadowTree::ShadowTree(Tag rootTag):
-  rootTag_(rootTag) {
+ShadowTree::ShadowTree(
+    SurfaceId surfaceId,
+    const LayoutConstraints &layoutConstraints,
+    const LayoutContext &layoutContext)
+    : surfaceId_(surfaceId) {
+  const auto noopEventEmitter = std::make_shared<const ViewEventEmitter>(
+      nullptr, -1, std::shared_ptr<const EventDispatcher>());
+
+  const auto props = std::make_shared<const RootProps>(
+      *RootShadowNode::defaultSharedProps(), layoutConstraints, layoutContext);
 
-  const auto &noopEventEmitter = std::make_shared<const ViewEventEmitter>(nullptr, rootTag, nullptr);
   rootShadowNode_ = std::make_shared<RootShadowNode>(
-    rootTag,
-    rootTag,
-    RootShadowNode::defaultSharedProps(),
-    noopEventEmitter,
-    ShadowNode::emptySharedShadowNodeSharedList(),
-    nullptr
-  );
+      ShadowNodeFragment{
+          .tag = surfaceId,
+          .rootTag = surfaceId,
+          .props = props,
+          .eventEmitter = noopEventEmitter,
+      },
+      nullptr);
+}
+
+ShadowTree::~ShadowTree() {
+  complete(std::make_shared<SharedShadowNodeList>(SharedShadowNodeList{}));
+}
+
+Tag ShadowTree::getSurfaceId() const {
+  return surfaceId_;
+}
+
+SharedRootShadowNode ShadowTree::getRootShadowNode() const {
+  std::lock_guard<std::recursive_mutex> lock(commitMutex_);
+  return rootShadowNode_;
 }
 
-Tag ShadowTree::getRootTag() const {
-  return rootTag_;
+void ShadowTree::synchronize(std::function<void(void)> function) const {
+  std::lock_guard<std::recursive_mutex> lock(commitMutex_);
+  function();
 }
 
 #pragma mark - Layout
 
-Size ShadowTree::measure(const LayoutConstraints &layoutConstraints, const LayoutContext &layoutContext) const {
-  auto newRootShadowNode = cloneRootShadowNode(layoutConstraints, layoutContext);
+Size ShadowTree::measure(
+    const LayoutConstraints &layoutConstraints,
+    const LayoutContext &layoutContext) const {
+  auto newRootShadowNode = cloneRootShadowNode(
+      getRootShadowNode(), layoutConstraints, layoutContext);
   newRootShadowNode->layout();
   return newRootShadowNode->getLayoutMetrics().frame.size;
 }
 
-void ShadowTree::constraintLayout(const LayoutConstraints &layoutConstraints, const LayoutContext &layoutContext) {
-  auto newRootShadowNode = cloneRootShadowNode(layoutConstraints, layoutContext);
-  complete(newRootShadowNode);
+bool ShadowTree::constraintLayout(
+    const LayoutConstraints &layoutConstraints,
+    const LayoutContext &layoutContext) const {
+  auto oldRootShadowNode = getRootShadowNode();
+  auto newRootShadowNode =
+      cloneRootShadowNode(oldRootShadowNode, layoutConstraints, layoutContext);
+  return complete(oldRootShadowNode, newRootShadowNode);
 }
 
 #pragma mark - Commiting
 
-UnsharedRootShadowNode ShadowTree::cloneRootShadowNode(const LayoutConstraints &layoutConstraints, const LayoutContext &layoutContext) const {
-  auto oldRootShadowNode = rootShadowNode_;
-  const auto &props = std::make_shared<const RootProps>(*oldRootShadowNode->getProps(), layoutConstraints, layoutContext);
-  auto newRootShadowNode = std::make_shared<RootShadowNode>(oldRootShadowNode, props, nullptr, nullptr);
+UnsharedRootShadowNode ShadowTree::cloneRootShadowNode(
+    const SharedRootShadowNode &oldRootShadowNode,
+    const LayoutConstraints &layoutConstraints,
+    const LayoutContext &layoutContext) const {
+  auto props = std::make_shared<const RootProps>(
+      *oldRootShadowNode->getProps(), layoutConstraints, layoutContext);
+  auto newRootShadowNode = std::make_shared<RootShadowNode>(
+      *oldRootShadowNode, ShadowNodeFragment{.props = props});
   return newRootShadowNode;
 }
 
-void ShadowTree::complete(const SharedShadowNodeUnsharedList &rootChildNodes) {
-  auto oldRootShadowNode = rootShadowNode_;
-  auto newRootShadowNode =
-    std::make_shared<RootShadowNode>(oldRootShadowNode, nullptr, nullptr, SharedShadowNodeSharedList(rootChildNodes));
+bool ShadowTree::complete(
+    const SharedShadowNodeUnsharedList &rootChildNodes) const {
+  auto oldRootShadowNode = getRootShadowNode();
+  auto newRootShadowNode = std::make_shared<RootShadowNode>(
+      *oldRootShadowNode,
+      ShadowNodeFragment{.children =
+                             SharedShadowNodeSharedList(rootChildNodes)});
 
-  complete(newRootShadowNode);
+  return complete(oldRootShadowNode, newRootShadowNode);
 }
 
-void ShadowTree::complete(UnsharedRootShadowNode newRootShadowNode) {
-  SharedRootShadowNode oldRootShadowNode = rootShadowNode_;
-
+bool ShadowTree::complete(
+    const SharedRootShadowNode &oldRootShadowNode,
+    const UnsharedRootShadowNode &newRootShadowNode) const {
   newRootShadowNode->layout();
-
   newRootShadowNode->sealRecursive();
 
-  TreeMutationInstructionList instructions = TreeMutationInstructionList();
+  auto mutations =
+      calculateShadowViewMutations(*oldRootShadowNode, *newRootShadowNode);
 
-  calculateMutationInstructions(
-    instructions,
-    oldRootShadowNode,
-    newRootShadowNode
-  );
+  if (!commit(oldRootShadowNode, newRootShadowNode, mutations)) {
+    return false;
+  }
 
-  if (commit(newRootShadowNode)) {
-    emitLayoutEvents(instructions);
+  emitLayoutEvents(mutations);
 
-    if (delegate_) {
-      delegate_->shadowTreeDidCommit(shared_from_this(), instructions);
-    }
+  if (delegate_) {
+    delegate_->shadowTreeDidCommit(*this, mutations);
   }
+
+  return true;
 }
 
-bool ShadowTree::commit(const SharedRootShadowNode &newRootShadowNode) {
-  std::lock_guard<std::mutex> lock(commitMutex_);
+bool ShadowTree::commit(
+    const SharedRootShadowNode &oldRootShadowNode,
+    const SharedRootShadowNode &newRootShadowNode,
+    const ShadowViewMutationList &mutations) const {
+  std::lock_guard<std::recursive_mutex> lock(commitMutex_);
 
-  if (newRootShadowNode->getSourceNode() != rootShadowNode_) {
+  if (oldRootShadowNode != rootShadowNode_) {
     return false;
   }
 
   rootShadowNode_ = newRootShadowNode;
+
+  toggleEventEmitters(mutations);
+
   return true;
 }
 
-void ShadowTree::emitLayoutEvents(const TreeMutationInstructionList &instructions) {
-  for (const auto &instruction : instructions) {
-    const auto &type = instruction.getType();
-
-    // Only `Insertion` and `Replacement` instructions can affect layout metrics.
-    if (
-        type == TreeMutationInstruction::Insertion ||
-        type == TreeMutationInstruction::Replacement
-    ) {
-      const auto &newShadowNode = instruction.getNewChildNode();
-      const auto &eventEmitter = newShadowNode->getEventEmitter();
-      const auto &viewEventEmitter = std::dynamic_pointer_cast<const ViewEventEmitter>(eventEmitter);
-
-      // Checking if particular shadow node supports `onLayout` event (part of `ViewEventEmitter`).
-      if (viewEventEmitter) {
-        // Now we know that both (old and new) shadow nodes must be `LayoutableShadowNode` subclasses.
-        assert(std::dynamic_pointer_cast<const LayoutableShadowNode>(newShadowNode));
-
-        // Checking if the `onLayout` event was requested for the particular Shadow Node.
-        const auto &viewProps = std::dynamic_pointer_cast<const ViewProps>(newShadowNode->getProps());
-        if (viewProps && !viewProps->onLayout) {
-          continue;
-        }
-
-        // TODO(T29661055): Consider using `std::reinterpret_pointer_cast`.
-        const auto &newLayoutableShadowNode =
-          std::dynamic_pointer_cast<const LayoutableShadowNode>(newShadowNode);
-
-        // In case if we have `oldShadowNode`, we have to check that layout metrics have changed.
-        if (type == TreeMutationInstruction::Replacement) {
-          const auto &oldShadowNode = instruction.getOldChildNode();
-          assert(std::dynamic_pointer_cast<const LayoutableShadowNode>(oldShadowNode));
-          // TODO(T29661055): Consider using `std::reinterpret_pointer_cast`.
-          const auto &oldLayoutableShadowNode =
-            std::dynamic_pointer_cast<const LayoutableShadowNode>(oldShadowNode);
-
-          if (oldLayoutableShadowNode->getLayoutMetrics() == newLayoutableShadowNode->getLayoutMetrics()) {
-            continue;
-          }
-        }
-
-        viewEventEmitter->onLayout(newLayoutableShadowNode->getLayoutMetrics());
-      }
+void ShadowTree::emitLayoutEvents(
+    const ShadowViewMutationList &mutations) const {
+  for (const auto &mutation : mutations) {
+    // Only `Insert` and `Update` mutations can affect layout metrics.
+    if (mutation.type != ShadowViewMutation::Insert &&
+        mutation.type != ShadowViewMutation::Update) {
+      continue;
+    }
+
+    const auto viewEventEmitter =
+        std::dynamic_pointer_cast<const ViewEventEmitter>(
+            mutation.newChildShadowView.eventEmitter);
+
+    // Checking if particular shadow node supports `onLayout` event (part of
+    // `ViewEventEmitter`).
+    if (!viewEventEmitter) {
+      continue;
+    }
+
+    // Checking if the `onLayout` event was requested for the particular Shadow
+    // Node.
+    const auto viewProps = std::dynamic_pointer_cast<const ViewProps>(
+        mutation.newChildShadowView.props);
+    if (viewProps && !viewProps->onLayout) {
+      continue;
+    }
+
+    // In case if we have `oldChildShadowView`, checking that layout metrics
+    // have changed.
+    if (mutation.type != ShadowViewMutation::Update &&
+        mutation.oldChildShadowView.layoutMetrics ==
+            mutation.newChildShadowView.layoutMetrics) {
+      continue;
+    }
+
+    viewEventEmitter->onLayout(mutation.newChildShadowView.layoutMetrics);
+  }
+}
+
+void ShadowTree::toggleEventEmitters(
+    const ShadowViewMutationList &mutations) const {
+  std::lock_guard<std::recursive_mutex> lock(EventEmitter::DispatchMutex());
+
+  for (const auto &mutation : mutations) {
+    if (mutation.type == ShadowViewMutation::Delete) {
+      mutation.oldChildShadowView.eventEmitter->setEnabled(false);
+    }
+  }
+
+  for (const auto &mutation : mutations) {
+    if (mutation.type == ShadowViewMutation::Create) {
+      mutation.newChildShadowView.eventEmitter->setEnabled(true);
     }
   }
 }
 
 #pragma mark - Delegate
 
-void ShadowTree::setDelegate(ShadowTreeDelegate *delegate) {
+void ShadowTree::setDelegate(ShadowTreeDelegate const *delegate) {
   delegate_ = delegate;
 }
 
-ShadowTreeDelegate *ShadowTree::getDelegate() const {
+ShadowTreeDelegate const *ShadowTree::getDelegate() const {
   return delegate_;
 }
 
diff --git a/ReactCommon/fabric/uimanager/ShadowTree.h b/ReactCommon/fabric/uimanager/ShadowTree.h
index 3bb6af8b44dc6d..836f956b62ce1f 100644
--- a/ReactCommon/fabric/uimanager/ShadowTree.h
+++ b/ReactCommon/fabric/uimanager/ShadowTree.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -8,60 +8,74 @@
 #include <memory>
 #include <mutex>
 
+#include <fabric/components/root/RootShadowNode.h>
 #include <fabric/core/LayoutConstraints.h>
 #include <fabric/core/ReactPrimitives.h>
 #include <fabric/core/ShadowNode.h>
 #include <fabric/uimanager/ShadowTreeDelegate.h>
-#include <fabric/view/RootShadowNode.h>
+#include <fabric/uimanager/ShadowViewMutation.h>
 
 namespace facebook {
 namespace react {
 
-class ShadowTree;
-
-using SharedShadowTree = std::shared_ptr<ShadowTree>;
-
 /*
  * Represents the shadow tree and its lifecycle.
  */
-class ShadowTree final:
-  public std::enable_shared_from_this<ShadowTree> {
+class ShadowTree final {
+ public:
+  /*
+   * Creates a new shadow tree instance.
+   */
+  ShadowTree(
+      SurfaceId surfaceId,
+      const LayoutConstraints &layoutConstraints,
+      const LayoutContext &layoutContext);
 
-public:
+  ~ShadowTree();
 
   /*
-   * Creates a new shadow tree instance with given `rootTag`.
+   * Returns the `SurfaceId` associated with the shadow tree.
    */
-  ShadowTree(Tag rootTag);
+  SurfaceId getSurfaceId() const;
 
   /*
-   * Returns the rootTag associated with the shadow tree (the tag of the
-   * root shadow node).
+   * Synchronously runs `function` when `commitMutex_` is acquired.
+   * It is useful in cases when transactional consistency and/or successful
+   * commit are required. E.g. you might want to run `measure` and
+   * `constraintLayout` as part of a single congious transaction.
+   * Use this only if it is necessary. All public methods of the class are
+   * already thread-safe.
    */
-  Tag getRootTag() const;
+  void synchronize(std::function<void(void)> function) const;
 
 #pragma mark - Layout
 
   /*
-   * Measures the shadow tree with given `layoutConstraints` and `layoutContext`.
-   * Can be called from any thread, side-effect-less.
+   * Measures the shadow tree with given `layoutConstraints` and
+   * `layoutContext`. Can be called from any thread, side-effect-less.
    */
-  Size measure(const LayoutConstraints &layoutConstraints, const LayoutContext &layoutContext) const;
+  Size measure(
+      const LayoutConstraints &layoutConstraints,
+      const LayoutContext &layoutContext) const;
 
   /*
    * Applies given `layoutConstraints` and `layoutContext` and commit
    * the new shadow tree.
+   * Returns `true` if the operation finished successfully.
    * Can be called from any thread.
    */
-  void constraintLayout(const LayoutConstraints &layoutConstraints, const LayoutContext &layoutContext);
+  bool constraintLayout(
+      const LayoutConstraints &layoutConstraints,
+      const LayoutContext &layoutContext) const;
 
 #pragma mark - Application
 
   /*
    * Create a new shadow tree with given `rootChildNodes` and commit.
    * Can be called from any thread.
+   * Returns `true` if the operation finished successfully.
    */
-  void complete(const SharedShadowNodeUnsharedList &rootChildNodes);
+  bool complete(const SharedShadowNodeUnsharedList &rootChildNodes) const;
 
 #pragma mark - Delegate
 
@@ -70,20 +84,36 @@ class ShadowTree final:
    * The delegate is stored as a raw pointer, so the owner must null
    * the pointer before being destroyed.
    */
-  void setDelegate(ShadowTreeDelegate *delegate);
-  ShadowTreeDelegate *getDelegate() const;
+  void setDelegate(ShadowTreeDelegate const *delegate);
+  ShadowTreeDelegate const *getDelegate() const;
+
+ private:
+  UnsharedRootShadowNode cloneRootShadowNode(
+      const SharedRootShadowNode &oldRootShadowNode,
+      const LayoutConstraints &layoutConstraints,
+      const LayoutContext &layoutContext) const;
 
-private:
+  bool complete(
+      const SharedRootShadowNode &oldRootShadowNode,
+      const UnsharedRootShadowNode &newRootShadowNode) const;
 
-  UnsharedRootShadowNode cloneRootShadowNode(const LayoutConstraints &layoutConstraints, const LayoutContext &layoutContext) const;
-  void complete(UnsharedRootShadowNode newRootShadowNode);
-  bool commit(const SharedRootShadowNode &newRootShadowNode);
-  void emitLayoutEvents(const TreeMutationInstructionList &instructions);
+  bool commit(
+      const SharedRootShadowNode &oldRootShadowNode,
+      const SharedRootShadowNode &newRootShadowNode,
+      const ShadowViewMutationList &mutations) const;
+
+  void toggleEventEmitters(const ShadowViewMutationList &mutations) const;
+  void emitLayoutEvents(const ShadowViewMutationList &mutations) const;
+
+  /*
+   * Return `rootShadowNodeMutex_` protected by `commitMutex_`.
+   */
+  SharedRootShadowNode getRootShadowNode() const;
 
-  const Tag rootTag_;
-  SharedRootShadowNode rootShadowNode_;
-  ShadowTreeDelegate *delegate_;
-  mutable std::mutex commitMutex_;
+  const SurfaceId surfaceId_;
+  mutable SharedRootShadowNode rootShadowNode_; // Protected by `commitMutex_`.
+  ShadowTreeDelegate const *delegate_;
+  mutable std::recursive_mutex commitMutex_;
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/uimanager/ShadowTreeDelegate.h b/ReactCommon/fabric/uimanager/ShadowTreeDelegate.h
index f2da57031b044b..7dbc96e7325d9e 100644
--- a/ReactCommon/fabric/uimanager/ShadowTreeDelegate.h
+++ b/ReactCommon/fabric/uimanager/ShadowTreeDelegate.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its 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 <fabric/uimanager/TreeMutationInstruction.h>
+#include <fabric/uimanager/ShadowViewMutation.h>
 
 namespace facebook {
 namespace react {
@@ -16,12 +16,15 @@ class ShadowTree;
  * Abstract class for ShadowTree's delegate.
  */
 class ShadowTreeDelegate {
-public:
-
+ public:
   /*
    * Called right after Shadow Tree commit a new state of the the tree.
    */
-  virtual void shadowTreeDidCommit(const std::shared_ptr<ShadowTree> &shadowTree, const TreeMutationInstructionList &instructions) = 0;
+  virtual void shadowTreeDidCommit(
+      const ShadowTree &shadowTree,
+      const ShadowViewMutationList &mutations) const = 0;
+
+  virtual ~ShadowTreeDelegate() noexcept = default;
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/uimanager/ShadowView.cpp b/ReactCommon/fabric/uimanager/ShadowView.cpp
new file mode 100644
index 00000000000000..8f0c869afd1bdb
--- /dev/null
+++ b/ReactCommon/fabric/uimanager/ShadowView.cpp
@@ -0,0 +1,59 @@
+// Copyright (c) Facebook, Inc. and its affiliates.
+
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+
+#include "ShadowView.h"
+
+#include <fabric/core/LayoutableShadowNode.h>
+
+namespace facebook {
+namespace react {
+
+static LayoutMetrics layoutMetricsFromShadowNode(const ShadowNode &shadowNode) {
+  auto layoutableShadowNode =
+      dynamic_cast<const LayoutableShadowNode *>(&shadowNode);
+  return layoutableShadowNode ? layoutableShadowNode->getLayoutMetrics()
+                              : EmptyLayoutMetrics;
+}
+
+ShadowView::ShadowView(const ShadowNode &shadowNode)
+    : componentName(shadowNode.getComponentName()),
+      componentHandle(shadowNode.getComponentHandle()),
+      tag(shadowNode.getTag()),
+      props(shadowNode.getProps()),
+      eventEmitter(shadowNode.getEventEmitter()),
+      layoutMetrics(layoutMetricsFromShadowNode(shadowNode)),
+      localData(shadowNode.getLocalData()) {}
+
+bool ShadowView::operator==(const ShadowView &rhs) const {
+  return std::tie(
+             this->tag,
+             this->componentName,
+             this->props,
+             this->eventEmitter,
+             this->layoutMetrics,
+             this->localData) ==
+      std::tie(
+             rhs.tag,
+             rhs.componentName,
+             rhs.props,
+             rhs.eventEmitter,
+             rhs.layoutMetrics,
+             rhs.localData);
+}
+
+bool ShadowView::operator!=(const ShadowView &rhs) const {
+  return !(*this == rhs);
+}
+
+bool ShadowViewNodePair::operator==(const ShadowViewNodePair &rhs) const {
+  return &this->shadowNode == &rhs.shadowNode;
+}
+
+bool ShadowViewNodePair::operator!=(const ShadowViewNodePair &rhs) const {
+  return !(*this == rhs);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/uimanager/ShadowView.h b/ReactCommon/fabric/uimanager/ShadowView.h
new file mode 100644
index 00000000000000..54c3b972f2f0da
--- /dev/null
+++ b/ReactCommon/fabric/uimanager/ShadowView.h
@@ -0,0 +1,61 @@
+// Copyright (c) Facebook, Inc. and its 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 <fabric/core/LayoutMetrics.h>
+#include <fabric/core/LocalData.h>
+#include <fabric/core/Props.h>
+#include <fabric/core/ReactPrimitives.h>
+#include <fabric/core/ShadowNode.h>
+#include <fabric/events/EventEmitter.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Describes a view that can be mounted.
+ */
+struct ShadowView final {
+  ShadowView() = default;
+  ShadowView(const ShadowView &shadowView) = default;
+
+  /*
+   * Constructs a `ShadowView` from given `ShadowNode`.
+   */
+  explicit ShadowView(const ShadowNode &shadowNode);
+
+  ShadowView &operator=(const ShadowView &other) = default;
+
+  bool operator==(const ShadowView &rhs) const;
+  bool operator!=(const ShadowView &rhs) const;
+
+  ComponentName componentName = "";
+  ComponentHandle componentHandle = 0;
+  Tag tag = -1;
+  SharedProps props = {};
+  SharedEventEmitter eventEmitter = {};
+  LayoutMetrics layoutMetrics = EmptyLayoutMetrics;
+  SharedLocalData localData = {};
+};
+
+/*
+ * Describes pair of a `ShadowView` and a `ShadowNode`.
+ */
+struct ShadowViewNodePair final {
+  const ShadowView shadowView;
+  const ShadowNode &shadowNode;
+
+  /*
+   * The stored pointer to `ShadowNode` represents an indentity of the pair.
+   */
+  bool operator==(const ShadowViewNodePair &rhs) const;
+  bool operator!=(const ShadowViewNodePair &rhs) const;
+};
+
+using ShadowViewNodePairList = std::vector<ShadowViewNodePair>;
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/uimanager/ShadowViewMutation.cpp b/ReactCommon/fabric/uimanager/ShadowViewMutation.cpp
new file mode 100644
index 00000000000000..023107a5fa95e0
--- /dev/null
+++ b/ReactCommon/fabric/uimanager/ShadowViewMutation.cpp
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ShadowViewMutation.h"
+
+namespace facebook {
+namespace react {
+
+ShadowViewMutation ShadowViewMutation::CreateMutation(ShadowView shadowView) {
+  return ShadowViewMutation{
+      .type = Create, .newChildShadowView = shadowView, .index = -1};
+}
+
+ShadowViewMutation ShadowViewMutation::DeleteMutation(ShadowView shadowView) {
+  return {.type = Delete, .oldChildShadowView = shadowView, .index = -1};
+}
+
+ShadowViewMutation ShadowViewMutation::InsertMutation(
+    ShadowView parentShadowView,
+    ShadowView childShadowView,
+    int index) {
+  return {.type = Insert,
+          .parentShadowView = parentShadowView,
+          .newChildShadowView = childShadowView,
+          .index = index};
+}
+
+ShadowViewMutation ShadowViewMutation::RemoveMutation(
+    ShadowView parentShadowView,
+    ShadowView childShadowView,
+    int index) {
+  return {.type = Remove,
+          .parentShadowView = parentShadowView,
+          .oldChildShadowView = childShadowView,
+          .index = index};
+}
+
+ShadowViewMutation ShadowViewMutation::UpdateMutation(
+    ShadowView parentShadowView,
+    ShadowView oldChildShadowView,
+    ShadowView newChildShadowView,
+    int index) {
+  return {.type = Update,
+          .parentShadowView = parentShadowView,
+          .oldChildShadowView = oldChildShadowView,
+          .newChildShadowView = newChildShadowView,
+          .index = index};
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/uimanager/ShadowViewMutation.h b/ReactCommon/fabric/uimanager/ShadowViewMutation.h
new file mode 100644
index 00000000000000..6619bec6b8f416
--- /dev/null
+++ b/ReactCommon/fabric/uimanager/ShadowViewMutation.h
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <vector>
+
+#include <fabric/uimanager/ShadowView.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Describes a single native view tree mutation which may contain
+ * pointers to an old shadow view, a new shadow view, a parent shadow view and
+ * final index of inserted or updated view.
+ * Use static methods to instantiate mutations of different types.
+ */
+struct ShadowViewMutation final {
+#pragma mark - Designated Initializers
+
+  /*
+   * Creates and returns an `Create` mutation.
+   */
+  static ShadowViewMutation CreateMutation(ShadowView shadowView);
+
+  /*
+   * Creates and returns an `Delete` mutation.
+   */
+  static ShadowViewMutation DeleteMutation(ShadowView shadowView);
+
+  /*
+   * Creates and returns an `Insert` mutation.
+   */
+  static ShadowViewMutation InsertMutation(
+      ShadowView parentShadowView,
+      ShadowView childShadowView,
+      int index);
+
+  /*
+   * Creates and returns a `Remove` mutation.
+   */
+  static ShadowViewMutation RemoveMutation(
+      ShadowView parentShadowView,
+      ShadowView childShadowView,
+      int index);
+
+  /*
+   * Creates and returns an `Update` mutation.
+   */
+  static ShadowViewMutation UpdateMutation(
+      ShadowView parentShadowView,
+      ShadowView oldChildShadowView,
+      ShadowView newChildShadowView,
+      int index);
+
+#pragma mark - Type
+
+  enum Type { Create, Delete, Insert, Remove, Update };
+
+#pragma mark - Fields
+
+  Type type = {Create};
+  ShadowView parentShadowView = {};
+  ShadowView oldChildShadowView = {};
+  ShadowView newChildShadowView = {};
+  int index = {};
+};
+
+using ShadowViewMutationList = std::vector<ShadowViewMutation>;
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/uimanager/TemplateRenderer.cpp b/ReactCommon/fabric/uimanager/TemplateRenderer.cpp
new file mode 100644
index 00000000000000..4e41accd82d147
--- /dev/null
+++ b/ReactCommon/fabric/uimanager/TemplateRenderer.cpp
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "TemplateRenderer.h"
+
+#include <glog/logging.h>
+
+#include <fabric/components/view/ViewComponentDescriptor.h>
+#include <fabric/components/view/ViewProps.h>
+#include <fabric/components/view/ViewShadowNode.h>
+#include <fabric/core/componentDescriptor.h>
+#include <fabric/core/LayoutContext.h>
+#include <fabric/core/ShadowNodeFragment.h>
+#include <fabric/debug/DebugStringConvertible.h>
+#include <fabric/debug/DebugStringConvertibleItem.h>
+#include <folly/json.h>
+
+namespace facebook {
+  namespace react {
+    SharedShadowNode TemplateRenderer::buildShadowTree(const std::string &jsonStr, int rootTag, const folly::dynamic &params, const ComponentDescriptorRegistry &componentDescriptorRegistry) {
+      LOG(INFO) << "(strt) TemplateRenderer inject hardcoded 'server rendered' view tree";
+      std::string content = jsonStr;
+      for (const auto& param : params.items()) {
+        const auto& key = param.first.asString();
+        size_t start_pos = content.find(key);
+        if(start_pos != std::string::npos) {
+          content.replace(start_pos, key.length(), param.second.asString());
+        }
+      }
+      auto json = folly::parseJson(content);
+      std::vector<SharedShadowNode> nodes;
+      nodes.resize(json.size() * 2);
+      int tagOffset = 4560; // MAYBE TODO: use number of existing tags so they don't collide rather than random value
+      for (const auto& command : json) {
+        if (command[0] == "createNode") {
+          int tag = command[1].asInt();
+          const auto& type = command[2].asString();
+          const auto& props = command[3];
+          nodes[tag] = componentDescriptorRegistry.createNode(tag + tagOffset, type, rootTag, props, nullptr);
+        } else if (command[0] == "appendChild") {
+          auto parentShadowNode = nodes[command[1].asInt()];
+          const SharedComponentDescriptor &componentDescriptor = componentDescriptorRegistry[parentShadowNode];
+          componentDescriptor->appendChild(parentShadowNode, nodes[command[2].asInt()]);
+        } else if (command[0] == "childSetNode") {
+          LOG(INFO) << "(stop) TemplateView inject serialized 'server rendered' view tree";
+          return nodes[command[1].asInt()];
+        }
+      }
+      throw std::runtime_error("Missing childSetNode command in template content:\n" + content);
+      return SharedShadowNode {};
+    }
+  }
+}
diff --git a/ReactCommon/fabric/uimanager/TemplateRenderer.h b/ReactCommon/fabric/uimanager/TemplateRenderer.h
new file mode 100644
index 00000000000000..36978538e41a61
--- /dev/null
+++ b/ReactCommon/fabric/uimanager/TemplateRenderer.h
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 <memory>
+
+#include <folly/dynamic.h>
+
+#include <fabric/core/ShadowNode.h>
+#include <fabric/uimanager/ComponentDescriptorRegistry.h>
+#include <fabric/uimanager/UIManagerDelegate.h>
+
+namespace facebook {
+  namespace react {
+    class TemplateRenderer {
+    public:
+      static SharedShadowNode buildShadowTree(const std::string &jsonStr, int rootTag, const folly::dynamic &params, const ComponentDescriptorRegistry &componentDescriptorRegistry);
+    };
+  } // react
+} // facebook
diff --git a/ReactCommon/fabric/uimanager/TreeMutationInstruction.cpp b/ReactCommon/fabric/uimanager/TreeMutationInstruction.cpp
deleted file mode 100644
index 630e13202d1b53..00000000000000
--- a/ReactCommon/fabric/uimanager/TreeMutationInstruction.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "TreeMutationInstruction.h"
-
-#include <fabric/debug/DebugStringConvertibleItem.h>
-
-namespace facebook {
-namespace react {
-
-const TreeMutationInstruction TreeMutationInstruction::Create(
-  SharedShadowNode node
-) {
-  assert(node);
-
-  return TreeMutationInstruction(
-    Creation,
-    nullptr,
-    nullptr,
-    node,
-    -1
-  );
-}
-
-const TreeMutationInstruction TreeMutationInstruction::Delete(
-  SharedShadowNode node
-) {
-  assert(node);
-
-  return TreeMutationInstruction(
-    Deletion,
-    nullptr,
-    node,
-    nullptr,
-    -1
-  );
-}
-
-const TreeMutationInstruction TreeMutationInstruction::Insert(
-  SharedShadowNode parentNode,
-  SharedShadowNode childNode,
-  int index
-) {
-  assert(parentNode);
-  assert(childNode);
-  assert(index != -1);
-
-  return TreeMutationInstruction(
-    Insertion,
-    parentNode,
-    nullptr,
-    childNode,
-    index
-  );
-}
-
-const TreeMutationInstruction TreeMutationInstruction::Remove(
-  SharedShadowNode parentNode,
-  SharedShadowNode childNode,
-  int index
-) {
-  assert(parentNode);
-  assert(childNode);
-  assert(index != -1);
-
-  return TreeMutationInstruction(
-    Removal,
-    parentNode,
-    childNode,
-    nullptr,
-    index
-  );
-}
-
-const TreeMutationInstruction TreeMutationInstruction::Replace(
-  SharedShadowNode parentNode,
-  SharedShadowNode oldChildNode,
-  SharedShadowNode newChildNode,
-  int index
-) {
-  assert(oldChildNode);
-  assert(newChildNode);
-
-  return TreeMutationInstruction(
-    Replacement,
-    parentNode,
-    oldChildNode,
-    newChildNode,
-    index
-  );
-}
-
-TreeMutationInstruction::TreeMutationInstruction(
-  Type type,
-  SharedShadowNode parentNode,
-  SharedShadowNode oldChildNode,
-  SharedShadowNode newChildNode,
-  int index
-):
-  type_(type),
-  parentNode_(parentNode),
-  oldChildNode_(oldChildNode),
-  newChildNode_(newChildNode),
-  index_(index) {};
-
-#pragma mark - Getters
-
-TreeMutationInstruction::Type TreeMutationInstruction::getType() const {
-  return type_;
-}
-
-SharedShadowNode TreeMutationInstruction::getParentNode() const {
-  assert(parentNode_);
-  return parentNode_;
-}
-
-SharedShadowNode TreeMutationInstruction::getOldChildNode() const {
-  assert(oldChildNode_);
-  return oldChildNode_;
-}
-
-SharedShadowNode TreeMutationInstruction::getNewChildNode() const {
-  assert(newChildNode_);
-  return newChildNode_;
-}
-
-int TreeMutationInstruction::getIndex() const {
-  assert(index_ != -1);
-  return index_;
-}
-
-#pragma mark - DebugStringConvertible
-
-std::string TreeMutationInstruction::getDebugName() const {
-  switch (type_) {
-    case Creation:
-      return "Create";
-    case Deletion:
-      return "Delete";
-    case Insertion:
-      return "Insert";
-    case Removal:
-      return "Remove";
-    case Replacement:
-      return "Replace";
-  }
-};
-
-std::string TreeMutationInstruction::getDebugValue() const {
-  switch (type_) {
-    case Creation:
-      return "[*" + folly::to<std::string>(newChildNode_->getTag()) + "]";
-    case Deletion:
-      return "[~" + folly::to<std::string>(oldChildNode_->getTag()) + "]";
-    case Insertion:
-      return "[" + folly::to<std::string>(newChildNode_->getTag()) + "->" + folly::to<std::string>(parentNode_->getTag()) + "]";
-    case Removal:
-      return "[" + folly::to<std::string>(oldChildNode_->getTag()) + "<~" + folly::to<std::string>(parentNode_->getTag()) + "]";
-    case Replacement:
-      return "[=" + folly::to<std::string>(oldChildNode_->getTag()) + "]";
-  }
-};
-
-SharedDebugStringConvertibleList TreeMutationInstruction::getDebugProps() const {
-  DebugStringConvertibleOptions options = {.maximumDepth = 1, .format = false};
-
-  switch (type_) {
-    case Creation:
-      return SharedDebugStringConvertibleList {
-        std::make_shared<DebugStringConvertibleItem>("node", newChildNode_->getDebugDescription(options)),
-      };
-    case Deletion:
-      return SharedDebugStringConvertibleList {
-        std::make_shared<DebugStringConvertibleItem>("node", oldChildNode_->getDebugDescription(options)),
-      };
-    case Insertion:
-      return SharedDebugStringConvertibleList {
-        std::make_shared<DebugStringConvertibleItem>("parentNode", parentNode_->getDebugDescription(options)),
-        std::make_shared<DebugStringConvertibleItem>("childNode", newChildNode_->getDebugDescription(options)),
-        std::make_shared<DebugStringConvertibleItem>("index", folly::to<std::string>(index_))
-      };
-    case Removal:
-      return SharedDebugStringConvertibleList {
-        std::make_shared<DebugStringConvertibleItem>("parentNode", parentNode_->getDebugDescription(options)),
-        std::make_shared<DebugStringConvertibleItem>("childNode", oldChildNode_->getDebugDescription(options)),
-        std::make_shared<DebugStringConvertibleItem>("index", folly::to<std::string>(index_))
-      };
-    case Replacement:
-      return SharedDebugStringConvertibleList {
-        std::make_shared<DebugStringConvertibleItem>("parentNode", parentNode_ ? parentNode_->getDebugDescription(options) : "nullptr"),
-        std::make_shared<DebugStringConvertibleItem>("oldChildNode", oldChildNode_->getDebugDescription(options)),
-        std::make_shared<DebugStringConvertibleItem>("newChildNode", newChildNode_->getDebugDescription(options)),
-        std::make_shared<DebugStringConvertibleItem>("index", folly::to<std::string>(index_))
-      };
-  }
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/uimanager/TreeMutationInstruction.h b/ReactCommon/fabric/uimanager/TreeMutationInstruction.h
deleted file mode 100644
index c27e6f71f35332..00000000000000
--- a/ReactCommon/fabric/uimanager/TreeMutationInstruction.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <vector>
-
-#include <fabric/core/ShadowNode.h>
-#include <fabric/debug/DebugStringConvertible.h>
-
-namespace facebook {
-namespace react {
-
-class TreeMutationInstruction;
-
-using TreeMutationInstructionList = std::vector<TreeMutationInstruction>;
-
-/*
- * Describes single native views tree mutation instruction which may contain
- * pointers to an old shadow node, a new shadow node, a parent shadow node and
- * final index of inserted or updated node.
- * The relationship between native view instances and shadow node instances is
- * defined by `tag` value.
- * Use static methods to instantiate mutation instructions of different types.
- */
-class TreeMutationInstruction:
-  public DebugStringConvertible {
-public:
-
-#pragma mark - Designated Initializers
-
-  /*
-   * Creates and returns an *Creation* instruction.
-   */
-  static const TreeMutationInstruction Create(
-    SharedShadowNode node
-  );
-
-  /*
-   * Creates and returns an *Deletion* instruction.
-   */
-  static const TreeMutationInstruction Delete(
-    SharedShadowNode node
-  );
-
-  /*
-   * Creates and returns an *Insertion* instruction.
-   */
-  static const TreeMutationInstruction Insert(
-    SharedShadowNode parentNode,
-    SharedShadowNode childNode,
-    int index
-  );
-
-  /*
-   * Creates and returns a *Removal* instruction.
-   */
-  static const TreeMutationInstruction Remove(
-    SharedShadowNode parentNode,
-    SharedShadowNode childNode,
-    int index
-  );
-  
-  /*
-   * Creates and returns an *Replacement* instruction.
-   */
-  static const TreeMutationInstruction Replace(
-    SharedShadowNode parentNode,
-    SharedShadowNode oldChildNode,
-    SharedShadowNode newChildNode,
-    int index
-  );
-
-#pragma mark - Type
-
-  enum Type {
-    Creation,
-    Deletion,
-    Insertion,
-    Removal,
-    Replacement
-  };
-
-#pragma mark - Getters
-
-  Type getType() const;
-  SharedShadowNode getParentNode() const;
-  SharedShadowNode getOldChildNode() const;
-  SharedShadowNode getNewChildNode() const;
-  int getIndex() const;
-
-#pragma mark - DebugStringConvertible
-
-  std::string getDebugName() const override;
-  std::string getDebugValue() const override;
-  SharedDebugStringConvertibleList getDebugProps() const override;
-
-private:
-  TreeMutationInstruction(
-    Type type,
-    SharedShadowNode parentNode,
-    SharedShadowNode oldChildNode,
-    SharedShadowNode newChildNode,
-    int index
-  );
-
-  Type type_ {Creation};
-  SharedShadowNode parentNode_ {nullptr};
-  SharedShadowNode oldChildNode_ {nullptr};
-  SharedShadowNode newChildNode_ {nullptr};
-  int index_ {-1};
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/uimanager/UIManagerDelegate.h b/ReactCommon/fabric/uimanager/UIManagerDelegate.h
index e94af1f44034b1..0e67113b89fb3b 100644
--- a/ReactCommon/fabric/uimanager/UIManagerDelegate.h
+++ b/ReactCommon/fabric/uimanager/UIManagerDelegate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/core/ShadowNode.h>
 #include <fabric/core/ReactPrimitives.h>
+#include <fabric/core/ShadowNode.h>
 
 namespace facebook {
 namespace react {
@@ -17,20 +17,24 @@ namespace react {
  * Abstract class for UIManager's delegate.
  */
 class UIManagerDelegate {
-public:
-
+ public:
   /*
    * Called right after the new/updated Shadow Node tree is constructed.
    * The tree is not layed out and not sealed at this time.
    */
-  virtual void uiManagerDidFinishTransaction(Tag rootTag, const SharedShadowNodeUnsharedList &rootChildNodes) = 0;
+  virtual void uiManagerDidFinishTransaction(
+      Tag rootTag,
+      const SharedShadowNodeUnsharedList &rootChildNodes) = 0;
 
   /*
    * Called each time when UIManager constructs a new Shadow Node. Receiver
    * maight use this to preluminary optimistically allocate a new native view
    * instances.
    */
-  virtual void uiManagerDidCreateShadowNode(const SharedShadowNode &shadowNode) = 0;
+  virtual void uiManagerDidCreateShadowNode(
+      const SharedShadowNode &shadowNode) = 0;
+
+  virtual ~UIManagerDelegate() noexcept = default;
 };
 
 } // namespace react
diff --git a/ReactCommon/fabric/uimanager/tests/FabricUIManagerTest.cpp b/ReactCommon/fabric/uimanager/tests/FabricUIManagerTest.cpp
index d22ed7f946314e..a283ff6c40a55e 100644
--- a/ReactCommon/fabric/uimanager/tests/FabricUIManagerTest.cpp
+++ b/ReactCommon/fabric/uimanager/tests/FabricUIManagerTest.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/fabric/view/ConcreteViewShadowNode.h b/ReactCommon/fabric/view/ConcreteViewShadowNode.h
deleted file mode 100644
index c65f9ea060d4dd..00000000000000
--- a/ReactCommon/fabric/view/ConcreteViewShadowNode.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <fabric/core/ConcreteShadowNode.h>
-#include <fabric/core/LayoutableShadowNode.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/view/AccessibleShadowNode.h>
-#include <fabric/view/ViewEventEmitter.h>
-#include <fabric/view/ViewProps.h>
-#include <fabric/view/YogaLayoutableShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-/*
- * Template for all <View>-like classes (classes which have all same props
- * as <View> and similar basic behaviour).
- * For example: <Paragraph>, <Image>, but not <Text>, <RawText>.
- */
-template <typename ViewPropsT = ViewProps, typename ViewEventEmitterT = ViewEventEmitter>
-class ConcreteViewShadowNode:
-  public ConcreteShadowNode<ViewPropsT, ViewEventEmitterT>,
-  public AccessibleShadowNode,
-  public YogaLayoutableShadowNode {
-
-  static_assert(std::is_base_of<ViewProps, ViewPropsT>::value, "ViewPropsT must be a descendant of ViewProps");
-  static_assert(std::is_base_of<YogaStylableProps, ViewPropsT>::value, "ViewPropsT must be a descendant of YogaStylableProps");
-  static_assert(std::is_base_of<AccessibilityProps, ViewPropsT>::value, "ViewPropsT must be a descendant of AccessibilityProps");
-
-public:
-
-  using ConcreteViewProps = ViewPropsT;
-  using SharedConcreteViewProps = std::shared_ptr<const ViewPropsT>;
-  using ConcreteViewEventEmitter = ViewEventEmitterT;
-  using SharedConcreteViewEventEmitter = std::shared_ptr<const ViewEventEmitterT>;
-  using SharedConcreteViewShadowNode = std::shared_ptr<const ConcreteViewShadowNode>;
-
-  ConcreteViewShadowNode(
-    const Tag &tag,
-    const Tag &rootTag,
-    const SharedConcreteViewProps &props,
-    const SharedConcreteViewEventEmitter &eventEmitter,
-    const SharedShadowNodeSharedList &children,
-    const ShadowNodeCloneFunction &cloneFunction
-  ):
-    ConcreteShadowNode<ViewPropsT, ViewEventEmitterT>(
-      tag,
-      rootTag,
-      props,
-      eventEmitter,
-      children,
-      cloneFunction
-    ),
-    AccessibleShadowNode(
-      props
-    ),
-    YogaLayoutableShadowNode(
-      props,
-      children
-    ) {};
-
-  ConcreteViewShadowNode(
-    const SharedConcreteViewShadowNode &shadowNode,
-    const SharedConcreteViewProps &props,
-    const SharedConcreteViewEventEmitter &eventEmitter,
-    const SharedShadowNodeSharedList &children
-  ):
-    ConcreteShadowNode<ViewPropsT, ViewEventEmitterT>(
-      shadowNode,
-      props,
-      eventEmitter,
-      children
-    ),
-    AccessibleShadowNode(
-      shadowNode,
-      props
-    ),
-    YogaLayoutableShadowNode(
-      shadowNode,
-      props,
-      children
-    ) {};
-
-  void appendChild(const SharedShadowNode &child) {
-    ensureUnsealed();
-
-    ShadowNode::appendChild(child);
-
-    auto yogaLayoutableChild = std::dynamic_pointer_cast<const YogaLayoutableShadowNode>(child);
-    if (yogaLayoutableChild) {
-      YogaLayoutableShadowNode::appendChild(yogaLayoutableChild);
-    }
-  }
-
-  SharedLayoutableShadowNode cloneAndReplaceChild(const SharedLayoutableShadowNode &child) override {
-    ensureUnsealed();
-
-    auto childShadowNode = std::dynamic_pointer_cast<const ShadowNode>(child);
-    assert(childShadowNode);
-    auto childShadowNodeClone = childShadowNode->clone();
-
-    // This is overloading of `SharedLayoutableShadowNode::cloneAndReplaceChild`,
-    // the method is used to clone some node as a preparation for future mutation
-    // caused by relayout.
-    // Because those changes are not requested by UIManager, they add a layer
-    // of node generation (between the committed stage and new proposed stage).
-    // That additional layer confuses the Diffing algorithm which uses
-    // `sourceNode` for referencing the previous (aka committed) stage
-    // of the tree to produce mutation instructions.
-    // In other words, if we don't compensate this change here,
-    // the Diffing algorithm will compare wrong trees
-    // ("new-but-not-laid-out-yet vs. new" instead of "committed vs. new").
-    auto nonConstChildShadowNodeClone = std::const_pointer_cast<ShadowNode>(childShadowNodeClone);
-    nonConstChildShadowNodeClone->shallowSourceNode();
-
-    ShadowNode::replaceChild(childShadowNode, childShadowNodeClone);
-    return std::dynamic_pointer_cast<const LayoutableShadowNode>(childShadowNodeClone);
-  }
-
-#pragma mark - Equality
-
-  bool operator==(const ShadowNode& rhs) const override {
-    if (!ShadowNode::operator==(rhs)) {
-      return false;
-    }
-
-    const auto &other = static_cast<const ConcreteViewShadowNode&>(rhs);
-    return getLayoutMetrics() == other.getLayoutMetrics();
-  }
-
-#pragma mark - DebugStringConvertible
-
-  SharedDebugStringConvertibleList getDebugProps() const override {
-    SharedDebugStringConvertibleList list = {};
-
-    auto basePropsList = ShadowNode::getDebugProps();
-    std::move(basePropsList.begin(), basePropsList.end(), std::back_inserter(list));
-
-    list.push_back(std::make_shared<DebugStringConvertibleItem>("layout", "", LayoutableShadowNode::getDebugProps()));
-
-    return list;
-  }
-
-protected:
-
-#pragma mark - LayoutableShadowNode
-
-  SharedLayoutableShadowNodeList getLayoutableChildNodes() const override {
-    SharedLayoutableShadowNodeList sharedLayoutableShadowNodeList = {};
-    for (auto child : *ShadowNode::children_) {
-      const SharedLayoutableShadowNode layoutableShadowNode = std::dynamic_pointer_cast<const LayoutableShadowNode>(child);
-      if (!layoutableShadowNode) {
-        continue;
-      }
-
-      sharedLayoutableShadowNodeList.push_back(layoutableShadowNode);
-    }
-
-    return sharedLayoutableShadowNodeList;
-  }
-
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/ViewProps.cpp b/ReactCommon/fabric/view/ViewProps.cpp
deleted file mode 100644
index 36d33216098ba1..00000000000000
--- a/ReactCommon/fabric/view/ViewProps.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "ViewProps.h"
-
-#include <fabric/core/propsConversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
-#include <fabric/graphics/conversions.h>
-#include <fabric/view/conversions.h>
-
-namespace facebook {
-namespace react {
-
-ViewProps::ViewProps(const YGStyle &yogaStyle):
-  YogaStylableProps(yogaStyle) {}
-
-ViewProps::ViewProps(const ViewProps &sourceProps, const RawProps &rawProps):
-  Props(sourceProps, rawProps),
-  YogaStylableProps(sourceProps, rawProps),
-  opacity(convertRawProp(rawProps, "opacity", sourceProps.opacity, (Float)1.0)),
-  foregroundColor(convertRawProp(rawProps, "foregroundColor", sourceProps.foregroundColor)),
-  backgroundColor(convertRawProp(rawProps, "backgroundColor", sourceProps.backgroundColor)),
-  borderWidth(convertRawProp(rawProps, "borderWidth", sourceProps.borderWidth)),
-  borderRadius(convertRawProp(rawProps, "borderRadius", sourceProps.borderRadius)),
-  borderColor(convertRawProp(rawProps, "borderColor", sourceProps.borderColor)),
-  borderStyle(convertRawProp(rawProps, "borderStyle", sourceProps.borderStyle)),
-  shadowColor(convertRawProp(rawProps, "shadowColor", sourceProps.shadowColor)),
-  shadowOffset(convertRawProp(rawProps, "shadowOffset", sourceProps.shadowOffset)),
-  shadowOpacity(convertRawProp(rawProps, "shadowOpacity", sourceProps.shadowOpacity)),
-  shadowRadius(convertRawProp(rawProps, "shadowRadius", sourceProps.shadowRadius)),
-  transform(convertRawProp(rawProps, "transform", sourceProps.transform)),
-  backfaceVisibility(convertRawProp(rawProps, "backfaceVisibility", sourceProps.backfaceVisibility)),
-  shouldRasterize(convertRawProp(rawProps, "shouldRasterize", sourceProps.shouldRasterize)),
-  zIndex(convertRawProp(rawProps, "zIndex", sourceProps.zIndex)),
-  pointerEvents(convertRawProp(rawProps, "pointerEvents", sourceProps.pointerEvents)),
-  hitSlop(convertRawProp(rawProps, "hitSlop", sourceProps.hitSlop)),
-  onLayout(convertRawProp(rawProps, "onLayout", sourceProps.onLayout)) {};
-
-#pragma mark - DebugStringConvertible
-
-SharedDebugStringConvertibleList ViewProps::getDebugProps() const {
-  const auto &defaultViewProps = ViewProps();
-
-  return
-    AccessibilityProps::getDebugProps() +
-    YogaStylableProps::getDebugProps() +
-    SharedDebugStringConvertibleList {
-      debugStringConvertibleItem("zIndex", zIndex, defaultViewProps.zIndex),
-      debugStringConvertibleItem("opacity", opacity, defaultViewProps.opacity),
-      debugStringConvertibleItem("foregroundColor", foregroundColor, defaultViewProps.foregroundColor),
-      debugStringConvertibleItem("backgroundColor", backgroundColor, defaultViewProps.backgroundColor),
-    };
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/ViewProps.h b/ReactCommon/fabric/view/ViewProps.h
deleted file mode 100644
index a533b051ff89dc..00000000000000
--- a/ReactCommon/fabric/view/ViewProps.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <fabric/core/Props.h>
-#include <fabric/graphics/Geometry.h>
-#include <fabric/graphics/Color.h>
-#include <fabric/view/AccessibilityProps.h>
-#include <fabric/view/primitives.h>
-#include <fabric/view/YogaStylableProps.h>
-
-namespace facebook {
-namespace react {
-
-class ViewProps;
-
-using SharedViewProps = std::shared_ptr<const ViewProps>;
-
-class ViewProps:
-  public Props,
-  public YogaStylableProps,
-  public AccessibilityProps {
-
-public:
-
-  ViewProps() = default;
-  ViewProps(const YGStyle &yogaStyle);
-  ViewProps(const ViewProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  // Color
-  const Float opacity {1.0};
-  const SharedColor foregroundColor {};
-  const SharedColor backgroundColor {};
-
-  // Borders
-  const EdgeInsets borderWidth {};
-  const CornerInsets borderRadius {};
-  const SharedColor borderColor {};
-  const BorderStyle borderStyle {};
-
-  // Shadow
-  const SharedColor shadowColor {};
-  const Size shadowOffset {};
-  const Float shadowOpacity {};
-  const Float shadowRadius {};
-
-  // Transform
-  const Transform transform {};
-  const bool backfaceVisibility {};
-  const bool shouldRasterize {};
-  const int zIndex {};
-
-  // Events
-  const PointerEventsMode pointerEvents {};
-  const EdgeInsets hitSlop {};
-  const bool onLayout {};
-
-#pragma mark - DebugStringConvertible
-
-  SharedDebugStringConvertibleList getDebugProps() const override;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/ViewShadowNode.h b/ReactCommon/fabric/view/ViewShadowNode.h
deleted file mode 100644
index a406f34de8a979..00000000000000
--- a/ReactCommon/fabric/view/ViewShadowNode.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <memory>
-
-#include <fabric/view/ViewProps.h>
-#include <fabric/view/ConcreteViewShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-class ViewShadowNode;
-
-using SharedViewShadowNode = std::shared_ptr<const ViewShadowNode>;
-
-class ViewShadowNode final:
-  public ConcreteViewShadowNode<ViewProps, ViewEventEmitter> {
-
-public:
-
-  using ConcreteViewShadowNode::ConcreteViewShadowNode;
-
-  ComponentName getComponentName() const override;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/accessibility/AccessibilityProps.cpp b/ReactCommon/fabric/view/accessibility/AccessibilityProps.cpp
deleted file mode 100644
index f8833ac7d9284a..00000000000000
--- a/ReactCommon/fabric/view/accessibility/AccessibilityProps.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "AccessibilityProps.h"
-
-#include "accessibilityValuesConversions.h"
-
-namespace facebook {
-namespace react {
-
-AccessibilityProps::AccessibilityProps(const AccessibilityProps &sourceProps, const RawProps &rawProps) {}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/accessibility/AccessibilityProps.h b/ReactCommon/fabric/view/accessibility/AccessibilityProps.h
deleted file mode 100644
index 931edc8d30091e..00000000000000
--- a/ReactCommon/fabric/view/accessibility/AccessibilityProps.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <fabric/core/Props.h>
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/view/AccessibilityPrimitives.h>
-
-namespace facebook {
-namespace react {
-
-class AccessibilityProps;
-
-typedef std::shared_ptr<const AccessibilityProps> SharedAccessibilityProps;
-
-class AccessibilityProps:
-  public virtual DebugStringConvertible {
-
-public:
-
-  AccessibilityProps() = default;
-  AccessibilityProps(const AccessibilityProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  const bool accessible {true};
-  const std::vector<std::string> accessibilityActions {};
-  const std::string accessibilityLabel {""};
-  const AccessibilityTraits accessibilityTraits {AccessibilityTraits::None};
-  const bool accessibilityViewIsModal {false};
-  const bool accessibilityElementsHidden {false};
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/accessibility/accessibilityValuesConversions.cpp b/ReactCommon/fabric/view/accessibility/accessibilityValuesConversions.cpp
deleted file mode 100644
index 1e97d64e265095..00000000000000
--- a/ReactCommon/fabric/view/accessibility/accessibilityValuesConversions.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "accessibilityValuesConversions.h"
-
-#include <folly/Conv.h>
-
-namespace facebook {
-namespace react {
-
-AccessibilityTraits accessibilityTraitsFromDynamic(const folly::dynamic &value) {
-  assert(value.isString());
-
-  // FIXME: Not clear yet.
-  abort();
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/conversions.h b/ReactCommon/fabric/view/conversions.h
deleted file mode 100644
index 64f1478d4d6336..00000000000000
--- a/ReactCommon/fabric/view/conversions.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <fabric/core/LayoutMetrics.h>
-#include <fabric/graphics/Geometry.h>
-#include <fabric/view/primitives.h>
-#include <folly/dynamic.h>
-#include <folly/Conv.h>
-#include <yoga/Yoga.h>
-#include <yoga/YGNode.h>
-
-// Yoga does not have this as part of the library, so we have to implement it
-// here ouside of `facebook::react::` namespace.
-inline bool operator==(const YGValue &lhs, const YGValue &rhs) {
-  if (
-    (lhs.unit == YGUnitUndefined && rhs.unit == YGUnitUndefined) ||
-    (lhs.unit == YGUnitAuto && rhs.unit == YGUnitAuto)
-  ) {
-    return true;
-  }
-
-  return
-    lhs.unit == rhs.unit &&
-    ((isnan(lhs.value) && isnan(rhs.value)) || (lhs.value == rhs.value));
-}
-
-namespace facebook {
-namespace react {
-
-inline Float fabricFloatFromYogaFloat(float value) {
-  if (value == YGUndefined) {
-    return kFloatUndefined;
-  }
-
-  return (Float)value;
-}
-
-inline float yogaFloatFromFabricFloat(Float value) {
-  if (value == kFloatUndefined) {
-    return YGUndefined;
-  }
-
-  return (float)value;
-}
-
-inline Float fabricFloatFromYogaOptionalFloat(YGFloatOptional value) {
-  if (value.isUndefined()) {
-    return kFloatUndefined;
-  }
-
-  return fabricFloatFromYogaFloat(value.getValue());
-}
-
-inline YGFloatOptional yogaOptionalFloatFromFabricFloat(Float value) {
-  if (value == kFloatUndefined) {
-    return YGFloatOptional();
-  }
-
-  return YGFloatOptional(yogaFloatFromFabricFloat(value));
-}
-
-inline YGValue yogaStyleValueFromFloat(const Float &value) {
-  if (isnan(value) || value == kFloatUndefined) {
-    return YGValueUndefined;
-  }
-
-  return {(float)value, YGUnitPoint};
-}
-
-inline LayoutMetrics layoutMetricsFromYogaNode(YGNode &yogaNode) {
-  LayoutMetrics layoutMetrics;
-
-  YGLayout layout = yogaNode.getLayout();
-
-  layoutMetrics.frame = Rect {
-    Point {
-      fabricFloatFromYogaFloat(layout.position[YGEdgeLeft]),
-      fabricFloatFromYogaFloat(layout.position[YGEdgeTop])
-    },
-    Size {
-      fabricFloatFromYogaFloat(layout.dimensions[YGDimensionWidth]),
-      fabricFloatFromYogaFloat(layout.dimensions[YGDimensionHeight])
-    }
-  };
-
-  layoutMetrics.borderWidth = EdgeInsets {
-    fabricFloatFromYogaFloat(layout.border[YGEdgeLeft]),
-    fabricFloatFromYogaFloat(layout.border[YGEdgeTop]),
-    fabricFloatFromYogaFloat(layout.border[YGEdgeRight]),
-    fabricFloatFromYogaFloat(layout.border[YGEdgeBottom])
-  };
-
-  layoutMetrics.contentInsets = EdgeInsets {
-    fabricFloatFromYogaFloat(layout.border[YGEdgeLeft] + layout.padding[YGEdgeLeft]),
-    fabricFloatFromYogaFloat(layout.border[YGEdgeTop] + layout.padding[YGEdgeTop]),
-    fabricFloatFromYogaFloat(layout.border[YGEdgeRight] + layout.padding[YGEdgeRight]),
-    fabricFloatFromYogaFloat(layout.border[YGEdgeBottom] + layout.padding[YGEdgeBottom])
-  };
-
-  layoutMetrics.displayType =
-    yogaNode.getStyle().display == YGDisplayNone ? DisplayType::None : DisplayType::Flex;
-
-  layoutMetrics.layoutDirection =
-    layout.direction == YGDirectionRTL ? LayoutDirection::RightToLeft : LayoutDirection::LeftToRight;
-
-  return layoutMetrics;
-}
-
-inline void fromDynamic(const folly::dynamic &value, YGDirection &result) {
-  assert(value.isString());
-  auto stringValue = value.asString();
-  if (stringValue == "inherit") { result = YGDirectionInherit; return; }
-  if (stringValue == "ltr") { result = YGDirectionLTR; return; }
-  if (stringValue == "rtl") { result = YGDirectionRTL; return; }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, YGFlexDirection &result) {
-  assert(value.isString());
-  auto stringValue = value.asString();
-  if (stringValue == "column") { result = YGFlexDirectionColumn; return; }
-  if (stringValue == "column-reverse") { result = YGFlexDirectionColumnReverse; return; }
-  if (stringValue == "row") { result = YGFlexDirectionRow; return; }
-  if (stringValue == "row-reverse") { result = YGFlexDirectionRowReverse; return; }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, YGJustify &result) {
-  assert(value.isString());
-  auto stringValue = value.asString();
-  if (stringValue == "flex-start") { result = YGJustifyFlexStart; return; }
-  if (stringValue == "center") { result = YGJustifyCenter; return; }
-  if (stringValue == "flex-end") { result = YGJustifyFlexEnd; return; }
-  if (stringValue == "space-between") { result = YGJustifySpaceBetween; return; }
-  if (stringValue == "space-around") { result = YGJustifySpaceAround; return; }
-  if (stringValue == "space-evenly") { result = YGJustifySpaceEvenly; return; }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, YGAlign &result) {
-  assert(value.isString());
-  auto stringValue = value.asString();
-  if (stringValue == "auto") { result = YGAlignAuto; return; }
-  if (stringValue == "flex-start") { result = YGAlignFlexStart; return; }
-  if (stringValue == "center") { result = YGAlignCenter; return; }
-  if (stringValue == "flex-end") { result = YGAlignFlexEnd; return; }
-  if (stringValue == "stretch") { result = YGAlignStretch; return; }
-  if (stringValue == "baseline") { result = YGAlignBaseline; return; }
-  if (stringValue == "between") { result = YGAlignSpaceBetween; return; }
-  if (stringValue == "space-around") { result = YGAlignSpaceAround; return; }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, YGPositionType &result) {
-  assert(value.isString());
-  auto stringValue = value.asString();
-  if (stringValue == "relative") { result = YGPositionTypeRelative; return; }
-  if (stringValue == "absolute") { result = YGPositionTypeAbsolute; return; }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, YGWrap &result) {
-  assert(value.isString());
-  auto stringValue = value.asString();
-  if (stringValue == "no-wrap") { result = YGWrapNoWrap; return; }
-  if (stringValue == "wrap") { result = YGWrapWrap; return; }
-  if (stringValue == "wrap-reverse") { result = YGWrapWrapReverse; return; }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, YGOverflow &result) {
-  assert(value.isString());
-  auto stringValue = value.asString();
-  if (stringValue == "visible") { result = YGOverflowVisible; return; }
-  if (stringValue == "hidden") { result = YGOverflowHidden; return; }
-  if (stringValue == "scroll") { result = YGOverflowScroll; return; }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, YGDisplay &result) {
-  assert(value.isString());
-  auto stringValue = value.asString();
-  if (stringValue == "flex") { result = YGDisplayFlex; return; }
-  if (stringValue == "none") { result = YGDisplayNone; return; }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, YGValue &result) {
-  if (value.isNumber()) {
-    result = yogaStyleValueFromFloat(value.asDouble());
-    return;
-  } else if (value.isString()) {
-    const auto stringValue = value.asString();
-    if (stringValue == "auto") {
-      result = YGValueUndefined;
-      return;
-    } else {
-      if (stringValue.back() == '%') {
-        result = { folly::to<float>(stringValue.substr(0, stringValue.length() - 1)), YGUnitPercent };
-        return;
-      } else {
-        result = { folly::to<float>(stringValue), YGUnitPoint };
-        return;
-      }
-    }
-  }
-  result = YGValueUndefined;
-}
-
-inline void fromDynamic(const folly::dynamic &value, YGFloatOptional &result) {
-  if (value.isNumber()) {
-    result = YGFloatOptional(value.asDouble());
-    return;
-  } else if (value.isString()) {
-    const auto stringValue = value.asString();
-    if (stringValue == "auto") {
-      result = YGFloatOptional();
-      return;
-    }
-  }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, Transform &result) {
-  assert(value.isArray());
-  Transform transformMatrix;
-  for (const auto &tranformConfiguration : value) {
-    assert(tranformConfiguration.isObject());
-    auto pair = *tranformConfiguration.items().begin();
-    const auto &operation = pair.first.asString();
-    const auto &parameters = pair.second;
-
-    if (operation == "matrix") {
-      assert(parameters.isArray());
-      assert(parameters.size() == transformMatrix.matrix.size());
-      int i = 0;
-      for (auto item : parameters) {
-        transformMatrix.matrix[i++] = (Float)item.asDouble();
-      }
-    } else if (operation == "perspective") {
-      transformMatrix = transformMatrix * Transform::Perspective((Float)parameters.asDouble());
-    } else if (operation == "rotateX") {
-      transformMatrix = transformMatrix * Transform::Rotate((Float)parameters.asDouble(), 0, 0);
-    } else if (operation == "rotateY") {
-      transformMatrix = transformMatrix * Transform::Rotate(0, (Float)parameters.asDouble(), 0);
-    } else if (operation == "rotateZ") {
-      transformMatrix = transformMatrix * Transform::Rotate(0, 0, (Float)parameters.asDouble());
-    } else if (operation == "scale") {
-      transformMatrix = transformMatrix * Transform::Scale((Float)parameters.asDouble(), (Float)parameters.asDouble(), (Float)parameters.asDouble());
-    } else if (operation == "scaleX") {
-      transformMatrix = transformMatrix * Transform::Scale((Float)parameters.asDouble(), 0, 0);
-    } else if (operation == "scaleY") {
-      transformMatrix = transformMatrix * Transform::Scale(0, (Float)parameters.asDouble(), 0);
-    } else if (operation == "scaleZ") {
-      transformMatrix = transformMatrix * Transform::Scale(0, 0, (Float)parameters.asDouble());
-    } else if (operation == "translate") {
-      transformMatrix = transformMatrix * Transform::Translate(parameters[0].asDouble(), parameters[1].asDouble(), 0);
-    } else if (operation == "translateX") {
-      transformMatrix = transformMatrix * Transform::Translate(parameters.asDouble(), 0, 0);
-    } else if (operation == "translateY") {
-      transformMatrix = transformMatrix * Transform::Translate(0, parameters.asDouble(), 0);
-    } else if (operation == "skewX") {
-      transformMatrix = transformMatrix * Transform::Skew(parameters.asDouble(), 0);
-    } else if (operation == "skewY") {
-      transformMatrix = transformMatrix * Transform::Skew(0, parameters.asDouble());
-    }
-  }
-
-  result = transformMatrix;
-}
-
-inline void fromDynamic(const folly::dynamic &value, PointerEventsMode &result) {
-  assert(value.isString());
-  auto stringValue = value.asString();
-  if (stringValue == "auto") { result = PointerEventsMode::Auto; return; }
-  if (stringValue == "none") { result = PointerEventsMode::None; return; }
-  if (stringValue == "box-none") { result = PointerEventsMode::BoxNone; return; }
-  if (stringValue == "box-only") { result = PointerEventsMode::BoxOnly; return; }
-  abort();
-}
-
-inline void fromDynamic(const folly::dynamic &value, BorderStyle &result) {
-  assert(value.isString());
-  auto stringValue = value.asString();
-  if (stringValue == "solid") { result = BorderStyle::Solid; return; }
-  if (stringValue == "dotted") { result = BorderStyle::Dotted; return; }
-  if (stringValue == "dashed") { result = BorderStyle::Dashed; return; }
-  abort();
-}
-
-inline std::string toString(const std::array<float, YGDimensionCount> &dimensions) {
-  return "{" + folly::to<std::string>(dimensions[0]) + ", " + folly::to<std::string>(dimensions[1]) + "}";
-}
-
-inline std::string toString(const std::array<float, 4> &position) {
-  return "{" + folly::to<std::string>(position[0]) + ", " + folly::to<std::string>(position[1]) + "}";
-}
-
-inline std::string toString(const std::array<float, YGEdgeCount> &edges) {
-  return "{" +
-    folly::to<std::string>(edges[0]) + ", " +
-    folly::to<std::string>(edges[1]) + ", " +
-    folly::to<std::string>(edges[2]) + ", " +
-    folly::to<std::string>(edges[3]) + "}";
-}
-
-inline std::string toString(const YGDirection &value) {
-  switch (value) {
-    case YGDirectionInherit: return "inherit";
-    case YGDirectionLTR: return "ltr";
-    case YGDirectionRTL: return "rtl";
-  }
-}
-
-inline std::string toString(const YGFlexDirection &value) {
-  switch (value) {
-    case YGFlexDirectionColumn: return "column";
-    case YGFlexDirectionColumnReverse: return "column-reverse";
-    case YGFlexDirectionRow: return "row";
-    case YGFlexDirectionRowReverse: return "row-reverse";
-  }
-}
-
-inline std::string toString(const YGJustify &value) {
-  switch (value) {
-    case YGJustifyFlexStart: return "flex-start";
-    case YGJustifyCenter: return "center";
-    case YGJustifyFlexEnd: return "flex-end";
-    case YGJustifySpaceBetween: return "space-between";
-    case YGJustifySpaceAround: return "space-around";
-    case YGJustifySpaceEvenly: return "space-evenly";
-  }
-}
-
-inline std::string toString(const YGAlign &value) {
-  switch (value) {
-    case YGAlignAuto: return "auto";
-    case YGAlignFlexStart: return "flex-start";
-    case YGAlignCenter: return "center";
-    case YGAlignFlexEnd: return "flex-end";
-    case YGAlignStretch: return "stretch";
-    case YGAlignBaseline: return "baseline";
-    case YGAlignSpaceBetween: return "space-between";
-    case YGAlignSpaceAround: return "space-around";
-  }
-}
-
-inline std::string toString(const YGPositionType &value) {
-  switch (value) {
-    case YGPositionTypeRelative: return "relative";
-    case YGPositionTypeAbsolute: return "absolute";
-  }
-}
-
-inline std::string toString(const YGWrap &value) {
-  switch (value) {
-    case YGWrapNoWrap: return "no-wrap";
-    case YGWrapWrap: return "wrap";
-    case YGWrapWrapReverse: return "wrap-reverse";
-  }
-}
-
-inline std::string toString(const YGOverflow &value) {
-  switch (value) {
-    case YGOverflowVisible: return "visible";
-    case YGOverflowScroll: return "scroll";
-    case YGOverflowHidden: return "hidden";
-  }
-}
-
-inline std::string toString(const YGDisplay &value) {
-  switch (value) {
-    case YGDisplayFlex: return "flex";
-    case YGDisplayNone: return "none";
-  }
-}
-
-inline std::string toString(const YGValue &value) {
-  switch (value.unit) {
-    case YGUnitUndefined: return "undefined";
-    case YGUnitPoint: return folly::to<std::string>(value.value);
-    case YGUnitPercent: return folly::to<std::string>(value.value) + "%";
-    case YGUnitAuto: return "auto";
-  }
-}
-
-inline std::string toString(const YGFloatOptional &value) {
-  if (value.isUndefined()) {
-    return "undefined";
-  }
-
-  return folly::to<std::string>(fabricFloatFromYogaFloat(value.getValue()));
-}
-
-inline std::string toString(const std::array<YGValue, YGDimensionCount> &value) {
-  return "{" +
-    toString(value[0]) + ", " +
-    toString(value[1]) + "}";
-}
-
-inline std::string toString(const std::array<YGValue, YGEdgeCount> &value) {
-  static std::array<std::string, YGEdgeCount> names = {
-    {"left", "top", "right", "bottom", "start", "end", "horizontal", "vertical", "all"}
-  };
-
-  std::string result;
-  std::string separator = ", ";
-
-  for (int i = 0; i < YGEdgeCount; i++) {
-    if (value[i].unit == YGUnitUndefined) {
-      continue;
-    }
-    result += names[i] + ": " + toString(value[i]) + separator;
-  }
-
-  if (!result.empty()) {
-    result.erase(result.length() - separator.length());
-  }
-
-  return "{" + result + "}";
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/primitives.h b/ReactCommon/fabric/view/primitives.h
deleted file mode 100644
index f7814c04152900..00000000000000
--- a/ReactCommon/fabric/view/primitives.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <cmath>
-
-namespace facebook {
-namespace react {
-
-struct Transform {
-  std::array<Float, 16> matrix {{
-    1, 0, 0, 0,
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1
-  }};
-
-  static Transform Identity() {
-    Transform transform;
-    return transform;
-  }
-
-  static Transform Perspective(const Float &perspective) {
-    Transform transform;
-    transform.matrix[11] = -1.0 / perspective;
-    return transform;
-  }
-
-  static Transform Scale(const Float &factorX, const Float &factorY, const Float &factorZ) {
-    Transform transform;
-    transform.matrix[0] = factorX;
-    transform.matrix[5] = factorY;
-    transform.matrix[10] = factorZ;
-    return transform;
-  }
-
-  static Transform Translate(const Float &x, const Float &y, const Float &z) {
-    Transform transform;
-    transform.matrix[12] = x;
-    transform.matrix[13] = y;
-    transform.matrix[14] = z;
-    return transform;
-  }
-
-  static Transform Skew(const Float &x, const Float &y) {
-    Transform transform;
-    transform.matrix[4] = std::tan(x);
-    transform.matrix[1] = std::tan(y);
-    return transform;
-  }
-
-  static Transform RotateX(const Float &radians) {
-    Transform transform;
-    transform.matrix[5] = std::cos(radians);
-    transform.matrix[6] = std::sin(radians);
-    transform.matrix[9] = -std::sin(radians);
-    transform.matrix[10] = std::cos(radians);
-    return transform;
-  }
-
-  static Transform RotateY(const Float &radians) {
-    Transform transform;
-    transform.matrix[0] = std::cos(radians);
-    transform.matrix[2] = -std::sin(radians);
-    transform.matrix[8] = std::sin(radians);
-    transform.matrix[10] = std::cos(radians);
-    return transform;
-  }
-
-  static Transform RotateZ(const Float &radians) {
-    Transform transform;
-    transform.matrix[0] = std::cos(radians);
-    transform.matrix[1] = std::sin(radians);
-    transform.matrix[4] = -std::sin(radians);
-    transform.matrix[5] = std::cos(radians);
-    return transform;
-  }
-
-  static Transform Rotate(const Float &x, const Float &y, const Float &z) {
-    Transform transform;
-    if (x != 0) { transform = transform * Transform::RotateX(x); }
-    if (y != 0) { transform = transform * Transform::RotateY(y); }
-    if (z != 0) { transform = transform * Transform::RotateZ(z); }
-    return transform;
-  }
-
-  bool operator ==(const Transform& rhs) const {
-    for (int i = 0; i < 16; i++) {
-      if (matrix[i] != rhs.matrix[i]) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  bool operator !=(const Transform& rhs) const {
-    return !(*this == rhs);
-  }
-
-  Transform operator *(const Transform& rhs) const {
-    if (*this == Transform::Identity()) {
-      return rhs;
-    }
-
-    const Transform &lhs = *this;
-    Transform result;
-
-    Float 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];
-
-    Float rhs0 = rhs.matrix[0], rhs1 = rhs.matrix[1], rhs2 = rhs.matrix[2], 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;
-    result.matrix[3] = rhs0 * lhs03 + rhs1 * lhs13 + rhs2 * lhs23 + rhs3 * lhs33;
-
-    rhs0 = rhs.matrix[4]; rhs1 = rhs.matrix[5]; rhs2 = rhs.matrix[6]; rhs3 = rhs.matrix[7];
-    result.matrix[4] = rhs0 * lhs00 + rhs1 * lhs10 + rhs2 * lhs20 + rhs3 * lhs30;
-    result.matrix[5] = rhs0 * lhs01 + rhs1 * lhs11 + rhs2 * lhs21 + rhs3 * lhs31;
-    result.matrix[6] = rhs0 * lhs02 + rhs1 * lhs12 + rhs2 * lhs22 + rhs3 * lhs32;
-    result.matrix[7] = rhs0 * lhs03 + rhs1 * lhs13 + rhs2 * lhs23 + rhs3 * lhs33;
-
-    rhs0 = rhs.matrix[8]; rhs1 = rhs.matrix[9]; rhs2 = rhs.matrix[10]; rhs3 = rhs.matrix[11];
-    result.matrix[8] = rhs0 * lhs00 + rhs1 * lhs10 + rhs2 * lhs20 + rhs3 * lhs30;
-    result.matrix[9] = rhs0 * lhs01 + rhs1 * lhs11 + rhs2 * lhs21 + rhs3 * lhs31;
-    result.matrix[10] = rhs0 * lhs02 + rhs1 * lhs12 + rhs2 * lhs22 + rhs3 * lhs32;
-    result.matrix[11] = rhs0 * lhs03 + rhs1 * lhs13 + rhs2 * lhs23 + rhs3 * lhs33;
-
-    rhs0 = rhs.matrix[12]; rhs1 = rhs.matrix[13]; rhs2 = rhs.matrix[14]; rhs3 = rhs.matrix[15];
-    result.matrix[12] = rhs0 * lhs00 + rhs1 * lhs10 + rhs2 * lhs20 + rhs3 * lhs30;
-    result.matrix[13] = rhs0 * lhs01 + rhs1 * lhs11 + rhs2 * lhs21 + rhs3 * lhs31;
-    result.matrix[14] = rhs0 * lhs02 + rhs1 * lhs12 + rhs2 * lhs22 + rhs3 * lhs32;
-    result.matrix[15] = rhs0 * lhs03 + rhs1 * lhs13 + rhs2 * lhs23 + rhs3 * lhs33;
-
-    return result;
-  }
-};
-
-enum class PointerEventsMode {
-  Auto,
-  None,
-  BoxNone,
-  BoxOnly
-};
-
-enum class BorderStyle {
-  Solid,
-  Dotted,
-  Dashed
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/propsConversions.h b/ReactCommon/fabric/view/propsConversions.h
deleted file mode 100644
index 8a8cfe099a59a5..00000000000000
--- a/ReactCommon/fabric/view/propsConversions.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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 <fabric/core/propsConversions.h>
-#include <fabric/view/conversions.h>
-
-namespace facebook {
-namespace react {
-
-static std::array<YGValue, 2> convertRawProp(const RawProps &rawProps, const std::string &widthName, const std::string &heightName, const std::array<YGValue, 2> &defaultValue) {
-  std::array<YGValue, 2> dimentions;
-  dimentions[YGDimensionWidth] = convertRawProp(rawProps, widthName, defaultValue[YGDimensionWidth]);
-  dimentions[YGDimensionHeight] = convertRawProp(rawProps, heightName, defaultValue[YGDimensionHeight]);
-  return dimentions;
-}
-
-static std::array<YGValue, YGEdgeCount> convertRawProp(const RawProps &rawProps, const std::string &prefix, const std::array<YGValue, YGEdgeCount> &defaultValue) {
-  std::array<YGValue, YGEdgeCount> result = defaultValue;
-  result[YGEdgeLeft] = convertRawProp(rawProps, prefix + "Left", defaultValue[YGEdgeLeft]);
-  result[YGEdgeTop] = convertRawProp(rawProps, prefix + "Top", defaultValue[YGEdgeTop]);
-  result[YGEdgeRight] = convertRawProp(rawProps, prefix + "Right", defaultValue[YGEdgeRight]);
-  result[YGEdgeBottom] = convertRawProp(rawProps, prefix + "Bottom", defaultValue[YGEdgeBottom]);
-  result[YGEdgeStart] = convertRawProp(rawProps, prefix + "Start", defaultValue[YGEdgeStart]);
-  result[YGEdgeEnd] = convertRawProp(rawProps, prefix + "End", defaultValue[YGEdgeEnd]);
-  result[YGEdgeHorizontal] = convertRawProp(rawProps, prefix + "Horizontal", defaultValue[YGEdgeHorizontal]);
-  result[YGEdgeVertical] = convertRawProp(rawProps, prefix + "Vertical", defaultValue[YGEdgeVertical]);
-  result[YGEdgeAll] = convertRawProp(rawProps, prefix, defaultValue[YGEdgeAll]);
-  return result;
-}
-
-static std::array<YGValue, YGEdgeCount> convertRawProp(const RawProps &rawProps, const std::array<YGValue, YGEdgeCount> &defaultValue) {
-  std::array<YGValue, YGEdgeCount> result = defaultValue;
-  result[YGEdgeLeft] = convertRawProp(rawProps, "left", defaultValue[YGEdgeLeft]);
-  result[YGEdgeTop] = convertRawProp(rawProps, "top", defaultValue[YGEdgeTop]);
-  result[YGEdgeRight] = convertRawProp(rawProps, "right", defaultValue[YGEdgeRight]);
-  result[YGEdgeBottom] = convertRawProp(rawProps, "bottom", defaultValue[YGEdgeBottom]);
-  result[YGEdgeStart] = convertRawProp(rawProps, "start", defaultValue[YGEdgeStart]);
-  result[YGEdgeEnd] = convertRawProp(rawProps, "end", defaultValue[YGEdgeEnd]);
-  return result;
-}
-
-static YGStyle convertRawProp(const RawProps &rawProps, const YGStyle &defaultValue) {
-  YGStyle yogaStyle;
-  yogaStyle.direction = convertRawProp(rawProps, "direction", defaultValue.direction);
-  yogaStyle.flexDirection = convertRawProp(rawProps, "flexDirection", defaultValue.flexDirection);
-  yogaStyle.justifyContent = convertRawProp(rawProps, "justifyContent", defaultValue.justifyContent);
-  yogaStyle.alignContent = convertRawProp(rawProps, "alignContent", defaultValue.alignContent);
-  yogaStyle.alignItems = convertRawProp(rawProps, "alignItems", defaultValue.alignItems);
-  yogaStyle.alignSelf = convertRawProp(rawProps, "alignSelf", defaultValue.alignSelf);
-  yogaStyle.positionType = convertRawProp(rawProps, "position", defaultValue.positionType);
-  yogaStyle.flexWrap = convertRawProp(rawProps, "flexWrap", defaultValue.flexWrap);
-  yogaStyle.overflow = convertRawProp(rawProps, "overflow", defaultValue.overflow);
-  yogaStyle.display = convertRawProp(rawProps, "display", defaultValue.display);
-  yogaStyle.flex = convertRawProp(rawProps, "flex", defaultValue.flex);
-  yogaStyle.flexGrow = convertRawProp(rawProps, "flexGrow", defaultValue.flexGrow);
-  yogaStyle.flexShrink = convertRawProp(rawProps, "flexShrink", defaultValue.flexShrink);
-  yogaStyle.flexBasis = convertRawProp(rawProps, "flexBasis", defaultValue.flexBasis);
-  yogaStyle.margin = convertRawProp(rawProps, "margin", defaultValue.margin);
-  yogaStyle.position = convertRawProp(rawProps, defaultValue.position);
-  yogaStyle.padding = convertRawProp(rawProps, "padding", defaultValue.padding);
-  yogaStyle.border = convertRawProp(rawProps, "border", defaultValue.border);
-  yogaStyle.dimensions = convertRawProp(rawProps, "width", "height", defaultValue.dimensions);
-  yogaStyle.minDimensions = convertRawProp(rawProps, "minWidth", "minHeight", defaultValue.minDimensions);
-  yogaStyle.maxDimensions = convertRawProp(rawProps, "maxWidth", "maxHeight", defaultValue.maxDimensions);
-  yogaStyle.aspectRatio = convertRawProp(rawProps, "aspectRatio", defaultValue.aspectRatio);
-  return yogaStyle;
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/root/RootProps.cpp b/ReactCommon/fabric/view/root/RootProps.cpp
deleted file mode 100644
index fe9f711d3ac2cc..00000000000000
--- a/ReactCommon/fabric/view/root/RootProps.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "RootProps.h"
-
-#include <fabric/view/conversions.h>
-#include <fabric/view/YogaLayoutableShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-static YGStyle yogaStyleFromLayoutConstraints(const LayoutConstraints &layoutConstraints) {
-  YGStyle yogaStyle;
-  yogaStyle.minDimensions[YGDimensionWidth] =
-    yogaStyleValueFromFloat(layoutConstraints.minimumSize.width);
-  yogaStyle.minDimensions[YGDimensionHeight] =
-    yogaStyleValueFromFloat(layoutConstraints.minimumSize.height);
-
-  yogaStyle.maxDimensions[YGDimensionWidth] =
-    yogaStyleValueFromFloat(layoutConstraints.maximumSize.width);
-  yogaStyle.maxDimensions[YGDimensionHeight] =
-    yogaStyleValueFromFloat(layoutConstraints.maximumSize.height);
-
-  return yogaStyle;
-}
-
-RootProps::RootProps(
-  const RootProps &sourceProps,
-  const LayoutConstraints &layoutConstraints,
-  const LayoutContext &layoutContext
-):
-  ViewProps(yogaStyleFromLayoutConstraints(layoutConstraints)),
-  layoutConstraints(layoutConstraints),
-  layoutContext(layoutContext) {};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/yoga/YogaLayoutableShadowNode.cpp b/ReactCommon/fabric/view/yoga/YogaLayoutableShadowNode.cpp
deleted file mode 100644
index 5941baa057ba2b..00000000000000
--- a/ReactCommon/fabric/view/yoga/YogaLayoutableShadowNode.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "YogaLayoutableShadowNode.h"
-
-#include <algorithm>
-#include <memory>
-
-#include <fabric/core/LayoutContext.h>
-#include <fabric/core/LayoutConstraints.h>
-#include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/view/conversions.h>
-#include <yoga/Yoga.h>
-
-namespace facebook {
-namespace react {
-
-YogaLayoutableShadowNode::YogaLayoutableShadowNode(
-  const SharedYogaStylableProps &props,
-  const SharedShadowNodeSharedList &children
-):
-  yogaNode_({}),
-  yogaConfig_(nullptr) {
-
-  assert(props);
-  assert(children);
-
-  initializeYogaConfig(yogaConfig_);
-  yogaNode_.setConfig(&yogaConfig_);
-  yogaNode_.setStyle(props->yogaStyle);
-  yogaNode_.setContext(this);
-  yogaNode_.setDirty(true);
-
-  YogaLayoutableShadowNode::setYogaNodeChildrenBasedOnShadowNodeChildren(&yogaNode_, children);
-}
-
-YogaLayoutableShadowNode::YogaLayoutableShadowNode(
-  const SharedYogaLayoutableShadowNode &shadowNode,
-  const SharedYogaStylableProps &props,
-  const SharedShadowNodeSharedList &children
-):
-  yogaNode_(shadowNode->yogaNode_),
-  yogaConfig_(nullptr) {
-
-  initializeYogaConfig(yogaConfig_);
-  yogaNode_.setConfig(&yogaConfig_);
-  yogaNode_.setContext(this);
-  yogaNode_.setOwner(nullptr);
-  yogaNode_.setDirty(true);
-
-  if (props) {
-    yogaNode_.setStyle(props->yogaStyle);
-  }
-
-  if (children) {
-    YogaLayoutableShadowNode::setYogaNodeChildrenBasedOnShadowNodeChildren(&yogaNode_, children);
-  }
-}
-
-void YogaLayoutableShadowNode::cleanLayout() {
-  yogaNode_.setDirty(false);
-}
-
-void YogaLayoutableShadowNode::dirtyLayout() {
-  yogaNode_.markDirtyAndPropogate();
-}
-
-bool YogaLayoutableShadowNode::getIsLayoutClean() const {
-  return !yogaNode_.isDirty();
-}
-
-bool YogaLayoutableShadowNode::getHasNewLayout() const {
-  return yogaNode_.getHasNewLayout();
-}
-
-void YogaLayoutableShadowNode::setHasNewLayout(bool hasNewLayout) {
-  yogaNode_.setHasNewLayout(hasNewLayout);
-}
-
-#pragma mark - Mutating Methods
-
-void YogaLayoutableShadowNode::enableMeasurement() {
-  ensureUnsealed();
-
-  yogaNode_.setMeasureFunc(YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector);
-}
-
-void YogaLayoutableShadowNode::appendChild(SharedYogaLayoutableShadowNode child) {
-  ensureUnsealed();
-
-  auto yogaNodeRawPtr = &yogaNode_;
-  auto childYogaNodeRawPtr = &child->yogaNode_;
-  yogaNodeRawPtr->insertChild(childYogaNodeRawPtr, yogaNodeRawPtr->getChildrenCount());
-
-  if (childYogaNodeRawPtr->getOwner() == nullptr) {
-    child->ensureUnsealed();
-    childYogaNodeRawPtr->setOwner(yogaNodeRawPtr);
-  }
-}
-
-void YogaLayoutableShadowNode::layout(LayoutContext layoutContext) {
-  if (!getIsLayoutClean()) {
-    ensureUnsealed();
-
-    /*
-     * In Yoga, every single Yoga Node has to have a (non-null) pointer to
-     * Yoga Config (this config can be shared between many nodes),
-     * so every node can be individually configured. This does *not* mean
-     * however that Yoga consults with every single Yoga Node Config for every
-     * config parameter. Especially in case of `pointScaleFactor`,
-     * the only value in the config of the root node is taken into account
-     * (and this is by design).
-     */
-    yogaConfig_.pointScaleFactor = layoutContext.pointScaleFactor;
-    YGNodeCalculateLayout(&yogaNode_, YGUndefined, YGUndefined, YGDirectionInherit);
-  }
-
-  LayoutableShadowNode::layout(layoutContext);
-}
-
-void YogaLayoutableShadowNode::layoutChildren(LayoutContext layoutContext) {
-  for (auto child : getLayoutableChildNodes()) {
-    auto yogaLayoutableChild = std::dynamic_pointer_cast<const YogaLayoutableShadowNode>(child);
-    if (!yogaLayoutableChild) {
-      continue;
-    }
-
-    auto nonConstYogaLayoutableChild = std::const_pointer_cast<YogaLayoutableShadowNode>(yogaLayoutableChild);
-
-    LayoutMetrics childLayoutMetrics = layoutMetricsFromYogaNode(nonConstYogaLayoutableChild->yogaNode_);
-    childLayoutMetrics.pointScaleFactor = layoutContext.pointScaleFactor;
-    nonConstYogaLayoutableChild->setLayoutMetrics(childLayoutMetrics);
-  }
-}
-
-#pragma mark - Yoga Connectors
-
-YGNode *YogaLayoutableShadowNode::yogaNodeCloneCallbackConnector(YGNode *oldYogaNode, YGNode *parentYogaNode, int childIndex) {
-  // We have only raw pointer to the parent shadow node, but that's enough for now.
-  YogaLayoutableShadowNode *parentShadowNodeRawPtr = (YogaLayoutableShadowNode *)parentYogaNode->getContext();
-  assert(parentShadowNodeRawPtr);
-
-  // Old child shadow node already exists but we have only raw pointer to it...
-  YogaLayoutableShadowNode *oldShadowNodeRawPtr = (YogaLayoutableShadowNode *)oldYogaNode->getContext();
-  assert(oldShadowNodeRawPtr);
-
-  // ... but we have to address this by `shared_ptr`. We cannot create a new `shared_ptr` for it because we will end up with two shared pointers to
-  // single object which will cause preluminary destroyng the object.
-
-  auto &&layoutableChildNodes = parentShadowNodeRawPtr->getLayoutableChildNodes();
-  SharedLayoutableShadowNode oldShadowNode = nullptr;
-
-  // We cannot rely on `childIndex` all the time because `childNodes` can
-  // contain non-layoutable shadow nodes, however chances are good that
-  // `childIndex` points to the right shadow node.
-
-  // Optimistic attempt (in case if `childIndex` is valid):
-  if (childIndex < layoutableChildNodes.size()) {
-    oldShadowNode = layoutableChildNodes[childIndex];
-    if (oldShadowNode.get() == oldShadowNodeRawPtr) {
-      goto found;
-    } else {
-      oldShadowNode = nullptr;
-    }
-  }
-
-  // General solution:
-  for (auto child : layoutableChildNodes) {
-    if (child.get() == oldShadowNodeRawPtr) {
-      oldShadowNode = child;
-      break;
-    }
-  }
-
-  assert(oldShadowNode);
-
-found:
-
-  // The new one does not exist yet. So, we have to clone and replace this using `cloneAndReplaceChild`.
-  SharedYogaLayoutableShadowNode newShadowNode =
-    std::dynamic_pointer_cast<const YogaLayoutableShadowNode>(parentShadowNodeRawPtr->cloneAndReplaceChild(oldShadowNode));
-  assert(newShadowNode);
-
-  return &newShadowNode->yogaNode_;
-}
-
-YGSize YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector(YGNode *yogaNode, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode) {
-  YogaLayoutableShadowNode *shadowNodeRawPtr = (YogaLayoutableShadowNode *)yogaNode->getContext();
-  assert(shadowNodeRawPtr);
-
-  Size minimumSize = Size {0, 0};
-  Size maximumSize = Size {kFloatMax, kFloatMax};
-
-  switch (widthMode) {
-    case YGMeasureModeUndefined:
-      break;
-    case YGMeasureModeExactly:
-      minimumSize.width = fabricFloatFromYogaFloat(width);
-      maximumSize.width = fabricFloatFromYogaFloat(width);
-      break;
-    case YGMeasureModeAtMost:
-      maximumSize.width = fabricFloatFromYogaFloat(width);
-      break;
-  }
-
-  switch (heightMode) {
-    case YGMeasureModeUndefined:
-      break;
-    case YGMeasureModeExactly:
-      minimumSize.height = fabricFloatFromYogaFloat(height);
-      maximumSize.height = fabricFloatFromYogaFloat(height);
-      break;
-    case YGMeasureModeAtMost:
-      maximumSize.height = fabricFloatFromYogaFloat(height);
-      break;
-  }
-
-  Size size = shadowNodeRawPtr->measure(LayoutConstraints {minimumSize, maximumSize});
-
-  return YGSize {
-    yogaFloatFromFabricFloat(size.width),
-    yogaFloatFromFabricFloat(size.height)
-  };
-}
-
-void YogaLayoutableShadowNode::setYogaNodeChildrenBasedOnShadowNodeChildren(YGNode *yogaNodeRawPtr, const SharedShadowNodeSharedList &children) {
-  auto yogaNodeChildren = YGVector();
-
-  for (const SharedShadowNode &shadowNode : *children) {
-    const SharedYogaLayoutableShadowNode yogaLayoutableShadowNode = std::dynamic_pointer_cast<const YogaLayoutableShadowNode>(shadowNode);
-
-    if (!yogaLayoutableShadowNode) {
-      continue;
-    }
-
-    auto &&childYogaNodeRawPtr = &yogaLayoutableShadowNode->yogaNode_;
-
-    yogaNodeChildren.push_back(childYogaNodeRawPtr);
-
-    if (childYogaNodeRawPtr->getOwner() == nullptr) {
-      yogaLayoutableShadowNode->ensureUnsealed();
-      childYogaNodeRawPtr->setOwner(yogaNodeRawPtr);
-    }
-  }
-
-  yogaNodeRawPtr->setChildren(yogaNodeChildren);
-}
-
-void YogaLayoutableShadowNode::initializeYogaConfig(YGConfig &config) {
-  config.cloneNodeCallback = YogaLayoutableShadowNode::yogaNodeCloneCallbackConnector;
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/view/yoga/YogaStylableProps.cpp b/ReactCommon/fabric/view/yoga/YogaStylableProps.cpp
deleted file mode 100644
index d89686b5366e22..00000000000000
--- a/ReactCommon/fabric/view/yoga/YogaStylableProps.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "YogaStylableProps.h"
-
-#include <fabric/view/conversions.h>
-#include <fabric/core/propsConversions.h>
-#include <fabric/view/propsConversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
-#include <yoga/YGNode.h>
-#include <yoga/Yoga.h>
-
-#include "conversions.h"
-
-namespace facebook {
-namespace react {
-
-YogaStylableProps::YogaStylableProps(const YGStyle &yogaStyle):
-  yogaStyle(yogaStyle) {}
-
-YogaStylableProps::YogaStylableProps(const YogaStylableProps &sourceProps, const RawProps &rawProps):
-  yogaStyle(convertRawProp(rawProps, sourceProps.yogaStyle)) {};
-
-#pragma mark - DebugStringConvertible
-
-SharedDebugStringConvertibleList YogaStylableProps::getDebugProps() const {
-  YGStyle defaultYogaStyle;
-  return {
-    debugStringConvertibleItem("direction", yogaStyle.direction, defaultYogaStyle.direction),
-    debugStringConvertibleItem("flexDirection", yogaStyle.flexDirection, defaultYogaStyle.flexDirection),
-    debugStringConvertibleItem("justifyContent", yogaStyle.justifyContent, defaultYogaStyle.justifyContent),
-    debugStringConvertibleItem("alignContent", yogaStyle.alignContent, defaultYogaStyle.alignContent),
-    debugStringConvertibleItem("alignItems", yogaStyle.alignItems, defaultYogaStyle.alignItems),
-    debugStringConvertibleItem("alignSelf", yogaStyle.alignSelf, defaultYogaStyle.alignSelf),
-    debugStringConvertibleItem("positionType", yogaStyle.positionType, defaultYogaStyle.positionType),
-    debugStringConvertibleItem("flexWrap", yogaStyle.flexWrap, defaultYogaStyle.flexWrap),
-    debugStringConvertibleItem("overflow", yogaStyle.overflow, defaultYogaStyle.overflow),
-    debugStringConvertibleItem("display", yogaStyle.display, defaultYogaStyle.display),
-    debugStringConvertibleItem("flex", yogaStyle.flex, defaultYogaStyle.flex),
-    debugStringConvertibleItem("flexGrow", yogaStyle.flexGrow, defaultYogaStyle.flexGrow),
-    debugStringConvertibleItem("flexShrink", yogaStyle.flexShrink, defaultYogaStyle.flexShrink),
-    debugStringConvertibleItem("flexBasis", yogaStyle.flexBasis, defaultYogaStyle.flexBasis),
-    debugStringConvertibleItem("margin", yogaStyle.margin, defaultYogaStyle.margin),
-    debugStringConvertibleItem("position", yogaStyle.position, defaultYogaStyle.position),
-    debugStringConvertibleItem("padding", yogaStyle.padding, defaultYogaStyle.padding),
-    debugStringConvertibleItem("border", yogaStyle.border, defaultYogaStyle.border),
-    debugStringConvertibleItem("dimensions", yogaStyle.dimensions, defaultYogaStyle.dimensions),
-    debugStringConvertibleItem("minDimensions", yogaStyle.minDimensions, defaultYogaStyle.minDimensions),
-    debugStringConvertibleItem("maxDimensions", yogaStyle.maxDimensions, defaultYogaStyle.maxDimensions),
-    debugStringConvertibleItem("aspectRatio", yogaStyle.aspectRatio, defaultYogaStyle.aspectRatio),
-  };
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/jschelpers/Android.mk b/ReactCommon/jschelpers/Android.mk
deleted file mode 100644
index 9202278639254f..00000000000000
--- a/ReactCommon/jschelpers/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := jschelpers
-
-LOCAL_SRC_FILES := \
-  JSCHelpers.cpp \
-  Unicode.cpp \
-  Value.cpp \
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
-
-LOCAL_CFLAGS := \
-  -DLOG_TAG=\"ReactNative\"
-
-LOCAL_CFLAGS += -Wall -Werror -fexceptions -frtti
-CXX11_FLAGS := -std=c++11
-LOCAL_CFLAGS += $(CXX11_FLAGS)
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
-
-LOCAL_SHARED_LIBRARIES := libfolly_json libjsc libglog
-
-include $(BUILD_STATIC_LIBRARY)
-
-$(call import-module,folly)
-$(call import-module,jsc)
-$(call import-module,glog)
-$(call import-module,privatedata)
diff --git a/ReactCommon/jschelpers/BUCK b/ReactCommon/jschelpers/BUCK
deleted file mode 100644
index 7739b8f7dc5454..00000000000000
--- a/ReactCommon/jschelpers/BUCK
+++ /dev/null
@@ -1,73 +0,0 @@
-load("//ReactNative:DEFS.bzl", "ANDROID", "ANDROID_JSC_INTERNAL_DEPS", "APPLE", "APPLE_JSC_INTERNAL_DEPS", "react_native_xplat_target", "rn_xplat_cxx_library")
-
-EXPORTED_HEADERS = [
-    "JavaScriptCore.h",
-    "JSCHelpers.h",
-    "JSCWrapper.h",
-    "noncopyable.h",
-    "Unicode.h",
-    "Value.h",
-]
-
-rn_xplat_cxx_library(
-    name = "jscinternalhelpers",
-    srcs = glob(
-        ["*.cpp"],
-        exclude = ["systemJSCWrapper.cpp"],
-    ),
-    headers = glob(
-        ["*.h"],
-        exclude = EXPORTED_HEADERS,
-    ),
-    header_namespace = "",
-    exported_headers = dict([
-        (
-            "jschelpers/%s" % header,
-            header,
-        )
-        for header in EXPORTED_HEADERS
-    ]),
-    compiler_flags = [
-        "-Wall",
-        "-fexceptions",
-        "-frtti",
-        "-fvisibility=hidden",
-        "-std=c++1y",
-    ],
-    fbandroid_deps = ANDROID_JSC_INTERNAL_DEPS,
-    fbobjc_deps = APPLE_JSC_INTERNAL_DEPS,
-    force_static = True,
-    platforms = (ANDROID, APPLE),
-    visibility = [
-        "PUBLIC",
-    ],
-    deps = [
-        "xplat//folly:molly",
-        "xplat//third-party/glog:glog",
-        react_native_xplat_target("privatedata:privatedata"),
-    ],
-    exported_deps = [
-        react_native_xplat_target("privatedata:privatedata"),
-    ],
-)
-
-rn_xplat_cxx_library(
-    name = "jschelpers",
-    srcs = [],
-    compiler_flags = [
-        "-Wall",
-        "-fexceptions",
-        "-fvisibility=hidden",
-        "-std=c++1y",
-    ],
-    fbobjc_frameworks = [
-        "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
-    ],
-    fbobjc_srcs = ["systemJSCWrapper.cpp"],
-    force_static = True,
-    platforms = (ANDROID, APPLE),
-    visibility = [
-        "PUBLIC",
-    ],
-    deps = [":jscinternalhelpers"],
-)
diff --git a/ReactCommon/jschelpers/JSCHelpers.cpp b/ReactCommon/jschelpers/JSCHelpers.cpp
deleted file mode 100644
index 3c28eb81ac6b02..00000000000000
--- a/ReactCommon/jschelpers/JSCHelpers.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "JSCHelpers.h"
-
-#ifdef WITH_FBSYSTRACE
-#include <fbsystrace.h>
-#endif
-
-#include <glog/logging.h>
-
-#if WITH_FBJSCEXTENSIONS
-#include <pthread.h>
-#endif
-
-#include "JavaScriptCore.h"
-#include "Value.h"
-#include <privatedata/PrivateDataBase.h>
-
-#if WITH_FBJSCEXTENSIONS
-#undef ASSERT
-#undef WTF_EXPORT_PRIVATE
-
-#include <JavaScriptCore/config.h>
-#include <wtf/WTFThreadData.h>
-
-#undef TRUE
-#undef FALSE
-#endif
-
-namespace facebook {
-namespace react {
-
-namespace {
-
-class JSFunctionPrivateData : public PrivateDataBase {
- public:
-  explicit JSFunctionPrivateData(JSFunction&& function) : jsFunction_{std::move(function)} {}
-
-  JSFunction& getJSFunction() {
-    return jsFunction_;
-  }
-
-private:
-  JSFunction jsFunction_;
-};
-
-JSValueRef functionCaller(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef* exception) {
-  const bool isCustomJSC = isCustomJSCPtr(ctx);
-  auto* privateData = PrivateDataBase::cast<JSFunctionPrivateData>(
-    JSC_JSObjectGetPrivate(isCustomJSC, function));
-  return (privateData->getJSFunction())(ctx, thisObject, argumentCount, arguments);
-}
-
-JSClassRef createFuncClass(JSContextRef ctx) {
-  JSClassDefinition definition = kJSClassDefinitionEmpty;
-  definition.attributes |= kJSClassAttributeNoAutomaticPrototype;
-
-  // Need to duplicate the two different finalizer blocks, since there's no way
-  // for it to capture this static information.
-  const bool isCustomJSC = isCustomJSCPtr(ctx);
-  if (isCustomJSC) {
-    definition.finalize = [](JSObjectRef object) {
-      auto* privateData = PrivateDataBase::cast<JSFunctionPrivateData>(
-        JSC_JSObjectGetPrivate(true, object));
-      delete privateData;
-    };
-  } else {
-    definition.finalize = [](JSObjectRef object) {
-      auto* privateData = PrivateDataBase::cast<JSFunctionPrivateData>(
-        JSC_JSObjectGetPrivate(false, object));
-      delete privateData;
-    };
-  }
-  definition.callAsFunction = exceptionWrapMethod<&functionCaller>();
-
-  return JSC_JSClassCreate(isCustomJSC, &definition);
-}
-
-JSObjectRef makeFunction(
-    JSContextRef ctx,
-    JSStringRef name,
-    JSFunction function) {
-  static JSClassRef kClassDef = NULL, kCustomJSCClassDef = NULL;
-  JSClassRef *classRef = isCustomJSCPtr(ctx) ? &kCustomJSCClassDef : &kClassDef;
-  if (!*classRef) {
-    *classRef = createFuncClass(ctx);
-  }
-
-  // dealloc in kClassDef.finalize
-  JSFunctionPrivateData *functionDataPtr = new JSFunctionPrivateData(std::move(function));
-  auto functionObject = Object(ctx, JSC_JSObjectMake(ctx, *classRef, functionDataPtr));
-  functionObject.setProperty("name", Value(ctx, name));
-  return functionObject;
-}
-
-}
-
-void JSException::buildMessage(JSContextRef ctx, JSValueRef exn, JSStringRef sourceURL, const char* errorMsg) {
-  std::ostringstream msgBuilder;
-  if (errorMsg && strlen(errorMsg) > 0) {
-    msgBuilder << errorMsg << ": ";
-  }
-
-  Object exnObject = Value(ctx, exn).asObject();
-  Value exnMessage = exnObject.getProperty("message");
-  msgBuilder << (exnMessage.isString() ? exnMessage : (Value)exnObject).toString().str();
-
-  // The null/empty-ness of source tells us if the JS came from a
-  // file/resource, or was a constructed statement.  The location
-  // info will include that source, if any.
-  std::string locationInfo = sourceURL != nullptr ? String::ref(ctx, sourceURL).str() : "";
-  auto line = exnObject.getProperty("line");
-  if (line != nullptr && line.isNumber()) {
-    if (locationInfo.empty() && line.asInteger() != 1) {
-      // If there is a non-trivial line number, but there was no
-      // location info, we include a placeholder, and the line
-      // number.
-      locationInfo = folly::to<std::string>("<unknown file>:", line.asInteger());
-    } else if (!locationInfo.empty()) {
-      // If there is location info, we always include the line
-      // number, regardless of its value.
-      locationInfo += folly::to<std::string>(":", line.asInteger());
-    }
-  }
-
-  if (!locationInfo.empty()) {
-    msgBuilder << " (" << locationInfo << ")";
-  }
-
-  auto exceptionText = msgBuilder.str();
-  LOG(ERROR) << "Got JS Exception: " << exceptionText;
-  msg_ = std::move(exceptionText);
-
-  Value jsStack = exnObject.getProperty("stack");
-  if (jsStack.isString()) {
-    auto stackText = jsStack.toString().str();
-    LOG(ERROR) << "Got JS Stack: " << stackText;
-    stack_ = std::move(stackText);
-  }
-}
-
-namespace ExceptionHandling {
-
-PlatformErrorExtractor platformErrorExtractor;
-
-}
-
-JSObjectRef makeFunction(
-    JSContextRef ctx,
-    const char* name,
-    JSFunction function) {
-  return makeFunction(ctx, String(ctx, name), std::move(function));
-}
-
-void installGlobalFunction(
-    JSGlobalContextRef ctx,
-    const char* name,
-    JSFunction function) {
-  auto jsName = String(ctx, name);
-  auto functionObj = makeFunction(ctx, jsName, std::move(function));
-  Object::getGlobalObject(ctx).setProperty(jsName, Value(ctx, functionObj));
-}
-
-JSObjectRef makeFunction(
-    JSGlobalContextRef ctx,
-    const char* name,
-    JSObjectCallAsFunctionCallback callback) {
-  auto jsName = String(ctx, name);
-  return JSC_JSObjectMakeFunctionWithCallback(ctx, jsName, callback);
-}
-
-void installGlobalFunction(
-    JSGlobalContextRef ctx,
-    const char* name,
-    JSObjectCallAsFunctionCallback callback) {
-  String jsName(ctx, name);
-  JSObjectRef functionObj = JSC_JSObjectMakeFunctionWithCallback(
-    ctx, jsName, callback);
-  Object::getGlobalObject(ctx).setProperty(jsName, Value(ctx, functionObj));
-}
-
-void installGlobalProxy(
-    JSGlobalContextRef ctx,
-    const char* name,
-    JSObjectGetPropertyCallback callback) {
-  JSClassDefinition proxyClassDefintion = kJSClassDefinitionEmpty;
-  proxyClassDefintion.attributes |= kJSClassAttributeNoAutomaticPrototype;
-  proxyClassDefintion.getProperty = callback;
-
-  const bool isCustomJSC = isCustomJSCPtr(ctx);
-  JSClassRef proxyClass = JSC_JSClassCreate(isCustomJSC, &proxyClassDefintion);
-  JSObjectRef proxyObj = JSC_JSObjectMake(ctx, proxyClass, nullptr);
-  JSC_JSClassRelease(isCustomJSC, proxyClass);
-
-  Object::getGlobalObject(ctx).setProperty(name, Value(ctx, proxyObj));
-}
-
-void removeGlobal(JSGlobalContextRef ctx, const char* name) {
-  Object::getGlobalObject(ctx).setProperty(name, Value::makeUndefined(ctx));
-}
-
-JSValueRef evaluateScript(JSContextRef context, JSStringRef script, JSStringRef sourceURL) {
-  JSValueRef exn, result;
-  result = JSC_JSEvaluateScript(context, script, NULL, sourceURL, 0, &exn);
-  if (result == nullptr) {
-    throw JSException(context, exn, sourceURL);
-  }
-  return result;
-}
-
-#if WITH_FBJSCEXTENSIONS
-JSValueRef evaluateSourceCode(JSContextRef context, JSSourceCodeRef source, JSStringRef sourceURL) {
-  JSValueRef exn, result;
-  result = JSEvaluateSourceCode(context, source, NULL, &exn);
-  if (result == nullptr) {
-    throw JSException(context, exn, sourceURL);
-  }
-  return result;
-}
-#endif
-
-JSContextLock::JSContextLock(JSGlobalContextRef ctx) noexcept
-#if WITH_FBJSCEXTENSIONS
-  : ctx_(ctx),
-   globalLock_(PTHREAD_MUTEX_INITIALIZER)
-   {
-  WTFThreadData& threadData = wtfThreadData();
-
-  // Code below is responsible for acquiring locks. It should execute
-  // atomically, thus none of the functions invoked from now on are allowed to
-  // throw an exception
-  try {
-    if (!threadData.isDebuggerThread()) {
-      CHECK(0 == pthread_mutex_lock(&globalLock_));
-    }
-    JSLock(ctx_);
-  } catch (...) {
-    abort();
-  }
-}
-#else
-{}
-#endif
-
-
-JSContextLock::~JSContextLock() noexcept {
-  #if WITH_FBJSCEXTENSIONS
-  WTFThreadData& threadData = wtfThreadData();
-
-  JSUnlock(ctx_);
-  if (!threadData.isDebuggerThread()) {
-    CHECK(0 == pthread_mutex_unlock(&globalLock_));
-  }
-  #endif
-}
-
-
-JSValueRef translatePendingCppExceptionToJSError(JSContextRef ctx, const char *exceptionLocation) {
-  try {
-    throw;
-  } catch (const std::bad_alloc& ex) {
-    throw; // We probably shouldn't try to handle this in JS
-  } catch (const std::exception& ex) {
-    if (ExceptionHandling::platformErrorExtractor) {
-      auto extractedEror = ExceptionHandling::platformErrorExtractor(ex, exceptionLocation);
-      if (extractedEror.message.length() > 0) {
-        return Value::makeError(ctx, extractedEror.message.c_str(), extractedEror.stack.c_str());
-      }
-    }
-    auto msg = folly::to<std::string>("C++ exception in '", exceptionLocation, "'\n\n", ex.what());
-    return Value::makeError(ctx, msg.c_str());
-  } catch (const char* ex) {
-    auto msg = folly::to<std::string>("C++ exception (thrown as a char*) in '", exceptionLocation, "'\n\n", ex);
-    return Value::makeError(ctx, msg.c_str());
-  } catch (...) {
-    auto msg = folly::to<std::string>("Unknown C++ exception in '", exceptionLocation, "'");
-    return Value::makeError(ctx, msg.c_str());
-  }
-}
-
-JSValueRef translatePendingCppExceptionToJSError(JSContextRef ctx, JSObjectRef jsFunctionCause) {
-  try {
-    auto functionName = Object(ctx, jsFunctionCause).getProperty("name").toString().str();
-    return translatePendingCppExceptionToJSError(ctx, functionName.c_str());
-  } catch (...) {
-    return Value::makeError(ctx, "Failed to translate native exception");
-  }
-}
-
-} }
diff --git a/ReactCommon/jschelpers/JSCHelpers.h b/ReactCommon/jschelpers/JSCHelpers.h
deleted file mode 100644
index 9bf2e5ee90216e..00000000000000
--- a/ReactCommon/jschelpers/JSCHelpers.h
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <algorithm>
-#include <functional>
-#include <stdexcept>
-
-#include <jschelpers/JavaScriptCore.h>
-#include <jschelpers/Value.h>
-
-#ifndef RN_EXPORT
-#define RN_EXPORT __attribute__((visibility("default")))
-#endif
-
-namespace facebook {
-namespace react {
-
-class RN_EXPORT JSException : public std::exception {
-public:
-  explicit JSException(const char* msg)
-    : msg_(msg) {}
-
-  explicit JSException(JSContextRef ctx, JSValueRef exn, const char* msg) {
-    buildMessage(ctx, exn, nullptr, msg);
-  }
-
-  explicit JSException(JSContextRef ctx, JSValueRef exn, JSStringRef sourceURL) {
-    buildMessage(ctx, exn, sourceURL, nullptr);
-  }
-
-  const std::string& getStack() const {
-    return stack_;
-  }
-
-  virtual const char* what() const noexcept override {
-    return msg_.c_str();
-  }
-
-private:
-  std::string msg_;
-  std::string stack_;
-
-  void buildMessage(JSContextRef ctx, JSValueRef exn, JSStringRef sourceURL, const char* errorMsg);
-};
-
-namespace ExceptionHandling {
-  struct ExtractedEror {
-    std::string message;
-    // Stacktrace formatted like JS stack
-    // method@filename[:line[:column]]
-    std::string stack;
-  };
-  typedef ExtractedEror(*PlatformErrorExtractor)(const std::exception &ex, const char *context);
-  extern PlatformErrorExtractor platformErrorExtractor;
-}
-
-using JSFunction = std::function<JSValueRef(JSContextRef, JSObjectRef, size_t, const JSValueRef[])>;
-
-JSObjectRef makeFunction(
-    JSContextRef ctx,
-    const char* name,
-    JSFunction function);
-
-RN_EXPORT void installGlobalFunction(
-    JSGlobalContextRef ctx,
-    const char* name,
-    JSFunction function);
-
-JSObjectRef makeFunction(
-    JSGlobalContextRef ctx,
-    const char* name,
-    JSObjectCallAsFunctionCallback callback);
-
-RN_EXPORT void installGlobalFunction(
-    JSGlobalContextRef ctx,
-    const char* name,
-    JSObjectCallAsFunctionCallback callback);
-
-void installGlobalProxy(
-    JSGlobalContextRef ctx,
-    const char* name,
-    JSObjectGetPropertyCallback callback);
-
-void removeGlobal(JSGlobalContextRef ctx, const char* name);
-
-JSValueRef evaluateScript(
-    JSContextRef ctx,
-    JSStringRef script,
-    JSStringRef sourceURL);
-
-#if WITH_FBJSCEXTENSIONS
-JSValueRef evaluateSourceCode(
-    JSContextRef ctx,
-    JSSourceCodeRef source,
-    JSStringRef sourceURL);
-#endif
-
-/**
- * A lock for protecting accesses to the JSGlobalContext
- * This will be a no-op for most compilations, where #if WITH_FBJSCEXTENSIONS is false,
- * but avoids deadlocks in execution environments with advanced locking requirements,
- * particularly with uses of the pthread mutex lock
-**/
-class JSContextLock {
-public:
-  JSContextLock(JSGlobalContextRef ctx) noexcept;
-  ~JSContextLock() noexcept;
-private:
-#if WITH_FBJSCEXTENSIONS
-  JSGlobalContextRef ctx_;
-  pthread_mutex_t globalLock_;
-#endif
-};
-
-JSValueRef translatePendingCppExceptionToJSError(JSContextRef ctx, const char *exceptionLocation);
-JSValueRef translatePendingCppExceptionToJSError(JSContextRef ctx, JSObjectRef jsFunctionCause);
-
-template<JSValueRef (method)(JSContextRef ctx,
-        JSObjectRef function,
-        JSObjectRef thisObject,
-        size_t argumentCount,
-        const JSValueRef arguments[],
-        JSValueRef *exception)>
-inline JSObjectCallAsFunctionCallback exceptionWrapMethod() {
-  struct funcWrapper {
-    static JSValueRef call(
-        JSContextRef ctx,
-        JSObjectRef function,
-        JSObjectRef thisObject,
-        size_t argumentCount,
-        const JSValueRef arguments[],
-        JSValueRef *exception) {
-      try {
-        return (*method)(ctx, function, thisObject, argumentCount, arguments, exception);
-      } catch (...) {
-        *exception = translatePendingCppExceptionToJSError(ctx, function);
-        return JSC_JSValueMakeUndefined(ctx);
-      }
-    }
-  };
-
-  return &funcWrapper::call;
-}
-
-} }
diff --git a/ReactCommon/jschelpers/JSCWrapper.cpp b/ReactCommon/jschelpers/JSCWrapper.cpp
deleted file mode 100644
index bc432eb05f624a..00000000000000
--- a/ReactCommon/jschelpers/JSCWrapper.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2016-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "JSCWrapper.h"
-
-#if defined(__APPLE__)
-
-// TODO: use glog in OSS too
-#if __has_include(<glog/logging.h>)
-#define USE_GLOG 1
-#include <glog/logging.h>
-#else
-#define USE_GLOG 0
-#endif
-
-namespace facebook {
-namespace react {
-
-static const JSCWrapper* s_customWrapper = nullptr;
-
-bool isCustomJSCWrapperSet() {
-  return s_customWrapper != nullptr;
-}
-
-const JSCWrapper* customJSCWrapper() {
-  #if USE_GLOG
-  CHECK(s_customWrapper != nullptr) << "Accessing custom JSC wrapper before it's set";
-  #endif
-  return s_customWrapper;
-}
-
-void setCustomJSCWrapper(const JSCWrapper* wrapper) {
-  #if USE_GLOG
-  CHECK(s_customWrapper == nullptr) << "Can't set custom JSC wrapper multiple times";
-  #endif
-  s_customWrapper = wrapper;
-}
-
-} }
-
-#endif
diff --git a/ReactCommon/jschelpers/JSCWrapper.h b/ReactCommon/jschelpers/JSCWrapper.h
deleted file mode 100644
index 471c23948b4ab6..00000000000000
--- a/ReactCommon/jschelpers/JSCWrapper.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2016-present, Facebook, Inc.
- *
- * 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 <functional>
-#include <string>
-#include <JavaScriptCore/JavaScript.h>
-
-#if defined(JSCINTERNAL) || (!defined(__APPLE__))
-#define JSC_IMPORT extern "C"
-#else
-#define JSC_IMPORT extern
-#endif
-
-#ifndef RN_EXPORT
-#define RN_EXPORT __attribute__((visibility("default")))
-#endif
-
-namespace facebook {
-namespace react {
-  class IInspector;
-}
-}
-
-JSC_IMPORT void JSGlobalContextEnableDebugger(
-    JSGlobalContextRef ctx,
-    facebook::react::IInspector &globalInspector,
-    const char *title,
-    const std::function<bool()> &checkIsInspectedRemote);
-JSC_IMPORT void JSGlobalContextDisableDebugger(
-    JSGlobalContextRef ctx,
-    facebook::react::IInspector &globalInspector);
-
-// This is used to substitute an alternate JSC implementation for
-// testing. These calls must all be ABI compatible with the standard JSC.
-JSC_IMPORT JSValueRef JSEvaluateBytecodeBundle(JSContextRef, JSObjectRef, int, JSStringRef, JSValueRef*);
-JSC_IMPORT bool JSSamplingProfilerEnabled();
-JSC_IMPORT void JSStartSamplingProfilingOnMainJSCThread(JSGlobalContextRef);
-JSC_IMPORT JSValueRef JSPokeSamplingProfiler(JSContextRef);
-#ifdef __cplusplus
-extern "C" {
-#endif
-JSC_IMPORT void configureJSCForIOS(std::string); // TODO: replace with folly::dynamic once supported
-JSC_IMPORT void FBJSContextStartGCTimers(JSContextRef);
-#ifdef __cplusplus
-}
-#endif
-
-#if defined(__APPLE__)
-#include <objc/objc.h>
-#include <JavaScriptCore/JSStringRefCF.h>
-#include <string>
-
-/**
- * JSNoBytecodeFileFormatVersion
- *
- * Version number indicating that bytecode is not supported by this runtime.
- */
-RN_EXPORT extern const int32_t JSNoBytecodeFileFormatVersion;
-
-namespace facebook {
-namespace react {
-
-#define JSC_WRAPPER_METHOD(m) decltype(&m) m
-
-struct JSCWrapper {
-  // JSGlobalContext
-  JSC_WRAPPER_METHOD(JSGlobalContextCreateInGroup);
-  JSC_WRAPPER_METHOD(JSGlobalContextRelease);
-  JSC_WRAPPER_METHOD(JSGlobalContextSetName);
-
-  // JSContext
-  JSC_WRAPPER_METHOD(JSContextGetGlobalContext);
-  JSC_WRAPPER_METHOD(JSContextGetGlobalObject);
-  JSC_WRAPPER_METHOD(FBJSContextStartGCTimers);
-
-  // JSEvaluate
-  JSC_WRAPPER_METHOD(JSEvaluateScript);
-  JSC_WRAPPER_METHOD(JSEvaluateBytecodeBundle);
-
-  // JSString
-  JSC_WRAPPER_METHOD(JSStringCreateWithUTF8CString);
-  JSC_WRAPPER_METHOD(JSStringCreateWithCFString);
-  #if WITH_FBJSCEXTENSIONS
-  JSC_WRAPPER_METHOD(JSStringCreateWithUTF8CStringExpectAscii);
-  #endif
-  JSC_WRAPPER_METHOD(JSStringCopyCFString);
-  JSC_WRAPPER_METHOD(JSStringGetCharactersPtr);
-  JSC_WRAPPER_METHOD(JSStringGetLength);
-  JSC_WRAPPER_METHOD(JSStringGetMaximumUTF8CStringSize);
-  JSC_WRAPPER_METHOD(JSStringIsEqualToUTF8CString);
-  JSC_WRAPPER_METHOD(JSStringRelease);
-  JSC_WRAPPER_METHOD(JSStringRetain);
-
-  // JSClass
-  JSC_WRAPPER_METHOD(JSClassCreate);
-  JSC_WRAPPER_METHOD(JSClassRetain);
-  JSC_WRAPPER_METHOD(JSClassRelease);
-
-  // JSObject
-  JSC_WRAPPER_METHOD(JSObjectCallAsConstructor);
-  JSC_WRAPPER_METHOD(JSObjectCallAsFunction);
-  JSC_WRAPPER_METHOD(JSObjectGetPrivate);
-  JSC_WRAPPER_METHOD(JSObjectGetProperty);
-  JSC_WRAPPER_METHOD(JSObjectGetPropertyAtIndex);
-  JSC_WRAPPER_METHOD(JSObjectIsConstructor);
-  JSC_WRAPPER_METHOD(JSObjectIsFunction);
-  JSC_WRAPPER_METHOD(JSObjectMake);
-  JSC_WRAPPER_METHOD(JSObjectMakeArray);
-  JSC_WRAPPER_METHOD(JSObjectMakeDate);
-  JSC_WRAPPER_METHOD(JSObjectMakeError);
-  JSC_WRAPPER_METHOD(JSObjectMakeFunctionWithCallback);
-  JSC_WRAPPER_METHOD(JSObjectSetPrivate);
-  JSC_WRAPPER_METHOD(JSObjectSetProperty);
-  JSC_WRAPPER_METHOD(JSObjectSetPropertyAtIndex);
-
-  // JSPropertyNameArray
-  JSC_WRAPPER_METHOD(JSObjectCopyPropertyNames);
-  JSC_WRAPPER_METHOD(JSPropertyNameArrayGetCount);
-  JSC_WRAPPER_METHOD(JSPropertyNameArrayGetNameAtIndex);
-  JSC_WRAPPER_METHOD(JSPropertyNameArrayRelease);
-
-  // JSValue
-  JSC_WRAPPER_METHOD(JSValueCreateJSONString);
-  JSC_WRAPPER_METHOD(JSValueGetType);
-  JSC_WRAPPER_METHOD(JSValueMakeFromJSONString);
-  JSC_WRAPPER_METHOD(JSValueMakeBoolean);
-  JSC_WRAPPER_METHOD(JSValueMakeNull);
-  JSC_WRAPPER_METHOD(JSValueMakeNumber);
-  JSC_WRAPPER_METHOD(JSValueMakeString);
-  JSC_WRAPPER_METHOD(JSValueMakeUndefined);
-  JSC_WRAPPER_METHOD(JSValueProtect);
-  JSC_WRAPPER_METHOD(JSValueToBoolean);
-  JSC_WRAPPER_METHOD(JSValueToNumber);
-  JSC_WRAPPER_METHOD(JSValueToObject);
-  JSC_WRAPPER_METHOD(JSValueToStringCopy);
-  JSC_WRAPPER_METHOD(JSValueUnprotect);
-  JSC_WRAPPER_METHOD(JSValueIsNull);
-
-  // Sampling profiler
-  JSC_WRAPPER_METHOD(JSSamplingProfilerEnabled);
-  JSC_WRAPPER_METHOD(JSPokeSamplingProfiler);
-  JSC_WRAPPER_METHOD(JSStartSamplingProfilingOnMainJSCThread);
-
-  JSC_WRAPPER_METHOD(JSGlobalContextEnableDebugger);
-  JSC_WRAPPER_METHOD(JSGlobalContextDisableDebugger);
-
-  JSC_WRAPPER_METHOD(configureJSCForIOS);
-
-  // Objective-C API
-  Class JSContext;
-  Class JSValue;
-
-  int32_t JSBytecodeFileFormatVersion;
-};
-
-template <typename T>
-bool isCustomJSCPtr(T *x) {
-  return (uintptr_t)x & 0x1;
-}
-
-RN_EXPORT bool isCustomJSCWrapperSet();
-RN_EXPORT void setCustomJSCWrapper(const JSCWrapper* wrapper);
-
-// This will return a single value for the whole life of the process.
-RN_EXPORT const JSCWrapper *systemJSCWrapper();
-RN_EXPORT const JSCWrapper *customJSCWrapper();
-
-} }
-
-#else
-
-namespace facebook {
-namespace react {
-
-template <typename T>
-bool isCustomJSCPtr(T *x) {
-  // Always use system JSC pointers
-  return false;
-}
-
-} }
-
-#endif
diff --git a/ReactCommon/jschelpers/JavaScriptCore.h b/ReactCommon/jschelpers/JavaScriptCore.h
deleted file mode 100644
index 4c61e8aeb3a0b5..00000000000000
--- a/ReactCommon/jschelpers/JavaScriptCore.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * Copyright (c) 2016-present, Facebook, Inc.
- *
- * 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 <jschelpers/JSCWrapper.h>
-
-#if defined(__APPLE__)
-
-// Use for methods that are taking JSContextRef as a first param
-#define __jsc_wrapper(method, ctx, ...)   \
-  (facebook::react::isCustomJSCPtr(ctx) ? \
-    facebook::react::customJSCWrapper() : \
-    facebook::react::systemJSCWrapper()   \
-  )->method(ctx, ## __VA_ARGS__)
-
-// Use for methods that don't take a JSContextRef as a first param. The wrapped version
-// of this method will require context as an additional param, but it will be dropped
-// before calling into the JSC method.
-#define __jsc_drop_ctx_wrapper(method, ctx, ...) \
-  (facebook::react::isCustomJSCPtr(ctx) ?        \
-    facebook::react::customJSCWrapper() :        \
-    facebook::react::systemJSCWrapper()          \
-  )->method(__VA_ARGS__)
-
-// Use for methods were access to a JSContextRef is impractical. The first bool param
-// will be dropped before the JSC method is invoked.
-#define __jsc_ensure_bool(field) \
-  static_assert(std::is_same<typename std::decay<decltype(field)>::type, bool>::value, "useCustomJSC must be bool");
-#define __jsc_bool_wrapper(method, useCustomJSC, ...)    \
-  ([]{ __jsc_ensure_bool(useCustomJSC) }, useCustomJSC ? \
-    facebook::react::customJSCWrapper() :                \
-    facebook::react::systemJSCWrapper()                  \
-  )->method(__VA_ARGS__)
-
-// Used for wrapping properties
-#define __jsc_prop_wrapper(prop, ctx)     \
-  (facebook::react::isCustomJSCPtr(ctx) ? \
-    facebook::react::customJSCWrapper() : \
-    facebook::react::systemJSCWrapper()   \
-  )->prop
-
-// Poison all regular versions of the JSC API in shared code. This prevents accidental
-// mixed usage of regular and custom JSC methods.
-// See https://gcc.gnu.org/onlinedocs/gcc-3.3/cpp/Pragmas.html for details
-#define jsc_pragma(x) _Pragma(#x)
-#ifndef NO_JSC_POISON
-#define jsc_poison(methods) jsc_pragma(GCC poison methods)
-#else
-#define jsc_poison(methods)
-#endif
-
-#else
-
-#define __jsc_wrapper(method, ctx, ...) method(ctx, ## __VA_ARGS__)
-#define __jsc_drop_ctx_wrapper(method, ctx, ...) ((void)ctx, method(__VA_ARGS__))
-#define __jsc_bool_wrapper(method, useCustomJSC, ...) \
-  ((void)useCustomJSC, method(__VA_ARGS__))
-#define __jsc_prop_wrapper(prop, ctx) prop
-
-#define jsc_pragma(x)
-#define jsc_poison(methods)
-
-#endif
-
-// JSGlobalContext
-#define JSC_JSGlobalContextCreateInGroup(...) __jsc_bool_wrapper(JSGlobalContextCreateInGroup, __VA_ARGS__)
-#define JSC_JSGlobalContextRelease(...) __jsc_wrapper(JSGlobalContextRelease, __VA_ARGS__)
-#define JSC_JSGlobalContextSetName(...) __jsc_wrapper(JSGlobalContextSetName, __VA_ARGS__)
-
-jsc_poison(JSContextGroupCreate JSContextGroupRelease JSContextGroupRetain
-           JSGlobalContextCreate JSGlobalContextCreateInGroup JSGlobalContextCopyName
-           JSGlobalContextRelease JSGlobalContextRetain JSGlobalContextSetName)
-
-// JSContext
-#define JSC_JSContextGetGlobalContext(...) __jsc_wrapper(JSContextGetGlobalContext, __VA_ARGS__)
-#define JSC_JSContextGetGlobalObject(...) __jsc_wrapper(JSContextGetGlobalObject, __VA_ARGS__)
-#define JSC_FBJSContextStartGCTimers(...) __jsc_wrapper(FBJSContextStartGCTimers, __VA_ARGS__)
-
-jsc_poison(JSContextGetGlobalContext JSContextGetGlobalObject JSContextGetGroup FBJSContextStartGCTimers)
-
-// JSEvaluate
-#define JSC_JSEvaluateScript(...) __jsc_wrapper(JSEvaluateScript, __VA_ARGS__)
-#define JSC_JSEvaluateBytecodeBundle(...) __jsc_wrapper(JSEvaluateBytecodeBundle, __VA_ARGS__)
-
-jsc_poison(JSCheckScriptSyntax JSEvaluateScript JSEvaluateBytecodeBundle JSGarbageCollect)
-
-// JSString
-#define JSC_JSStringCreateWithCFString(...) __jsc_drop_ctx_wrapper(JSStringCreateWithCFString, __VA_ARGS__)
-#define JSC_JSStringCreateWithUTF8CString(...) __jsc_drop_ctx_wrapper(JSStringCreateWithUTF8CString, __VA_ARGS__)
-#define JSC_JSStringCreateWithUTF8CStringExpectAscii(...) __jsc_drop_ctx_wrapper(JSStringCreateWithUTF8CStringExpectAscii, __VA_ARGS__)
-#define JSC_JSStringCopyCFString(...) __jsc_drop_ctx_wrapper(JSStringCopyCFString, __VA_ARGS__)
-#define JSC_JSStringGetCharactersPtr(...) __jsc_drop_ctx_wrapper(JSStringGetCharactersPtr, __VA_ARGS__)
-#define JSC_JSStringGetLength(...) __jsc_drop_ctx_wrapper(JSStringGetLength, __VA_ARGS__)
-#define JSC_JSStringGetMaximumUTF8CStringSize(...) __jsc_drop_ctx_wrapper(JSStringGetMaximumUTF8CStringSize, __VA_ARGS__)
-#define JSC_JSStringIsEqualToUTF8CString(...) __jsc_drop_ctx_wrapper(JSStringIsEqualToUTF8CString, __VA_ARGS__)
-#define JSC_JSStringRelease(...) __jsc_drop_ctx_wrapper(JSStringRelease, __VA_ARGS__)
-#define JSC_JSStringRetain(...) __jsc_drop_ctx_wrapper(JSStringRetain, __VA_ARGS__)
-
-jsc_poison(JSStringCopyCFString JSStringCreateWithCharacters JSStringCreateWithCFString
-           JSStringCreateWithUTF8CString JSStringCreateWithUTF8CStringExpectAscii
-           JSStringGetCharactersPtr JSStringGetLength JSStringGetMaximumUTF8CStringSize
-           JSStringGetUTF8CString JSStringIsEqual JSStringIsEqualToUTF8CString
-           JSStringRelease JSStringRetain)
-
-// JSValueRef
-#define JSC_JSValueCreateJSONString(...) __jsc_wrapper(JSValueCreateJSONString, __VA_ARGS__)
-#define JSC_JSValueGetType(...) __jsc_wrapper(JSValueGetType, __VA_ARGS__)
-#define JSC_JSValueMakeFromJSONString(...) __jsc_wrapper(JSValueMakeFromJSONString, __VA_ARGS__)
-#define JSC_JSValueMakeBoolean(...) __jsc_wrapper(JSValueMakeBoolean, __VA_ARGS__)
-#define JSC_JSValueMakeNull(...) __jsc_wrapper(JSValueMakeNull, __VA_ARGS__)
-#define JSC_JSValueMakeNumber(...) __jsc_wrapper(JSValueMakeNumber, __VA_ARGS__)
-#define JSC_JSValueMakeString(...) __jsc_wrapper(JSValueMakeString, __VA_ARGS__)
-#define JSC_JSValueMakeUndefined(...) __jsc_wrapper(JSValueMakeUndefined, __VA_ARGS__)
-#define JSC_JSValueProtect(...) __jsc_wrapper(JSValueProtect, __VA_ARGS__)
-#define JSC_JSValueToBoolean(...) __jsc_wrapper(JSValueToBoolean, __VA_ARGS__)
-#define JSC_JSValueToNumber(...) __jsc_wrapper(JSValueToNumber, __VA_ARGS__)
-#define JSC_JSValueToObject(...) __jsc_wrapper(JSValueToObject, __VA_ARGS__)
-#define JSC_JSValueToStringCopy(...) __jsc_wrapper(JSValueToStringCopy, __VA_ARGS__)
-#define JSC_JSValueUnprotect(...) __jsc_wrapper(JSValueUnprotect, __VA_ARGS__)
-#define JSC_JSValueIsNull(...) __jsc_wrapper(JSValueIsNull, __VA_ARGS__)
-
-jsc_poison(JSValueCreateJSONString JSValueGetType JSValueGetTypedArrayType JSValueIsArray
-           JSValueIsBoolean JSValueIsDate JSValueIsEqual JSValueIsInstanceOfConstructor
-           JSValueIsNull JSValueIsNumber JSValueIsObject JSValueIsObjectOfClass
-           JSValueIsStrictEqual JSValueIsString JSValueIsString JSValueIsUndefined
-           JSValueMakeBoolean JSValueMakeFromJSONString JSValueMakeNull JSValueMakeNumber
-           JSValueMakeString JSValueMakeUndefined JSValueProtect JSValueToBoolean
-           JSValueToNumber JSValueToObject JSValueToStringCopy JSValueUnprotect)
-
-// JSClass
-#define JSC_JSClassCreate(...) __jsc_bool_wrapper(JSClassCreate, __VA_ARGS__)
-#define JSC_JSClassRetain(...) __jsc_bool_wrapper(JSClassRetain, __VA_ARGS__)
-#define JSC_JSClassRelease(...) __jsc_bool_wrapper(JSClassRelease, __VA_ARGS__)
-
-jsc_poison(JSClassCreate JSClassRelease JSClassRetain)
-
-// JSObject
-#define JSC_JSObjectCallAsConstructor(...) __jsc_wrapper(JSObjectCallAsConstructor, __VA_ARGS__)
-#define JSC_JSObjectCallAsFunction(...) __jsc_wrapper(JSObjectCallAsFunction, __VA_ARGS__)
-#define JSC_JSObjectGetPrivate(...) __jsc_bool_wrapper(JSObjectGetPrivate, __VA_ARGS__)
-#define JSC_JSObjectGetProperty(...) __jsc_wrapper(JSObjectGetProperty, __VA_ARGS__)
-#define JSC_JSObjectGetPropertyAtIndex(...) __jsc_wrapper(JSObjectGetPropertyAtIndex, __VA_ARGS__)
-#define JSC_JSObjectIsConstructor(...) __jsc_wrapper(JSObjectIsConstructor, __VA_ARGS__)
-#define JSC_JSObjectIsFunction(...) __jsc_wrapper(JSObjectIsFunction, __VA_ARGS__)
-#define JSC_JSObjectMake(...) __jsc_wrapper(JSObjectMake, __VA_ARGS__)
-#define JSC_JSObjectMakeArray(...) __jsc_wrapper(JSObjectMakeArray, __VA_ARGS__)
-#define JSC_JSObjectMakeDate(...) __jsc_wrapper(JSObjectMakeDate, __VA_ARGS__)
-#define JSC_JSObjectMakeError(...) __jsc_wrapper(JSObjectMakeError, __VA_ARGS__)
-#define JSC_JSObjectMakeFunctionWithCallback(...) __jsc_wrapper(JSObjectMakeFunctionWithCallback, __VA_ARGS__)
-#define JSC_JSObjectSetPrivate(...) __jsc_bool_wrapper(JSObjectSetPrivate, __VA_ARGS__)
-#define JSC_JSObjectSetProperty(...) __jsc_wrapper(JSObjectSetProperty, __VA_ARGS__)
-#define JSC_JSObjectSetPropertyAtIndex(...) __jsc_wrapper(JSObjectSetPropertyAtIndex, __VA_ARGS__)
-
-jsc_poison(JSObjectCallAsConstructor JSObjectCallAsFunction JSObjectDeleteProperty
-           JSObjectGetPrivate JSObjectGetProperty JSObjectGetPropertyAtIndex
-           JSObjectGetPrototype JSObjectHasProperty JSObjectIsConstructor
-           JSObjectIsFunction JSObjectMake JSObjectMakeArray JSObjectMakeConstructor
-           JSObjectMakeDate JSObjectMakeError JSObjectMakeFunction
-           JSObjectMakeFunctionWithCallback JSObjectMakeRegExp JSObjectSetPrivate
-           JSObjectSetPrototype JSObjectSetProperty JSObjectSetPropertyAtIndex)
-
-// JSPropertyNameArray
-#define JSC_JSObjectCopyPropertyNames(...) __jsc_wrapper(JSObjectCopyPropertyNames, __VA_ARGS__)
-#define JSC_JSPropertyNameArrayGetCount(...) __jsc_drop_ctx_wrapper(JSPropertyNameArrayGetCount, __VA_ARGS__)
-#define JSC_JSPropertyNameArrayGetNameAtIndex(...) __jsc_drop_ctx_wrapper(JSPropertyNameArrayGetNameAtIndex, __VA_ARGS__)
-#define JSC_JSPropertyNameArrayRelease(...) __jsc_drop_ctx_wrapper(JSPropertyNameArrayRelease, __VA_ARGS__)
-
-jsc_poison(JSObjectCopyPropertyNames JSPropertyNameAccumulatorAddName
-           JSPropertyNameArrayGetCount JSPropertyNameArrayGetNameAtIndex
-           JSPropertyNameArrayRelease JSPropertyNameArrayRetain)
-
-// JSTypedArray
-jsc_poison(JSObjectMakeArrayBufferWithBytesNoCopy JSObjectMakeTypedArray
-           JSObjectMakeTypedArrayWithArrayBuffer
-           JSObjectMakeTypedArrayWithArrayBufferAndOffset
-           JSObjectMakeTypedArrayWithBytesNoCopy JSObjectGetTypedArrayByteLength
-           JSObjectGetTypedArrayByteOffset JSObjectGetTypedArrayBytesPtr
-           JSObjectGetTypedArrayBuffer JSObjectGetTypedArrayLength
-           JSObjectGetArrayBufferBytesPtr JSObjectGetArrayBufferByteLength)
-
-// Sampling profiler
-#define JSC_JSSamplingProfilerEnabled(...) __jsc_drop_ctx_wrapper(JSSamplingProfilerEnabled, __VA_ARGS__)
-#define JSC_JSPokeSamplingProfiler(...) __jsc_wrapper(JSPokeSamplingProfiler, __VA_ARGS__)
-#define JSC_JSStartSamplingProfilingOnMainJSCThread(...) __jsc_wrapper(JSStartSamplingProfilingOnMainJSCThread, __VA_ARGS__)
-
-jsc_poison(JSSamplingProfilerEnabled JSPokeSamplingProfiler
-           JSStartSamplingProfilingOnMainJSCThread)
-
-#define JSC_JSGlobalContextEnableDebugger(...) __jsc_wrapper(JSGlobalContextEnableDebugger, __VA_ARGS__)
-// no need to poison JSGlobalContextEnableDebugger because it's not defined for System JSC / standard SDK header
-// jsc_poison(JSGlobalContextEnableDebugger)
-
-#define JSC_JSGlobalContextDisableDebugger(...) __jsc_wrapper(JSGlobalContextDisableDebugger, __VA_ARGS__)
-// no need to poison JSGlobalContextDisableDebugger because it's not defined for System JSC / standard SDK header
-// jsc_poison(JSGlobalContextDisableDebugger)
-
-
-#define JSC_configureJSCForIOS(...) __jsc_bool_wrapper(configureJSCForIOS, __VA_ARGS__)
-
-jsc_poison(configureJSCForIOS)
-
-// Objective-C API
-#define JSC_JSContext(ctx) __jsc_prop_wrapper(JSContext, ctx)
-#define JSC_JSValue(ctx) __jsc_prop_wrapper(JSValue, ctx)
-
-#undef jsc_poison
-#undef jsc_pragma
diff --git a/ReactCommon/jschelpers/Unicode.cpp b/ReactCommon/jschelpers/Unicode.cpp
deleted file mode 100644
index 8b6dc78a970d7c..00000000000000
--- a/ReactCommon/jschelpers/Unicode.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "Unicode.h"
-
-namespace facebook {
-namespace react {
-namespace unicode {
-namespace {
-
-// TODO(12827176): Don't duplicate this code here and fbjni.
-
-const uint16_t kUtf8OneByteBoundary       = 0x80;
-const uint16_t kUtf8TwoBytesBoundary      = 0x800;
-const uint16_t kUtf16HighSubLowBoundary   = 0xD800;
-const uint16_t kUtf16HighSubHighBoundary  = 0xDC00;
-const uint16_t kUtf16LowSubHighBoundary   = 0xE000;
-
-// Calculate how many bytes are needed to convert an UTF16 string into UTF8
-// UTF16 string
-size_t utf16toUTF8Length(const uint16_t* utf16String, size_t utf16StringLen) {
-  if (!utf16String || utf16StringLen == 0) {
-    return 0;
-  }
-
-  uint32_t utf8StringLen = 0;
-  auto utf16StringEnd = utf16String + utf16StringLen;
-  auto idx16 = utf16String;
-  while (idx16 < utf16StringEnd) {
-    auto ch = *idx16++;
-    if (ch < kUtf8OneByteBoundary) {
-      utf8StringLen++;
-    } else if (ch < kUtf8TwoBytesBoundary) {
-      utf8StringLen += 2;
-    } else if (
-        (ch >= kUtf16HighSubLowBoundary) && (ch < kUtf16HighSubHighBoundary) &&
-        (idx16 < utf16StringEnd) &&
-        (*idx16 >= kUtf16HighSubHighBoundary) && (*idx16 < kUtf16LowSubHighBoundary)) {
-      utf8StringLen += 4;
-      idx16++;
-    } else {
-      utf8StringLen += 3;
-    }
-  }
-
-  return utf8StringLen;
-}
-
-} // namespace
-
-std::string utf16toUTF8(const uint16_t* utf16String, size_t utf16StringLen) noexcept {
-  if (!utf16String || utf16StringLen <= 0) {
-    return "";
-  }
-
-  std::string utf8String(utf16toUTF8Length(utf16String, utf16StringLen), '\0');
-  auto idx8 = utf8String.begin();
-  auto idx16 = utf16String;
-  auto utf16StringEnd = utf16String + utf16StringLen;
-  while (idx16 < utf16StringEnd) {
-    auto ch = *idx16++;
-    if (ch < kUtf8OneByteBoundary) {
-      *idx8++ = (ch & 0x7F);
-    } else if (ch < kUtf8TwoBytesBoundary) {
-      *idx8++ = 0b11000000 | (ch >> 6);
-      *idx8++ = 0b10000000 | (ch & 0x3F);
-    } else if (
-        (ch >= kUtf16HighSubLowBoundary) && (ch < kUtf16HighSubHighBoundary) &&
-        (idx16 < utf16StringEnd) &&
-        (*idx16 >= kUtf16HighSubHighBoundary) && (*idx16 < kUtf16LowSubHighBoundary)) {
-      auto ch2 = *idx16++;
-      uint8_t trunc_byte = (((ch >> 6) & 0x0F) + 1);
-      *idx8++ = 0b11110000 | (trunc_byte >> 2);
-      *idx8++ = 0b10000000 | ((trunc_byte & 0x03) << 4) | ((ch >> 2) & 0x0F);
-      *idx8++ = 0b10000000 | ((ch & 0x03) << 4) | ((ch2 >> 6) & 0x0F);
-      *idx8++ = 0b10000000 | (ch2 & 0x3F);
-    } else {
-      *idx8++ = 0b11100000 | (ch >> 12);
-      *idx8++ = 0b10000000 | ((ch >> 6) & 0x3F);
-      *idx8++ = 0b10000000 | (ch & 0x3F);
-    }
-  }
-
-  return utf8String;
-}
-
-} // namespace unicode
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/jschelpers/Unicode.h b/ReactCommon/jschelpers/Unicode.h
deleted file mode 100644
index 91ac167269839b..00000000000000
--- a/ReactCommon/jschelpers/Unicode.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <string>
-#include <cstdint>
-
-namespace facebook {
-namespace react {
-namespace unicode {
-__attribute__((visibility("default"))) std::string utf16toUTF8(const uint16_t* utf16, size_t length) noexcept;
-}
-}
-}
diff --git a/ReactCommon/jschelpers/Value.cpp b/ReactCommon/jschelpers/Value.cpp
deleted file mode 100644
index 09dc1c9ef2dbdd..00000000000000
--- a/ReactCommon/jschelpers/Value.cpp
+++ /dev/null
@@ -1,325 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "Value.h"
-
-#include <folly/json.h>
-#include <folly/Conv.h>
-
-#include "JSCHelpers.h"
-#include "JavaScriptCore.h"
-
-// See the comment under Value::fromDynamic()
-#if !defined(__APPLE__) && defined(WITH_FB_JSC_TUNING)
-#define USE_FAST_FOLLY_DYNAMIC_CONVERSION 1
-#else
-#define USE_FAST_FOLLY_DYNAMIC_CONVERSION 0
-#endif
-
-namespace facebook {
-namespace react {
-
-/* static */
-Object Object::makeDate(JSContextRef ctx, Object::TimeType time) {
-  using std::chrono::duration_cast;
-  using std::chrono::milliseconds;
-
-  JSValueRef arguments[1];
-  arguments[0] = JSC_JSValueMakeNumber(
-    ctx,
-    duration_cast<milliseconds>(time.time_since_epoch()).count());
-
-  JSValueRef exn;
-  auto result = JSC_JSObjectMakeDate(ctx, 1, arguments, &exn);
-  if (!result) {
-    throw JSException(ctx, exn, "Failed to create Date");
-  }
-  return Object(ctx, result);
-}
-
-Object Object::makeArray(JSContextRef ctx, JSValueRef* elements, unsigned length) {
-  JSValueRef exn;
-  auto arr = JSC_JSObjectMakeArray(ctx, length, elements, &exn);
-  if (!arr) {
-    throw JSException(ctx, exn, "Failed to create an Array");
-  }
-  return Object(ctx, arr);
-}
-
-Value::Value(JSContextRef context, JSValueRef value)
-  : m_context(context), m_value(value) {}
-
-Value::Value(JSContextRef context, JSStringRef str)
-  : m_context(context), m_value(JSC_JSValueMakeString(context, str)) {}
-
-JSContextRef Value::context() const {
-  return m_context;
-}
-
-/* static */
-std::string Value::toJSONString(unsigned indent) const {
-  JSValueRef exn;
-  auto stringToAdopt = JSC_JSValueCreateJSONString(m_context, m_value, indent, &exn);
-  if (!stringToAdopt) {
-    throw JSException(m_context, exn, "Exception creating JSON string");
-  }
-  return String::adopt(m_context, stringToAdopt).str();
-}
-
-/* static */
-Value Value::fromJSON(const String& json) {
-  JSContextRef ctx = json.context();
-  auto result = JSC_JSValueMakeFromJSONString(ctx, json);
-  if (!result) {
-    throw JSException(folly::to<std::string>(
-      "Failed to create Value from JSON: ", json.str()).c_str());
-  }
-  return Value(ctx, result);
-}
-
-Value Value::fromDynamic(JSContextRef ctx, const folly::dynamic& value) {
-// JavaScriptCore's iOS APIs have their own version of this direct conversion.
-// In addition, using this requires exposing some of JSC's private APIs,
-//  so it's limited to non-apple platforms and to builds that use the custom JSC.
-// Otherwise, we use the old way of converting through JSON.
-#if USE_FAST_FOLLY_DYNAMIC_CONVERSION
-  // Defer GC during the creation of the JSValue, as we don't want
-  //  intermediate objects to be collected.
-  // We could use JSValueProtect(), but it will make the process much slower.
-  JSDeferredGCRef deferGC = JSDeferGarbageCollection(ctx);
-  // Set a global lock for the whole process,
-  //  instead of re-acquiring the lock for each operation.
-  JSLock(ctx);
-  JSValueRef jsVal = Value::fromDynamicInner(ctx, value);
-  JSUnlock(ctx);
-  JSResumeGarbageCollection(ctx, deferGC);
-  return Value(ctx, jsVal);
-#else
-  auto json = folly::toJson(value);
-  return fromJSON(String(ctx, json.c_str()));
-#endif
-}
-
-JSValueRef Value::fromDynamicInner(JSContextRef ctx, const folly::dynamic& obj) {
-  switch (obj.type()) {
-    // For primitive types (and strings), just create and return an equivalent JSValue
-    case folly::dynamic::Type::NULLT:
-      return JSC_JSValueMakeNull(ctx);
-
-    case folly::dynamic::Type::BOOL:
-      return JSC_JSValueMakeBoolean(ctx, obj.getBool());
-
-    case folly::dynamic::Type::DOUBLE:
-      return JSC_JSValueMakeNumber(ctx, obj.getDouble());
-
-    case folly::dynamic::Type::INT64:
-      return JSC_JSValueMakeNumber(ctx, obj.asDouble());
-
-    case folly::dynamic::Type::STRING:
-      return JSC_JSValueMakeString(ctx, String(ctx, obj.getString().c_str()));
-
-    case folly::dynamic::Type::ARRAY: {
-      // Collect JSValue for every element in the array
-      JSValueRef vals[obj.size()];
-      for (size_t i = 0; i < obj.size(); ++i) {
-        vals[i] = fromDynamicInner(ctx, obj[i]);
-      }
-      // Create a JSArray with the values
-      JSValueRef arr = JSC_JSObjectMakeArray(ctx, obj.size(), vals, nullptr);
-      return arr;
-    }
-
-    case folly::dynamic::Type::OBJECT: {
-      // Create an empty object
-      JSObjectRef jsObj = JSC_JSObjectMake(ctx, nullptr, nullptr);
-      // Create a JSValue for each of the object's children and set them in the object
-      for (auto it = obj.items().begin(); it != obj.items().end(); ++it) {
-        JSC_JSObjectSetProperty(
-          ctx,
-          jsObj,
-          String(ctx, it->first.asString().c_str()),
-          fromDynamicInner(ctx, it->second),
-          kJSPropertyAttributeNone,
-          nullptr);
-      }
-      return jsObj;
-    }
-    default:
-      // Assert not reached
-      LOG(FATAL) << "Trying to convert a folly object of unsupported type.";
-      return JSC_JSValueMakeNull(ctx);
-  }
-}
-
-Object Value::asObject() const {
-  JSValueRef exn;
-  JSObjectRef jsObj = JSC_JSValueToObject(context(), m_value, &exn);
-  if (!jsObj) {
-    throw JSException(m_context, exn, "Failed to convert to object");
-  }
-  return Object(context(), jsObj);
-}
-
-String Value::toString() const {
-  JSValueRef exn;
-  JSStringRef jsStr = JSC_JSValueToStringCopy(context(), m_value, &exn);
-  if (!jsStr) {
-    throw JSException(m_context, exn, "Failed to convert to string");
-  }
-  return String::adopt(context(), jsStr);
-}
-
-Value Value::makeError(JSContextRef ctx, const char *error, const char *stack)
-{
-  auto errorMsg = Value(ctx, String(ctx, error));
-  JSValueRef args[] = {errorMsg};
-  if (stack) {
-    // Using this instead of JSObjectMakeError to actually get a stack property.
-    // MakeError only sets it stack when returning from the invoked function, so we
-    // can't extend it here.
-    auto errorConstructor = Object::getGlobalObject(ctx).getProperty("Error").asObject();
-    auto jsError = errorConstructor.callAsConstructor({errorMsg});
-    auto fullStack = std::string(stack) + jsError.getProperty("stack").toString().str();
-    jsError.setProperty("stack", String(ctx, fullStack.c_str()));
-    return jsError;
-  } else {
-    JSValueRef exn;
-    JSObjectRef errorObj = JSC_JSObjectMakeError(ctx, 1, args, &exn);
-    if (!errorObj) {
-      throw JSException(ctx, exn, "Exception making error");
-    }
-    return Value(ctx, errorObj);
-  }
-}
-
-void Value::throwTypeException(const std::string &expectedType) const {
-  std::string wat("TypeError: Expected ");
-  wat += expectedType;
-  wat += ", instead got '";
-  wat += toString().str();
-  wat += "'";
-  throw JSException(wat.c_str());
-}
-
-Object::operator Value() const {
-  return Value(m_context, m_obj);
-}
-
-Value Object::callAsFunction(std::initializer_list<JSValueRef> args) const {
-  return callAsFunction(nullptr, args.size(), args.begin());
-}
-
-Value Object::callAsFunction(const Object& thisObj, std::initializer_list<JSValueRef> args) const {
-  return callAsFunction((JSObjectRef)thisObj, args.size(), args.begin());
-}
-
-Value Object::callAsFunction(int nArgs, const JSValueRef args[]) const {
-  return callAsFunction(nullptr, nArgs, args);
-}
-
-Value Object::callAsFunction(const Object& thisObj, int nArgs, const JSValueRef args[]) const {
-  return callAsFunction(static_cast<JSObjectRef>(thisObj), nArgs, args);
-}
-
-Value Object::callAsFunction(JSObjectRef thisObj, int nArgs, const JSValueRef args[]) const {
-  JSValueRef exn;
-  JSValueRef result = JSC_JSObjectCallAsFunction(m_context, m_obj, thisObj, nArgs, args, &exn);
-  if (!result) {
-    throw JSException(m_context, exn, "Exception calling object as function");
-  }
-  return Value(m_context, result);
-}
-
-Object Object::callAsConstructor(std::initializer_list<JSValueRef> args) const {
-  JSValueRef exn;
-  JSObjectRef result = JSC_JSObjectCallAsConstructor(m_context, m_obj, args.size(), args.begin(), &exn);
-  if (!result) {
-    throw JSException(m_context, exn, "Exception calling object as constructor");
-  }
-  return Object(m_context, result);
-}
-
-Value Object::getProperty(const String& propName) const {
-  JSValueRef exn;
-  JSValueRef property = JSC_JSObjectGetProperty(m_context, m_obj, propName, &exn);
-  if (!property) {
-    throw JSException(m_context, exn, folly::to<std::string>(
-      "Failed to get property '", propName.str(), "'").c_str());
-  }
-  return Value(m_context, property);
-}
-
-Value Object::getPropertyAtIndex(unsigned int index) const {
-  JSValueRef exn;
-  JSValueRef property = JSC_JSObjectGetPropertyAtIndex(m_context, m_obj, index, &exn);
-  if (!property) {
-    throw JSException(m_context, exn, folly::to<std::string>(
-      "Failed to get property at index ", index).c_str());
-  }
-  return Value(m_context, property);
-}
-
-Value Object::getProperty(const char *propName) const {
-  return getProperty(String(m_context, propName));
-}
-
-void Object::setProperty(const String& propName, const Value& value) {
-  JSValueRef exn = nullptr;
-  JSC_JSObjectSetProperty(m_context, m_obj, propName, value, kJSPropertyAttributeNone, &exn);
-  if (exn) {
-    throw JSException(m_context, exn, folly::to<std::string>(
-      "Failed to set property '", propName.str(), "'").c_str());
-  }
-}
-
-void Object::setPropertyAtIndex(unsigned int index, const Value& value) {
-  JSValueRef exn = nullptr;
-  JSC_JSObjectSetPropertyAtIndex(m_context, m_obj, index, value, &exn);
-  if (exn) {
-    throw JSException(m_context, exn, folly::to<std::string>(
-      "Failed to set property at index ", index).c_str());
-  }
-}
-
-void Object::setProperty(const char *propName, const Value& value) {
-  setProperty(String(m_context, propName), value);
-}
-
-std::vector<String> Object::getPropertyNames() const {
-  auto namesRef = JSC_JSObjectCopyPropertyNames(m_context, m_obj);
-  size_t count = JSC_JSPropertyNameArrayGetCount(m_context, namesRef);
-  std::vector<String> names;
-  names.reserve(count);
-  for (size_t i = 0; i < count; i++) {
-    names.emplace_back(String::ref(m_context,
-      JSC_JSPropertyNameArrayGetNameAtIndex(m_context, namesRef, i)));
-  }
-  JSC_JSPropertyNameArrayRelease(m_context, namesRef);
-  return names;
-}
-
-std::unordered_map<std::string, std::string> Object::toJSONMap() const {
-  std::unordered_map<std::string, std::string> map;
-  auto namesRef = JSC_JSObjectCopyPropertyNames(m_context, m_obj);
-  size_t count = JSC_JSPropertyNameArrayGetCount(m_context, namesRef);
-  for (size_t i = 0; i < count; i++) {
-    auto key = String::ref(m_context,
-      JSC_JSPropertyNameArrayGetNameAtIndex(m_context, namesRef, i));
-    map.emplace(key.str(), getProperty(key).toJSONString());
-  }
-  JSC_JSPropertyNameArrayRelease(m_context, namesRef);
-  return map;
-}
-
-/* static */
-Object Object::create(JSContextRef ctx) {
-  JSObjectRef newObj = JSC_JSObjectMake(
-      ctx,
-      NULL, // create instance of default object class
-      NULL); // no private data
-  return Object(ctx, newObj);
-}
-
-} }
diff --git a/ReactCommon/jschelpers/Value.h b/ReactCommon/jschelpers/Value.h
deleted file mode 100644
index d902732cc256dc..00000000000000
--- a/ReactCommon/jschelpers/Value.h
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <chrono>
-#include <memory>
-#include <sstream>
-#include <unordered_map>
-#include <vector>
-
-#include <folly/dynamic.h>
-#include <jschelpers/JavaScriptCore.h>
-#include <jschelpers/Unicode.h>
-#include <jschelpers/noncopyable.h>
-#include <privatedata/PrivateDataBase.h>
-
-#ifndef RN_EXPORT
-#define RN_EXPORT __attribute__((visibility("default")))
-#endif
-
-namespace facebook {
-namespace react {
-
-class Value;
-
-// C++ object wrapper for JSStringRef
-class String : public noncopyable {
-public:
-  explicit String(): m_context(nullptr), m_string(nullptr) {} // dummy empty constructor
-
-  explicit String(JSContextRef context, const char* utf8)
-  : m_context(context), m_string(JSC_JSStringCreateWithUTF8CString(context, utf8)) {}
-
-  String(String&& other) :
-    m_context(other.m_context), m_string(other.m_string)
-  {
-    other.m_string = nullptr;
-  }
-
-  String(const String& other) :
-    m_context(other.m_context), m_string(other.m_string)
-  {
-    if (m_string) {
-      JSC_JSStringRetain(m_context, m_string);
-    }
-  }
-
-  ~String() {
-    if (m_string) {
-      JSC_JSStringRelease(m_context, m_string);
-    }
-  }
-
-  String& operator=(String&& other) {
-    if (m_string) {
-      JSC_JSStringRelease(m_context, m_string);
-    }
-
-    m_context = other.m_context;
-    m_string = other.m_string;
-    other.m_string = nullptr;
-
-    return *this;
-  }
-
-  operator JSStringRef() const {
-    return m_string;
-  }
-
-  JSContextRef context() const {
-    return m_context;
-  }
-
-  // Length in characters
-  size_t length() const {
-    return m_string ? JSC_JSStringGetLength(m_context, m_string) : 0;
-  }
-
-  // Length in bytes of a nul-terminated utf8 encoded value
-  size_t utf8Size() const {
-    return m_string ? JSC_JSStringGetMaximumUTF8CStringSize(m_context, m_string) : 0;
-  }
-
-  /*
-   * JavaScriptCore is built with strict utf16 -> utf8 conversion.
-   * This means if JSC's built-in conversion function encounters a JavaScript
-   * string which contains half of a 32-bit UTF-16 symbol, it produces an error
-   * rather than returning a string.
-   *
-   * Instead of relying on this, we use our own utf16 -> utf8 conversion function
-   * which is more lenient and always returns a string. When an invalid UTF-16
-   * string is provided, it'll likely manifest as a rendering glitch in the app for
-   * the invalid symbol.
-   *
-   * For details on JavaScript's unicode support see:
-   * https://mathiasbynens.be/notes/javascript-unicode
-   */
-  std::string str() const {
-    if (!m_string) {
-      return "";
-    }
-    const JSChar* utf16 = JSC_JSStringGetCharactersPtr(m_context, m_string);
-    size_t stringLength = JSC_JSStringGetLength(m_context, m_string);
-    return unicode::utf16toUTF8(utf16, stringLength);
-  }
-
-  // Assumes that utf8 is nul-terminated
-  bool equals(const char* utf8) {
-    return m_string ? JSC_JSStringIsEqualToUTF8CString(m_context, m_string, utf8) : false;
-  }
-
-  // This assumes ascii is nul-terminated.
-  static String createExpectingAscii(JSContextRef context, const char* ascii, size_t len) {
-#if WITH_FBJSCEXTENSIONS
-    return String(context, JSC_JSStringCreateWithUTF8CStringExpectAscii(context, ascii, len), true);
-#else
-    return String(context, JSC_JSStringCreateWithUTF8CString(context, ascii), true);
-#endif
-  }
-
-  static String createExpectingAscii(JSContextRef context, std::string const &ascii) {
-    return createExpectingAscii(context, ascii.c_str(), ascii.size());
-  }
-
-  // Creates a String wrapper and increases the refcount of the JSStringRef
-  static String ref(JSContextRef context, JSStringRef string) {
-    return String(context, string, false);
-  }
-
-  // Creates a String wrapper that takes over ownership of the string. The
-  // JSStringRef passed in must previously have been created or retained.
-  static String adopt(JSContextRef context, JSStringRef string) {
-    return String(context, string, true);
-  }
-
-private:
-  explicit String(JSContextRef context, JSStringRef string, bool adopt) :
-    m_context(context), m_string(string)
-  {
-    if (!adopt && string) {
-      JSC_JSStringRetain(context, string);
-    }
-  }
-
-  JSContextRef m_context;
-  JSStringRef m_string;
-};
-
-// C++ object wrapper for JSObjectRef. The underlying JSObjectRef can be
-// optionally protected. You must protect the object if it is ever
-// heap-allocated, since otherwise you may end up with an invalid reference.
-class Object : public noncopyable {
-public:
-  using TimeType = std::chrono::time_point<std::chrono::system_clock>;
-
-  Object(JSContextRef context, JSObjectRef obj) :
-    m_context(context),
-    m_obj(obj)
-  {}
-
-  Object(Object&& other) :
-      m_context(other.m_context),
-      m_obj(other.m_obj),
-      m_isProtected(other.m_isProtected) {
-    other.m_obj = nullptr;
-    other.m_isProtected = false;
-  }
-
-  ~Object() {
-    if (m_isProtected && m_obj) {
-      JSC_JSValueUnprotect(m_context, m_obj);
-    }
-  }
-
-  Object& operator=(Object&& other) {
-    std::swap(m_context, other.m_context);
-    std::swap(m_obj, other.m_obj);
-    std::swap(m_isProtected, other.m_isProtected);
-    return *this;
-  }
-
-  operator JSObjectRef() const {
-    return m_obj;
-  }
-
-  operator Value() const;
-
-  bool isFunction() const {
-    return JSC_JSObjectIsFunction(m_context, m_obj);
-  }
-
-  Value callAsFunction(std::initializer_list<JSValueRef> args) const;
-  Value callAsFunction(const Object& thisObj, std::initializer_list<JSValueRef> args) const;
-  Value callAsFunction(int nArgs, const JSValueRef args[]) const;
-  Value callAsFunction(const Object& thisObj, int nArgs, const JSValueRef args[]) const;
-
-  Object callAsConstructor(std::initializer_list<JSValueRef> args) const;
-
-  Value getProperty(const String& propName) const;
-  Value getProperty(const char *propName) const;
-  Value getPropertyAtIndex(unsigned int index) const;
-  void setProperty(const String& propName, const Value& value);
-  void setProperty(const char *propName, const Value& value);
-  void setPropertyAtIndex(unsigned int index, const Value& value);
-  std::vector<String> getPropertyNames() const;
-  std::unordered_map<std::string, std::string> toJSONMap() const;
-
-  void makeProtected() {
-    if (!m_isProtected && m_obj) {
-      JSC_JSValueProtect(m_context, m_obj);
-      m_isProtected = true;
-    }
-  }
-
-  RN_EXPORT static Object makeArray(JSContextRef ctx, JSValueRef* elements, unsigned length);
-  RN_EXPORT static Object makeDate(JSContextRef ctx, TimeType time);
-
-  template<typename ReturnType>
-  ReturnType* getPrivate() const {
-    const bool isCustomJSC = isCustomJSCPtr(m_context);
-    return PrivateDataBase::cast<ReturnType>(JSC_JSObjectGetPrivate(isCustomJSC, m_obj));
-  }
-
-  void setPrivate(PrivateDataBase* data) const {
-    const bool isCustomJSC = isCustomJSCPtr(m_context);
-    JSC_JSObjectSetPrivate(isCustomJSC, m_obj, data);
-  }
-
-  JSContextRef context() const {
-    return m_context;
-  }
-
-  static Object getGlobalObject(JSContextRef ctx) {
-    auto globalObj = JSC_JSContextGetGlobalObject(ctx);
-    return Object(ctx, globalObj);
-  }
-
-  /**
-   * Creates an instance of the default object class.
-   */
-  static Object create(JSContextRef ctx);
-
-private:
-  JSContextRef m_context;
-  JSObjectRef m_obj;
-  bool m_isProtected = false;
-
-  Value callAsFunction(JSObjectRef thisObj, int nArgs, const JSValueRef args[]) const;
-};
-
-// C++ object wrapper for JSValueRef. The underlying JSValueRef is not
-// protected, so this class should always be used as a stack-allocated
-// variable.
-class Value : public noncopyable {
-public:
-  RN_EXPORT Value(JSContextRef context, JSValueRef value);
-  RN_EXPORT Value(JSContextRef context, JSStringRef value);
-
-  RN_EXPORT Value(const Value &o) : Value(o.m_context, o.m_value) {}
-  RN_EXPORT Value(const String &o) : Value(o.context(), o) {}
-
-  Value& operator=(Value&& other) {
-    m_context = other.m_context;
-    m_value = other.m_value;
-    other.m_value = NULL;
-    return *this;
-  };
-
-  operator JSValueRef() const {
-    return m_value;
-  }
-
-  JSType getType() const {
-    return JSC_JSValueGetType(m_context, m_value);
-  }
-
-  bool isBoolean() const {
-    return getType() == kJSTypeBoolean;
-  }
-
-  bool asBoolean() const {
-    return JSC_JSValueToBoolean(context(), m_value);
-  }
-
-  bool isNumber() const {
-    return getType() == kJSTypeNumber;
-  }
-
-  bool isNull() const {
-    return getType() == kJSTypeNull;
-  }
-
-  bool isUndefined() const {
-    return getType() == kJSTypeUndefined;
-  }
-
-  double asNumber() const {
-    if (isNumber()) {
-      return JSC_JSValueToNumber(context(), m_value, nullptr);
-    } else {
-      return 0.0f;
-    }
-  }
-
-  double getNumberOrThrow() const {
-    if (!isNumber()) {
-      throwTypeException("Number");
-    }
-    return JSC_JSValueToNumber(context(), m_value, nullptr);
-  }
-
-  int32_t asInteger() const {
-    return static_cast<int32_t>(asNumber());
-  }
-
-  uint32_t asUnsignedInteger() const {
-    return static_cast<uint32_t>(asNumber());
-  }
-
-  bool isObject() const {
-    return getType() == kJSTypeObject;
-  }
-
-  RN_EXPORT Object asObject() const;
-
-  bool isString() const {
-    return getType() == kJSTypeString;
-  }
-
-  RN_EXPORT String toString() const;
-
-  // Create an error, optionally adding an additional number of lines to the stack.
-  // Stack must be empty or newline terminated.
-  RN_EXPORT static Value makeError(JSContextRef ctx, const char *error, const char *stack = nullptr);
-
-  static Value makeNumber(JSContextRef ctx, double value) {
-    return Value(ctx, JSC_JSValueMakeNumber(ctx, value));
-  }
-
-  static Value makeUndefined(JSContextRef ctx) {
-    return Value(ctx, JSC_JSValueMakeUndefined(ctx));
-  }
-
-  static Value makeNull(JSContextRef ctx) {
-    return Value(ctx, JSC_JSValueMakeNull(ctx));
-  }
-
-  static Value makeBoolean(JSContextRef ctx, bool value) {
-    return Value(ctx, JSC_JSValueMakeBoolean(ctx, value));
-  }
-
-  static Value makeString(JSContextRef ctx, const char* utf8) {
-    return Value(ctx, String(ctx, utf8));
-  }
-
-  RN_EXPORT std::string toJSONString(unsigned indent = 0) const;
-  RN_EXPORT static Value fromJSON(const String& json);
-  RN_EXPORT static Value fromDynamic(JSContextRef ctx, const folly::dynamic& value);
-  RN_EXPORT JSContextRef context() const;
-
-private:
-  JSContextRef m_context;
-  JSValueRef m_value;
-
-  void throwTypeException(const std::string &expectedType) const;
-  static JSValueRef fromDynamicInner(JSContextRef ctx, const folly::dynamic& obj);
-
-};
-
-} }
diff --git a/ReactCommon/jschelpers/noncopyable.h b/ReactCommon/jschelpers/noncopyable.h
deleted file mode 100644
index d8a1cca4b06217..00000000000000
--- a/ReactCommon/jschelpers/noncopyable.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 {
-struct noncopyable {
-  noncopyable(const noncopyable&) = delete;
-  noncopyable& operator=(const noncopyable&) = delete;
- protected:
-  noncopyable() = default;
-};
-}}
diff --git a/ReactCommon/jschelpers/systemJSCWrapper.cpp b/ReactCommon/jschelpers/systemJSCWrapper.cpp
deleted file mode 100644
index eecb036f547c0f..00000000000000
--- a/ReactCommon/jschelpers/systemJSCWrapper.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright (c) 2016-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <jschelpers/JSCWrapper.h>
-
-#if defined(__APPLE__)
-
-#include <mutex>
-
-#include <objc/runtime.h>
-
-// Crash the app (with a descriptive stack trace) if a function that is not supported by
-// the system JSC is called.
-#define UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(FUNC_NAME)            \
-static void Unimplemented_##FUNC_NAME(__unused void* args...) { \
-  assert(false);                                                \
-}
-
-UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSEvaluateBytecodeBundle)
-#if WITH_FBJSCEXTENSIONS
-UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSStringCreateWithUTF8CStringExpectAscii)
-#endif
-UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSPokeSamplingProfiler)
-UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSStartSamplingProfilingOnMainJSCThread)
-
-UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSGlobalContextEnableDebugger)
-UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSGlobalContextDisableDebugger)
-
-UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(configureJSCForIOS)
-
-UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(FBJSContextStartGCTimers)
-
-bool JSSamplingProfilerEnabled() {
-  return false;
-}
-
-const int32_t JSNoBytecodeFileFormatVersion = -1;
-
-namespace facebook {
-namespace react {
-
-static JSCWrapper s_systemWrapper = {};
-
-const JSCWrapper* systemJSCWrapper() {
-  // Note that this is not used on Android. All methods are statically linked instead.
-  // Some fields are lazily initialized
-  static std::once_flag flag;
-  std::call_once(flag, []() {
-    s_systemWrapper = {
-      .JSGlobalContextCreateInGroup = JSGlobalContextCreateInGroup,
-      .JSGlobalContextRelease = JSGlobalContextRelease,
-      .JSGlobalContextSetName = JSGlobalContextSetName,
-
-      .JSContextGetGlobalContext = JSContextGetGlobalContext,
-      .JSContextGetGlobalObject = JSContextGetGlobalObject,
-      .FBJSContextStartGCTimers =
-        (decltype(&FBJSContextStartGCTimers))
-        Unimplemented_FBJSContextStartGCTimers,
-
-      .JSEvaluateScript = JSEvaluateScript,
-      .JSEvaluateBytecodeBundle =
-        (decltype(&JSEvaluateBytecodeBundle))
-        Unimplemented_JSEvaluateBytecodeBundle,
-
-      .JSStringCreateWithUTF8CString = JSStringCreateWithUTF8CString,
-      .JSStringCreateWithCFString = JSStringCreateWithCFString,
-      #if WITH_FBJSCEXTENSIONS
-      .JSStringCreateWithUTF8CStringExpectAscii =
-        (decltype(&JSStringCreateWithUTF8CStringExpectAscii))
-        Unimplemented_JSStringCreateWithUTF8CStringExpectAscii,
-      #endif
-      .JSStringCopyCFString = JSStringCopyCFString,
-      .JSStringGetCharactersPtr = JSStringGetCharactersPtr,
-      .JSStringGetLength = JSStringGetLength,
-      .JSStringGetMaximumUTF8CStringSize = JSStringGetMaximumUTF8CStringSize,
-      .JSStringIsEqualToUTF8CString = JSStringIsEqualToUTF8CString,
-      .JSStringRelease = JSStringRelease,
-      .JSStringRetain = JSStringRetain,
-
-      .JSClassCreate = JSClassCreate,
-      .JSClassRetain = JSClassRetain,
-      .JSClassRelease = JSClassRelease,
-
-      .JSObjectCallAsConstructor = JSObjectCallAsConstructor,
-      .JSObjectCallAsFunction = JSObjectCallAsFunction,
-      .JSObjectGetPrivate = JSObjectGetPrivate,
-      .JSObjectGetProperty = JSObjectGetProperty,
-      .JSObjectGetPropertyAtIndex = JSObjectGetPropertyAtIndex,
-      .JSObjectIsConstructor = JSObjectIsConstructor,
-      .JSObjectIsFunction = JSObjectIsFunction,
-      .JSObjectMake = JSObjectMake,
-      .JSObjectMakeArray = JSObjectMakeArray,
-      .JSObjectMakeDate = JSObjectMakeDate,
-      .JSObjectMakeError = JSObjectMakeError,
-      .JSObjectMakeFunctionWithCallback = JSObjectMakeFunctionWithCallback,
-      .JSObjectSetPrivate = JSObjectSetPrivate,
-      .JSObjectSetProperty = JSObjectSetProperty,
-      .JSObjectSetPropertyAtIndex = JSObjectSetPropertyAtIndex,
-
-      .JSObjectCopyPropertyNames = JSObjectCopyPropertyNames,
-      .JSPropertyNameArrayGetCount = JSPropertyNameArrayGetCount,
-      .JSPropertyNameArrayGetNameAtIndex = JSPropertyNameArrayGetNameAtIndex,
-      .JSPropertyNameArrayRelease = JSPropertyNameArrayRelease,
-
-      .JSValueCreateJSONString = JSValueCreateJSONString,
-      .JSValueGetType = JSValueGetType,
-      .JSValueMakeFromJSONString = JSValueMakeFromJSONString,
-      .JSValueMakeBoolean = JSValueMakeBoolean,
-      .JSValueMakeNull = JSValueMakeNull,
-      .JSValueMakeNumber = JSValueMakeNumber,
-      .JSValueMakeString = JSValueMakeString,
-      .JSValueMakeUndefined = JSValueMakeUndefined,
-      .JSValueProtect = JSValueProtect,
-      .JSValueToBoolean = JSValueToBoolean,
-      .JSValueToNumber = JSValueToNumber,
-      .JSValueToObject = JSValueToObject,
-      .JSValueToStringCopy = JSValueToStringCopy,
-      .JSValueUnprotect = JSValueUnprotect,
-      .JSValueIsNull = JSValueIsNull,
-
-      .JSSamplingProfilerEnabled = JSSamplingProfilerEnabled,
-      .JSPokeSamplingProfiler =
-        (decltype(&JSPokeSamplingProfiler))
-        Unimplemented_JSPokeSamplingProfiler,
-      .JSStartSamplingProfilingOnMainJSCThread =
-        (decltype(&JSStartSamplingProfilingOnMainJSCThread))
-        Unimplemented_JSStartSamplingProfilingOnMainJSCThread,
-
-      .JSGlobalContextEnableDebugger =
-        (decltype(&JSGlobalContextEnableDebugger))
-        Unimplemented_JSGlobalContextEnableDebugger,
-      .JSGlobalContextDisableDebugger =
-        (decltype(&JSGlobalContextDisableDebugger))
-        Unimplemented_JSGlobalContextDisableDebugger,
-
-      .configureJSCForIOS =
-        (decltype(&configureJSCForIOS))Unimplemented_configureJSCForIOS,
-
-      .JSContext = objc_getClass("JSContext"),
-      .JSValue = objc_getClass("JSValue"),
-
-      .JSBytecodeFileFormatVersion = JSNoBytecodeFileFormatVersion,
-    };
-  });
-  return &s_systemWrapper;
-}
-
-} }
-
-#endif
diff --git a/ReactCommon/jsi/Android.mk b/ReactCommon/jsi/Android.mk
new file mode 100644
index 00000000000000..1b27989ff058ad
--- /dev/null
+++ b/ReactCommon/jsi/Android.mk
@@ -0,0 +1,15 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := jsi
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+
+LOCAL_CFLAGS := -fexceptions -frtti -O3
+LOCAL_SHARED_LIBRARIES := libfolly_json libjsc glog
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactCommon/jsi/BUCK b/ReactCommon/jsi/BUCK
new file mode 100644
index 00000000000000..1e216da0bcbd0a
--- /dev/null
+++ b/ReactCommon/jsi/BUCK
@@ -0,0 +1,96 @@
+# BUILD FILE SYNTAX: SKYLARK
+
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_xplat_dep", "rn_xplat_cxx_library")
+
+rn_xplat_cxx_library(
+    name = "jsi",
+    srcs = [
+        "jsi.cpp",
+    ],
+    header_namespace = "jsi",
+    exported_headers = [
+        "instrumentation.h",
+        "jsi.h",
+        "jsi-inl.h",
+    ],
+    compiler_flags = [
+        "-O3",
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+        "-Werror",
+        "-Wextra",
+        "-Wcast-qual",
+        "-Wdelete-non-virtual-dtor",
+        "-Wwrite-strings",
+    ],
+    cxx_compiler_flags = [
+        "-Wglobal-constructors",
+        "-Wmissing-prototypes",
+    ],
+    fbobjc_compiler_flags = [
+        "-Wglobal-constructors",
+        "-Wmissing-prototypes",
+    ],
+    visibility = ["PUBLIC"],
+)
+
+rn_xplat_cxx_library(
+    name = "JSIDynamic",
+    srcs = [
+        "JSIDynamic.cpp",
+    ],
+    header_namespace = "jsi",
+    exported_headers = [
+        "JSIDynamic.h",
+    ],
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+    ],
+    fbobjc_force_static = True,
+    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",
+    ],
+    cxx_deps = [
+        "xplat//jsc:jsc",
+    ],
+    fbandroid_compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-O3",
+    ],
+    fbandroid_deps = [
+        "xplat//jsc:jsc",
+    ],
+    fbobjc_compiler_flags = [
+        "-Os",
+    ],
+    fbobjc_frameworks = [
+        "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
+    ],
+    visibility = ["PUBLIC"],
+    xplat_mangled_args = {
+        "soname": "libjscjsi.$(ext)",
+    },
+    exported_deps = [
+        react_native_xplat_dep("jsi:jsi"),
+    ],
+)
diff --git a/ReactCommon/jsi/JSCRuntime.cpp b/ReactCommon/jsi/JSCRuntime.cpp
new file mode 100644
index 00000000000000..f9a5e0b8cb642a
--- /dev/null
+++ b/ReactCommon/jsi/JSCRuntime.cpp
@@ -0,0 +1,1302 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "JSCRuntime.h"
+
+#include <JavaScriptCore/JavaScript.h>
+#include <condition_variable>
+#include <cstdlib>
+#include <mutex>
+#include <queue>
+#include <sstream>
+#include <thread>
+
+#ifndef NDEBUG
+#include <atomic>
+#endif
+
+namespace facebook {
+namespace jsc {
+
+namespace detail {
+class ArgsConverter;
+class ProtectionQueue;
+} // namespace detail
+
+class JSCRuntime;
+
+struct Lock {
+  void lock(const jsc::JSCRuntime&) const {}
+  void unlock(const jsc::JSCRuntime&) const {}
+};
+
+class JSCRuntime : public jsi::Runtime {
+ public:
+  // Creates new context in new context group
+  JSCRuntime();
+  // Retains ctx
+  JSCRuntime(JSGlobalContextRef ctx);
+  ~JSCRuntime();
+
+  void evaluateJavaScript(
+      std::unique_ptr<const jsi::Buffer> buffer,
+      const std::string& sourceURL) override;
+  jsi::Object global() override;
+
+  std::string description() override;
+
+  bool isInspectable() override;
+
+  void setDescription(const std::string& desc);
+
+  // Please don't use the following two functions, only exposed for
+  // integration efforts.
+  JSGlobalContextRef getContext() {
+    return ctx_;
+  }
+
+  // JSValueRef->JSValue (needs make.*Value so it must be member function)
+  jsi::Value createValue(JSValueRef value) const;
+
+  // Value->JSValueRef (similar to above)
+  JSValueRef valueRef(const jsi::Value& value);
+
+ protected:
+  friend class detail::ArgsConverter;
+  friend class detail::ProtectionQueue;
+  class JSCStringValue final : public PointerValue {
+#ifndef NDEBUG
+    JSCStringValue(JSStringRef str, std::atomic<intptr_t>& counter);
+#else
+    JSCStringValue(JSStringRef str);
+#endif
+    ~JSCStringValue();
+
+    void invalidate() override;
+
+    JSStringRef str_;
+#ifndef NDEBUG
+    std::atomic<intptr_t>& counter_;
+#endif
+   protected:
+    friend class JSCRuntime;
+  };
+
+  class JSCObjectValue final : public PointerValue {
+#ifndef NDEBUG
+    JSCObjectValue(
+        JSGlobalContextRef ctx,
+        detail::ProtectionQueue& pq,
+        JSObjectRef obj,
+        std::atomic<intptr_t>& counter);
+#else
+    JSCObjectValue(
+        JSGlobalContextRef context,
+        detail::ProtectionQueue& pq,
+        JSObjectRef obj);
+#endif
+    ~JSCObjectValue();
+
+    void invalidate() override;
+
+    JSGlobalContextRef ctx_;
+    JSObjectRef obj_;
+    detail::ProtectionQueue& protectionQueue_;
+#ifndef NDEBUG
+    std::atomic<intptr_t>& counter_;
+#endif
+   protected:
+    friend class JSCRuntime;
+    friend class detail::ProtectionQueue;
+  };
+
+  PointerValue* cloneString(const Runtime::PointerValue* pv) override;
+  PointerValue* cloneObject(const Runtime::PointerValue* pv) override;
+  PointerValue* clonePropNameID(const Runtime::PointerValue* pv) override;
+
+  jsi::PropNameID createPropNameIDFromAscii(const char* str, size_t length)
+      override;
+  jsi::PropNameID createPropNameIDFromUtf8(const uint8_t* utf8, size_t length)
+      override;
+  jsi::PropNameID createPropNameIDFromString(const jsi::String& str) override;
+  std::string utf8(const jsi::PropNameID&) override;
+  bool compare(const jsi::PropNameID&, const jsi::PropNameID&) 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;
+
+  jsi::Object createObject() override;
+  jsi::Object createObject(std::shared_ptr<jsi::HostObject> ho) override;
+  virtual std::shared_ptr<jsi::HostObject> getHostObject(
+      const jsi::Object&) override;
+  jsi::HostFunctionType& getHostFunction(const jsi::Function&) override;
+
+  jsi::Value getProperty(const jsi::Object&, const jsi::String& name) override;
+  jsi::Value getProperty(const jsi::Object&, const jsi::PropNameID& name)
+      override;
+  bool hasProperty(const jsi::Object&, const jsi::String& name) override;
+  bool hasProperty(const jsi::Object&, const jsi::PropNameID& name) override;
+  void setPropertyValue(
+      jsi::Object&,
+      const jsi::String& name,
+      const jsi::Value& value) override;
+  void setPropertyValue(
+      jsi::Object&,
+      const jsi::PropNameID& name,
+      const jsi::Value& value) override;
+  bool isArray(const jsi::Object&) const override;
+  bool isArrayBuffer(const jsi::Object&) const override;
+  bool isFunction(const jsi::Object&) const override;
+  bool isHostObject(const jsi::Object&) const override;
+  bool isHostFunction(const jsi::Function&) const override;
+  jsi::Array getPropertyNames(const jsi::Object&) override;
+
+  jsi::WeakObject createWeakObject(const jsi::Object&) override;
+  jsi::Value lockWeakObject(const jsi::WeakObject&) override;
+
+  jsi::Array createArray(size_t length) override;
+  size_t size(const jsi::Array&) override;
+  size_t size(const jsi::ArrayBuffer&) override;
+  uint8_t* data(const jsi::ArrayBuffer&) override;
+  jsi::Value getValueAtIndex(const jsi::Array&, size_t i) override;
+  void setValueAtIndexImpl(jsi::Array&, size_t i, const jsi::Value& value)
+      override;
+
+  jsi::Function createFunctionFromHostFunction(
+      const jsi::PropNameID& name,
+      unsigned int paramCount,
+      jsi::HostFunctionType func) override;
+  jsi::Value call(
+      const jsi::Function&,
+      const jsi::Value& jsThis,
+      const jsi::Value* args,
+      size_t count) override;
+  jsi::Value callAsConstructor(
+      const jsi::Function&,
+      const jsi::Value* args,
+      size_t count) override;
+
+  bool strictEquals(const jsi::String& a, const jsi::String& b) const override;
+  bool strictEquals(const jsi::Object& a, const jsi::Object& b) const override;
+  bool instanceOf(const jsi::Object& o, const jsi::Function& f) override;
+
+ private:
+  // Basically convenience casts
+  static JSStringRef stringRef(const jsi::String& str);
+  static JSStringRef stringRef(const jsi::PropNameID& sym);
+  static JSObjectRef objectRef(const jsi::Object& obj);
+
+  // Factory methods for creating String/Object
+  jsi::String createString(JSStringRef stringRef) const;
+  jsi::PropNameID createPropNameID(JSStringRef stringRef);
+  jsi::Object createObject(JSObjectRef objectRef) const;
+
+  // Used by factory methods and clone methods
+  jsi::Runtime::PointerValue* makeStringValue(JSStringRef str) const;
+  jsi::Runtime::PointerValue* makeObjectValue(JSObjectRef obj) const;
+
+  void checkException(JSValueRef exc);
+  void checkException(JSValueRef res, JSValueRef exc);
+  void checkException(JSValueRef exc, const char* msg);
+  void checkException(JSValueRef res, JSValueRef exc, const char* msg);
+
+  JSGlobalContextRef ctx_;
+  std::string desc_;
+  // We make this a pointer so that we can control explicitly when it's deleted
+  // namely before the context is released.
+  mutable std::unique_ptr<detail::ProtectionQueue> protectionQueue_;
+#ifndef NDEBUG
+  mutable std::atomic<intptr_t> objectCounter_;
+  mutable std::atomic<intptr_t> stringCounter_;
+#endif
+};
+
+#if __has_builtin(__builtin_expect)
+#define JSC_LIKELY(EXPR) __builtin_expect((bool)(EXPR), true)
+#define JSC_UNLIKELY(EXPR) __builtin_expect((bool)(EXPR), false)
+#else
+#define JSC_LIKELY(EXPR) (EXPR)
+#define JSC_UNLIKELY(EXPR) (EXPR)
+#endif
+
+#define JSC_ASSERT(x)          \
+  do {                         \
+    if (JSC_UNLIKELY(!!(x))) { \
+      abort();                 \
+    }                          \
+  } while (0)
+
+#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+// This takes care of watch and tvos (due to backwards compatibility in
+// Availability.h
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_9_0
+#define _JSC_FAST_IS_ARRAY
+#endif
+#endif
+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_11
+// Only one of these should be set for a build.  If somehow that's not
+// true, this will be a compile-time error and it can be resolved when
+// we understand why.
+#define _JSC_FAST_IS_ARRAY
+#endif
+#endif
+
+// JSStringRef utilities
+namespace {
+std::string JSStringToSTLString(JSStringRef str) {
+  std::string result;
+  size_t maxBytes = JSStringGetMaximumUTF8CStringSize(str);
+  result.resize(maxBytes);
+  size_t bytesWritten = JSStringGetUTF8CString(str, &result[0], maxBytes);
+  // JSStringGetUTF8CString writes the null terminator, so we want to resize
+  // to `bytesWritten - 1` so that `result` has the correct length.
+  result.resize(bytesWritten - 1);
+  return result;
+}
+
+JSStringRef getLengthString() {
+  static JSStringRef length = JSStringCreateWithUTF8CString("length");
+  return length;
+}
+
+JSStringRef getNameString() {
+  static JSStringRef name = JSStringCreateWithUTF8CString("name");
+  return name;
+}
+
+JSStringRef getFunctionString() {
+  static JSStringRef func = JSStringCreateWithUTF8CString("Function");
+  return func;
+}
+
+#if !defined(_JSC_FAST_IS_ARRAY)
+JSStringRef getArrayString() {
+  static JSStringRef array = JSStringCreateWithUTF8CString("Array");
+  return array;
+}
+
+JSStringRef getIsArrayString() {
+  static JSStringRef isArray = JSStringCreateWithUTF8CString("isArray");
+  return isArray;
+}
+#endif
+} // namespace
+
+// std::string utility
+namespace {
+std::string to_string(void* value) {
+  std::ostringstream ss;
+  ss << value;
+  return ss.str();
+}
+} // namespace
+
+// UnprotectQueue
+namespace detail {
+class ProtectionQueue {
+ public:
+  ProtectionQueue()
+      : shuttingDown_(false)
+#ifndef NDEBUG
+        ,
+        didShutdown_ {
+    false
+  }
+#endif
+  , unprotectorThread_(&ProtectionQueue::unprotectThread, this) {}
+
+  void shutdown() {
+    {
+      std::lock_guard<std::mutex> locker(mutex_);
+      shuttingDown_ = true;
+      notEmpty_.notify_one();
+    }
+    unprotectorThread_.join();
+  }
+
+  void push(JSCRuntime::JSCObjectValue* value) {
+    std::lock_guard<std::mutex> locker(mutex_);
+    assert(!didShutdown_);
+    queue_.push(value);
+    notEmpty_.notify_one();
+  }
+
+ private:
+  // This this the function that runs in the background deleting (and thus
+  // unprotecting JSObjectRefs as need be). This needs to be explicitly on a
+  // separate thread so that we don't have the API lock when `JSValueUnprotect`
+  // is called already (i.e. if we did this on the same thread that calls
+  // invalidate() on an Object then we might be in the middle of a GC pass, and
+  // already have the API lock).
+  void unprotectThread() {
+#if defined(__APPLE__)
+    pthread_setname_np("jsc-protectionqueue-unprotectthread");
+#endif
+
+    std::unique_lock<std::mutex> locker(mutex_);
+    while (!shuttingDown_ || !queue_.empty()) {
+      if (queue_.empty()) {
+        // This will wake up when shuttingDown_ becomes true
+        notEmpty_.wait(locker);
+      } else {
+        JSCRuntime::JSCObjectValue* value = queue_.front();
+        queue_.pop();
+        // We need to drop the lock here since this calls JSValueUnprotect and
+        // that may make another GC pass, which could call another finalizer
+        // and thus attempt to push to this queue then, and deadlock.
+        locker.unlock();
+        delete value;
+        locker.lock();
+      }
+    }
+#ifndef NDEBUG
+    didShutdown_ = true;
+#endif
+  }
+  // Used to lock the queue_/shuttingDown_ ivars
+  std::mutex mutex_;
+  // Used to signal queue_ empty status changing
+  std::condition_variable notEmpty_;
+  // The actual underlying queue
+  std::queue<JSCRuntime::JSCObjectValue*> queue_;
+  // A flag dictating whether or not we need to stop all execution
+  bool shuttingDown_;
+#ifndef NDEBUG
+  std::atomic<bool> didShutdown_;
+#endif
+  // The thread that dequeues and processes the queue. Note this is the last
+  // member on purpose so the thread starts up after all state has been
+  // properly initialized
+  std::thread unprotectorThread_;
+};
+} // namespace detail
+
+JSCRuntime::JSCRuntime()
+    : JSCRuntime(JSGlobalContextCreateInGroup(nullptr, nullptr)) {
+  JSGlobalContextRelease(ctx_);
+}
+
+JSCRuntime::JSCRuntime(JSGlobalContextRef ctx)
+    : ctx_(JSGlobalContextRetain(ctx)),
+      protectionQueue_(std::make_unique<detail::ProtectionQueue>())
+#ifndef NDEBUG
+      ,
+      objectCounter_(0),
+      stringCounter_(0)
+#endif
+{
+}
+
+JSCRuntime::~JSCRuntime() {
+  protectionQueue_->shutdown();
+#ifndef NDEBUG
+  assert(
+      objectCounter_ == 0 && "JSCRuntime destroyed with a dangling API object");
+  assert(
+      stringCounter_ == 0 && "JSCRuntime destroyed with a dangling API string");
+#endif
+  JSGlobalContextRelease(ctx_);
+}
+
+void JSCRuntime::evaluateJavaScript(
+    std::unique_ptr<const jsi::Buffer> buffer,
+    const std::string& sourceURL) {
+  std::string tmp(
+      reinterpret_cast<const char*>(buffer->data()), buffer->size());
+  JSStringRef sourceRef = JSStringCreateWithUTF8CString(tmp.c_str());
+  JSStringRef sourceURLRef = nullptr;
+  if (!sourceURL.empty()) {
+    sourceURLRef = JSStringCreateWithUTF8CString(sourceURL.c_str());
+  }
+  JSValueRef exc = nullptr;
+  JSValueRef res =
+      JSEvaluateScript(ctx_, sourceRef, nullptr, sourceURLRef, 0, &exc);
+  JSStringRelease(sourceRef);
+  if (sourceURLRef) {
+    JSStringRelease(sourceURLRef);
+  }
+  checkException(res, exc);
+}
+
+jsi::Object JSCRuntime::global() {
+  return createObject(JSContextGetGlobalObject(ctx_));
+}
+
+std::string JSCRuntime::description() {
+  if (desc_.empty()) {
+    desc_ = std::string("<JSCRuntime@") + to_string(this) + ">";
+  }
+  return desc_;
+}
+
+bool JSCRuntime::isInspectable() {
+  return false;
+}
+
+#ifndef NDEBUG
+JSCRuntime::JSCStringValue::JSCStringValue(
+    JSStringRef str,
+    std::atomic<intptr_t>& counter)
+    : str_(JSStringRetain(str)), counter_(counter) {
+  // Since std::atomic returns a copy instead of a reference when calling
+  // operator+= we must do this explicitly in the constructor
+  counter_ += 1;
+}
+#else
+JSCRuntime::JSCStringValue::JSCStringValue(JSStringRef str)
+    : str_(JSStringRetain(str)) {
+}
+#endif
+
+void JSCRuntime::JSCStringValue::invalidate() {
+  // JSI needs to be flexible enough to allow Runtime to act as a root in
+  // hermes' case and just an interface in JSC's case. In hermes the
+  // objects/strings must be tracked in a list so that they can be marked
+  // on a GC sweep, while for JSC we want to immediately JSStringRelease once a
+  // String is released, and queue a JSObjectRef to unprotected (see comment
+  // on ProtectionQueue::unprotectThread above).
+  //
+  // In JSC's case these JSC{String,Object}Value objects are implicitly owned
+  // by the {String,Object} objects, thus when a String/Object is destructed
+  // the JSC{String,Object}Value should be released (again this has the caveat
+  // that objects must be unprotected on a separate thread).
+  //
+  // Angery reaccs only
+  delete this;
+}
+
+JSCRuntime::JSCStringValue::~JSCStringValue() {
+#ifndef NDEBUG
+  counter_ -= 1;
+#endif
+  JSStringRelease(str_);
+}
+
+JSCRuntime::JSCObjectValue::JSCObjectValue(
+    JSGlobalContextRef ctx,
+    detail::ProtectionQueue& pq,
+    JSObjectRef obj
+#ifndef NDEBUG
+    ,
+    std::atomic<intptr_t>& counter
+#endif
+    )
+    : ctx_(ctx),
+      obj_(obj),
+      protectionQueue_(pq)
+#ifndef NDEBUG
+      ,
+      counter_(counter)
+#endif
+{
+  JSValueProtect(ctx_, obj_);
+#ifndef NDEBUG
+  counter_ += 1;
+#endif
+}
+
+void JSCRuntime::JSCObjectValue::invalidate() {
+  // See comment in JSCRuntime::JSCStringValue::invalidate as well as
+  // on ProtectionQueue::unprotectThread.
+  protectionQueue_.push(this);
+}
+
+JSCRuntime::JSCObjectValue::~JSCObjectValue() {
+#ifndef NDEBUG
+  counter_ -= 1;
+#endif
+  JSValueUnprotect(ctx_, obj_);
+}
+
+jsi::Runtime::PointerValue* JSCRuntime::cloneString(
+    const jsi::Runtime::PointerValue* pv) {
+  if (!pv) {
+    return nullptr;
+  }
+  const JSCStringValue* string = static_cast<const JSCStringValue*>(pv);
+  return makeStringValue(string->str_);
+}
+
+jsi::Runtime::PointerValue* JSCRuntime::cloneObject(
+    const jsi::Runtime::PointerValue* pv) {
+  if (!pv) {
+    return nullptr;
+  }
+  const JSCObjectValue* object = static_cast<const JSCObjectValue*>(pv);
+  assert(
+      object->ctx_ == ctx_ &&
+      "Don't try to clone an object backed by a different Runtime");
+  return makeObjectValue(object->obj_);
+}
+
+jsi::Runtime::PointerValue* JSCRuntime::clonePropNameID(
+    const jsi::Runtime::PointerValue* pv) {
+  if (!pv) {
+    return nullptr;
+  }
+  const JSCStringValue* string = static_cast<const JSCStringValue*>(pv);
+  return makeStringValue(string->str_);
+}
+
+jsi::PropNameID JSCRuntime::createPropNameIDFromAscii(
+    const char* str,
+    size_t length) {
+  // For system JSC this must is identical to a string
+  std::string tmp(str, length);
+  JSStringRef strRef = JSStringCreateWithUTF8CString(tmp.c_str());
+  auto res = createPropNameID(strRef);
+  JSStringRelease(strRef);
+  return res;
+}
+
+jsi::PropNameID JSCRuntime::createPropNameIDFromUtf8(
+    const uint8_t* utf8,
+    size_t length) {
+  std::string tmp(reinterpret_cast<const char*>(utf8), length);
+  JSStringRef strRef = JSStringCreateWithUTF8CString(tmp.c_str());
+  auto res = createPropNameID(strRef);
+  JSStringRelease(strRef);
+  return res;
+}
+
+jsi::PropNameID JSCRuntime::createPropNameIDFromString(const jsi::String& str) {
+  return createPropNameID(stringRef(str));
+}
+
+std::string JSCRuntime::utf8(const jsi::PropNameID& sym) {
+  return JSStringToSTLString(stringRef(sym));
+}
+
+bool JSCRuntime::compare(const jsi::PropNameID& a, const jsi::PropNameID& b) {
+  return JSStringIsEqual(stringRef(a), stringRef(b));
+}
+
+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)
+  return this->createStringFromUtf8(
+      reinterpret_cast<const uint8_t*>(str), length);
+}
+
+jsi::String JSCRuntime::createStringFromUtf8(
+    const uint8_t* str,
+    size_t length) {
+  std::string tmp(reinterpret_cast<const char*>(str), length);
+  JSStringRef stringRef = JSStringCreateWithUTF8CString(tmp.c_str());
+  return createString(stringRef);
+}
+
+std::string JSCRuntime::utf8(const jsi::String& str) {
+  return JSStringToSTLString(stringRef(str));
+}
+
+jsi::Object JSCRuntime::createObject() {
+  return createObject(static_cast<JSObjectRef>(nullptr));
+}
+
+// HostObject details
+namespace detail {
+struct HostObjectProxyBase {
+  HostObjectProxyBase(
+      JSCRuntime& rt,
+      const std::shared_ptr<jsi::HostObject>& sho)
+      : runtime(rt), hostObject(sho) {}
+
+  JSCRuntime& runtime;
+  std::shared_ptr<jsi::HostObject> hostObject;
+};
+} // namespace detail
+
+namespace {
+std::once_flag hostObjectClassOnceFlag;
+JSClassRef hostObjectClass{};
+} // namespace
+
+jsi::Object JSCRuntime::createObject(std::shared_ptr<jsi::HostObject> ho) {
+  struct HostObjectProxy : public detail::HostObjectProxyBase {
+    static JSValueRef getProperty(
+        JSContextRef ctx,
+        JSObjectRef object,
+        JSStringRef propertyName,
+        JSValueRef* exception) {
+      auto proxy = static_cast<HostObjectProxy*>(JSObjectGetPrivate(object));
+      auto& rt = proxy->runtime;
+      jsi::PropNameID sym = rt.createPropNameID(propertyName);
+      jsi::Value ret;
+      try {
+        ret = proxy->hostObject->get(rt, sym);
+      } catch (const jsi::JSError& error) {
+        *exception = rt.valueRef(error.value());
+        return JSValueMakeUndefined(ctx);
+      } catch (const std::exception& ex) {
+        auto excValue =
+            rt.global()
+                .getPropertyAsFunction(rt, "Error")
+                .call(
+                    rt,
+                    std::string("Exception in HostObject::get: ") + ex.what());
+        *exception = rt.valueRef(excValue);
+        return JSValueMakeUndefined(ctx);
+      } catch (...) {
+        auto excValue =
+            rt.global()
+                .getPropertyAsFunction(rt, "Error")
+                .call(rt, "Exception in HostObject::get: <unknown>");
+        *exception = rt.valueRef(excValue);
+        return JSValueMakeUndefined(ctx);
+      }
+      return rt.valueRef(ret);
+    }
+
+    static bool setProperty(
+        JSContextRef ctx,
+        JSObjectRef object,
+        JSStringRef propName,
+        JSValueRef value,
+        JSValueRef* exception) {
+      auto proxy = static_cast<HostObjectProxy*>(JSObjectGetPrivate(object));
+      auto& rt = proxy->runtime;
+      jsi::PropNameID sym = rt.createPropNameID(propName);
+      try {
+        proxy->hostObject->set(rt, sym, rt.createValue(value));
+      } catch (const jsi::JSError& error) {
+        *exception = rt.valueRef(error.value());
+        return false;
+      } catch (const std::exception& ex) {
+        auto excValue =
+            rt.global()
+                .getPropertyAsFunction(rt, "Error")
+                .call(
+                    rt,
+                    std::string("Exception in HostObject::set: ") + ex.what());
+        *exception = rt.valueRef(excValue);
+        return false;
+      } catch (...) {
+        auto excValue =
+            rt.global()
+                .getPropertyAsFunction(rt, "Error")
+                .call(rt, "Exception in HostObject::set: <unknown>");
+        *exception = rt.valueRef(excValue);
+        return false;
+      }
+      return true;
+    }
+
+    // JSC does not provide means to communicate errors from this callback,
+    // so the error handling strategy is very brutal - we'll just crash
+    // due to noexcept.
+    static void getPropertyNames(
+        JSContextRef ctx,
+        JSObjectRef object,
+        JSPropertyNameAccumulatorRef propertyNames) noexcept {
+      auto proxy = static_cast<HostObjectProxy*>(JSObjectGetPrivate(object));
+      auto& rt = proxy->runtime;
+      auto names = proxy->hostObject->getPropertyNames(rt);
+      for (auto& name : names) {
+        JSPropertyNameAccumulatorAddName(propertyNames, stringRef(name));
+      }
+    }
+
+    static void finalize(JSObjectRef obj) {
+      auto hostObject = static_cast<HostObjectProxy*>(JSObjectGetPrivate(obj));
+      JSObjectSetPrivate(obj, nullptr);
+      delete hostObject;
+    }
+
+    using HostObjectProxyBase::HostObjectProxyBase;
+  };
+
+  std::call_once(hostObjectClassOnceFlag, []() {
+    JSClassDefinition hostObjectClassDef = kJSClassDefinitionEmpty;
+    hostObjectClassDef.version = 0;
+    hostObjectClassDef.attributes = kJSClassAttributeNoAutomaticPrototype;
+    hostObjectClassDef.finalize = HostObjectProxy::finalize;
+    hostObjectClassDef.getProperty = HostObjectProxy::getProperty;
+    hostObjectClassDef.setProperty = HostObjectProxy::setProperty;
+    hostObjectClassDef.getPropertyNames = HostObjectProxy::getPropertyNames;
+    hostObjectClass = JSClassCreate(&hostObjectClassDef);
+  });
+
+  JSObjectRef obj =
+      JSObjectMake(ctx_, hostObjectClass, new HostObjectProxy(*this, ho));
+  return createObject(obj);
+}
+
+std::shared_ptr<jsi::HostObject> JSCRuntime::getHostObject(
+    const jsi::Object& obj) {
+  // We are guarenteed at this point to have isHostObject(obj) == true
+  // so the private data should be HostObjectMetadata
+  JSObjectRef object = objectRef(obj);
+  auto metadata =
+      static_cast<detail::HostObjectProxyBase*>(JSObjectGetPrivate(object));
+  assert(metadata);
+  return metadata->hostObject;
+}
+
+jsi::Value JSCRuntime::getProperty(
+    const jsi::Object& obj,
+    const jsi::String& name) {
+  JSObjectRef objRef = objectRef(obj);
+  JSValueRef exc = nullptr;
+  JSValueRef res = JSObjectGetProperty(ctx_, objRef, stringRef(name), &exc);
+  checkException(exc);
+  return createValue(res);
+}
+
+jsi::Value JSCRuntime::getProperty(
+    const jsi::Object& obj,
+    const jsi::PropNameID& name) {
+  JSObjectRef objRef = objectRef(obj);
+  JSValueRef exc = nullptr;
+  JSValueRef res = JSObjectGetProperty(ctx_, objRef, stringRef(name), &exc);
+  checkException(exc);
+  return createValue(res);
+}
+
+bool JSCRuntime::hasProperty(const jsi::Object& obj, const jsi::String& name) {
+  JSObjectRef objRef = objectRef(obj);
+  return JSObjectHasProperty(ctx_, objRef, stringRef(name));
+}
+
+bool JSCRuntime::hasProperty(
+    const jsi::Object& obj,
+    const jsi::PropNameID& name) {
+  JSObjectRef objRef = objectRef(obj);
+  return JSObjectHasProperty(ctx_, objRef, stringRef(name));
+}
+
+void JSCRuntime::setPropertyValue(
+    jsi::Object& object,
+    const jsi::PropNameID& name,
+    const jsi::Value& value) {
+  JSValueRef exc = nullptr;
+  JSObjectSetProperty(
+      ctx_,
+      objectRef(object),
+      stringRef(name),
+      valueRef(value),
+      kJSPropertyAttributeNone,
+      &exc);
+  checkException(exc);
+}
+
+void JSCRuntime::setPropertyValue(
+    jsi::Object& object,
+    const jsi::String& name,
+    const jsi::Value& value) {
+  JSValueRef exc = nullptr;
+  JSObjectSetProperty(
+      ctx_,
+      objectRef(object),
+      stringRef(name),
+      valueRef(value),
+      kJSPropertyAttributeNone,
+      &exc);
+  checkException(exc);
+}
+
+bool JSCRuntime::isArray(const jsi::Object& obj) const {
+#if !defined(_JSC_FAST_IS_ARRAY)
+  JSObjectRef global = JSContextGetGlobalObject(ctx_);
+  JSStringRef arrayString = getArrayString();
+  JSValueRef exc = nullptr;
+  JSValueRef arrayCtorValue =
+      JSObjectGetProperty(ctx_, global, arrayString, &exc);
+  JSC_ASSERT(exc);
+  JSObjectRef arrayCtor = JSValueToObject(ctx_, arrayCtorValue, &exc);
+  JSC_ASSERT(exc);
+  JSStringRef isArrayString = getIsArrayString();
+  JSValueRef isArrayValue =
+      JSObjectGetProperty(ctx_, arrayCtor, isArrayString, &exc);
+  JSC_ASSERT(exc);
+  JSObjectRef isArray = JSValueToObject(ctx_, isArrayValue, &exc);
+  JSC_ASSERT(exc);
+  JSValueRef arg = objectRef(obj);
+  JSValueRef result =
+      JSObjectCallAsFunction(ctx_, isArray, nullptr, 1, &arg, &exc);
+  JSC_ASSERT(exc);
+  return JSValueToBoolean(ctx_, result);
+#else
+  return JSValueIsArray(ctx_, objectRef(obj));
+#endif
+}
+
+bool JSCRuntime::isArrayBuffer(const jsi::Object& /*obj*/) const {
+  // TODO: T23270523 - This would fail on builds that use our custom JSC
+  // auto typedArrayType = JSValueGetTypedArrayType(ctx_, objectRef(obj),
+  // nullptr);  return typedArrayType == kJSTypedArrayTypeArrayBuffer;
+  throw std::runtime_error("Unsupported");
+}
+
+uint8_t* JSCRuntime::data(const jsi::ArrayBuffer& /*obj*/) {
+  // TODO: T23270523 - This would fail on builds that use our custom JSC
+  // return static_cast<uint8_t*>(
+  //    JSObjectGetArrayBufferBytesPtr(ctx_, objectRef(obj), nullptr));
+  throw std::runtime_error("Unsupported");
+}
+
+size_t JSCRuntime::size(const jsi::ArrayBuffer& /*obj*/) {
+  // TODO: T23270523 - This would fail on builds that use our custom JSC
+  // return JSObjectGetArrayBufferByteLength(ctx_, objectRef(obj), nullptr);
+  throw std::runtime_error("Unsupported");
+}
+
+bool JSCRuntime::isFunction(const jsi::Object& obj) const {
+  return JSObjectIsFunction(ctx_, objectRef(obj));
+}
+
+bool JSCRuntime::isHostObject(const jsi::Object& obj) const {
+  auto cls = hostObjectClass;
+  return cls != nullptr && JSValueIsObjectOfClass(ctx_, objectRef(obj), cls);
+}
+
+// Very expensive
+jsi::Array JSCRuntime::getPropertyNames(const jsi::Object& obj) {
+  JSPropertyNameArrayRef names =
+      JSObjectCopyPropertyNames(ctx_, objectRef(obj));
+  size_t len = JSPropertyNameArrayGetCount(names);
+  // Would be better if we could create an array with explicit elements
+  auto result = createArray(len);
+  for (size_t i = 0; i < len; i++) {
+    JSStringRef str = JSPropertyNameArrayGetNameAtIndex(names, i);
+    result.setValueAtIndex(*this, i, createString(str));
+  }
+  JSPropertyNameArrayRelease(names);
+  return result;
+}
+
+jsi::WeakObject JSCRuntime::createWeakObject(const jsi::Object&) {
+  throw std::logic_error("Not implemented");
+}
+
+jsi::Value JSCRuntime::lockWeakObject(const jsi::WeakObject&) {
+  throw std::logic_error("Not implemented");
+}
+
+jsi::Array JSCRuntime::createArray(size_t length) {
+  JSValueRef exc = nullptr;
+  JSObjectRef obj = JSObjectMakeArray(ctx_, 0, nullptr, &exc);
+  checkException(obj, exc);
+  JSObjectSetProperty(
+      ctx_,
+      obj,
+      getLengthString(),
+      JSValueMakeNumber(ctx_, static_cast<double>(length)),
+      0,
+      &exc);
+  checkException(exc);
+  return createObject(obj).getArray(*this);
+}
+
+size_t JSCRuntime::size(const jsi::Array& arr) {
+  return static_cast<size_t>(
+      getProperty(arr, createPropNameID(getLengthString())).getNumber());
+}
+
+jsi::Value JSCRuntime::getValueAtIndex(const jsi::Array& arr, size_t i) {
+  JSValueRef exc = nullptr;
+  auto res = JSObjectGetPropertyAtIndex(ctx_, objectRef(arr), i, &exc);
+  checkException(exc);
+  return createValue(res);
+}
+
+void JSCRuntime::setValueAtIndexImpl(
+    jsi::Array& arr,
+    size_t i,
+    const jsi::Value& value) {
+  JSValueRef exc = nullptr;
+  JSObjectSetPropertyAtIndex(ctx_, objectRef(arr), i, valueRef(value), &exc);
+  checkException(exc);
+}
+
+namespace {
+std::once_flag hostFunctionClassOnceFlag;
+JSClassRef hostFunctionClass{};
+
+class HostFunctionProxy {
+ public:
+  HostFunctionProxy(jsi::HostFunctionType hostFunction)
+      : hostFunction_(hostFunction) {}
+
+  jsi::HostFunctionType& getHostFunction() {
+    return hostFunction_;
+  }
+
+ protected:
+  jsi::HostFunctionType hostFunction_;
+};
+} // namespace
+
+jsi::Function JSCRuntime::createFunctionFromHostFunction(
+    const jsi::PropNameID& name,
+    unsigned int paramCount,
+    jsi::HostFunctionType func) {
+  class HostFunctionMetadata : public HostFunctionProxy {
+   public:
+    static void initialize(JSContextRef ctx, JSObjectRef object) {
+      // We need to set up the prototype chain properly here. In theory we
+      // could set func.prototype.prototype = Function.prototype to get the
+      // same result. Not sure which approach is better.
+      HostFunctionMetadata* metadata =
+          static_cast<HostFunctionMetadata*>(JSObjectGetPrivate(object));
+
+      JSValueRef exc = nullptr;
+      JSObjectSetProperty(
+          ctx,
+          object,
+          getLengthString(),
+          JSValueMakeNumber(ctx, metadata->argCount),
+          kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum |
+              kJSPropertyAttributeDontDelete,
+          &exc);
+      if (exc) {
+        // Silently fail to set length
+        exc = nullptr;
+      }
+
+      JSStringRef name = nullptr;
+      std::swap(metadata->name, name);
+      JSObjectSetProperty(
+          ctx,
+          object,
+          getNameString(),
+          JSValueMakeString(ctx, name),
+          kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum |
+              kJSPropertyAttributeDontDelete,
+          &exc);
+      JSStringRelease(name);
+      if (exc) {
+        // Silently fail to set name
+        exc = nullptr;
+      }
+
+      JSObjectRef global = JSContextGetGlobalObject(ctx);
+      JSValueRef value =
+          JSObjectGetProperty(ctx, global, getFunctionString(), &exc);
+      // If we don't have Function then something bad is going on.
+      if (JSC_UNLIKELY(exc)) {
+        abort();
+      }
+      JSObjectRef funcCtor = JSValueToObject(ctx, value, &exc);
+      if (!funcCtor) {
+        // We can't do anything if Function is not an object
+        return;
+      }
+      JSValueRef funcProto = JSObjectGetPrototype(ctx, funcCtor);
+      JSObjectSetPrototype(ctx, object, funcProto);
+    }
+
+    static JSValueRef makeError(JSCRuntime& rt, const std::string& desc) {
+      jsi::Value value =
+          rt.global().getPropertyAsFunction(rt, "Error").call(rt, desc);
+      return rt.valueRef(value);
+    }
+
+    static JSValueRef call(
+        JSContextRef ctx,
+        JSObjectRef function,
+        JSObjectRef thisObject,
+        size_t argumentCount,
+        const JSValueRef arguments[],
+        JSValueRef* exception) {
+      HostFunctionMetadata* metadata =
+          static_cast<HostFunctionMetadata*>(JSObjectGetPrivate(function));
+      JSCRuntime& rt = *(metadata->runtime);
+      const unsigned maxStackArgCount = 8;
+      jsi::Value stackArgs[maxStackArgCount];
+      std::unique_ptr<jsi::Value[]> heapArgs;
+      jsi::Value* args;
+      if (argumentCount > maxStackArgCount) {
+        heapArgs = std::make_unique<jsi::Value[]>(argumentCount);
+        for (size_t i = 0; i < argumentCount; i++) {
+          heapArgs[i] = rt.createValue(arguments[i]);
+        }
+        args = heapArgs.get();
+      } else {
+        for (size_t i = 0; i < argumentCount; i++) {
+          stackArgs[i] = rt.createValue(arguments[i]);
+        }
+        args = stackArgs;
+      }
+      JSValueRef res;
+      jsi::Value thisVal(rt.createObject(thisObject));
+      try {
+        res = rt.valueRef(
+            metadata->hostFunction_(rt, thisVal, args, argumentCount));
+      } catch (const jsi::JSError& error) {
+        *exception = rt.valueRef(error.value());
+        res = JSValueMakeUndefined(ctx);
+      } catch (const std::exception& ex) {
+        std::string exceptionString("Exception in HostFunction: ");
+        exceptionString += ex.what();
+        *exception = makeError(rt, exceptionString);
+        res = JSValueMakeUndefined(ctx);
+      } catch (...) {
+        std::string exceptionString("Exception in HostFunction: <unknown>");
+        *exception = makeError(rt, exceptionString);
+        res = JSValueMakeUndefined(ctx);
+      }
+      return res;
+    }
+
+    static void finalize(JSObjectRef object) {
+      HostFunctionMetadata* metadata =
+          static_cast<HostFunctionMetadata*>(JSObjectGetPrivate(object));
+      JSObjectSetPrivate(object, nullptr);
+      delete metadata;
+    }
+
+    HostFunctionMetadata(
+        JSCRuntime* rt,
+        jsi::HostFunctionType hf,
+        unsigned ac,
+        JSStringRef n)
+        : HostFunctionProxy(hf),
+          runtime(rt),
+          argCount(ac),
+          name(JSStringRetain(n)) {}
+
+    JSCRuntime* runtime;
+    unsigned argCount;
+    JSStringRef name;
+  };
+
+  std::call_once(hostFunctionClassOnceFlag, []() {
+    JSClassDefinition functionClass = kJSClassDefinitionEmpty;
+    functionClass.version = 0;
+    functionClass.attributes = kJSClassAttributeNoAutomaticPrototype;
+    functionClass.initialize = HostFunctionMetadata::initialize;
+    functionClass.finalize = HostFunctionMetadata::finalize;
+    functionClass.callAsFunction = HostFunctionMetadata::call;
+
+    hostFunctionClass = JSClassCreate(&functionClass);
+  });
+
+  JSObjectRef funcRef = JSObjectMake(
+      ctx_,
+      hostFunctionClass,
+      new HostFunctionMetadata(this, func, paramCount, stringRef(name)));
+  return createObject(funcRef).getFunction(*this);
+}
+
+namespace detail {
+
+class ArgsConverter {
+ public:
+  ArgsConverter(JSCRuntime& rt, const jsi::Value* args, size_t count) {
+    JSValueRef* destination = inline_;
+    if (count > maxStackArgs) {
+      outOfLine_ = std::make_unique<JSValueRef[]>(count);
+      destination = outOfLine_.get();
+    }
+
+    for (size_t i = 0; i < count; ++i) {
+      destination[i] = rt.valueRef(args[i]);
+    }
+  }
+
+  operator JSValueRef*() {
+    return outOfLine_ ? outOfLine_.get() : inline_;
+  }
+
+ private:
+  constexpr static unsigned maxStackArgs = 8;
+  JSValueRef inline_[maxStackArgs];
+  std::unique_ptr<JSValueRef[]> outOfLine_;
+};
+} // namespace detail
+
+bool JSCRuntime::isHostFunction(const jsi::Function& obj) const {
+  auto cls = hostFunctionClass;
+  return cls != nullptr && JSValueIsObjectOfClass(ctx_, objectRef(obj), cls);
+}
+
+jsi::HostFunctionType& JSCRuntime::getHostFunction(const jsi::Function& obj) {
+  // We know that isHostFunction(obj) is true here, so its safe to proceed
+  auto proxy =
+      static_cast<HostFunctionProxy*>(JSObjectGetPrivate(objectRef(obj)));
+  return proxy->getHostFunction();
+}
+
+jsi::Value JSCRuntime::call(
+    const jsi::Function& f,
+    const jsi::Value& jsThis,
+    const jsi::Value* args,
+    size_t count) {
+  JSValueRef exc = nullptr;
+  auto res = JSObjectCallAsFunction(
+      ctx_,
+      objectRef(f),
+      jsThis.isUndefined() ? nullptr : objectRef(jsThis.getObject(*this)),
+      count,
+      detail::ArgsConverter(*this, args, count),
+      &exc);
+  checkException(exc);
+  return createValue(res);
+}
+
+jsi::Value JSCRuntime::callAsConstructor(
+    const jsi::Function& f,
+    const jsi::Value* args,
+    size_t count) {
+  JSValueRef exc = nullptr;
+  auto res = JSObjectCallAsConstructor(
+      ctx_,
+      objectRef(f),
+      count,
+      detail::ArgsConverter(*this, args, count),
+      &exc);
+  checkException(exc);
+  return createValue(res);
+}
+
+bool JSCRuntime::strictEquals(const jsi::String& a, const jsi::String& b)
+    const {
+  return JSStringIsEqual(stringRef(a), stringRef(b));
+}
+
+bool JSCRuntime::strictEquals(const jsi::Object& a, const jsi::Object& b)
+    const {
+  return objectRef(a) == objectRef(b);
+}
+
+bool JSCRuntime::instanceOf(const jsi::Object& o, const jsi::Function& f) {
+  JSValueRef exc = nullptr;
+  bool res =
+      JSValueIsInstanceOfConstructor(ctx_, objectRef(o), objectRef(f), &exc);
+  checkException(exc);
+  return res;
+}
+
+namespace {
+JSStringRef getEmptyString() {
+  static JSStringRef empty = JSStringCreateWithUTF8CString("");
+  return empty;
+}
+} // namespace
+
+jsi::Runtime::PointerValue* JSCRuntime::makeStringValue(
+    JSStringRef stringRef) const {
+  if (!stringRef) {
+    stringRef = getEmptyString();
+  }
+#ifndef NDEBUG
+  return new JSCStringValue(stringRef, stringCounter_);
+#else
+  return new JSCStringValue(stringRef);
+#endif
+}
+
+jsi::String JSCRuntime::createString(JSStringRef str) const {
+  return make<jsi::String>(makeStringValue(str));
+}
+
+jsi::PropNameID JSCRuntime::createPropNameID(JSStringRef str) {
+  return make<jsi::PropNameID>(makeStringValue(str));
+}
+
+jsi::Runtime::PointerValue* JSCRuntime::makeObjectValue(
+    JSObjectRef objectRef) const {
+  if (!objectRef) {
+    objectRef = JSObjectMake(ctx_, nullptr, nullptr);
+  }
+#ifndef NDEBUG
+  return new JSCObjectValue(ctx_, *protectionQueue_, objectRef, objectCounter_);
+#else
+  return new JSCObjectValue(ctx_, *protectionQueue_, objectRef);
+#endif
+}
+
+jsi::Object JSCRuntime::createObject(JSObjectRef obj) const {
+  return make<jsi::Object>(makeObjectValue(obj));
+}
+
+jsi::Value JSCRuntime::createValue(JSValueRef value) const {
+  if (JSValueIsNumber(ctx_, value)) {
+    return jsi::Value(JSValueToNumber(ctx_, value, nullptr));
+  } else if (JSValueIsBoolean(ctx_, value)) {
+    return jsi::Value(JSValueToBoolean(ctx_, value));
+  } else if (JSValueIsNull(ctx_, value)) {
+    return jsi::Value(nullptr);
+  } else if (JSValueIsUndefined(ctx_, value)) {
+    return jsi::Value();
+  } else if (JSValueIsString(ctx_, value)) {
+    JSStringRef str = JSValueToStringCopy(ctx_, value, nullptr);
+    auto result = jsi::Value(createString(str));
+    JSStringRelease(str);
+    return result;
+  } else if (JSValueIsObject(ctx_, value)) {
+    JSObjectRef objRef = JSValueToObject(ctx_, value, nullptr);
+    return jsi::Value(createObject(objRef));
+  } else {
+    // WHAT ARE YOU
+    abort();
+  }
+}
+
+JSValueRef JSCRuntime::valueRef(const jsi::Value& value) {
+  // I would rather switch on value.kind_
+  if (value.isUndefined()) {
+    return JSValueMakeUndefined(ctx_);
+  } else if (value.isNull()) {
+    return JSValueMakeNull(ctx_);
+  } else if (value.isBool()) {
+    return JSValueMakeBoolean(ctx_, value.getBool());
+  } else if (value.isNumber()) {
+    return JSValueMakeNumber(ctx_, value.getNumber());
+  } else if (value.isString()) {
+    return JSValueMakeString(ctx_, stringRef(value.getString(*this)));
+  } else if (value.isObject()) {
+    return objectRef(value.getObject(*this));
+  } else {
+    // What are you?
+    abort();
+  }
+}
+
+JSStringRef JSCRuntime::stringRef(const jsi::String& str) {
+  return static_cast<const JSCStringValue*>(getPointerValue(str))->str_;
+}
+
+JSStringRef JSCRuntime::stringRef(const jsi::PropNameID& sym) {
+  return static_cast<const JSCStringValue*>(getPointerValue(sym))->str_;
+}
+
+JSObjectRef JSCRuntime::objectRef(const jsi::Object& obj) {
+  return static_cast<const JSCObjectValue*>(getPointerValue(obj))->obj_;
+}
+
+void JSCRuntime::checkException(JSValueRef exc) {
+  if (JSC_UNLIKELY(exc)) {
+    throw jsi::JSError(*this, createValue(exc));
+  }
+}
+
+void JSCRuntime::checkException(JSValueRef res, JSValueRef exc) {
+  if (JSC_UNLIKELY(!res)) {
+    throw jsi::JSError(*this, createValue(exc));
+  }
+}
+
+void JSCRuntime::checkException(JSValueRef exc, const char* msg) {
+  if (JSC_UNLIKELY(exc)) {
+    throw jsi::JSError(std::string(msg), *this, createValue(exc));
+  }
+}
+
+void JSCRuntime::checkException(
+    JSValueRef res,
+    JSValueRef exc,
+    const char* msg) {
+  if (JSC_UNLIKELY(!res)) {
+    throw jsi::JSError(std::string(msg), *this, createValue(exc));
+  }
+}
+
+std::unique_ptr<jsi::Runtime> makeJSCRuntime() {
+  return std::make_unique<JSCRuntime>();
+}
+
+} // namespace jsc
+} // namespace facebook
diff --git a/ReactCommon/jsi/JSCRuntime.h b/ReactCommon/jsi/JSCRuntime.h
new file mode 100644
index 00000000000000..d3ba65ac536dca
--- /dev/null
+++ b/ReactCommon/jsi/JSCRuntime.h
@@ -0,0 +1,14 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+#include <jsi/jsi.h>
+#include <memory.h>
+
+namespace facebook {
+namespace jsc {
+
+std::unique_ptr<jsi::Runtime> makeJSCRuntime();
+
+} // namespace jsc
+} // namespace facebook
diff --git a/ReactCommon/jsi/JSIDynamic.cpp b/ReactCommon/jsi/JSIDynamic.cpp
new file mode 100644
index 00000000000000..938f362bb0443b
--- /dev/null
+++ b/ReactCommon/jsi/JSIDynamic.cpp
@@ -0,0 +1,93 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "JSIDynamic.h"
+
+#include <folly/dynamic.h>
+#include <jsi/jsi.h>
+
+using namespace facebook::jsi;
+
+namespace facebook {
+namespace jsi {
+
+Value valueFromDynamic(Runtime& runtime, const folly::dynamic& dyn) {
+  switch (dyn.type()) {
+  case folly::dynamic::NULLT:
+    return Value::null();
+  case folly::dynamic::ARRAY: {
+    Array ret = Array(runtime, dyn.size());
+    for (size_t i = 0; i < dyn.size(); ++i) {
+      ret.setValueAtIndex(runtime, i, valueFromDynamic(runtime, dyn[i]));
+    }
+    return std::move(ret);
+  }
+  case folly::dynamic::BOOL:
+    return dyn.getBool();
+  case folly::dynamic::DOUBLE:
+    return dyn.getDouble();
+  case folly::dynamic::INT64:
+    // Can't use asDouble() here.  If the int64 value is too bit to be
+    // represented precisely as a double, folly will throw an
+    // exception.
+    return (double)dyn.getInt();
+  case folly::dynamic::OBJECT: {
+    Object ret(runtime);
+    for (const auto& element : dyn.items()) {
+      Value value = valueFromDynamic(runtime, element.second);
+      if (element.first.isNumber() || element.first.isString()) {
+        ret.setProperty(runtime, element.first.asString().c_str(), value);
+      }
+    }
+    return std::move(ret);
+  }
+  case folly::dynamic::STRING:
+    return String::createFromUtf8(runtime, dyn.getString());
+  }
+  CHECK(false);
+}
+
+folly::dynamic dynamicFromValue(Runtime& runtime, const Value& value) {
+  if (value.isUndefined() || value.isNull()) {
+    return nullptr;
+  } else if (value.isBool()) {
+    return value.getBool();
+  } else if (value.isNumber()) {
+    return value.getNumber();
+  } else if (value.isString()) {
+    return value.getString(runtime).utf8(runtime);
+  } else {
+    Object obj = value.getObject(runtime);
+    if (obj.isArray(runtime)) {
+      Array array = obj.getArray(runtime);
+      folly::dynamic ret = folly::dynamic::array();
+      for (size_t i = 0; i < array.size(runtime); ++i) {
+        ret.push_back(dynamicFromValue(runtime, array.getValueAtIndex(runtime, i)));
+      }
+      return ret;
+    } else if (obj.isFunction(runtime)) {
+      throw JSError(runtime, "JS Functions are not convertible to dynamic");
+    } else {
+      folly::dynamic ret = folly::dynamic::object();
+      Array names = obj.getPropertyNames(runtime);
+      for (size_t i = 0; i < names.size(runtime); ++i) {
+        String name = names.getValueAtIndex(runtime, i).getString(runtime);
+        Value prop = obj.getProperty(runtime, name);
+        if (prop.isUndefined()) {
+          continue;
+        }
+        // The JSC conversion uses JSON.stringify, which substitutes
+        // null for a function, so we do the same here.  Just dropping
+        // the pair might also work, but would require more testing.
+        if (prop.isObject() && prop.getObject(runtime).isFunction(runtime)) {
+          prop = Value::null();
+        }
+        ret.insert(
+            name.utf8(runtime), dynamicFromValue(runtime, std::move(prop)));
+      }
+      return ret;
+    }
+  }
+}
+
+}
+}
diff --git a/ReactCommon/jsi/JSIDynamic.h b/ReactCommon/jsi/JSIDynamic.h
new file mode 100644
index 00000000000000..0daf273dcd3896
--- /dev/null
+++ b/ReactCommon/jsi/JSIDynamic.h
@@ -0,0 +1,18 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+#include <folly/dynamic.h>
+#include <jsi/jsi.h>
+
+namespace facebook {
+namespace jsi {
+
+facebook::jsi::Value valueFromDynamic(
+  facebook::jsi::Runtime& runtime, const folly::dynamic& dyn);
+
+folly::dynamic dynamicFromValue(facebook::jsi::Runtime& runtime,
+                                const facebook::jsi::Value& value);
+
+}
+}
diff --git a/ReactCommon/jsi/instrumentation.h b/ReactCommon/jsi/instrumentation.h
new file mode 100644
index 00000000000000..e35ef1dbf6bd74
--- /dev/null
+++ b/ReactCommon/jsi/instrumentation.h
@@ -0,0 +1,73 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+#include <string>
+
+#include <jsi/jsi.h>
+
+namespace facebook {
+namespace jsi {
+
+/// Methods for starting and collecting instrumentation, an \c Instrumentation
+/// instance is associated with a particular \c Runtime instance, which it
+/// controls the instrumentation of.
+class Instrumentation {
+ public:
+  virtual ~Instrumentation() = default;
+
+  /// Returns GC statistics as a JSON-encoded string, with an object containing
+  /// "type" and "version" fields outermost. "type" is a string, unique to a
+  /// particular implementation of \c jsi::Instrumentation, and "version" is a
+  /// number to indicate any revision to that implementation and its output
+  /// format.
+  ///
+  /// \pre This call can only be made on the instrumentation instance of a
+  ///   runtime initialised to collect GC statistics.
+  ///
+  /// \post All cumulative measurements mentioned in the output are accumulated
+  ///   across the entire lifetime of the Runtime.
+  ///
+  /// \return the GC statistics collected so far, as a JSON-encoded string.
+  virtual std::string getRecordedGCStats() = 0;
+
+  /// Request statistics about the current state of the runtime's heap. This
+  /// function can be called at any time, and should produce information that is
+  /// correct at the instant it is called (i.e, not stale).
+  ///
+  /// \return a jsi Value containing whichever statistics the runtime supports
+  ///   for its heap.
+  virtual Value getHeapInfo(bool includeExpensive) = 0;
+
+  /// perform a full garbage collection
+  virtual void collectGarbage() = 0;
+
+  /// Captures the heap to a file
+  ///
+  /// \param path to save the heap capture
+  ///
+  /// \param compact Whether the JSON should be compact or pretty
+  ///
+  /// \return true iff the heap capture succeeded
+  virtual bool createSnapshotToFile(const std::string& path, bool compact) = 0;
+
+  /// Write a trace of bridge traffic to the given file name.
+  virtual void writeBridgeTrafficTraceToFile(
+      const std::string& fileName) const = 0;
+
+  /// Write basic block profile trace to the given file name.
+  virtual void writeBasicBlockProfileTraceToFile(
+      const std::string& fileName) const = 0;
+
+  /// Enable sampling profiler.
+  virtual void enableSamplingProfiler() const = 0;
+
+  /// Dump sampled stack trace to the given file name.
+  virtual void dumpSampledTraceToFile(const std::string& fileName) const = 0;
+
+  /// Dump external profiler symbols to the given file name.
+  virtual void dumpProfilerSymbolsToFile(const std::string& fileName) const = 0;
+};
+
+} // namespace jsi
+} // namespace facebook
diff --git a/ReactCommon/jsi/jsi-inl.h b/ReactCommon/jsi/jsi-inl.h
new file mode 100644
index 00000000000000..155a840ceef64a
--- /dev/null
+++ b/ReactCommon/jsi/jsi-inl.h
@@ -0,0 +1,306 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+namespace facebook {
+namespace jsi {
+namespace detail {
+
+inline Value toValue(Runtime&, std::nullptr_t) {
+  return Value::null();
+}
+inline Value toValue(Runtime&, bool b) {
+  return Value(b);
+}
+inline Value toValue(Runtime&, double d) {
+  return Value(d);
+}
+inline Value toValue(Runtime&, int i) {
+  return Value(i);
+}
+inline Value toValue(Runtime& runtime, const char* str) {
+  return String::createFromAscii(runtime, str);
+}
+inline Value toValue(Runtime& runtime, const std::string& str) {
+  return String::createFromAscii(runtime, str);
+}
+template <typename T>
+inline Value toValue(Runtime& runtime, const T& other) {
+  static_assert(
+      std::is_base_of<Pointer, T>::value,
+      "This type cannot be converted to Value");
+  return Value(runtime, other);
+}
+inline Value toValue(Runtime& runtime, const Value& value) {
+  return Value(runtime, value);
+}
+inline Value&& toValue(Runtime&, Value&& value) {
+  return std::move(value);
+}
+
+inline PropNameID toPropNameID(Runtime& runtime, const char* name) {
+  return PropNameID::forAscii(runtime, name);
+}
+inline PropNameID toPropNameID(Runtime& runtime, const std::string& name) {
+  return PropNameID::forUtf8(runtime, name);
+}
+inline PropNameID&& toPropNameID(Runtime&, PropNameID&& name) {
+  return std::move(name);
+}
+
+void throwJSError(Runtime&, const char* msg);
+
+} // namespace detail
+
+template <typename T>
+inline T Runtime::make(Runtime::PointerValue* pv) {
+  return T(pv);
+}
+
+inline const Runtime::PointerValue* Runtime::getPointerValue(
+    const jsi::Pointer& pointer) {
+  return pointer.ptr_;
+}
+
+inline const Runtime::PointerValue* Runtime::getPointerValue(
+    const jsi::Value& value) {
+  return value.data_.pointer.ptr_;
+}
+
+inline Value Object::getProperty(Runtime& runtime, const char* name) const {
+  return getProperty(runtime, String::createFromAscii(runtime, name));
+}
+
+inline Value Object::getProperty(Runtime& runtime, const String& name) const {
+  return runtime.getProperty(*this, name);
+}
+
+inline Value Object::getProperty(Runtime& runtime, const PropNameID& name)
+    const {
+  return runtime.getProperty(*this, name);
+}
+
+inline bool Object::hasProperty(Runtime& runtime, const char* name) const {
+  return hasProperty(runtime, String::createFromAscii(runtime, name));
+}
+
+inline bool Object::hasProperty(Runtime& runtime, const String& name) const {
+  return runtime.hasProperty(*this, name);
+}
+
+inline bool Object::hasProperty(Runtime& runtime, const PropNameID& name)
+    const {
+  return runtime.hasProperty(*this, name);
+}
+
+template <typename T>
+void Object::setProperty(Runtime& runtime, const char* name, T&& value) {
+  setProperty(
+      runtime, String::createFromAscii(runtime, name), std::forward<T>(value));
+}
+
+template <typename T>
+void Object::setProperty(Runtime& runtime, const String& name, T&& value) {
+  setPropertyValue(
+      runtime, name, detail::toValue(runtime, std::forward<T>(value)));
+}
+
+template <typename T>
+void Object::setProperty(Runtime& runtime, const PropNameID& name, T&& value) {
+  setPropertyValue(
+      runtime, name, detail::toValue(runtime, std::forward<T>(value)));
+}
+
+inline Array Object::getArray(Runtime& runtime) const& {
+  assert(runtime.isArray(*this));
+  (void)runtime; // when assert is disabled we need to mark this as used
+  return Array(runtime.cloneObject(ptr_));
+}
+
+inline Array Object::getArray(Runtime& runtime) && {
+  assert(runtime.isArray(*this));
+  (void)runtime; // when assert is disabled we need to mark this as used
+  Runtime::PointerValue* value = ptr_;
+  ptr_ = nullptr;
+  return Array(value);
+}
+
+inline ArrayBuffer Object::getArrayBuffer(Runtime& runtime) const& {
+  assert(runtime.isArrayBuffer(*this));
+  (void)runtime; // when assert is disabled we need to mark this as used
+  return ArrayBuffer(runtime.cloneObject(ptr_));
+}
+
+inline ArrayBuffer Object::getArrayBuffer(Runtime& runtime) && {
+  assert(runtime.isArrayBuffer(*this));
+  (void)runtime; // when assert is disabled we need to mark this as used
+  Runtime::PointerValue* value = ptr_;
+  ptr_ = nullptr;
+  return ArrayBuffer(value);
+}
+
+inline Function Object::getFunction(Runtime& runtime) const& {
+  assert(runtime.isFunction(*this));
+  return Function(runtime.cloneObject(ptr_));
+}
+
+inline Function Object::getFunction(Runtime& runtime) && {
+  assert(runtime.isFunction(*this));
+  (void)runtime; // when assert is disabled we need to mark this as used
+  Runtime::PointerValue* value = ptr_;
+  ptr_ = nullptr;
+  return Function(value);
+}
+
+template <typename T>
+inline bool Object::isHostObject(Runtime& runtime) const {
+  return runtime.isHostObject(*this) &&
+      std::dynamic_pointer_cast<T>(runtime.getHostObject(*this));
+}
+
+template <>
+inline bool Object::isHostObject<HostObject>(Runtime& runtime) const {
+  return runtime.isHostObject(*this);
+}
+
+template <typename T>
+inline std::shared_ptr<T> Object::getHostObject(Runtime& runtime) const {
+  assert(isHostObject<T>(runtime));
+  return std::static_pointer_cast<T>(runtime.getHostObject(*this));
+}
+
+template <typename T>
+inline std::shared_ptr<T> Object::asHostObject(Runtime& runtime) const {
+  if (!isHostObject<T>(runtime)) {
+    detail::throwJSError(runtime, "Object is not a HostObject of desired type");
+  }
+  return std::static_pointer_cast<T>(runtime.getHostObject(*this));
+}
+
+template <>
+inline std::shared_ptr<HostObject> Object::getHostObject<HostObject>(
+    Runtime& runtime) const {
+  assert(runtime.isHostObject(*this));
+  return runtime.getHostObject(*this);
+}
+
+inline Array Object::getPropertyNames(Runtime& runtime) const {
+  return runtime.getPropertyNames(*this);
+}
+
+inline Value WeakObject::lock(Runtime& runtime) {
+  return runtime.lockWeakObject(*this);
+}
+
+template <typename T>
+void Array::setValueAtIndex(Runtime& runtime, size_t i, T&& value) {
+  setValueAtIndexImpl(
+      runtime, i, detail::toValue(runtime, std::forward<T>(value)));
+}
+
+inline Value Array::getValueAtIndex(Runtime& runtime, size_t i) const {
+  return runtime.getValueAtIndex(*this, i);
+}
+
+inline Function Function::createFromHostFunction(
+    Runtime& runtime,
+    const jsi::PropNameID& name,
+    unsigned int paramCount,
+    jsi::HostFunctionType func) {
+  return runtime.createFunctionFromHostFunction(
+      name, paramCount, std::move(func));
+}
+
+inline Value Function::call(Runtime& runtime, const Value* args, size_t count)
+    const {
+  return runtime.call(*this, Value::undefined(), args, count);
+}
+
+inline Value Function::call(Runtime& runtime, std::initializer_list<Value> args)
+    const {
+  return call(runtime, args.begin(), args.size());
+}
+
+template <typename... Args>
+inline Value Function::call(Runtime& runtime, Args&&... args) const {
+  // A more awesome version of this would be able to create raw values
+  // which can be used directly as HermesValues, instead of having to
+  // wrap the args in Values and hvFromValue on each to unwrap them.
+  // But this will do for now.
+  return call(runtime, {detail::toValue(runtime, std::forward<Args>(args))...});
+}
+
+inline Value Function::callWithThis(
+    Runtime& runtime,
+    const Object& jsThis,
+    const Value* args,
+    size_t count) const {
+  return runtime.call(*this, Value(runtime, jsThis), args, count);
+}
+
+inline Value Function::callWithThis(
+    Runtime& runtime,
+    const Object& jsThis,
+    std::initializer_list<Value> args) const {
+  return callWithThis(runtime, jsThis, args.begin(), args.size());
+}
+
+template <typename... Args>
+inline Value Function::callWithThis(
+    Runtime& runtime,
+    const Object& jsThis,
+    Args&&... args) const {
+  // A more awesome version of this would be able to create raw values
+  // which can be used directly as HermesValues, instead of having to
+  // wrap the args in Values and hvFromValue on each to unwrap them.
+  // But this will do for now.
+  return callWithThis(
+      runtime, jsThis, {detail::toValue(runtime, std::forward<Args>(args))...});
+}
+
+template <typename... Args>
+inline Array Array::createWithElements(Runtime& runtime, Args&&... args) {
+  return createWithElements(
+      runtime, {detail::toValue(runtime, std::forward<Args>(args))...});
+}
+
+template <typename... Args>
+inline std::vector<PropNameID> PropNameID::names(
+    Runtime& runtime,
+    Args&&... args) {
+  return names({detail::toPropNameID(runtime, std::forward<Args>(args))...});
+}
+
+template <size_t N>
+inline std::vector<PropNameID> PropNameID::names(
+    PropNameID(&&propertyNames)[N]) {
+  std::vector<PropNameID> result;
+  result.reserve(N);
+  for (auto& name : propertyNames) {
+    result.push_back(std::move(name));
+  }
+  return result;
+}
+
+inline Value Function::callAsConstructor(
+    Runtime& runtime,
+    const Value* args,
+    size_t count) const {
+  return runtime.callAsConstructor(*this, args, count);
+}
+
+inline Value Function::callAsConstructor(
+    Runtime& runtime,
+    std::initializer_list<Value> args) const {
+  return callAsConstructor(runtime, args.begin(), args.size());
+}
+
+template <typename... Args>
+inline Value Function::callAsConstructor(Runtime& runtime, Args&&... args)
+    const {
+  return callAsConstructor(
+      runtime, {detail::toValue(runtime, std::forward<Args>(args))...});
+}
+
+} // namespace jsi
+} // namespace facebook
diff --git a/ReactCommon/jsi/jsi.cpp b/ReactCommon/jsi/jsi.cpp
new file mode 100644
index 00000000000000..5709d5ca91572f
--- /dev/null
+++ b/ReactCommon/jsi/jsi.cpp
@@ -0,0 +1,350 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include <cassert>
+#include <cmath>
+#include <cstdlib>
+#include <stdexcept>
+
+#include <jsi/instrumentation.h>
+#include <jsi/jsi.h>
+
+namespace facebook {
+namespace jsi {
+
+namespace detail {
+
+void throwJSError(Runtime& rt, const char* msg) {
+  throw JSError(rt, msg);
+}
+
+} // namespace detail
+
+Buffer::~Buffer() {}
+
+Value HostObject::get(Runtime&, const PropNameID&) {
+  return Value();
+}
+
+void HostObject::set(Runtime& rt, const PropNameID& name, const Value&) {
+  std::string msg("TypeError: Cannot assign to property '");
+  msg += name.utf8(rt);
+  msg += "' on HostObject with default setter";
+  throw JSError(rt, msg);
+}
+
+HostObject::~HostObject() {}
+
+Runtime::~Runtime() {}
+
+Instrumentation& Runtime::instrumentation() {
+  class NoInstrumentation : public Instrumentation {
+    std::string getRecordedGCStats() override {
+      return "";
+    }
+
+    Value getHeapInfo(bool) override {
+      return Value::undefined();
+    }
+
+    void collectGarbage() override {}
+
+    bool createSnapshotToFile(const std::string&, bool) override {
+      return false;
+    }
+
+    void writeBridgeTrafficTraceToFile(const std::string&) const override {
+      std::abort();
+    }
+
+    void writeBasicBlockProfileTraceToFile(const std::string&) const override {
+      std::abort();
+    }
+
+    void enableSamplingProfiler() const override {
+      std::abort();
+    }
+
+    void dumpSampledTraceToFile(const std::string&) const override {
+      std::abort();
+    }
+
+    void dumpProfilerSymbolsToFile(const std::string&) const override {
+      std::abort();
+    }
+  };
+
+  static NoInstrumentation sharedInstance;
+  return sharedInstance;
+}
+
+Pointer& Pointer::operator=(Pointer&& other) {
+  if (ptr_) {
+    ptr_->invalidate();
+  }
+  ptr_ = other.ptr_;
+  other.ptr_ = nullptr;
+  return *this;
+}
+
+Object Object::getPropertyAsObject(Runtime& runtime, const char* name) const {
+  Value v = getProperty(runtime, name);
+
+  if (!v.isObject()) {
+    throw JSError(
+        runtime,
+        std::string("getPropertyAsObject: property '") + name +
+            "' is not an Object");
+  }
+
+  return v.getObject(runtime);
+}
+
+Function Object::getPropertyAsFunction(Runtime& runtime, const char* name)
+    const {
+  Object obj = getPropertyAsObject(runtime, name);
+  if (!obj.isFunction(runtime)) {
+    throw JSError(
+        runtime,
+        std::string("getPropertyAsFunction: property '") + name +
+            "' is not a Function");
+  };
+
+  Runtime::PointerValue* value = obj.ptr_;
+  obj.ptr_ = nullptr;
+  return Function(value);
+}
+
+Array Object::asArray(Runtime& runtime) const& {
+  if (!isArray(runtime)) {
+    throw JSError(runtime, "Object is not an array");
+  }
+  return getArray(runtime);
+}
+
+Array Object::asArray(Runtime& runtime) && {
+  if (!isArray(runtime)) {
+    throw JSError(runtime, "Object is not an array");
+  }
+  return std::move(*this).getArray(runtime);
+}
+
+Function Object::asFunction(Runtime& runtime) const& {
+  if (!isFunction(runtime)) {
+    throw JSError(runtime, "Object is not a function");
+  }
+  return getFunction(runtime);
+}
+
+Function Object::asFunction(Runtime& runtime) && {
+  if (!isFunction(runtime)) {
+    throw JSError(runtime, "Object is not a function");
+  }
+  return std::move(*this).getFunction(runtime);
+}
+
+Value::Value(Value&& other) : Value(other.kind_) {
+  if (kind_ == BooleanKind) {
+    data_.boolean = other.data_.boolean;
+  } else if (kind_ == NumberKind) {
+    data_.number = other.data_.number;
+  } else if (kind_ >= PointerKind) {
+    new (&data_.pointer) Pointer(std::move(other.data_.pointer));
+  }
+  // when the other's dtor runs, nothing will happen.
+  other.kind_ = UndefinedKind;
+}
+
+Value::Value(Runtime& runtime, const Value& other) : Value(other.kind_) {
+  // data_ is uninitialized, so use placement new to create non-POD
+  // types in it.  Any other kind of initialization will call a dtor
+  // first, which is incorrect.
+  if (kind_ == BooleanKind) {
+    data_.boolean = other.data_.boolean;
+  } else if (kind_ == NumberKind) {
+    data_.number = other.data_.number;
+  } else if (kind_ == StringKind) {
+    new (&data_.pointer) Pointer(runtime.cloneString(other.data_.pointer.ptr_));
+  } else if (kind_ >= ObjectKind) {
+    new (&data_.pointer) Pointer(runtime.cloneObject(other.data_.pointer.ptr_));
+  }
+}
+
+Value::~Value() {
+  if (kind_ >= PointerKind) {
+    data_.pointer.~Pointer();
+  }
+}
+
+Value Value::createFromJsonUtf8(
+    Runtime& runtime,
+    const uint8_t* json,
+    size_t length) {
+  Function parseJson = runtime.global()
+                           .getPropertyAsObject(runtime, "JSON")
+                           .getPropertyAsFunction(runtime, "parse");
+  return parseJson.call(runtime, String::createFromUtf8(runtime, json, length));
+}
+
+bool Value::strictEquals(Runtime& runtime, const Value& a, const Value& b) {
+  if (a.kind_ != b.kind_) {
+    return false;
+  }
+  switch (a.kind_) {
+    case UndefinedKind:
+    case NullKind:
+      return true;
+    case BooleanKind:
+      return a.data_.boolean == b.data_.boolean;
+    case NumberKind:
+      return a.data_.number == b.data_.number;
+    case StringKind:
+      return runtime.strictEquals(
+          static_cast<const String&>(a.data_.pointer),
+          static_cast<const String&>(b.data_.pointer));
+    case ObjectKind:
+      return runtime.strictEquals(
+          static_cast<const Object&>(a.data_.pointer),
+          static_cast<const Object&>(b.data_.pointer));
+  }
+  return false;
+}
+
+double Value::asNumber() const {
+  if (!isNumber()) {
+    throw JSINativeException("Value is not an Object");
+  }
+
+  return getNumber();
+}
+
+Object Value::asObject(Runtime& runtime) const& {
+  if (!isObject()) {
+    throw JSError(runtime, "Value is not an Object");
+  }
+
+  return getObject(runtime);
+}
+
+Object Value::asObject(Runtime& rt) && {
+  if (!isObject()) {
+    throw JSError(rt, "Value is not an Object");
+  }
+  auto ptr = data_.pointer.ptr_;
+  data_.pointer.ptr_ = nullptr;
+  return static_cast<Object>(ptr);
+}
+
+String Value::asString(Runtime& rt) const& {
+  if (!isString()) {
+    throw JSError(rt, "Value is not a String");
+  }
+
+  return getString(rt);
+}
+
+String Value::asString(Runtime& rt) && {
+  if (!isString()) {
+    throw JSError(rt, "Value is not a String");
+  }
+
+  return std::move(*this).getString(rt);
+}
+
+String Value::toString(Runtime& runtime) const {
+  Function toString = runtime.global().getPropertyAsFunction(runtime, "String");
+  return toString.call(runtime, *this).getString(runtime);
+}
+
+Array Array::createWithElements(
+    Runtime& rt,
+    std::initializer_list<Value> elements) {
+  Array result(rt, elements.size());
+  size_t index = 0;
+  for (const auto& element : elements) {
+    result.setValueAtIndex(rt, index++, element);
+  }
+  return result;
+}
+
+std::vector<PropNameID> HostObject::getPropertyNames(Runtime&) {
+  return {};
+}
+
+Runtime::ScopeState* Runtime::pushScope() {
+  return nullptr;
+}
+
+void Runtime::popScope(ScopeState*) {}
+
+JSError::JSError(Runtime& rt, Value&& value) {
+  setValue(rt, std::move(value));
+}
+
+JSError::JSError(Runtime& rt, std::string msg) : message_(std::move(msg)) {
+  try {
+    setValue(
+        rt, rt.global().getPropertyAsFunction(rt, "Error").call(rt, message_));
+  } catch (...) {
+    setValue(rt, Value());
+  }
+}
+
+JSError::JSError(Runtime& rt, std::string msg, std::string stack)
+    : message_(std::move(msg)), stack_(std::move(stack)) {
+  try {
+    Object e(rt);
+    e.setProperty(rt, "message", String::createFromUtf8(rt, message_));
+    e.setProperty(rt, "stack", String::createFromUtf8(rt, stack_));
+    setValue(rt, std::move(e));
+  } catch (...) {
+    setValue(rt, Value());
+  }
+}
+
+JSError::JSError(std::string what, Runtime& rt, Value&& value)
+    : JSIException(std::move(what)) {
+  setValue(rt, std::move(value));
+}
+
+void JSError::setValue(Runtime& rt, Value&& value) {
+  value_ = std::make_shared<jsi::Value>(std::move(value));
+
+  try {
+    if ((message_.empty() || stack_.empty()) && value_->isObject()) {
+      auto obj = value_->getObject(rt);
+
+      if (message_.empty()) {
+        jsi::Value message = obj.getProperty(rt, "message");
+        if (!message.isUndefined()) {
+          message_ = message.toString(rt).utf8(rt);
+        }
+      }
+
+      if (stack_.empty()) {
+        jsi::Value stack = obj.getProperty(rt, "stack");
+        if (!stack.isUndefined()) {
+          stack_ = stack.toString(rt).utf8(rt);
+        }
+      }
+    }
+
+    if (message_.empty()) {
+      message_ = value_->toString(rt).utf8(rt);
+    }
+
+    if (stack_.empty()) {
+      stack_ = "no stack";
+    }
+
+    if (what_.empty()) {
+      what_ = message_ + "\n\n" + stack_;
+    }
+  } catch (...) {
+    message_ = "[Exception caught creating message string]";
+    stack_ = "[Exception caught creating stack string]";
+    what_ = "[Exception caught getting value fields]";
+  }
+}
+
+} // namespace jsi
+} // namespace facebook
diff --git a/ReactCommon/jsi/jsi.h b/ReactCommon/jsi/jsi.h
new file mode 100644
index 00000000000000..b1b26ff6a3462d
--- /dev/null
+++ b/ReactCommon/jsi/jsi.h
@@ -0,0 +1,1146 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+#include <cassert>
+#include <cstring>
+#include <exception>
+#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
+
+#define JSI_EXPORT __attribute__((visibility("default")))
+
+class FBJSRuntime;
+namespace facebook {
+namespace jsi {
+
+namespace detail {
+
+template <typename R, typename L>
+class ThreadSafeRuntimeImpl;
+}
+
+class Buffer {
+ public:
+  virtual ~Buffer();
+  virtual size_t size() const = 0;
+  virtual const uint8_t* data() const = 0;
+};
+
+class StringBuffer : public Buffer {
+ public:
+  StringBuffer(std::string s) : s_(std::move(s)) {}
+  size_t size() const override {
+    return s_.size();
+  }
+  const uint8_t* data() const override {
+    return reinterpret_cast<const uint8_t*>(s_.data());
+  }
+
+ private:
+  std::string s_;
+};
+
+class Runtime;
+class Pointer;
+class PropNameID;
+class String;
+class Object;
+class WeakObject;
+class Array;
+class ArrayBuffer;
+class Function;
+class Value;
+class Instrumentation;
+class Scope;
+class JSIException;
+class JSError;
+
+/// A function which has this type can be registered as a function
+/// callable from JavaScript using Function::createFromHostFunction().
+/// When the function is called, args will point to the arguments, and
+/// count will indicate how many arguments are passed.  The function
+/// can return a Value to the caller, or throw an exception.  If a C++
+/// exception is thrown, a JS Error will be created and thrown into
+/// JS; if the C++ exception extends std::exception, the Error's
+/// message will be whatever what() returns. Note that it is undefined whether
+/// HostFunctions may or may not be called in strict mode; that is `thisVal`
+/// can be any value - it will not necessarily be coerced to an object or
+/// or set to the global object.
+using HostFunctionType = std::function<
+    Value(Runtime& rt, const Value& thisVal, const Value* args, size_t count)>;
+
+/// An object which implements this interface can be registered as an
+/// Object with the JS runtime.
+class JSI_EXPORT HostObject {
+ public:
+  // The C++ object's dtor will be called when the GC finalizes this
+  // object.  (This may be as late as when the Runtime is shut down.)
+  // You have no control over which thread it is called on.  This will
+  // be called from inside the GC, so it is unsafe to do any VM
+  // operations which require a Runtime&.  Derived classes' dtors
+  // should also avoid doing anything expensive.  Calling the dtor on
+  // a jsi object is explicitly ok.  If you want to do JS operations,
+  // or any nontrivial work, you should add it to a work queue, and
+  // manage it externally.
+  virtual ~HostObject();
+
+  // When JS wants a property with a given name from the HostObject,
+  // it will call this method.  If it throws an exception, the call
+  // will throw a JS \c Error object. By default this returns undefined.
+  // \return the value for the property.
+  virtual Value get(Runtime&, const PropNameID& name);
+
+  // When JS wants to set a property with a given name on the HostObject,
+  // it will call this method. If it throws an exception, the call will
+  // throw a JS \c Error object. By default this throws a type error exception
+  // mimicking the behavior of a frozen object in strict mode.
+  virtual void set(Runtime&, const PropNameID& name, const Value& value);
+
+  // When JS wants a list of property names for the HostObject, it will
+  // call this method. If it throws an exception, the call will thow a
+  // JS \c Error object. The default implementation returns empty vector.
+  virtual std::vector<PropNameID> getPropertyNames(Runtime& rt);
+};
+
+/// Represents a JS runtime.  Movable, but not copyable.  Note that
+/// this object is not thread-aware, but cannot be used safely from
+/// multiple threads at once.  The application is responsible for
+/// ensuring that it is used safely.  This could mean using the
+/// Runtime from a single thread, using a mutex, doing all work on a
+/// serial queue, etc.  This restriction applies to the methods of
+/// this class, and any method in the API which take a Runtime& as an
+/// argument.  Destructors (all but ~Scope), operators, or other methods
+/// which do not take Runtime& as an argument are safe to call from any
+/// thread, but it is still forbidden to make write operations on a single
+/// instance of any class from more than one thread.
+class Runtime {
+ public:
+  virtual ~Runtime();
+
+  /// Evaluates the given JavaScript \c buffer.  \c sourceURL is used
+  /// to annotate the stack trace if there is an exception.  The
+  /// contents may be utf8-encoded JS source code, or binary bytcode
+  /// whose format is specific to the implementation.  If the input
+  /// format is unknown, or evaluation causes an error, a JSIException
+  /// will be thrown.
+  virtual void evaluateJavaScript(
+      std::unique_ptr<const Buffer> buffer,
+      const std::string& sourceURL) = 0;
+  /// \return the global object
+  virtual Object global() = 0;
+
+  /// \return a short printable description of the instance.  This
+  /// should only be used by logging, debugging, and other
+  /// developer-facing callers.
+  virtual std::string description() = 0;
+
+  /// \return whether or not the underlying runtime supports debugging via the
+  /// Chrome remote debugging protocol.
+  ///
+  /// NOTE: the API for determining whether a runtime is debuggable and
+  /// registering a runtime with the debugger is still in flux, so please don't
+  /// use this API unless you know what you're doing.
+  virtual bool isInspectable() = 0;
+
+  /// \return an interface to extract metrics from this \c Runtime.  The default
+  /// implementation of this function returns an \c Instrumentation instance
+  /// which returns no metrics.
+  virtual Instrumentation& instrumentation();
+
+ protected:
+  friend class Pointer;
+  friend class PropNameID;
+  friend class String;
+  friend class Object;
+  friend class WeakObject;
+  friend class Array;
+  friend class ArrayBuffer;
+  friend class Function;
+  friend class Value;
+  friend class Scope;
+  friend class JSError;
+
+  // Potential optimization: avoid the cloneFoo() virtual dispatch,
+  // and instead just fix the number of fields, and copy them, since
+  // in practice they are trivially copyable.  Sufficient use of
+  // rvalue arguments/methods would also reduce the number of clones.
+
+  struct PointerValue {
+    virtual void invalidate() = 0;
+
+   protected:
+    ~PointerValue() = default;
+  };
+
+  virtual PointerValue* cloneString(const Runtime::PointerValue* pv) = 0;
+  virtual PointerValue* cloneObject(const Runtime::PointerValue* pv) = 0;
+  virtual PointerValue* clonePropNameID(const Runtime::PointerValue* pv) = 0;
+
+  virtual PropNameID createPropNameIDFromAscii(
+      const char* str,
+      size_t length) = 0;
+  virtual PropNameID createPropNameIDFromUtf8(
+      const uint8_t* utf8,
+      size_t length) = 0;
+  virtual PropNameID createPropNameIDFromString(const String& str) = 0;
+  virtual std::string utf8(const PropNameID&) = 0;
+  virtual bool compare(const PropNameID&, const PropNameID&) = 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;
+
+  virtual Object createObject() = 0;
+  virtual Object createObject(std::shared_ptr<HostObject> ho) = 0;
+  virtual std::shared_ptr<HostObject> getHostObject(const jsi::Object&) = 0;
+  virtual HostFunctionType& getHostFunction(const jsi::Function&) = 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;
+  virtual bool hasProperty(const Object&, const String& name) = 0;
+  virtual void
+  setPropertyValue(Object&, const PropNameID& name, const Value& value) = 0;
+  virtual void
+  setPropertyValue(Object&, const String& name, const Value& value) = 0;
+
+  virtual bool isArray(const Object&) const = 0;
+  virtual bool isArrayBuffer(const Object&) const = 0;
+  virtual bool isFunction(const Object&) const = 0;
+  virtual bool isHostObject(const jsi::Object&) const = 0;
+  virtual bool isHostFunction(const jsi::Function&) const = 0;
+  virtual Array getPropertyNames(const Object&) = 0;
+
+  virtual WeakObject createWeakObject(const Object&) = 0;
+  virtual Value lockWeakObject(const WeakObject&) = 0;
+
+  virtual Array createArray(size_t length) = 0;
+  virtual size_t size(const Array&) = 0;
+  virtual size_t size(const ArrayBuffer&) = 0;
+  virtual uint8_t* data(const ArrayBuffer&) = 0;
+  virtual Value getValueAtIndex(const Array&, size_t i) = 0;
+  virtual void setValueAtIndexImpl(Array&, size_t i, const Value& value) = 0;
+
+  virtual Function createFunctionFromHostFunction(
+      const PropNameID& name,
+      unsigned int paramCount,
+      HostFunctionType func) = 0;
+  virtual Value call(
+      const Function&,
+      const Value& jsThis,
+      const Value* args,
+      size_t count) = 0;
+  virtual Value
+  callAsConstructor(const Function&, const Value* args, size_t count) = 0;
+
+  // Private data for managing scopes.
+  struct ScopeState;
+  virtual ScopeState* pushScope();
+  virtual void popScope(ScopeState*);
+
+  virtual bool strictEquals(const String& a, const String& b) const = 0;
+  virtual bool strictEquals(const Object& a, const Object& b) const = 0;
+
+  virtual bool instanceOf(const Object& o, const Function& f) = 0;
+
+  // These exist so derived classes can access the private parts of
+  // Value, String, and Object, which are all friends of Runtime.
+  template <typename T>
+  static T make(PointerValue* pv);
+  static const PointerValue* getPointerValue(const Pointer& pointer);
+  static const PointerValue* getPointerValue(const Value& value);
+
+  // TODO T25594389: think harder about this friend declaration (and
+  // it's forward decl above)
+  template <typename R, typename L>
+  friend class detail::ThreadSafeRuntimeImpl;
+  friend class ::FBJSRuntime;
+};
+
+// Base class for pointer-storing types.
+class Pointer {
+ protected:
+  explicit Pointer(Pointer&& other) : ptr_(other.ptr_) {
+    other.ptr_ = nullptr;
+  }
+
+  ~Pointer() {
+    if (ptr_) {
+      ptr_->invalidate();
+    }
+  }
+
+  Pointer& operator=(Pointer&& other);
+
+  friend class Runtime;
+  friend class Value;
+
+  explicit Pointer(Runtime::PointerValue* ptr) : ptr_(ptr) {}
+
+  typename Runtime::PointerValue* ptr_;
+};
+
+/// Represents something that can be a JS property key.  Movable, not copyable.
+class PropNameID : public Pointer {
+ public:
+  using Pointer::Pointer;
+
+  PropNameID(Runtime& runtime, const PropNameID& other)
+      : PropNameID(runtime.clonePropNameID(other.ptr_)) {}
+
+  PropNameID(PropNameID&& other) = default;
+  PropNameID& operator=(PropNameID&& other) = default;
+
+  /// Create a JS property name id from ascii values.  The data is
+  /// copied.
+  static PropNameID forAscii(Runtime& runtime, const char* str, size_t length) {
+    return runtime.createPropNameIDFromAscii(str, length);
+  }
+
+  /// Create a property name id from a nul-terminated C ascii name.  The data is
+  /// copied.
+  static PropNameID forAscii(Runtime& runtime, const char* str) {
+    return forAscii(runtime, str, strlen(str));
+  }
+
+  /// Create a PropNameID from a C++ string. The string is copied.
+  static PropNameID forAscii(Runtime& runtime, const std::string& str) {
+    return forAscii(runtime, str.c_str(), str.size());
+  }
+
+  /// Create a PropNameID from utf8 values.  The data is copied.
+  static PropNameID
+  forUtf8(Runtime& runtime, const uint8_t* utf8, size_t length) {
+    return runtime.createPropNameIDFromUtf8(utf8, length);
+  }
+
+  /// Create a PropNameID from utf8-encoded octets stored in a
+  /// std::string.  The string data is transformed and copied.
+  static PropNameID forUtf8(Runtime& runtime, const std::string& utf8) {
+    return runtime.createPropNameIDFromUtf8(
+        reinterpret_cast<const uint8_t*>(utf8.data()), utf8.size());
+  }
+
+  /// Create a PropNameID from a JS string.
+  static PropNameID forString(Runtime& runtime, const jsi::String& str) {
+    return runtime.createPropNameIDFromString(str);
+  }
+
+  // Creates a vector of PropNameIDs constructed from given arguments.
+  template <typename... Args>
+  static std::vector<PropNameID> names(Runtime& runtime, Args&&... args);
+
+  // Creates a vector of given PropNameIDs.
+  template <size_t N>
+  static std::vector<PropNameID> names(PropNameID(&&propertyNames)[N]);
+
+  /// Copies the data in a PropNameID as utf8 into a C++ string.
+  std::string utf8(Runtime& runtime) const {
+    return runtime.utf8(*this);
+  }
+
+  static bool compare(
+      Runtime& runtime,
+      const jsi::PropNameID& a,
+      const jsi::PropNameID& b) {
+    return runtime.compare(a, b);
+  }
+
+  friend class Runtime;
+  friend class Value;
+};
+
+/// Represents a JS String.  Movable, not copyable.
+class String : public Pointer {
+ public:
+  using Pointer::Pointer;
+
+  String(String&& other) = default;
+  String& operator=(String&& other) = default;
+
+  /// Create a JS string from ascii values.  The string data is
+  /// copied.
+  static String
+  createFromAscii(Runtime& runtime, const char* str, size_t length) {
+    return runtime.createStringFromAscii(str, length);
+  }
+
+  /// Create a JS string from a nul-terminated C ascii string.  The
+  /// string data is copied.
+  static String createFromAscii(Runtime& runtime, const char* str) {
+    return createFromAscii(runtime, str, strlen(str));
+  }
+
+  /// Create a JS string from a C++ string.  The string data is
+  /// copied.
+  static String createFromAscii(Runtime& runtime, const std::string& str) {
+    return createFromAscii(runtime, str.c_str(), str.size());
+  }
+
+  /// Create a JS string from utf8-encoded octets.  The string data is
+  /// transformed and copied.
+  static String
+  createFromUtf8(Runtime& runtime, const uint8_t* utf8, size_t length) {
+    return runtime.createStringFromUtf8(utf8, length);
+  }
+
+  /// Create a JS string from utf8-encoded octets stored in a
+  /// std::string.  The string data is transformed and copied.
+  static String createFromUtf8(Runtime& runtime, const std::string& utf8) {
+    return runtime.createStringFromUtf8(
+        reinterpret_cast<const uint8_t*>(utf8.data()), utf8.length());
+  }
+
+  /// \return whether a and b contain the same characters.
+  static bool strictEquals(Runtime& runtime, const String& a, const String& b) {
+    return runtime.strictEquals(a, b);
+  }
+
+  /// Copies the data in a JS string as utf8 into a C++ string.
+  std::string utf8(Runtime& runtime) const {
+    return runtime.utf8(*this);
+  }
+
+  friend class Runtime;
+  friend class Value;
+};
+
+class Array;
+class Function;
+
+/// Represents a JS Object.  Movable, not copyable.
+class Object : public Pointer {
+ public:
+  using Pointer::Pointer;
+
+  Object(Object&& other) = default;
+  Object& operator=(Object&& other) = default;
+
+  /// Creates a new Object instance, like '{}' in JS.
+  Object(Runtime& runtime) : Object(runtime.createObject()) {}
+
+  static Object createFromHostObject(
+      Runtime& runtime,
+      std::shared_ptr<HostObject> ho) {
+    return runtime.createObject(ho);
+  }
+
+  /// \return whether this and \c obj are the same JSObject or not.
+  static bool strictEquals(Runtime& runtime, const Object& a, const Object& b) {
+    return runtime.strictEquals(a, b);
+  }
+
+  /// \return the result of `this instanceOf ctor` in JS.
+  bool instanceOf(Runtime& rt, const Function& ctor) {
+    return rt.instanceOf(*this, ctor);
+  }
+
+  /// \return the property of the object with the given ascii name.
+  /// If the name isn't a property on the object, returns the
+  /// undefined value.
+  Value getProperty(Runtime& runtime, const char* name) const;
+
+  /// \return the property of the object with the String name.
+  /// If the name isn't a property on the object, returns the
+  /// undefined value.
+  Value getProperty(Runtime& runtime, const String& name) const;
+
+  /// \return the property of the object with the given JS PropNameID
+  /// name.  If the name isn't a property on the object, returns the
+  /// undefined value.
+  Value getProperty(Runtime& runtime, const PropNameID& name) const;
+
+  /// \return true if and only if the object has a property with the
+  /// given ascii name.
+  bool hasProperty(Runtime& runtime, const char* name) const;
+
+  /// \return true if and only if the object has a property with the
+  /// given String name.
+  bool hasProperty(Runtime& runtime, const String& name) const;
+
+  /// \return true if and only if the object has a property with the
+  /// given PropNameID name.
+  bool hasProperty(Runtime& runtime, const PropNameID& name) const;
+
+  /// Sets the property value from a Value or anything which can be
+  /// used to make one: nullptr_t, bool, double, int, const char*,
+  /// String, or Object.
+  template <typename T>
+  void setProperty(Runtime& runtime, const char* name, T&& value);
+
+  /// Sets the property value from a Value or anything which can be
+  /// used to make one: nullptr_t, bool, double, int, const char*,
+  /// String, or Object.
+  template <typename T>
+  void setProperty(Runtime& runtime, const String& name, T&& value);
+
+  /// Sets the property value from a Value or anything which can be
+  /// used to make one: nullptr_t, bool, double, int, const char*,
+  /// String, or Object.
+  template <typename T>
+  void setProperty(Runtime& runtime, const PropNameID& name, T&& value);
+
+  /// \return true iff JS \c Array.isArray() would return \c true.  If
+  /// so, then \c getArray() will succeed.
+  bool isArray(Runtime& runtime) const {
+    return runtime.isArray(*this);
+  }
+
+  /// \return true iff the Object is an ArrayBuffer. If so, then \c
+  /// getArrayBuffer() will succeed.
+  bool isArrayBuffer(Runtime& runtime) const {
+    return runtime.isArrayBuffer(*this);
+  }
+
+  /// \return true iff the Object is callable.  If so, then \c
+  /// getFunction will succeed.
+  bool isFunction(Runtime& runtime) const {
+    return runtime.isFunction(*this);
+  }
+
+  /// \return true iff the Object was initialized with \c createFromHostObject
+  /// and the HostObject passed is of type \c T. If returns \c true then
+  /// \c getHostObject<T> will succeed.
+  template <typename T = HostObject>
+  bool isHostObject(Runtime& runtime) const;
+
+  /// \return an Array instance which refers to the same underlying
+  /// object.  If \c isArray() would return false, this will assert.
+  Array getArray(Runtime& runtime) const&;
+
+  /// \return an Array instance which refers to the same underlying
+  /// object.  If \c isArray() would return false, this will assert.
+  Array getArray(Runtime& runtime) &&;
+
+  /// \return an Array instance which refers to the same underlying
+  /// object.  If \c isArray() would return false, this will throw
+  /// JSIException.
+  Array asArray(Runtime& runtime) const&;
+
+  /// \return an Array instance which refers to the same underlying
+  /// object.  If \c isArray() would return false, this will throw
+  /// JSIException.
+  Array asArray(Runtime& runtime) &&;
+
+  /// \return an ArrayBuffer instance which refers to the same underlying
+  /// object.  If \c isArrayBuffer() would return false, this will assert.
+  ArrayBuffer getArrayBuffer(Runtime& runtime) const&;
+
+  /// \return an ArrayBuffer instance which refers to the same underlying
+  /// object.  If \c isArrayBuffer() would return false, this will assert.
+  ArrayBuffer getArrayBuffer(Runtime& runtime) &&;
+
+  /// \return a Function instance which refers to the same underlying
+  /// object.  If \c isFunction() would return false, this will assert.
+  Function getFunction(Runtime& runtime) const&;
+
+  /// \return a Function instance which refers to the same underlying
+  /// object.  If \c isFunction() would return false, this will assert.
+  Function getFunction(Runtime& runtime) &&;
+
+  /// \return a Function instance which refers to the same underlying
+  /// object.  If \c isFunction() would return false, this will throw
+  /// JSIException.
+  Function asFunction(Runtime& runtime) const&;
+
+  /// \return a Function instance which refers to the same underlying
+  /// object.  If \c isFunction() would return false, this will throw
+  /// JSIException.
+  Function asFunction(Runtime& runtime) &&;
+
+  /// \return a shared_ptr<T> which refers to the same underlying
+  /// \c HostObject that was used to create this object. If \c isHostObject<T>
+  /// is false, this will assert. Note that this does a type check and will
+  /// assert if the underlying HostObject isn't of type \c T
+  template <typename T = HostObject>
+  std::shared_ptr<T> getHostObject(Runtime& runtime) const;
+
+  /// \return a shared_ptr<T> which refers to the same underlying
+  /// \c HostObject that was used to crete this object. If \c isHostObject<T>
+  /// is false, this will throw.
+  template <typename T = HostObject>
+  std::shared_ptr<T> asHostObject(Runtime& runtime) const;
+
+  /// \return same as \c getProperty(name).asObject(), except with
+  /// a better exception message.
+  Object getPropertyAsObject(Runtime& runtime, const char* name) const;
+
+  /// \return similar to \c
+  /// getProperty(name).getObject().getFunction(), except it will
+  /// throw JSIException instead of asserting if the property is
+  /// not an object, or the object is not callable.
+  Function getPropertyAsFunction(Runtime& runtime, const char* name) const;
+
+  /// \return an Array consisting of all enumerable property names in
+  /// the object and its prototype chain.  All values in the return
+  /// will be isString().  (This is probably not optimal, but it
+  /// works.  I only need it in one place.)
+  Array getPropertyNames(Runtime& runtime) const;
+
+ protected:
+  void
+  setPropertyValue(Runtime& runtime, const String& name, const Value& value) {
+    return runtime.setPropertyValue(*this, name, value);
+  }
+
+  void setPropertyValue(
+      Runtime& runtime,
+      const PropNameID& name,
+      const Value& value) {
+    return runtime.setPropertyValue(*this, name, value);
+  }
+
+  friend class Runtime;
+  friend class Value;
+};
+
+/// Represents a weak reference to a JS Object.  If the only reference
+/// to an Object are these, the object is eligible for GC.  Method
+/// names are inspired by C++ weak_ptr.  Movable, not copyable.
+class WeakObject : public Pointer {
+ public:
+  using Pointer::Pointer;
+
+  WeakObject(WeakObject&& other) = default;
+  WeakObject& operator=(WeakObject&& other) = default;
+
+  /// Create a WeakObject from an Object.
+  WeakObject(Runtime& runtime, const Object& o)
+      : WeakObject(runtime.createWeakObject(o)) {}
+
+  /// \return a Value representing the underlying Object if it is still valid;
+  /// otherwise returns \c undefined.  Note that this method has nothing to do
+  /// with threads or concurrency.  The name is based on std::weak_ptr::lock()
+  /// which serves a similar purpose.
+  Value lock(Runtime& runtime);
+
+  friend class Runtime;
+};
+
+/// Represents a JS Object which can be efficiently used as an array
+/// with integral indices.
+class Array : public Object {
+ public:
+  Array(Array&&) = default;
+  /// Creates a new Array instance, with \c length undefined elements.
+  Array(Runtime& runtime, size_t length) : Array(runtime.createArray(length)) {}
+
+  Array& operator=(Array&&) = default;
+
+  /// \return the size of the Array, according to its length property.
+  /// (C++ naming convention)
+  size_t size(Runtime& runtime) const {
+    return runtime.size(*this);
+  }
+
+  /// \return the size of the Array, according to its length property.
+  /// (JS naming convention)
+  size_t length(Runtime& runtime) const {
+    return size(runtime);
+  }
+
+  /// \return the property of the array at index \c i.  If there is no
+  /// such property, returns the undefined value.  If \c i is out of
+  /// range [ 0..\c length ] throws a JSIException.
+  Value getValueAtIndex(Runtime& runtime, size_t i) const;
+
+  /// Sets the property of the array at index \c i.  The argument
+  /// value behaves as with Object::setProperty().  If \c i is out of
+  /// range [ 0..\c length ] throws a JSIException.
+  template <typename T>
+  void setValueAtIndex(Runtime& runtime, size_t i, T&& value);
+
+  /// There is no current API for changing the size of an array once
+  /// created.  We'll probably need that eventually.
+
+  /// Creates a new Array instance from provided values
+  template <typename... Args>
+  static Array createWithElements(Runtime&, Args&&... args);
+
+  /// Creates a new Array instance from intitializer list.
+  static Array createWithElements(
+      Runtime& runtime,
+      std::initializer_list<Value> elements);
+
+ private:
+  friend class Object;
+  friend class Value;
+
+  void setValueAtIndexImpl(Runtime& runtime, size_t i, const Value& value) {
+    return runtime.setValueAtIndexImpl(*this, i, value);
+  }
+
+  Array(Runtime::PointerValue* value) : Object(value) {}
+};
+
+/// Represents a JSArrayBuffer
+class ArrayBuffer : public Object {
+ public:
+  ArrayBuffer(ArrayBuffer&&) = default;
+  ArrayBuffer& operator=(ArrayBuffer&&) = default;
+
+  /// \return the size of the ArrayBuffer, according to its byteLength property.
+  /// (C++ naming convention)
+  size_t size(Runtime& runtime) const {
+    return runtime.size(*this);
+  }
+
+  size_t length(Runtime& runtime) const {
+    return runtime.size(*this);
+  }
+
+  uint8_t* data(Runtime& runtime) {
+    return runtime.data(*this);
+  }
+
+ private:
+  friend class Object;
+  friend class Value;
+
+  ArrayBuffer(Runtime::PointerValue* value) : Object(value) {}
+};
+
+/// Represents a JS Object which is guaranteed to be Callable.
+class Function : public Object {
+ public:
+  Function(Function&&) = default;
+  Function& operator=(Function&&) = default;
+
+  /// Create a function which, when invoked, calls C++ code. If the
+  /// function throws an exception, a JS Error will be created and
+  /// thrown.
+  /// \param name the name property for the function.
+  /// \param paramCount the length property for the function, which
+  /// may not be the number of arguments the function is passed.
+  static Function createFromHostFunction(
+      Runtime& runtime,
+      const jsi::PropNameID& name,
+      unsigned int paramCount,
+      jsi::HostFunctionType func);
+
+  /// Calls the function with \c count \c args.  The \c this value of
+  /// the JS function will be undefined.
+  Value call(Runtime& runtime, const Value* args, size_t count) const;
+
+  /// Calls the function with a \c std::initializer_list of Value
+  /// arguments. The \c this value of the JS function will be
+  /// undefined.
+  Value call(Runtime& runtime, std::initializer_list<Value> args) const;
+
+  /// Calls the function with any number of arguments similarly to
+  /// Object::setProperty().  The \c this value of the JS function
+  /// will be undefined.
+  template <typename... Args>
+  Value call(Runtime& runtime, Args&&... args) const;
+
+  /// Calls the function with \c count \c args and \c jsThis value passed
+  /// as this value.
+  Value callWithThis(
+      Runtime& Runtime,
+      const Object& jsThis,
+      const Value* args,
+      size_t count) const;
+
+  /// Calls the function with a \c std::initializer_list of Value
+  /// arguments. The \c this value of the JS function will be
+  /// undefined.
+  Value callWithThis(
+      Runtime& runtime,
+      const Object& jsThis,
+      std::initializer_list<Value> args) const;
+
+  /// Calls the function with any number of arguments similarly to
+  /// Object::setProperty().  The \c this value of the JS function
+  /// will be undefined.
+  template <typename... Args>
+  Value callWithThis(Runtime& runtime, const Object& jsThis, Args&&... args)
+      const;
+
+  /// Calls the function as a constructor with \c count \c args. Equivalent
+  /// to calling `new Func` where `Func` is the js function reqresented by
+  /// this.
+  Value callAsConstructor(Runtime& runtime, const Value* args, size_t count)
+      const;
+
+  /// Same as above `callAsConstructor`, except use an initializer_list to
+  /// supply the arguments.
+  Value callAsConstructor(Runtime& runtime, std::initializer_list<Value> args)
+      const;
+
+  /// Same as above `callAsConstructor`, but automatically converts/wraps
+  /// any argument with a jsi Value.
+  template <typename... Args>
+  Value callAsConstructor(Runtime& runtime, Args&&... args) const;
+
+  /// Returns whether this was created with Function::createFromHostFunction.
+  /// If true then you can use getHostFunction to get the underlying
+  /// HostFunctionType.
+  bool isHostFunction(Runtime& runtime) const {
+    return runtime.isHostFunction(*this);
+  }
+
+  /// Returns the underlying HostFunctionType iff isHostFunction returns true
+  /// and asserts otherwise. You can use this to use std::function<>::target
+  /// to get the object that was passed to create the HostFunctionType.
+  ///
+  /// Note: The reference returned is borrowed from the JS object underlying
+  ///       \c this, and thus only lasts as long as the object underlying
+  ///       \c this does.
+  HostFunctionType& getHostFunction(Runtime& runtime) const {
+    assert(isHostFunction(runtime));
+    return runtime.getHostFunction(*this);
+  }
+
+ private:
+  friend class Object;
+  friend class Value;
+
+  Function(Runtime::PointerValue* value) : Object(value) {}
+};
+
+/// Represents any JS Value (undefined, null, boolean, number, string,
+/// or object).  Movable, or explicitly copyable (has no copy ctor).
+class Value {
+ public:
+  /// Default ctor creates an \c undefined JS value.
+  Value() : Value(UndefinedKind) {}
+
+  /// Creates a \c null JS value.
+  /* implicit */ Value(std::nullptr_t) : kind_(NullKind) {}
+
+  /// Creates a boolean JS value.
+  /* implicit */ Value(bool b) : Value(BooleanKind) {
+    data_.boolean = b;
+  }
+
+  /// Creates a number JS value.
+  /* implicit */ Value(double d) : Value(NumberKind) {
+    data_.number = d;
+  }
+
+  /// Creates a number JS value.
+  /* implicit */ Value(int i) : Value(NumberKind) {
+    data_.number = i;
+  }
+
+  /// Moves a String or Object rvalue into a new JS value.
+  template <typename T>
+  /* implicit */ Value(T&& other) : Value(kindOf(other)) {
+    static_assert(
+        std::is_base_of<String, T>::value || std::is_base_of<Object, T>::value,
+        "Value cannot be implictly move-constructed from this type");
+    new (&data_.pointer) T(std::move(other));
+  }
+
+  /// Value("foo") will treat foo as a bool.  This makes doing that a
+  /// compile error.
+  template <typename T = void>
+  Value(const char*) {
+    static_assert(
+        !std::is_same<void, T>::value,
+        "Value cannot be constructed directly from const char*");
+  }
+
+  Value(Value&& value);
+
+  /// Copies a String lvalue into a new JS value.
+  Value(Runtime& runtime, const String& str) : Value(StringKind) {
+    new (&data_.pointer) String(runtime.cloneString(str.ptr_));
+  }
+
+  /// Copies a Object lvalue into a new JS value.
+  Value(Runtime& runtime, const Object& obj) : Value(ObjectKind) {
+    new (&data_.pointer) Object(runtime.cloneObject(obj.ptr_));
+  }
+
+  /// Creates a JS value from another Value lvalue.
+  Value(Runtime& runtime, const Value& value);
+
+  /// Value(rt, "foo") will treat foo as a bool.  This makes doing
+  /// that a compile error.
+  template <typename T = void>
+  Value(Runtime&, const char*) {
+    static_assert(
+        !std::is_same<T, void>::value,
+        "Value cannot be constructed directly from const char*");
+  }
+
+  ~Value();
+  // \return the undefined \c Value.
+  static Value undefined() {
+    return Value();
+  }
+
+  // \return the null \c Value.
+  static Value null() {
+    return Value(nullptr);
+  }
+
+  // \return a \c Value created from a utf8-encoded JSON string.
+  static Value
+  createFromJsonUtf8(Runtime& runtime, const uint8_t* json, size_t length);
+
+  /// \return according to the SameValue algorithm see more here:
+  //  https://www.ecma-international.org/ecma-262/5.1/#sec-11.9.4
+  static bool strictEquals(Runtime& runtime, const Value& a, const Value& b);
+
+  Value& operator=(Value&& other) {
+    this->~Value();
+    new (this) Value(std::move(other));
+    return *this;
+  }
+
+  bool isUndefined() const {
+    return kind_ == UndefinedKind;
+  }
+
+  bool isNull() const {
+    return kind_ == NullKind;
+  }
+
+  bool isBool() const {
+    return kind_ == BooleanKind;
+  }
+
+  bool isNumber() const {
+    return kind_ == NumberKind;
+  }
+
+  bool isString() const {
+    return kind_ == StringKind;
+  }
+
+  bool isObject() const {
+    return kind_ == ObjectKind;
+  }
+
+  /// \return the boolean value, or asserts if not a boolean.
+  bool getBool() const {
+    assert(isBool());
+    return data_.boolean;
+  }
+
+  /// \return the number value, or asserts if not a number.
+  double getNumber() const {
+    assert(isNumber());
+    return data_.number;
+  }
+
+  /// \return the number value, or throws JSIException if not a
+  /// number.
+  double asNumber() const;
+
+  /// \return the String value, or asserts if not a string.
+  String getString(Runtime& runtime) const& {
+    assert(isString());
+    return String(runtime.cloneString(data_.pointer.ptr_));
+  }
+
+  /// \return the String value, or asserts if not a string.
+  /// Can be used on rvalue references to avoid cloning more strings.
+  String getString(Runtime&) && {
+    assert(isString());
+    auto ptr = data_.pointer.ptr_;
+    data_.pointer.ptr_ = nullptr;
+    return static_cast<String>(ptr);
+  }
+
+  String asString(Runtime& runtime) const&;
+  String asString(Runtime& runtime) &&;
+
+  /// \return the Object value, or asserts if not an object.
+  Object getObject(Runtime& runtime) const& {
+    assert(isObject());
+    return Object(runtime.cloneObject(data_.pointer.ptr_));
+  }
+
+  /// \return the Object value, or asserts if not an object.
+  /// Can be used on rvalue references to avoid cloning more objects.
+  Object getObject(Runtime&) && {
+    assert(isObject());
+    auto ptr = data_.pointer.ptr_;
+    data_.pointer.ptr_ = nullptr;
+    return static_cast<Object>(ptr);
+  }
+
+  /// \return the Object value, or throws JSIException if not an
+  /// object.
+  Object asObject(Runtime& runtime) const&;
+  Object asObject(Runtime& runtime) &&;
+
+  // \return a String like JS .toString() would do.
+  String toString(Runtime& runtime) const;
+
+ private:
+  friend class Runtime;
+
+  enum ValueKind {
+    UndefinedKind,
+    NullKind,
+    BooleanKind,
+    NumberKind,
+    StringKind,
+    ObjectKind,
+    PointerKind = StringKind,
+  };
+
+  union Data {
+    // Value's ctor and dtor will manage the lifecycle of the contained Data.
+    Data() {
+      static_assert(
+          sizeof(Data) == sizeof(uint64_t),
+          "Value data should fit in a 64-bit register");
+    }
+    ~Data() {}
+
+    // scalars
+    bool boolean;
+    double number;
+    // pointers
+    Pointer pointer; // String, Object, Array, Function
+  };
+
+  Value(ValueKind kind) : kind_(kind) {}
+
+  constexpr static ValueKind kindOf(const String&) {
+    return StringKind;
+  }
+  constexpr static ValueKind kindOf(const Object&) {
+    return ObjectKind;
+  }
+
+  ValueKind kind_;
+  Data data_;
+
+  // In the future: Value becomes NaN-boxed.  In the Hermes impl, if
+  // the object contains a PinnedHermesValue, we need to be able to
+  // get a pointer to it; this can be casted from 'this'.  In the JSC
+  // impl, we need to be able to convert the boxed value into a JSC
+  // ref.  This can be done by casting this, deferencing it to get a
+  // number, doing some bit masks, and then casting again into the
+  // desired JSC ref type.
+};
+
+/// Not movable and not copyable RAII marker advising the underlying
+/// JavaScript VM to track resources allocated since creation until
+/// destruction so that they can be recycled eagerly when the Scope
+/// goes out of scope instead of floating in the air until the next
+/// garbage collection or any other delayed release occurs.
+///
+/// This API should be treated only as advice, implementations can
+/// choose to ignore the fact that Scopes are created or destroyed.
+///
+/// This class is an exception to the rule allowing destructors to be
+/// called without proper synchronization (see Runtime documentation).
+/// The whole point of this class is to enable all sorts of clean ups
+/// when the destructor is called and this proper synchronization is
+/// required at that time.
+///
+/// Instances of this class are intended to be created as automatic stack
+/// variables in which case destructor calls don't require any additional
+/// locking, provided that the lock (if any) is managed with RAII helpers.
+class Scope {
+ public:
+  explicit Scope(Runtime& rt) : rt_(rt), prv_(rt.pushScope()) {}
+  ~Scope() {
+    rt_.popScope(prv_);
+  };
+
+  Scope(const Scope&) = delete;
+  Scope(Scope&&) = delete;
+
+  Scope& operator=(const Scope&) = delete;
+  Scope& operator=(Scope&&) = delete;
+
+  template <typename F>
+  static auto callInNewScope(Runtime& rt, F f) -> decltype(f()) {
+    Scope s(rt);
+    return f();
+  }
+
+ private:
+  Runtime& rt_;
+  Runtime::ScopeState* prv_;
+};
+
+/// Base class for jsi exceptions
+class JSIException : public std::exception {
+ protected:
+  JSIException(){};
+  JSIException(std::string what) : what_(std::move(what)){};
+
+ public:
+  virtual const char* what() const noexcept override {
+    return what_.c_str();
+  }
+
+ protected:
+  std::string what_;
+};
+
+/// This exception will be thrown by API functions on errors not related to
+/// JavaScript execution.
+class JSINativeException : public JSIException {
+ public:
+  JSINativeException(std::string what) : JSIException(std::move(what)) {}
+};
+
+/// This exception will be thrown by API functions whenever a JS
+/// operation causes an exception as described by the spec, or as
+/// otherwise described.
+class JSError : public JSIException {
+ public:
+  /// Creates a JSError referring to provided \c value
+  JSError(Runtime& r, Value&& value);
+
+  /// Creates a JSError referring to new \c Error instance capturing current
+  /// JavaScript stack. The error message property is set to given \c message.
+  JSError(Runtime& rt, std::string message);
+
+  /// Creates a JSError referring to new \c Error instance capturing current
+  /// JavaScript stack. The error message property is set to given \c message.
+  JSError(Runtime& rt, const char* message)
+      : JSError(rt, std::string(message)){};
+
+  /// Creates a JSError referring to a JavaScript Object having message and
+  /// stack properties set to provided values.
+  JSError(Runtime& rt, std::string message, std::string stack);
+
+  /// Creates a JSError referring to provided value and what string
+  /// set to provided message.  This argument order is a bit weird,
+  /// but necessary to avoid ambiguity with the above.
+  JSError(std::string what, Runtime& rt, Value&& value);
+
+  const std::string& getStack() const {
+    return stack_;
+  }
+
+  const std::string& getMessage() const {
+    return message_;
+  }
+
+  const jsi::Value& value() const {
+    assert(value_);
+    return *value_;
+  }
+
+ private:
+  // This initializes the value_ member and does some other
+  // validation, so it must be called by every branch through the
+  // constructors.
+  void setValue(Runtime& rt, Value&& value);
+
+  // This needs to be on the heap, because throw requires the object
+  // be copyable, and Value is not.
+  std::shared_ptr<jsi::Value> value_;
+  std::string message_;
+  std::string stack_;
+};
+
+} // namespace jsi
+} // namespace facebook
+
+#include <jsi/jsi-inl.h>
diff --git a/ReactCommon/jsiexecutor/Android.mk b/ReactCommon/jsiexecutor/Android.mk
new file mode 100644
index 00000000000000..8580c9f4befcee
--- /dev/null
+++ b/ReactCommon/jsiexecutor/Android.mk
@@ -0,0 +1,17 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := jsireact
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jsireact/*.cpp)
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+
+LOCAL_CFLAGS := -fexceptions -frtti -O3
+
+LOCAL_STATIC_LIBRARIES := libjsi reactnative
+LOCAL_SHARED_LIBRARIES := libfolly_json glog
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactCommon/jsiexecutor/BUCK b/ReactCommon/jsiexecutor/BUCK
new file mode 100644
index 00000000000000..c979a1a68ddf39
--- /dev/null
+++ b/ReactCommon/jsiexecutor/BUCK
@@ -0,0 +1,39 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "cxx_library", "react_native_xplat_dep", "react_native_xplat_target")
+
+cxx_library(
+    name = "jsiexecutor",
+    srcs = [
+        "jsireact/JSIExecutor.cpp",
+        "jsireact/JSINativeModules.cpp",
+    ],
+    header_namespace = "",
+    exported_headers = {
+        "jsireact/JSIExecutor.h": "jsireact/JSIExecutor.h",
+        "jsireact/JSINativeModules.h": "jsireact/JSINativeModules.h",
+    },
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+    ],
+    fbandroid_deps = [
+        "xplat//folly:molly",
+        "xplat//third-party/glog:glog",
+        "xplat//third-party/linker_lib:atomic",
+    ],
+    fbobjc_force_static = True,
+    fbobjc_header_path_prefix = "",
+    platforms = (ANDROID, APPLE),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    visibility = [
+        "PUBLIC",
+    ],
+    xcode_public_headers_symlinks = True,
+    deps = [
+        react_native_xplat_dep("jsi:jsi"),
+        react_native_xplat_dep("jsi:JSIDynamic"),
+        react_native_xplat_target("cxxreact:bridge"),
+    ],
+)
diff --git a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
new file mode 100644
index 00000000000000..f243d8d7e32148
--- /dev/null
+++ b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
@@ -0,0 +1,405 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "jsireact/JSIExecutor.h"
+
+#include <cxxreact/JSBigString.h>
+#include <cxxreact/ModuleRegistry.h>
+#include <cxxreact/ReactMarker.h>
+#include <cxxreact/SystraceSection.h>
+#include <folly/Conv.h>
+#include <folly/json.h>
+#include <glog/logging.h>
+#include <jsi/JSIDynamic.h>
+
+#include <stdexcept>
+
+using namespace facebook::jsi;
+
+namespace facebook {
+namespace react {
+
+JSIExecutorFactory::JSIExecutorFactory(
+    std::shared_ptr<jsi::Runtime> runtime,
+    JSIExecutor::Logger logger,
+    JSIExecutor::RuntimeInstaller runtimeInstaller)
+    : runtime_(runtime),
+      logger_(logger),
+      runtimeInstaller_(runtimeInstaller) {}
+
+std::unique_ptr<JSExecutor> JSIExecutorFactory::createJSExecutor(
+    std::shared_ptr<ExecutorDelegate> delegate,
+    std::shared_ptr<MessageQueueThread>) {
+  return std::make_unique<JSIExecutor>(
+      runtime_,
+      delegate,
+      logger_,
+      JSIExecutor::defaultTimeoutInvoker,
+      runtimeInstaller_);
+}
+
+class JSIExecutor::NativeModuleProxy : public jsi::HostObject {
+ public:
+  NativeModuleProxy(JSIExecutor& executor) : executor_(executor) {}
+
+  Value get(Runtime& rt, const PropNameID& name) override {
+    if (name.utf8(rt) == "name") {
+      return jsi::String::createFromAscii(rt, "NativeModules");
+    }
+
+    return executor_.nativeModules_.getModule(rt, name);
+  }
+
+  void set(Runtime&, const PropNameID&, const Value&) override {
+    throw std::runtime_error(
+        "Unable to put on NativeModules: Operation unsupported");
+  }
+
+ private:
+  JSIExecutor& executor_;
+};
+
+namespace {
+
+// basename_r isn't in all iOS SDKs, so use this simple version instead.
+std::string simpleBasename(const std::string& path) {
+  size_t pos = path.rfind("/");
+  return (pos != std::string::npos) ? path.substr(pos) : path;
+}
+
+} // namespace
+
+JSIExecutor::JSIExecutor(
+    std::shared_ptr<jsi::Runtime> runtime,
+    std::shared_ptr<ExecutorDelegate> delegate,
+    Logger logger,
+    const JSIScopedTimeoutInvoker& scopedTimeoutInvoker,
+    RuntimeInstaller runtimeInstaller)
+    : runtime_(runtime),
+      delegate_(delegate),
+      nativeModules_(delegate ? delegate->getModuleRegistry() : nullptr),
+      logger_(logger),
+      scopedTimeoutInvoker_(scopedTimeoutInvoker),
+      runtimeInstaller_(runtimeInstaller) {
+  runtime_->global().setProperty(
+      *runtime, "__jsiExecutorDescription", runtime->description());
+}
+
+void JSIExecutor::loadApplicationScript(
+    std::unique_ptr<const JSBigString> script,
+    std::string sourceURL) {
+  SystraceSection s("JSIExecutor::loadApplicationScript");
+
+  // TODO: check for and use precompiled HBC
+
+  runtime_->global().setProperty(
+      *runtime_,
+      "nativeModuleProxy",
+      Object::createFromHostObject(
+          *runtime_, std::make_shared<NativeModuleProxy>(*this)));
+
+  runtime_->global().setProperty(
+      *runtime_,
+      "nativeFlushQueueImmediate",
+      Function::createFromHostFunction(
+          *runtime_,
+          PropNameID::forAscii(*runtime_, "nativeFlushQueueImmediate"),
+          1,
+          [this](
+              jsi::Runtime&,
+              const jsi::Value&,
+              const jsi::Value* args,
+              size_t count) {
+            if (count != 1) {
+              throw std::invalid_argument(
+                  "nativeFlushQueueImmediate arg count must be 1");
+            }
+            callNativeModules(args[0], false);
+            return Value::undefined();
+          }));
+
+  runtime_->global().setProperty(
+      *runtime_,
+      "nativeCallSyncHook",
+      Function::createFromHostFunction(
+          *runtime_,
+          PropNameID::forAscii(*runtime_, "nativeCallSyncHook"),
+          1,
+          [this](
+              jsi::Runtime&,
+              const jsi::Value&,
+              const jsi::Value* args,
+              size_t count) { return nativeCallSyncHook(args, count); }));
+
+  if (logger_) {
+    // Only inject the logging function if it was supplied by the caller.
+    runtime_->global().setProperty(
+        *runtime_,
+        "nativeLoggingHook",
+        Function::createFromHostFunction(
+            *runtime_,
+            PropNameID::forAscii(*runtime_, "nativeLoggingHook"),
+            2,
+            [this](
+                jsi::Runtime&,
+                const jsi::Value&,
+                const jsi::Value* args,
+                size_t count) {
+              if (count != 2) {
+                throw std::invalid_argument(
+                    "nativeLoggingHook takes 2 arguments");
+              }
+              logger_(
+                  args[0].asString(*runtime_).utf8(*runtime_),
+                  folly::to<unsigned int>(args[1].asNumber()));
+              return Value::undefined();
+            }));
+  }
+
+  if (runtimeInstaller_) {
+    runtimeInstaller_(*runtime_);
+  }
+
+  bool hasLogger(ReactMarker::logTaggedMarker);
+  std::string scriptName = simpleBasename(sourceURL);
+  if (hasLogger) {
+    ReactMarker::logTaggedMarker(
+        ReactMarker::RUN_JS_BUNDLE_START, scriptName.c_str());
+  }
+  runtime_->evaluateJavaScript(
+      std::make_unique<BigStringBuffer>(std::move(script)), sourceURL);
+  flush();
+  if (hasLogger) {
+    ReactMarker::logMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP);
+    ReactMarker::logTaggedMarker(
+        ReactMarker::RUN_JS_BUNDLE_STOP, scriptName.c_str());
+  }
+}
+
+void JSIExecutor::setBundleRegistry(std::unique_ptr<RAMBundleRegistry> r) {
+  if (!bundleRegistry_) {
+    runtime_->global().setProperty(
+        *runtime_,
+        "nativeRequire",
+        Function::createFromHostFunction(
+            *runtime_,
+            PropNameID::forAscii(*runtime_, "nativeRequire"),
+            2,
+            [this](
+                Runtime& rt,
+                const facebook::jsi::Value&,
+                const facebook::jsi::Value* args,
+                size_t count) { return nativeRequire(args, count); }));
+  }
+  bundleRegistry_ = std::move(r);
+}
+
+void JSIExecutor::registerBundle(
+    uint32_t bundleId,
+    const std::string& bundlePath) {
+  const auto tag = folly::to<std::string>(bundleId);
+  ReactMarker::logTaggedMarker(
+      ReactMarker::REGISTER_JS_SEGMENT_START, tag.c_str());
+  if (bundleRegistry_) {
+    bundleRegistry_->registerBundle(bundleId, bundlePath);
+  } else {
+    auto script = JSBigFileString::fromPath(bundlePath);
+    runtime_->evaluateJavaScript(
+        std::make_unique<BigStringBuffer>(std::move(script)),
+        JSExecutor::getSyntheticBundlePath(bundleId, bundlePath));
+  }
+  ReactMarker::logTaggedMarker(
+      ReactMarker::REGISTER_JS_SEGMENT_STOP, tag.c_str());
+}
+
+void JSIExecutor::callFunction(
+    const std::string& moduleId,
+    const std::string& methodId,
+    const folly::dynamic& arguments) {
+  SystraceSection s(
+      "JSIExecutor::callFunction", "moduleId", moduleId, "methodId", methodId);
+  if (!callFunctionReturnFlushedQueue_) {
+    bindBridge();
+  }
+
+  // Construct the error message producer in case this times out.
+  // This is executed on a background thread, so it must capture its parameters
+  // by value.
+  auto errorProducer = [=] {
+    std::stringstream ss;
+    ss << "moduleID: " << moduleId << " methodID: " << methodId
+       << " arguments: " << folly::toJson(arguments);
+    return ss.str();
+  };
+
+  Value ret = Value::undefined();
+  try {
+    scopedTimeoutInvoker_(
+        [&] {
+          ret = callFunctionReturnFlushedQueue_->call(
+              *runtime_,
+              moduleId,
+              methodId,
+              valueFromDynamic(*runtime_, arguments));
+        },
+        std::move(errorProducer));
+  } catch (...) {
+    std::throw_with_nested(
+        std::runtime_error("Error calling " + moduleId + "." + methodId));
+  }
+
+  callNativeModules(ret, true);
+}
+
+void JSIExecutor::invokeCallback(
+    const double callbackId,
+    const folly::dynamic& arguments) {
+  SystraceSection s("JSIExecutor::invokeCallback", "callbackId", callbackId);
+  if (!invokeCallbackAndReturnFlushedQueue_) {
+    bindBridge();
+  }
+  Value ret;
+  try {
+    ret = invokeCallbackAndReturnFlushedQueue_->call(
+        *runtime_, callbackId, valueFromDynamic(*runtime_, arguments));
+  } catch (...) {
+    std::throw_with_nested(std::runtime_error(
+        folly::to<std::string>("Error invoking callback ", callbackId)));
+  }
+
+  callNativeModules(ret, true);
+}
+
+void JSIExecutor::setGlobalVariable(
+    std::string propName,
+    std::unique_ptr<const JSBigString> jsonValue) {
+  SystraceSection s("JSIExecutor::setGlobalVariable", "propName", propName);
+  runtime_->global().setProperty(
+      *runtime_,
+      propName.c_str(),
+      Value::createFromJsonUtf8(
+          *runtime_,
+          reinterpret_cast<const uint8_t*>(jsonValue->c_str()),
+          jsonValue->size()));
+}
+
+std::string JSIExecutor::getDescription() {
+  return "JSI " + runtime_->description();
+}
+
+void* JSIExecutor::getJavaScriptContext() {
+  return runtime_.get();
+}
+
+bool JSIExecutor::isInspectable() {
+  return runtime_->isInspectable();
+}
+
+void JSIExecutor::bindBridge() {
+  std::call_once(bindFlag_, [this] {
+    SystraceSection s("JSIExecutor::bindBridge (once)");
+    Value batchedBridgeValue =
+        runtime_->global().getProperty(*runtime_, "__fbBatchedBridge");
+    if (batchedBridgeValue.isUndefined()) {
+      Function requireBatchedBridge = runtime_->global().getPropertyAsFunction(
+          *runtime_, "__fbRequireBatchedBridge");
+      batchedBridgeValue = requireBatchedBridge.call(*runtime_);
+      if (batchedBridgeValue.isUndefined()) {
+        throw JSINativeException(
+            "Could not get BatchedBridge, make sure your bundle is packaged correctly");
+      }
+    }
+
+    Object batchedBridge = batchedBridgeValue.asObject(*runtime_);
+    callFunctionReturnFlushedQueue_ = batchedBridge.getPropertyAsFunction(
+        *runtime_, "callFunctionReturnFlushedQueue");
+    invokeCallbackAndReturnFlushedQueue_ = batchedBridge.getPropertyAsFunction(
+        *runtime_, "invokeCallbackAndReturnFlushedQueue");
+    flushedQueue_ =
+        batchedBridge.getPropertyAsFunction(*runtime_, "flushedQueue");
+    callFunctionReturnResultAndFlushedQueue_ =
+        batchedBridge.getPropertyAsFunction(
+            *runtime_, "callFunctionReturnResultAndFlushedQueue");
+  });
+}
+
+void JSIExecutor::callNativeModules(const Value& queue, bool isEndOfBatch) {
+  SystraceSection s("JSIExecutor::callNativeModules");
+  // If this fails, you need to pass a fully functional delegate with a
+  // module registry to the factory/ctor.
+  CHECK(delegate_) << "Attempting to use native modules without a delegate";
+#if 0 // maybe useful for debugging
+  std::string json = runtime_->global().getPropertyAsObject(*runtime_, "JSON")
+    .getPropertyAsFunction(*runtime_, "stringify").call(*runtime_, queue)
+    .getString(*runtime_).utf8(*runtime_);
+#endif
+  delegate_->callNativeModules(
+      *this, dynamicFromValue(*runtime_, queue), isEndOfBatch);
+}
+
+void JSIExecutor::flush() {
+  SystraceSection s("JSIExecutor::flush");
+  if (flushedQueue_) {
+    callNativeModules(flushedQueue_->call(*runtime_), true);
+    return;
+  }
+
+  // When a native module is called from JS, BatchedBridge.enqueueNativeCall()
+  // is invoked.  For that to work, require('BatchedBridge') has to be called,
+  // and when that happens, __fbBatchedBridge is set as a side effect.
+  Value batchedBridge =
+      runtime_->global().getProperty(*runtime_, "__fbBatchedBridge");
+  // So here, if __fbBatchedBridge doesn't exist, then we know no native calls
+  // have happened, and we were able to determine this without forcing
+  // BatchedBridge to be loaded as a side effect.
+  if (!batchedBridge.isUndefined()) {
+    // If calls were made, we bind to the JS bridge methods, and use them to
+    // get the pending queue of native calls.
+    bindBridge();
+    callNativeModules(flushedQueue_->call(*runtime_), true);
+  } else if (delegate_) {
+    // If we have a delegate, we need to call it; we pass a null list to
+    // callNativeModules, since we know there are no native calls, without
+    // calling into JS again.  If no calls were made and there's no delegate,
+    // nothing happens, which is correct.
+    callNativeModules(nullptr, true);
+  }
+}
+
+Value JSIExecutor::nativeRequire(const Value* args, size_t count) {
+  if (count > 2 || count == 0) {
+    throw std::invalid_argument("Got wrong number of args");
+  }
+
+  uint32_t moduleId = folly::to<uint32_t>(args[0].getNumber());
+  uint32_t bundleId = count == 2 ? folly::to<uint32_t>(args[1].getNumber()) : 0;
+  auto module = bundleRegistry_->getModule(bundleId, moduleId);
+
+  runtime_->evaluateJavaScript(
+      std::make_unique<StringBuffer>(module.code), module.name);
+  return facebook::jsi::Value();
+}
+
+Value JSIExecutor::nativeCallSyncHook(const Value* args, size_t count) {
+  if (count != 3) {
+    throw std::invalid_argument("nativeCallSyncHook arg count must be 3");
+  }
+
+  if (!args[2].asObject(*runtime_).isArray(*runtime_)) {
+    throw std::invalid_argument(
+        folly::to<std::string>("method parameters should be array"));
+  }
+
+  MethodCallResult result = delegate_->callSerializableNativeHook(
+      *this,
+      static_cast<unsigned int>(args[0].getNumber()), // moduleId
+      static_cast<unsigned int>(args[1].getNumber()), // methodId
+      dynamicFromValue(*runtime_, args[2])); // args
+
+  if (!result.hasValue()) {
+    return Value::undefined();
+  }
+  return valueFromDynamic(*runtime_, result.value());
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h
new file mode 100644
index 00000000000000..51c1d86b889010
--- /dev/null
+++ b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h
@@ -0,0 +1,149 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+#include "JSINativeModules.h"
+
+#include <cxxreact/JSBigString.h>
+#include <cxxreact/JSExecutor.h>
+#include <cxxreact/RAMBundleRegistry.h>
+#include <jsi/jsi.h>
+#include <functional>
+#include <mutex>
+
+namespace facebook {
+namespace react {
+
+// A JSIScopedTimeoutInvoker is a trampoline-type function for introducing
+// timeouts. Call the TimeoutInvoker with a function to execute, the invokee.
+// The TimeoutInvoker will immediately invoke it, synchronously on the same
+// thread. If the invokee fails to return after some timeout (private to the
+// TimeoutInvoker), a soft error may be reported.
+//
+// If a soft error is reported, the second parameter errorMessageProducer will
+// be invoked to produce an error message, which will be included in the soft
+// error report. Note that the errorMessageProducer will be invoked
+// asynchronously on a different thread.
+//
+// The timeout behavior does NOT caues the invokee to aborted. If the invokee
+// blocks forever, so will the ScopedTimeoutInvoker (but the soft error may
+// still be reported).
+//
+// The invokee is passed by const ref because it is executed synchronously, but
+// the errorMessageProducer is passed by value because it must be copied or
+// moved for async execution.
+//
+// Example usage:
+//
+//   int param = ...;
+//   timeoutInvoker(
+//       [&]{ someBigWork(param); },
+//       [=] -> std::string {
+//           return "someBigWork, param " + std::to_string(param);
+//       })
+//
+using JSIScopedTimeoutInvoker = std::function<void(
+    const std::function<void()>& invokee,
+    std::function<std::string()> errorMessageProducer)>;
+
+class BigStringBuffer : public jsi::Buffer {
+ public:
+  BigStringBuffer(std::unique_ptr<const JSBigString> script)
+      : script_(std::move(script)) {}
+
+  size_t size() const override {
+    return script_->size();
+  }
+
+  const uint8_t* data() const override {
+    return reinterpret_cast<const uint8_t*>(script_->c_str());
+  }
+
+ private:
+  std::unique_ptr<const JSBigString> script_;
+};
+
+class JSIExecutor : public JSExecutor {
+ public:
+  using Logger =
+      std::function<void(const std::string& message, unsigned int logLevel)>;
+
+  using RuntimeInstaller = std::function<void(jsi::Runtime& runtime)>;
+
+  JSIExecutor(
+      std::shared_ptr<jsi::Runtime> runtime,
+      std::shared_ptr<ExecutorDelegate> delegate,
+      Logger logger,
+      const JSIScopedTimeoutInvoker& timeoutInvoker,
+      RuntimeInstaller runtimeInstaller);
+  void loadApplicationScript(
+      std::unique_ptr<const JSBigString> script,
+      std::string sourceURL) override;
+  void setBundleRegistry(std::unique_ptr<RAMBundleRegistry>) override;
+  void registerBundle(uint32_t bundleId, const std::string& bundlePath)
+      override;
+  void callFunction(
+      const std::string& moduleId,
+      const std::string& methodId,
+      const folly::dynamic& arguments) override;
+  void invokeCallback(const double callbackId, const folly::dynamic& arguments)
+      override;
+  void setGlobalVariable(
+      std::string propName,
+      std::unique_ptr<const JSBigString> jsonValue) override;
+  std::string getDescription() override;
+  void* getJavaScriptContext() override;
+  bool isInspectable() override;
+
+  // An implementation of JSIScopedTimeoutInvoker that simply runs the
+  // invokee, with no timeout.
+  static void defaultTimeoutInvoker(
+      const std::function<void()>& invokee,
+      std::function<std::string()> errorMessageProducer) {
+    (void)errorMessageProducer;
+    invokee();
+  }
+
+ private:
+  class NativeModuleProxy;
+
+  void flush();
+  void bindBridge();
+  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);
+
+  std::shared_ptr<jsi::Runtime> runtime_;
+  std::shared_ptr<ExecutorDelegate> delegate_;
+  JSINativeModules nativeModules_;
+  std::once_flag bindFlag_;
+  std::unique_ptr<RAMBundleRegistry> bundleRegistry_;
+  Logger logger_;
+  JSIScopedTimeoutInvoker scopedTimeoutInvoker_;
+  RuntimeInstaller runtimeInstaller_;
+
+  folly::Optional<jsi::Function> callFunctionReturnFlushedQueue_;
+  folly::Optional<jsi::Function> invokeCallbackAndReturnFlushedQueue_;
+  folly::Optional<jsi::Function> flushedQueue_;
+  folly::Optional<jsi::Function> callFunctionReturnResultAndFlushedQueue_;
+};
+
+class JSIExecutorFactory : public JSExecutorFactory {
+ public:
+  explicit JSIExecutorFactory(
+      std::shared_ptr<jsi::Runtime> runtime,
+      JSIExecutor::Logger logger,
+      JSIExecutor::RuntimeInstaller);
+
+  std::unique_ptr<JSExecutor> createJSExecutor(
+      std::shared_ptr<ExecutorDelegate> delegate,
+      std::shared_ptr<MessageQueueThread> jsQueue) override;
+
+ private:
+  std::shared_ptr<jsi::Runtime> runtime_;
+  JSIExecutor::Logger logger_;
+  JSIExecutor::RuntimeInstaller runtimeInstaller_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp b/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp
new file mode 100644
index 00000000000000..7a5e0673ceb7c9
--- /dev/null
+++ b/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp
@@ -0,0 +1,86 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "jsireact/JSINativeModules.h"
+
+#include <cxxreact/ReactMarker.h>
+
+#include <jsi/JSIDynamic.h>
+
+#include <string>
+
+using namespace facebook::jsi;
+
+namespace facebook {
+namespace react {
+
+JSINativeModules::JSINativeModules(
+    std::shared_ptr<ModuleRegistry> moduleRegistry)
+    : m_moduleRegistry(std::move(moduleRegistry)) {}
+
+Value JSINativeModules::getModule(Runtime& rt, const PropNameID& name) {
+  if (!m_moduleRegistry) {
+    return nullptr;
+  }
+
+  std::string moduleName = name.utf8(rt);
+
+  const auto it = m_objects.find(moduleName);
+  if (it != m_objects.end()) {
+    return Value(rt, it->second);
+  }
+
+  auto module = createModule(rt, moduleName);
+  if (!module.hasValue()) {
+    // Allow lookup to continue in the objects own properties, which allows for
+    // overrides of NativeModules
+    return nullptr;
+  }
+
+  auto result =
+      m_objects.emplace(std::move(moduleName), std::move(*module)).first;
+  return Value(rt, result->second);
+}
+
+void JSINativeModules::reset() {
+  m_genNativeModuleJS = nullptr;
+  m_objects.clear();
+}
+
+folly::Optional<Object> JSINativeModules::createModule(
+    Runtime& rt,
+    const std::string& name) {
+  bool hasLogger(ReactMarker::logTaggedMarker);
+  if (hasLogger) {
+    ReactMarker::logTaggedMarker(
+        ReactMarker::NATIVE_MODULE_SETUP_START, name.c_str());
+  }
+
+  if (!m_genNativeModuleJS) {
+    m_genNativeModuleJS =
+        rt.global().getPropertyAsFunction(rt, "__fbGenNativeModule");
+  }
+
+  auto result = m_moduleRegistry->getConfig(name);
+  if (!result.hasValue()) {
+    return nullptr;
+  }
+
+  Value moduleInfo = m_genNativeModuleJS->call(
+      rt,
+      valueFromDynamic(rt, result->config),
+      static_cast<double>(result->index));
+  CHECK(!moduleInfo.isNull()) << "Module returned from genNativeModule is null";
+
+  folly::Optional<Object> module(
+      moduleInfo.asObject(rt).getPropertyAsObject(rt, "module"));
+
+  if (hasLogger) {
+    ReactMarker::logTaggedMarker(
+        ReactMarker::NATIVE_MODULE_SETUP_STOP, name.c_str());
+  }
+
+  return module;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/jsiexecutor/jsireact/JSINativeModules.h b/ReactCommon/jsiexecutor/jsireact/JSINativeModules.h
new file mode 100644
index 00000000000000..6b7ff731a09b8b
--- /dev/null
+++ b/ReactCommon/jsiexecutor/jsireact/JSINativeModules.h
@@ -0,0 +1,35 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include <cxxreact/ModuleRegistry.h>
+#include <folly/Optional.h>
+#include <jsi/jsi.h>
+
+namespace facebook {
+namespace react {
+
+/**
+ * Holds and creates JS representations of the modules in ModuleRegistry
+ */
+class JSINativeModules {
+ public:
+  explicit JSINativeModules(std::shared_ptr<ModuleRegistry> moduleRegistry);
+  jsi::Value getModule(jsi::Runtime& rt, const jsi::PropNameID& name);
+  void reset();
+
+ private:
+  folly::Optional<jsi::Function> m_genNativeModuleJS;
+  std::shared_ptr<ModuleRegistry> m_moduleRegistry;
+  std::unordered_map<std::string, jsi::Object> m_objects;
+
+  folly::Optional<jsi::Object> createModule(
+      jsi::Runtime& rt,
+      const std::string& name);
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/jsinspector/Android.mk b/ReactCommon/jsinspector/Android.mk
index d93747b7fca71f..2e36c22745a7d1 100644
--- a/ReactCommon/jsinspector/Android.mk
+++ b/ReactCommon/jsinspector/Android.mk
@@ -4,15 +4,11 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := jsinspector
 
-LOCAL_SRC_FILES := \
-  InspectorInterfaces.cpp
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 
-LOCAL_CFLAGS += -Wall -Werror -fexceptions
-CXX11_FLAGS := -std=c++11
-LOCAL_CFLAGS += $(CXX11_FLAGS)
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
+LOCAL_CFLAGS += -fexceptions
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactCommon/jsinspector/BUCK b/ReactCommon/jsinspector/BUCK
index ceb0293f71eb1c..7d9baea11c6171 100644
--- a/ReactCommon/jsinspector/BUCK
+++ b/ReactCommon/jsinspector/BUCK
@@ -1,5 +1,5 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library")
+load("@fbsource//tools/build_defs:glob_defs.bzl", "subdir_glob")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_xplat_cxx_library")
 
 EXPORTED_HEADERS = [
     "InspectorInterfaces.h",
diff --git a/ReactCommon/jsinspector/InspectorInterfaces.cpp b/ReactCommon/jsinspector/InspectorInterfaces.cpp
index 326495d031162a..b4f0af30fe1443 100644
--- a/ReactCommon/jsinspector/InspectorInterfaces.cpp
+++ b/ReactCommon/jsinspector/InspectorInterfaces.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/jsinspector/InspectorInterfaces.h b/ReactCommon/jsinspector/InspectorInterfaces.h
index c37c2d574d2ff8..e8b0c94235574f 100644
--- a/ReactCommon/jsinspector/InspectorInterfaces.h
+++ b/ReactCommon/jsinspector/InspectorInterfaces.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/microprofiler/BUCK b/ReactCommon/microprofiler/BUCK
index d35af4ee2cbdba..a67104a8c859d3 100644
--- a/ReactCommon/microprofiler/BUCK
+++ b/ReactCommon/microprofiler/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "GLOG_DEP", "cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "GLOG_DEP", "cxx_library")
 
 cxx_library(
     name = "microprofiler",
diff --git a/ReactCommon/microprofiler/MicroProfiler.cpp b/ReactCommon/microprofiler/MicroProfiler.cpp
index 0f1e860e4a99ae..8bee8cd75eb628 100644
--- a/ReactCommon/microprofiler/MicroProfiler.cpp
+++ b/ReactCommon/microprofiler/MicroProfiler.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/microprofiler/MicroProfiler.h b/ReactCommon/microprofiler/MicroProfiler.h
index 30658da0b7233e..797ab0dfd38b0a 100644
--- a/ReactCommon/microprofiler/MicroProfiler.h
+++ b/ReactCommon/microprofiler/MicroProfiler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/privatedata/Android.mk b/ReactCommon/privatedata/Android.mk
deleted file mode 100644
index d467706151ec5e..00000000000000
--- a/ReactCommon/privatedata/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := privatedata
-
-LOCAL_SRC_FILES := \
-  PrivateDataBase.cpp \
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
-
-LOCAL_CFLAGS := \
-  -DLOG_TAG=\"ReactNative\"
-
-LOCAL_CFLAGS += -Wall -Werror -fexceptions -frtti
-CXX11_FLAGS := -std=c++11
-LOCAL_CFLAGS += $(CXX11_FLAGS)
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactCommon/privatedata/BUCK b/ReactCommon/privatedata/BUCK
deleted file mode 100644
index abd0de4d498eca..00000000000000
--- a/ReactCommon/privatedata/BUCK
+++ /dev/null
@@ -1,24 +0,0 @@
-load("@xplat//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library")
-
-rn_xplat_cxx_library(
-    name = "privatedata",
-    srcs = glob(["**/*.cpp"]),
-    header_namespace = "",
-    exported_headers = subdir_glob(
-        [
-            ("", "**/*.h"),
-        ],
-        prefix = "privatedata",
-    ),
-    compiler_flags = [
-        "-Wall",
-        "-fexceptions",
-        "-frtti",
-        "-fvisibility=hidden",
-        "-std=c++1y",
-    ],
-    visibility = [
-        "PUBLIC",
-    ],
-)
diff --git a/ReactCommon/privatedata/PrivateDataBase.cpp b/ReactCommon/privatedata/PrivateDataBase.cpp
deleted file mode 100644
index dd76506594c4bb..00000000000000
--- a/ReactCommon/privatedata/PrivateDataBase.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// This source code is licensed under the MIT license found in the
-// LICENSE file in the root directory of this source tree.
-
-#include "PrivateDataBase.h"
-
-namespace facebook {
-namespace react {
-
-PrivateDataBase::~PrivateDataBase() {}
-
-} }
diff --git a/ReactCommon/privatedata/PrivateDataBase.h b/ReactCommon/privatedata/PrivateDataBase.h
deleted file mode 100644
index 4553e80efcd978..00000000000000
--- a/ReactCommon/privatedata/PrivateDataBase.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) 2004-present, Facebook, Inc.
-
-// 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 <cassert>
-#include <cstdlib>
-#include <type_traits>
-
-#ifndef RN_EXPORT
-#define RN_EXPORT __attribute__((visibility("default")))
-#endif
-
-namespace facebook {
-namespace react {
-
-// Base class for private data used to implement hybrid JS-native objects. A common root class,
-// rtti and dynamic_cast allow us to do some runtime type checking that makes it possible
-// for multiple hybrid object implementations to co-exist.
-class RN_EXPORT PrivateDataBase {
- public:
-  virtual ~PrivateDataBase();
-
-  // Casts given void* to PrivateDataBase and performs dynamic_cast to desired type. Returns null on
-  // failure.
-  template <typename T>
-  static typename std::enable_if<std::is_base_of<PrivateDataBase, T>::value, T>::type* tryCast(void* ptr) {
-    return dynamic_cast<T*>(reinterpret_cast<PrivateDataBase*>(ptr));
-  }
-
-  // Like tryCast, but aborts on failure.
-  template <typename T>
-  static typename std::enable_if<std::is_base_of<PrivateDataBase, T>::value, T>::type* cast(void* ptr) {
-    auto result = tryCast<T>(ptr);
-    if (!result) {
-      assert(false && "could not cast to desired type");
-      abort();
-    }
-    return result;
-  }
-};
-
-} }
diff --git a/ReactCommon/yoga/Android.mk b/ReactCommon/yoga/Android.mk
index c3579fb2a67eae..07e664037f359d 100644
--- a/ReactCommon/yoga/Android.mk
+++ b/ReactCommon/yoga/Android.mk
@@ -9,6 +9,6 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/yoga/*.cpp)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 
-LOCAL_CFLAGS := -Wall -Werror -fexceptions -frtti -std=c++1y -O3
+LOCAL_CFLAGS := -fexceptions -frtti -O3
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactCommon/yoga/BUCK b/ReactCommon/yoga/BUCK
index 43ac549233609d..49ac7854aecba7 100644
--- a/ReactCommon/yoga/BUCK
+++ b/ReactCommon/yoga/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "cxx_library")
 
 cxx_library(
     name = "yoga",
diff --git a/ReactCommon/yoga/yoga/Utils.cpp b/ReactCommon/yoga/yoga/Utils.cpp
index 6fa8df823ba32f..fa21a55b68d644 100644
--- a/ReactCommon/yoga/yoga/Utils.cpp
+++ b/ReactCommon/yoga/yoga/Utils.cpp
@@ -1,12 +1,14 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
  */
-
 #include "Utils.h"
 
+using namespace facebook;
+
 YGFlexDirection YGFlexDirectionCross(
     const YGFlexDirection flexDirection,
     const YGDirection direction) {
@@ -16,18 +18,18 @@ YGFlexDirection YGFlexDirectionCross(
 }
 
 float YGFloatMax(const float a, const float b) {
-  if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
+  if (!yoga::isUndefined(a) && !yoga::isUndefined(b)) {
     return fmaxf(a, b);
   }
-  return YGFloatIsUndefined(a) ? b : a;
+  return yoga::isUndefined(a) ? b : a;
 }
 
 float YGFloatMin(const float a, const float b) {
-  if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
+  if (!yoga::isUndefined(a) && !yoga::isUndefined(b)) {
     return fminf(a, b);
   }
 
-  return YGFloatIsUndefined(a) ? b : a;
+  return yoga::isUndefined(a) ? b : a;
 }
 
 bool YGValueEqual(const YGValue a, const YGValue b) {
@@ -36,7 +38,7 @@ bool YGValueEqual(const YGValue a, const YGValue b) {
   }
 
   if (a.unit == YGUnitUndefined ||
-      (YGFloatIsUndefined(a.value) && YGFloatIsUndefined(b.value))) {
+      (yoga::isUndefined(a.value) && yoga::isUndefined(b.value))) {
     return true;
   }
 
@@ -44,14 +46,14 @@ bool YGValueEqual(const YGValue a, const YGValue b) {
 }
 
 bool YGFloatsEqual(const float a, const float b) {
-  if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
+  if (!yoga::isUndefined(a) && !yoga::isUndefined(b)) {
     return fabs(a - b) < 0.0001f;
   }
-  return YGFloatIsUndefined(a) && YGFloatIsUndefined(b);
+  return yoga::isUndefined(a) && yoga::isUndefined(b);
 }
 
 float YGFloatSanitize(const float& val) {
-  return YGFloatIsUndefined(val) ? 0 : val;
+  return yoga::isUndefined(val) ? 0 : val;
 }
 
 float YGUnwrapFloatOptional(const YGFloatOptional& op) {
diff --git a/ReactCommon/yoga/yoga/Utils.h b/ReactCommon/yoga/yoga/Utils.h
index 6c95b1e7aaf772..e538cad9c50f08 100644
--- a/ReactCommon/yoga/yoga/Utils.h
+++ b/ReactCommon/yoga/yoga/Utils.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/yoga/yoga/YGConfig.cpp b/ReactCommon/yoga/yoga/YGConfig.cpp
index 5cee527852fc90..646f8d929ff9eb 100644
--- a/ReactCommon/yoga/yoga/YGConfig.cpp
+++ b/ReactCommon/yoga/yoga/YGConfig.cpp
@@ -1,10 +1,10 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
  */
-
 #include "YGConfig.h"
 
 const std::array<bool, YGExperimentalFeatureCount>
@@ -15,5 +15,8 @@ YGConfig::YGConfig(YGLogger logger)
       useWebDefaults(false),
       useLegacyStretchBehaviour(false),
       shouldDiffLayoutWithoutLegacyStretchBehaviour(false),
-      pointScaleFactor(1.0f), logger(logger), cloneNodeCallback(nullptr),
-      context(nullptr) {}
+      pointScaleFactor(1.0f),
+      logger(logger),
+      cloneNodeCallback(nullptr),
+      context(nullptr),
+      printTree(false) {}
diff --git a/ReactCommon/yoga/yoga/YGConfig.h b/ReactCommon/yoga/yoga/YGConfig.h
index 0f655d1be3e6a1..3718133a511912 100644
--- a/ReactCommon/yoga/yoga/YGConfig.h
+++ b/ReactCommon/yoga/yoga/YGConfig.h
@@ -1,10 +1,10 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * 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 "Yoga-internal.h"
 #include "Yoga.h"
@@ -18,6 +18,7 @@ struct YGConfig {
   YGLogger logger;
   YGCloneNodeFunc cloneNodeCallback;
   void* context;
+  bool printTree;
 
   YGConfig(YGLogger logger);
 };
diff --git a/ReactCommon/yoga/yoga/YGEnums.cpp b/ReactCommon/yoga/yoga/YGEnums.cpp
index 7f16628ce14910..5f8ef9af263b8f 100644
--- a/ReactCommon/yoga/yoga/YGEnums.cpp
+++ b/ReactCommon/yoga/yoga/YGEnums.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/yoga/yoga/YGEnums.h b/ReactCommon/yoga/yoga/YGEnums.h
index 0976d78d947923..db555281374a0f 100644
--- a/ReactCommon/yoga/yoga/YGEnums.h
+++ b/ReactCommon/yoga/yoga/YGEnums.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/yoga/yoga/YGFloatOptional.cpp b/ReactCommon/yoga/yoga/YGFloatOptional.cpp
index ceee1dc28176af..c7ade6a2462425 100644
--- a/ReactCommon/yoga/yoga/YGFloatOptional.cpp
+++ b/ReactCommon/yoga/yoga/YGFloatOptional.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
@@ -9,9 +9,12 @@
 #include <cstdlib>
 #include <iostream>
 #include "Yoga.h"
+#include "Yoga-internal.h"
+
+using namespace facebook;
 
 YGFloatOptional::YGFloatOptional(float value) {
-  if (YGFloatIsUndefined(value)) {
+  if (yoga::isUndefined(value)) {
     isUndefined_ = true;
     value_ = 0;
   } else {
@@ -20,9 +23,7 @@ YGFloatOptional::YGFloatOptional(float value) {
   }
 }
 
-YGFloatOptional::YGFloatOptional() : value_(0), isUndefined_(true) {}
-
-const float& YGFloatOptional::getValue() const {
+float YGFloatOptional::getValue() const {
   if (isUndefined_) {
     // Abort, accessing a value of an undefined float optional
     std::cerr << "Tried to get value of an undefined YGFloatOptional\n";
@@ -43,7 +44,7 @@ bool YGFloatOptional::operator!=(const YGFloatOptional& op) const {
 }
 
 bool YGFloatOptional::operator==(float val) const {
-  if (YGFloatIsUndefined(val) == isUndefined_) {
+  if (yoga::isUndefined(val) == isUndefined_) {
     return isUndefined_ || val == value_;
   }
   return false;
diff --git a/ReactCommon/yoga/yoga/YGFloatOptional.h b/ReactCommon/yoga/yoga/YGFloatOptional.h
index d426d8491ec408..00acc31395e9ca 100644
--- a/ReactCommon/yoga/yoga/YGFloatOptional.h
+++ b/ReactCommon/yoga/yoga/YGFloatOptional.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
@@ -14,12 +14,12 @@ struct YGFloatOptional {
 
  public:
   explicit YGFloatOptional(float value);
-  explicit YGFloatOptional();
+  explicit YGFloatOptional() : value_(0), isUndefined_(true) {}
 
   // Program will terminate if the value of an undefined is accessed. Please
   // make sure to check if the optional is defined before calling this function.
   // To check if float optional is defined, use `isUndefined()`.
-  const float& getValue() const;
+  float getValue() const;
 
   // Sets the value of float optional, and thus isUndefined is assigned false.
   void setValue(float val) {
diff --git a/ReactCommon/yoga/yoga/YGLayout.cpp b/ReactCommon/yoga/yoga/YGLayout.cpp
index 6e367bd50a9b03..fea7015f2863df 100644
--- a/ReactCommon/yoga/yoga/YGLayout.cpp
+++ b/ReactCommon/yoga/yoga/YGLayout.cpp
@@ -1,13 +1,15 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
  */
-
 #include "YGLayout.h"
 #include "Utils.h"
 
+using namespace facebook;
+
 const std::array<float, 2> kYGDefaultDimensionValues = {
     {YGUndefined, YGUndefined}};
 
@@ -46,20 +48,16 @@ bool YGLayout::operator==(YGLayout layout) const {
     isEqual = isEqual && cachedMeasurements[i] == layout.cachedMeasurements[i];
   }
 
-  if (!YGFloatIsUndefined(measuredDimensions[0]) ||
-      !YGFloatIsUndefined(layout.measuredDimensions[0])) {
+  if (!yoga::isUndefined(measuredDimensions[0]) ||
+      !yoga::isUndefined(layout.measuredDimensions[0])) {
     isEqual =
         isEqual && (measuredDimensions[0] == layout.measuredDimensions[0]);
   }
-  if (!YGFloatIsUndefined(measuredDimensions[1]) ||
-      !YGFloatIsUndefined(layout.measuredDimensions[1])) {
+  if (!yoga::isUndefined(measuredDimensions[1]) ||
+      !yoga::isUndefined(layout.measuredDimensions[1])) {
     isEqual =
         isEqual && (measuredDimensions[1] == layout.measuredDimensions[1]);
   }
 
   return isEqual;
 }
-
-bool YGLayout::operator!=(YGLayout layout) const {
-  return !(*this == layout);
-}
diff --git a/ReactCommon/yoga/yoga/YGLayout.h b/ReactCommon/yoga/yoga/YGLayout.h
index 46ca130d29bf46..22f2a1eb42bff3 100644
--- a/ReactCommon/yoga/yoga/YGLayout.h
+++ b/ReactCommon/yoga/yoga/YGLayout.h
@@ -1,10 +1,10 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * 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 "YGFloatOptional.h"
 #include "Yoga-internal.h"
@@ -38,5 +38,7 @@ struct YGLayout {
   YGLayout();
 
   bool operator==(YGLayout layout) const;
-  bool operator!=(YGLayout layout) const;
+  bool operator!=(YGLayout layout) const {
+    return !(*this == layout);
+  }
 };
diff --git a/ReactCommon/yoga/yoga/YGMacros.h b/ReactCommon/yoga/yoga/YGMacros.h
index 15ed81d3820a2d..0aafdca36f22c5 100644
--- a/ReactCommon/yoga/yoga/YGMacros.h
+++ b/ReactCommon/yoga/yoga/YGMacros.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/yoga/yoga/YGNode.cpp b/ReactCommon/yoga/yoga/YGNode.cpp
index 13571a9d62fbc8..76f662e710c2bd 100644
--- a/ReactCommon/yoga/yoga/YGNode.cpp
+++ b/ReactCommon/yoga/yoga/YGNode.cpp
@@ -1,14 +1,16 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
+/*
+ *  Copyright (c) 2018-present, Facebook, Inc.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
  */
-
 #include "YGNode.h"
 #include <iostream>
 #include "Utils.h"
 
+using namespace facebook;
+
 YGFloatOptional YGNode::getLeadingPosition(
     const YGFlexDirection& axis,
     const float& axisSize) const {
@@ -97,8 +99,6 @@ YGFloatOptional YGNode::getMarginForAxis(
 
 // Setters
 
-
-
 void YGNode::setMeasureFunc(YGMeasureFunc measureFunc) {
   if (measureFunc == nullptr) {
     measure_ = nullptr;
@@ -254,76 +254,6 @@ void YGNode::setPosition(
       trailing[crossAxis]);
 }
 
-YGNode::YGNode()
-    : context_(nullptr),
-      print_(nullptr),
-      hasNewLayout_(true),
-      nodeType_(YGNodeTypeDefault),
-      measure_(nullptr),
-      baseline_(nullptr),
-      dirtied_(nullptr),
-      style_(YGStyle()),
-      layout_(YGLayout()),
-      lineIndex_(0),
-      owner_(nullptr),
-      children_(YGVector()),
-      config_(nullptr),
-      isDirty_(false),
-      resolvedDimensions_({{YGValueUndefined, YGValueUndefined}}) {}
-
-YGNode::YGNode(const YGNode& node)
-    : context_(node.context_),
-      print_(node.print_),
-      hasNewLayout_(node.hasNewLayout_),
-      nodeType_(node.nodeType_),
-      measure_(node.measure_),
-      baseline_(node.baseline_),
-      dirtied_(node.dirtied_),
-      style_(node.style_),
-      layout_(node.layout_),
-      lineIndex_(node.lineIndex_),
-      owner_(node.owner_),
-      children_(node.children_),
-      config_(node.config_),
-      isDirty_(node.isDirty_),
-      resolvedDimensions_(node.resolvedDimensions_) {}
-
-YGNode::YGNode(const YGConfigRef newConfig) : YGNode() {
-  config_ = newConfig;
-}
-
-YGNode::YGNode(
-    void* context,
-    YGPrintFunc print,
-    bool hasNewLayout,
-    YGNodeType nodeType,
-    YGMeasureFunc measure,
-    YGBaselineFunc baseline,
-    YGDirtiedFunc dirtied,
-    YGStyle style,
-    const YGLayout& layout,
-    uint32_t lineIndex,
-    YGNodeRef owner,
-    const YGVector& children,
-    YGConfigRef config,
-    bool isDirty,
-    std::array<YGValue, 2> resolvedDimensions)
-    : context_(context),
-      print_(print),
-      hasNewLayout_(hasNewLayout),
-      nodeType_(nodeType),
-      measure_(measure),
-      baseline_(baseline),
-      dirtied_(dirtied),
-      style_(style),
-      layout_(layout),
-      lineIndex_(lineIndex),
-      owner_(owner),
-      children_(children),
-      config_(config),
-      isDirty_(isDirty),
-      resolvedDimensions_(resolvedDimensions) {}
-
 YGNode& YGNode::operator=(const YGNode& node) {
   if (&node == this) {
     return *this;
@@ -396,7 +326,7 @@ void YGNode::resolveDimension() {
 YGDirection YGNode::resolveDirection(const YGDirection ownerDirection) {
   if (style_.direction == YGDirectionInherit) {
     return ownerDirection > YGDirectionInherit ? ownerDirection
-                                                : YGDirectionLTR;
+                                               : YGDirectionLTR;
   } else {
     return style_.direction;
   }
@@ -407,11 +337,6 @@ void YGNode::clearChildren() {
   children_.shrink_to_fit();
 }
 
-YGNode::~YGNode() {
-  // All the member variables are deallocated externally, so no need to
-  // deallocate here
-}
-
 // Other Methods
 
 void YGNode::cloneChildrenIfNeeded() {
@@ -502,7 +427,7 @@ bool YGNode::isNodeFlexible() {
 float YGNode::getLeadingBorder(const YGFlexDirection& axis) const {
   if (YGFlexDirectionIsRow(axis) &&
       style_.border[YGEdgeStart].unit != YGUnitUndefined &&
-      !YGFloatIsUndefined(style_.border[YGEdgeStart].value) &&
+      !yoga::isUndefined(style_.border[YGEdgeStart].value) &&
       style_.border[YGEdgeStart].value >= 0.0f) {
     return style_.border[YGEdgeStart].value;
   }
@@ -515,7 +440,7 @@ float YGNode::getLeadingBorder(const YGFlexDirection& axis) const {
 float YGNode::getTrailingBorder(const YGFlexDirection& flexDirection) const {
   if (YGFlexDirectionIsRow(flexDirection) &&
       style_.border[YGEdgeEnd].unit != YGUnitUndefined &&
-      !YGFloatIsUndefined(style_.border[YGEdgeEnd].value) &&
+      !yoga::isUndefined(style_.border[YGEdgeEnd].value) &&
       style_.border[YGEdgeEnd].value >= 0.0f) {
     return style_.border[YGEdgeEnd].value;
   }
@@ -533,7 +458,7 @@ YGFloatOptional YGNode::getLeadingPadding(
       YGResolveValue(style_.padding[YGEdgeStart], widthSize);
   if (YGFlexDirectionIsRow(axis) &&
       style_.padding[YGEdgeStart].unit != YGUnitUndefined &&
-      !paddingEdgeStart.isUndefined() && paddingEdgeStart.getValue() > 0.0f) {
+      !paddingEdgeStart.isUndefined() && paddingEdgeStart.getValue() >= 0.0f) {
     return paddingEdgeStart;
   }
 
diff --git a/ReactCommon/yoga/yoga/YGNode.h b/ReactCommon/yoga/yoga/YGNode.h
index ab302e06727ece..d771aad24609cc 100644
--- a/ReactCommon/yoga/yoga/YGNode.h
+++ b/ReactCommon/yoga/yoga/YGNode.h
@@ -1,10 +1,10 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * 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 <stdio.h>
 #include "YGConfig.h"
@@ -14,48 +14,33 @@
 
 struct YGNode {
  private:
-  void* context_;
-  YGPrintFunc print_;
-  bool hasNewLayout_;
-  YGNodeType nodeType_;
-  YGMeasureFunc measure_;
-  YGBaselineFunc baseline_;
-  YGDirtiedFunc dirtied_;
-  YGStyle style_;
-  YGLayout layout_;
-  uint32_t lineIndex_;
-  YGNodeRef owner_;
-  YGVector children_;
-  YGConfigRef config_;
-  bool isDirty_;
-  std::array<YGValue, 2> resolvedDimensions_;
+  void* context_ = nullptr;
+  YGPrintFunc print_ = nullptr;
+  bool hasNewLayout_ = true;
+  YGNodeType nodeType_ = YGNodeTypeDefault;
+  YGMeasureFunc measure_ = nullptr;
+  YGBaselineFunc baseline_ = nullptr;
+  YGDirtiedFunc dirtied_ = nullptr;
+  YGStyle style_ = {};
+  YGLayout layout_ = {};
+  uint32_t lineIndex_ = 0;
+  YGNodeRef owner_ = nullptr;
+  YGVector children_ = {};
+  YGConfigRef config_ = nullptr;
+  bool isDirty_ = false;
+  std::array<YGValue, 2> resolvedDimensions_ = {
+      {YGValueUndefined, YGValueUndefined}};
 
   YGFloatOptional relativePosition(
       const YGFlexDirection& axis,
       const float& axisSize) const;
 
  public:
-  YGNode();
-  ~YGNode();
-  explicit YGNode(const YGConfigRef newConfig);
-  YGNode(const YGNode& node);
+  YGNode() = default;
+  ~YGNode() = default; // cleanup of owner/children relationships in YGNodeFree
+  explicit YGNode(const YGConfigRef newConfig) : config_(newConfig){};
+  YGNode(const YGNode& node) = default;
   YGNode& operator=(const YGNode& node);
-  YGNode(
-      void* context,
-      YGPrintFunc print,
-      bool hasNewLayout,
-      YGNodeType nodeType,
-      YGMeasureFunc measure,
-      YGBaselineFunc baseline,
-      YGDirtiedFunc dirtied,
-      YGStyle style,
-      const YGLayout& layout,
-      uint32_t lineIndex,
-      YGNodeRef owner,
-      const YGVector& children,
-      YGConfigRef config,
-      bool isDirty,
-      std::array<YGValue, 2> resolvedDimensions);
 
   // Getters
   void* getContext() const {
@@ -69,23 +54,23 @@ struct YGNode {
   bool getHasNewLayout() const {
     return hasNewLayout_;
   }
-  
+
   YGNodeType getNodeType() const {
     return nodeType_;
   }
-  
+
   YGMeasureFunc getMeasure() const {
     return measure_;
   }
-  
+
   YGBaselineFunc getBaseline() const {
     return baseline_;
   }
-  
+
   YGDirtiedFunc getDirtied() const {
     return dirtied_;
   }
-  
+
   // For Performance reasons passing as reference.
   YGStyle& getStyle() {
     return style_;
@@ -103,11 +88,11 @@ struct YGNode {
   const YGLayout& getLayout() const {
     return layout_;
   }
-  
+
   uint32_t getLineIndex() const {
     return lineIndex_;
   }
-  
+
   // returns the YGNodeRef that owns this YGNode. An owner is used to identify
   // the YogaTree that a YGNode belongs to.
   // This method will return the parent of the YGNode when a YGNode only belongs
@@ -116,20 +101,16 @@ struct YGNode {
   YGNodeRef getOwner() const {
     return owner_;
   }
-  
+
   // Deprecated, use getOwner() instead.
   YGNodeRef getParent() const {
     return getOwner();
   }
-  
-  YGVector getChildren() const {
+
+  const YGVector& getChildren() const {
     return children_;
   }
-  
-  uint32_t getChildrenCount() const {
-    return static_cast<uint32_t>(children_.size());
-  }
-  
+
   YGNodeRef getChild(uint32_t index) const {
     return children_.at(index);
   }
@@ -137,21 +118,22 @@ struct YGNode {
   YGConfigRef getConfig() const {
     return config_;
   }
-  
+
   bool isDirty() const {
     return isDirty_;
   }
-  
+
   std::array<YGValue, 2> getResolvedDimensions() const {
     return resolvedDimensions_;
   }
-  
+
   YGValue getResolvedDimension(int index) const {
     return resolvedDimensions_[index];
   }
 
   // Methods related to positions, margin, padding and border
-  YGFloatOptional getLeadingPosition(const YGFlexDirection& axis,
+  YGFloatOptional getLeadingPosition(
+      const YGFlexDirection& axis,
       const float& axisSize) const;
   bool isLeadingPositionDefined(const YGFlexDirection& axis) const;
   bool isTrailingPosDefined(const YGFlexDirection& axis) const;
@@ -194,7 +176,7 @@ struct YGNode {
   void setHasNewLayout(bool hasNewLayout) {
     hasNewLayout_ = hasNewLayout;
   }
-  
+
   void setNodeType(YGNodeType nodeType) {
     nodeType_ = nodeType;
   }
@@ -220,15 +202,15 @@ struct YGNode {
   void setStyle(const YGStyle& style) {
     style_ = style;
   }
-  
+
   void setLayout(const YGLayout& layout) {
     layout_ = layout;
   }
-  
+
   void setLineIndex(uint32_t lineIndex) {
     lineIndex_ = lineIndex;
   }
-  
+
   void setOwner(YGNodeRef owner) {
     owner_ = owner;
   }
@@ -238,7 +220,7 @@ struct YGNode {
   }
 
   // TODO: rvalue override for setChildren
-  
+
   void setConfig(YGConfigRef config) {
     config_ = config;
   }
diff --git a/ReactCommon/yoga/yoga/YGNodePrint.cpp b/ReactCommon/yoga/yoga/YGNodePrint.cpp
index ab3aa7c7b3be04..cd11bec6cad4bc 100644
--- a/ReactCommon/yoga/yoga/YGNodePrint.cpp
+++ b/ReactCommon/yoga/yoga/YGNodePrint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/yoga/yoga/YGNodePrint.h b/ReactCommon/yoga/yoga/YGNodePrint.h
index 16259fcff7cf8e..a4f24cb5bec929 100644
--- a/ReactCommon/yoga/yoga/YGNodePrint.h
+++ b/ReactCommon/yoga/yoga/YGNodePrint.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/ReactCommon/yoga/yoga/YGStyle.cpp b/ReactCommon/yoga/yoga/YGStyle.cpp
index 7664dcf8e59cb3..44fd9e50b2fb1b 100644
--- a/ReactCommon/yoga/yoga/YGStyle.cpp
+++ b/ReactCommon/yoga/yoga/YGStyle.cpp
@@ -1,10 +1,10 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
  */
-
 #include "YGStyle.h"
 
 const YGValue kYGValueUndefined = {0, YGUnitUndefined};
@@ -98,9 +98,3 @@ bool YGStyle::operator==(const YGStyle& style) {
 
   return areNonFloatValuesEqual;
 }
-
-bool YGStyle::operator!=(YGStyle style) {
-  return !(*this == style);
-}
-
-YGStyle::~YGStyle() {}
diff --git a/ReactCommon/yoga/yoga/YGStyle.h b/ReactCommon/yoga/yoga/YGStyle.h
index f0f97bd8faf1f0..efd52fffbbeda2 100644
--- a/ReactCommon/yoga/yoga/YGStyle.h
+++ b/ReactCommon/yoga/yoga/YGStyle.h
@@ -1,16 +1,18 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * 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 "YGFloatOptional.h"
 #include "Yoga-internal.h"
 #include "Yoga.h"
 
 struct YGStyle {
+  using Dimensions = std::array<YGValue, 2>;
+
   YGDirection direction;
   YGFlexDirection flexDirection;
   YGJustify justifyContent;
@@ -29,15 +31,17 @@ struct YGStyle {
   std::array<YGValue, YGEdgeCount> position;
   std::array<YGValue, YGEdgeCount> padding;
   std::array<YGValue, YGEdgeCount> border;
-  std::array<YGValue, 2> dimensions;
-  std::array<YGValue, 2> minDimensions;
-  std::array<YGValue, 2> maxDimensions;
+  Dimensions dimensions;
+  Dimensions minDimensions;
+  Dimensions maxDimensions;
+  // Yoga specific properties, not compatible with flexbox specification
   YGFloatOptional aspectRatio;
 
   YGStyle();
-  // Yoga specific properties, not compatible with flexbox specification
   bool operator==(const YGStyle& style);
 
-  bool operator!=(YGStyle style);
-  ~YGStyle();
+  bool operator!=(YGStyle style) {
+    return !(*this == style);
+  }
+  ~YGStyle() = default;
 };
diff --git a/ReactCommon/yoga/yoga/Yoga-internal.h b/ReactCommon/yoga/yoga/Yoga-internal.h
index be1d96325b95be..0e02646cdcd58d 100644
--- a/ReactCommon/yoga/yoga/Yoga-internal.h
+++ b/ReactCommon/yoga/yoga/Yoga-internal.h
@@ -1,10 +1,10 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * 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 <algorithm>
 #include <array>
@@ -16,13 +16,34 @@ using YGVector = std::vector<YGNodeRef>;
 
 YG_EXTERN_C_BEGIN
 
-WIN_EXPORT float YGRoundValueToPixelGrid(const float value,
-                                         const float pointScaleFactor,
-                                         const bool forceCeil,
-                                         const bool forceFloor);
+WIN_EXPORT float YGRoundValueToPixelGrid(
+    const float value,
+    const float pointScaleFactor,
+    const bool forceCeil,
+    const bool forceFloor);
 
 YG_EXTERN_C_END
 
+namespace facebook {
+namespace yoga {
+
+inline bool isUndefined(float value) {
+  // Value of a float in the case of it being not defined is 10.1E20. Earlier
+  // it used to be NAN, the benefit of which was that if NAN is involved in any
+  // mathematical expression the result was NAN. But since we want to have
+  // `-ffast-math` flag being used by compiler which assumes that the floating
+  // point values are not NAN and Inf, we represent YGUndefined as 10.1E20. But
+  // now if YGUndefined is involved in any mathematical operations this
+  // value(10.1E20) would change. So the following check makes sure that if the
+  // value is outside a range (-10E8, 10E8) then it is undefined.
+  return value >= 10E8 || value <= -10E8;
+}
+
+} // namespace yoga
+} // namespace facebook
+
+using namespace facebook;
+
 extern const std::array<YGEdge, 4> trailing;
 extern const std::array<YGEdge, 4> leading;
 extern bool YGValueEqual(const YGValue a, const YGValue b);
@@ -62,20 +83,20 @@ struct YGCachedMeasurement {
     bool isEqual = widthMeasureMode == measurement.widthMeasureMode &&
         heightMeasureMode == measurement.heightMeasureMode;
 
-    if (!YGFloatIsUndefined(availableWidth) ||
-        !YGFloatIsUndefined(measurement.availableWidth)) {
+    if (!yoga::isUndefined(availableWidth) ||
+        !yoga::isUndefined(measurement.availableWidth)) {
       isEqual = isEqual && availableWidth == measurement.availableWidth;
     }
-    if (!YGFloatIsUndefined(availableHeight) ||
-        !YGFloatIsUndefined(measurement.availableHeight)) {
+    if (!yoga::isUndefined(availableHeight) ||
+        !yoga::isUndefined(measurement.availableHeight)) {
       isEqual = isEqual && availableHeight == measurement.availableHeight;
     }
-    if (!YGFloatIsUndefined(computedWidth) ||
-        !YGFloatIsUndefined(measurement.computedWidth)) {
+    if (!yoga::isUndefined(computedWidth) ||
+        !yoga::isUndefined(measurement.computedWidth)) {
       isEqual = isEqual && computedWidth == measurement.computedWidth;
     }
-    if (!YGFloatIsUndefined(computedHeight) ||
-        !YGFloatIsUndefined(measurement.computedHeight)) {
+    if (!yoga::isUndefined(computedHeight) ||
+        !yoga::isUndefined(measurement.computedHeight)) {
       isEqual = isEqual && computedHeight == measurement.computedHeight;
     }
 
@@ -87,7 +108,6 @@ struct YGCachedMeasurement {
 // layouts should not require more than 16 entries to fit within the cache.
 #define YG_MAX_CACHED_RESULT_COUNT 16
 
-
 static const float kDefaultFlexGrow = 0.0f;
 static const float kDefaultFlexShrink = 0.0f;
 static const float kWebDefaultFlexShrink = 1.0f;
diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp
index 5b5a90888cea21..552834738b3584 100644
--- a/ReactCommon/yoga/yoga/Yoga.cpp
+++ b/ReactCommon/yoga/yoga/Yoga.cpp
@@ -1,11 +1,10 @@
 /*
- *  Copyright (c) 2014-present, Facebook, Inc.
+ *  Copyright (c) 2018-present, Facebook, Inc.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
  *
  */
-
 #include "Yoga.h"
 #include <float.h>
 #include <string.h>
@@ -29,30 +28,46 @@ __forceinline const float fmaxf(const float a, const float b) {
 #endif
 
 #ifdef ANDROID
-static int YGAndroidLog(const YGConfigRef config,
-                        const YGNodeRef node,
-                        YGLogLevel level,
-                        const char *format,
-                        va_list args);
+static int YGAndroidLog(
+    const YGConfigRef config,
+    const YGNodeRef node,
+    YGLogLevel level,
+    const char* format,
+    va_list args);
 #else
-static int YGDefaultLog(const YGConfigRef config,
-                        const YGNodeRef node,
-                        YGLogLevel level,
-                        const char *format,
-                        va_list args);
+static int YGDefaultLog(
+    const YGConfigRef config,
+    const YGNodeRef node,
+    YGLogLevel level,
+    const char* format,
+    va_list args);
 #endif
 
 const YGValue YGValueZero = {0, YGUnitPoint};
 const YGValue YGValueUndefined = {YGUndefined, YGUnitUndefined};
 const YGValue YGValueAuto = {YGUndefined, YGUnitAuto};
 
+bool operator==(const YGValue& lhs, const YGValue& rhs) {
+  if ((lhs.unit == YGUnitUndefined && rhs.unit == YGUnitUndefined) ||
+      (lhs.unit == YGUnitAuto && rhs.unit == YGUnitAuto)) {
+    return true;
+  }
+
+  return lhs.unit == rhs.unit && lhs.value == rhs.value;
+}
+
+bool operator!=(const YGValue& lhs, const YGValue& rhs) {
+  return !(lhs == rhs);
+}
+
 #ifdef ANDROID
 #include <android/log.h>
-static int YGAndroidLog(const YGConfigRef config,
-                        const YGNodeRef node,
-                        YGLogLevel level,
-                        const char *format,
-                        va_list args) {
+static int YGAndroidLog(
+    const YGConfigRef config,
+    const YGNodeRef node,
+    YGLogLevel level,
+    const char* format,
+    va_list args) {
   int androidLevel = YGLogLevelDebug;
   switch (level) {
     case YGLogLevelFatal:
@@ -80,11 +95,12 @@ static int YGAndroidLog(const YGConfigRef config,
 #else
 #define YG_UNUSED(x) (void)(x);
 
-static int YGDefaultLog(const YGConfigRef config,
-                        const YGNodeRef node,
-                        YGLogLevel level,
-                        const char *format,
-                        va_list args) {
+static int YGDefaultLog(
+    const YGConfigRef config,
+    const YGNodeRef node,
+    YGLogLevel level,
+    const char* format,
+    va_list args) {
   YG_UNUSED(config);
   YG_UNUSED(node);
   switch (level) {
@@ -104,15 +120,7 @@ static int YGDefaultLog(const YGConfigRef config,
 #endif
 
 bool YGFloatIsUndefined(const float value) {
-  // Value of a float in the case of it being not defined is 10.1E20. Earlier
-  // it used to be NAN, the benefit of which was that if NAN is involved in any
-  // mathematical expression the result was NAN. But since we want to have
-  // `-ffast-math` flag being used by compiler which assumes that the floating
-  // point values are not NAN and Inf, we represent YGUndefined as 10.1E20. But
-  // now if YGUndefined is involved in any mathematical operations this
-  // value(10.1E20) would change. So the following check makes sure that if the
-  // value is outside a range (-10E8, 10E8) then it is undefined.
-  return value >= 10E8 || value <= -10E8;
+  return facebook::yoga::isUndefined(value);
 }
 
 const YGValue* YGComputedEdgeValue(
@@ -128,7 +136,8 @@ const YGValue* YGComputedEdgeValue(
     return &edges[YGEdgeVertical];
   }
 
-  if ((edge == YGEdgeLeft || edge == YGEdgeRight || edge == YGEdgeStart || edge == YGEdgeEnd) &&
+  if ((edge == YGEdgeLeft || edge == YGEdgeRight || edge == YGEdgeStart ||
+       edge == YGEdgeEnd) &&
       edges[YGEdgeHorizontal].unit != YGUnitUndefined) {
     return &edges[YGEdgeHorizontal];
   }
@@ -188,6 +197,10 @@ bool YGNodeGetHasNewLayout(YGNodeRef node) {
   return node->getHasNewLayout();
 }
 
+void YGConfigSetPrintTreeFlag(YGConfigRef config, bool enabled) {
+  config->printTree = enabled;
+}
+
 void YGNodeSetHasNewLayout(YGNodeRef node, bool hasNewLayout) {
   node->setHasNewLayout(hasNewLayout);
 }
@@ -264,7 +277,7 @@ static YGNodeRef YGNodeDeepClone(YGNodeRef oldNode) {
   YGVector vec = YGVector();
   vec.reserve(oldNode->getChildren().size());
   YGNodeRef childNode = nullptr;
-  for (auto& item : oldNode->getChildren()) {
+  for (auto* item : oldNode->getChildren()) {
     childNode = YGNodeDeepClone(item);
     childNode->setOwner(node);
     vec.push_back(childNode);
@@ -301,8 +314,8 @@ static void YGConfigFreeRecursive(const YGNodeRef root) {
     delete root->getConfig();
   }
   // Delete configs recursively for childrens
-  for (uint32_t i = 0; i < root->getChildrenCount(); ++i) {
-    YGConfigFreeRecursive(root->getChild(i));
+  for (auto* child : root->getChildren()) {
+    YGConfigFreeRecursive(child);
   }
 }
 
@@ -320,9 +333,10 @@ void YGNodeFreeRecursive(const YGNodeRef root) {
 }
 
 void YGNodeReset(const YGNodeRef node) {
-  YGAssertWithNode(node,
-                   YGNodeGetChildCount(node) == 0,
-                   "Cannot reset a node which still has children attached");
+  YGAssertWithNode(
+      node,
+      YGNodeGetChildCount(node) == 0,
+      "Cannot reset a node which still has children attached");
   YGAssertWithNode(
       node,
       node->getOwner() == nullptr,
@@ -348,17 +362,17 @@ int32_t YGConfigGetInstanceCount(void) {
 }
 
 YGConfigRef YGConfigNew(void) {
-  #ifdef ANDROID
+#ifdef ANDROID
   const YGConfigRef config = new YGConfig(YGAndroidLog);
-  #else
+#else
   const YGConfigRef config = new YGConfig(YGDefaultLog);
-  #endif
+#endif
   gConfigInstanceCount++;
   return config;
 }
 
 void YGConfigFree(const YGConfigRef config) {
-  free(config);
+  delete config;
   gConfigInstanceCount--;
 }
 
@@ -366,7 +380,10 @@ void YGConfigCopy(const YGConfigRef dest, const YGConfigRef src) {
   memcpy(dest, src, sizeof(YGConfig));
 }
 
-void YGNodeInsertChild(const YGNodeRef node, const YGNodeRef child, const uint32_t index) {
+void YGNodeInsertChild(
+    const YGNodeRef node,
+    const YGNodeRef child,
+    const uint32_t index) {
   YGAssertWithNode(
       node,
       child->getOwner() == nullptr,
@@ -409,8 +426,8 @@ void YGNodeRemoveChild(const YGNodeRef owner, const YGNodeRef excludedChild) {
   }
   const YGNodeRef firstChild = YGNodeGetChild(owner, 0);
   if (firstChild->getOwner() == owner) {
-    // If the first child has this node as its owner, we assume that it is already unique.
-    // We can now try to delete a child in this list.
+    // If the first child has this node as its owner, we assume that it is
+    // already unique. We can now try to delete a child in this list.
     if (owner->removeChild(excludedChild)) {
       excludedChild->setLayout(
           YGNode().getLayout()); // layout is no longer valid
@@ -419,18 +436,18 @@ void YGNodeRemoveChild(const YGNodeRef owner, const YGNodeRef excludedChild) {
     }
     return;
   }
-  // Otherwise we have to clone the node list except for the child we're trying to delete.
-  // We don't want to simply clone all children, because then the host will need to free
-  // the clone of the child that was just deleted.
+  // Otherwise we have to clone the node list except for the child we're trying
+  // to delete. We don't want to simply clone all children, because then the
+  // host will need to free the clone of the child that was just deleted.
   const YGCloneNodeFunc cloneNodeCallback =
       owner->getConfig()->cloneNodeCallback;
   uint32_t nextInsertIndex = 0;
   for (uint32_t i = 0; i < childCount; i++) {
     const YGNodeRef oldChild = owner->getChild(i);
     if (excludedChild == oldChild) {
-      // Ignore the deleted child. Don't reset its layout or owner since it is still valid
-      // in the other owner. However, since this owner has now changed, we need to mark it
-      // as dirty.
+      // Ignore the deleted child. Don't reset its layout or owner since it is
+      // still valid in the other owner. However, since this owner has now
+      // changed, we need to mark it as dirty.
       owner->markDirtyAndPropogate();
       continue;
     }
@@ -460,7 +477,8 @@ void YGNodeRemoveAllChildren(const YGNodeRef owner) {
   }
   const YGNodeRef firstChild = YGNodeGetChild(owner, 0);
   if (firstChild->getOwner() == owner) {
-    // If the first child has this node as its owner, we assume that this child set is unique.
+    // If the first child has this node as its owner, we assume that this child
+    // set is unique.
     for (uint32_t i = 0; i < childCount; i++) {
       const YGNodeRef oldChild = YGNodeGetChild(owner, i);
       oldChild->setLayout(YGNode().getLayout()); // layout is no longer valid
@@ -470,13 +488,15 @@ void YGNodeRemoveAllChildren(const YGNodeRef owner) {
     owner->markDirtyAndPropogate();
     return;
   }
-  // Otherwise, we are not the owner of the child set. We don't have to do anything to clear it.
+  // Otherwise, we are not the owner of the child set. We don't have to do
+  // anything to clear it.
   owner->setChildren(YGVector());
   owner->markDirtyAndPropogate();
 }
 
-static void YGNodeSetChildrenInternal(YGNodeRef const owner, const std::vector<YGNodeRef> &children)
-{
+static void YGNodeSetChildrenInternal(
+    YGNodeRef const owner,
+    const std::vector<YGNodeRef>& children) {
   if (!owner) {
     return;
   }
@@ -492,8 +512,10 @@ static void YGNodeSetChildrenInternal(YGNodeRef const owner, const std::vector<Y
   } else {
     if (YGNodeGetChildCount(owner) > 0) {
       for (YGNodeRef const oldChild : owner->getChildren()) {
-        // Our new children may have nodes in common with the old children. We don't reset these common nodes.
-        if (std::find(children.begin(), children.end(), oldChild) == children.end()) {
+        // Our new children may have nodes in common with the old children. We
+        // don't reset these common nodes.
+        if (std::find(children.begin(), children.end(), oldChild) ==
+            children.end()) {
           oldChild->setLayout(YGLayout());
           oldChild->setOwner(nullptr);
         }
@@ -507,13 +529,17 @@ static void YGNodeSetChildrenInternal(YGNodeRef const owner, const std::vector<Y
   }
 }
 
-void YGNodeSetChildren(YGNodeRef const owner, const YGNodeRef c[], const uint32_t count) {
+void YGNodeSetChildren(
+    YGNodeRef const owner,
+    const YGNodeRef c[],
+    const uint32_t count) {
   const YGVector children = {c, c + count};
   YGNodeSetChildrenInternal(owner, children);
 }
 
-void YGNodeSetChildren(YGNodeRef const owner, const std::vector<YGNodeRef> &children)
-{
+void YGNodeSetChildren(
+    YGNodeRef const owner,
+    const std::vector<YGNodeRef>& children) {
   YGNodeSetChildrenInternal(owner, children);
 }
 
@@ -566,50 +592,55 @@ float YGNodeStyleGetFlexShrink(const YGNodeRef node) {
       : node->getStyle().flexShrink.getValue();
 }
 
-#define YG_NODE_STYLE_PROPERTY_SETTER_IMPL(                               \
-    type, name, paramName, instanceName)                                  \
-  void YGNodeStyleSet##name(const YGNodeRef node, const type paramName) { \
-    if (node->getStyle().instanceName != paramName) {                     \
-      YGStyle style = node->getStyle();                                   \
-      style.instanceName = paramName;                                     \
-      node->setStyle(style);                                              \
-      node->markDirtyAndPropogate();                                      \
-    }                                                                     \
-  }
-
-#define YG_NODE_STYLE_PROPERTY_SETTER_UNIT_IMPL(                          \
-    type, name, paramName, instanceName)                                  \
-  void YGNodeStyleSet##name(const YGNodeRef node, const type paramName) { \
-    YGValue value = {                                                     \
-        YGFloatSanitize(paramName),                                       \
-        YGFloatIsUndefined(paramName) ? YGUnitUndefined : YGUnitPoint,    \
-    };                                                                    \
-    if ((node->getStyle().instanceName.value != value.value &&            \
-         value.unit != YGUnitUndefined) ||                                \
-        node->getStyle().instanceName.unit != value.unit) {               \
-      YGStyle style = node->getStyle();                                   \
-      style.instanceName = value;                                         \
-      node->setStyle(style);                                              \
-      node->markDirtyAndPropogate();                                      \
-    }                                                                     \
-  }                                                                       \
-                                                                          \
-  void YGNodeStyleSet##name##Percent(                                     \
-      const YGNodeRef node, const type paramName) {                       \
-    YGValue value = {                                                     \
-        YGFloatSanitize(paramName),                                       \
-        YGFloatIsUndefined(paramName) ? YGUnitUndefined : YGUnitPercent,  \
-    };                                                                    \
-    if ((node->getStyle().instanceName.value != value.value &&            \
-         value.unit != YGUnitUndefined) ||                                \
-        node->getStyle().instanceName.unit != value.unit) {               \
-      YGStyle style = node->getStyle();                                   \
-                                                                          \
-      style.instanceName = value;                                         \
-      node->setStyle(style);                                              \
-      node->markDirtyAndPropogate();                                      \
-    }                                                                     \
+namespace {
+
+template <typename T, T YGStyle::*P>
+struct StyleProp {
+  static T get(YGNodeRef node) {
+    return node->getStyle().*P;
+  }
+  static void set(YGNodeRef node, T newValue) {
+    if (node->getStyle().*P != newValue) {
+      node->getStyle().*P = newValue;
+      node->markDirtyAndPropogate();
+    }
+  }
+};
+
+struct Value {
+  template <YGUnit U>
+  static YGValue create(float value) {
+    return {
+        YGFloatSanitize(value),
+        YGFloatIsUndefined(value) ? YGUnitUndefined : U,
+    };
+  }
+};
+
+template <YGStyle::Dimensions YGStyle::*P>
+struct DimensionProp {
+  template <YGDimension idx>
+  static WIN_STRUCT(YGValue) get(YGNodeRef node) {
+    YGValue value = (node->getStyle().*P)[idx];
+    if (value.unit == YGUnitUndefined || value.unit == YGUnitAuto) {
+      value.value = YGUndefined;
+    }
+    return WIN_STRUCT_REF(value);
+  }
+
+  template <YGDimension idx, YGUnit U>
+  static void set(YGNodeRef node, float newValue) {
+    YGValue value = Value::create<U>(newValue);
+    if (((node->getStyle().*P)[idx].value != value.value &&
+         value.unit != YGUnitUndefined) ||
+        (node->getStyle().*P)[idx].unit != value.unit) {
+      (node->getStyle().*P)[idx] = value;
+      node->markDirtyAndPropogate();
+    }
   }
+};
+
+} // namespace
 
 #define YG_NODE_STYLE_PROPERTY_SETTER_UNIT_AUTO_IMPL(                        \
     type, name, paramName, instanceName)                                     \
@@ -621,9 +652,7 @@ float YGNodeStyleGetFlexShrink(const YGNodeRef node) {
     if ((node->getStyle().instanceName.value != value.value &&               \
          value.unit != YGUnitUndefined) ||                                   \
         node->getStyle().instanceName.unit != value.unit) {                  \
-      YGStyle style = node->getStyle();                                      \
-      style.instanceName = value;                                            \
-      node->setStyle(style);                                                 \
+      node->getStyle().instanceName = value;                                 \
       node->markDirtyAndPropogate();                                         \
     }                                                                        \
   }                                                                          \
@@ -632,44 +661,20 @@ float YGNodeStyleGetFlexShrink(const YGNodeRef node) {
       const YGNodeRef node, const type paramName) {                          \
     if (node->getStyle().instanceName.value != YGFloatSanitize(paramName) || \
         node->getStyle().instanceName.unit != YGUnitPercent) {               \
-      YGStyle style = node->getStyle();                                      \
-      style.instanceName.value = YGFloatSanitize(paramName);                 \
-      style.instanceName.unit =                                              \
-          YGFloatIsUndefined(paramName) ? YGUnitAuto : YGUnitPercent;        \
-      node->setStyle(style);                                                 \
+      node->getStyle().instanceName = YGFloatIsUndefined(paramName)          \
+          ? YGValue{0, YGUnitAuto}                                           \
+          : YGValue{paramName, YGUnitPercent};                               \
       node->markDirtyAndPropogate();                                         \
     }                                                                        \
   }                                                                          \
                                                                              \
   void YGNodeStyleSet##name##Auto(const YGNodeRef node) {                    \
     if (node->getStyle().instanceName.unit != YGUnitAuto) {                  \
-      YGStyle style = node->getStyle();                                      \
-      style.instanceName.value = 0;                                          \
-      style.instanceName.unit = YGUnitAuto;                                  \
-      node->setStyle(style);                                                 \
+      node->getStyle().instanceName = {0, YGUnitAuto};                       \
       node->markDirtyAndPropogate();                                         \
     }                                                                        \
   }
 
-#define YG_NODE_STYLE_PROPERTY_IMPL(type, name, paramName, instanceName)  \
-  YG_NODE_STYLE_PROPERTY_SETTER_IMPL(type, name, paramName, instanceName) \
-                                                                          \
-  type YGNodeStyleGet##name(const YGNodeRef node) {                       \
-    return node->getStyle().instanceName;                                 \
-  }
-
-#define YG_NODE_STYLE_PROPERTY_UNIT_IMPL(type, name, paramName, instanceName) \
-  YG_NODE_STYLE_PROPERTY_SETTER_UNIT_IMPL(                                    \
-      float, name, paramName, instanceName)                                   \
-                                                                              \
-  type YGNodeStyleGet##name(const YGNodeRef node) {                           \
-    YGValue value = node->getStyle().instanceName;                            \
-    if (value.unit == YGUnitUndefined || value.unit == YGUnitAuto) {          \
-      value.value = YGUndefined;                                              \
-    }                                                                         \
-    return value;                                                             \
-  }
-
 #define YG_NODE_STYLE_PROPERTY_UNIT_AUTO_IMPL(                       \
     type, name, paramName, instanceName)                             \
   YG_NODE_STYLE_PROPERTY_SETTER_UNIT_AUTO_IMPL(                      \
@@ -686,10 +691,7 @@ float YGNodeStyleGetFlexShrink(const YGNodeRef node) {
 #define YG_NODE_STYLE_EDGE_PROPERTY_UNIT_AUTO_IMPL(type, name, instanceName) \
   void YGNodeStyleSet##name##Auto(const YGNodeRef node, const YGEdge edge) { \
     if (node->getStyle().instanceName[edge].unit != YGUnitAuto) {            \
-      YGStyle style = node->getStyle();                                      \
-      style.instanceName[edge].value = 0;                                    \
-      style.instanceName[edge].unit = YGUnitAuto;                            \
-      node->setStyle(style);                                                 \
+      node->getStyle().instanceName[edge] = {0, YGUnitAuto};                 \
       node->markDirtyAndPropogate();                                         \
     }                                                                        \
   }
@@ -705,9 +707,7 @@ float YGNodeStyleGetFlexShrink(const YGNodeRef node) {
     if ((node->getStyle().instanceName[edge].value != value.value &&     \
          value.unit != YGUnitUndefined) ||                               \
         node->getStyle().instanceName[edge].unit != value.unit) {        \
-      YGStyle style = node->getStyle();                                  \
-      style.instanceName[edge] = value;                                  \
-      node->setStyle(style);                                             \
+      node->getStyle().instanceName[edge] = value;                       \
       node->markDirtyAndPropogate();                                     \
     }                                                                    \
   }                                                                      \
@@ -721,9 +721,7 @@ float YGNodeStyleGetFlexShrink(const YGNodeRef node) {
     if ((node->getStyle().instanceName[edge].value != value.value &&     \
          value.unit != YGUnitUndefined) ||                               \
         node->getStyle().instanceName[edge].unit != value.unit) {        \
-      YGStyle style = node->getStyle();                                  \
-      style.instanceName[edge] = value;                                  \
-      node->setStyle(style);                                             \
+      node->getStyle().instanceName[edge] = value;                       \
       node->markDirtyAndPropogate();                                     \
     }                                                                    \
   }                                                                      \
@@ -768,32 +766,91 @@ float YGNodeStyleGetFlexShrink(const YGNodeRef node) {
     return node->getLayout().instanceName[edge];                        \
   }
 
-// YG_NODE_PROPERTY_IMPL(void *, Context, context, context);
-// YG_NODE_PROPERTY_IMPL(YGPrintFunc, PrintFunc, printFunc, print);
-// YG_NODE_PROPERTY_IMPL(bool, HasNewLayout, hasNewLayout, hasNewLayout);
-// YG_NODE_PROPERTY_IMPL(YGNodeType, NodeType, nodeType, nodeType);
+void YGNodeStyleSetDirection(
+    const YGNodeRef node,
+    const YGDirection direction) {
+  StyleProp<YGDirection, &YGStyle::direction>::set(node, direction);
+}
+YGDirection YGNodeStyleGetDirection(const YGNodeRef node) {
+  return StyleProp<YGDirection, &YGStyle::direction>::get(node);
+}
+
+void YGNodeStyleSetFlexDirection(
+    const YGNodeRef node,
+    const YGFlexDirection flexDirection) {
+  StyleProp<YGFlexDirection, &YGStyle::flexDirection>::set(node, flexDirection);
+}
+YGFlexDirection YGNodeStyleGetFlexDirection(const YGNodeRef node) {
+  return StyleProp<YGFlexDirection, &YGStyle::flexDirection>::get(node);
+}
+
+void YGNodeStyleSetJustifyContent(
+    const YGNodeRef node,
+    const YGJustify justifyContent) {
+  StyleProp<YGJustify, &YGStyle::justifyContent>::set(node, justifyContent);
+}
+YGJustify YGNodeStyleGetJustifyContent(const YGNodeRef node) {
+  return StyleProp<YGJustify, &YGStyle::justifyContent>::get(node);
+}
+
+void YGNodeStyleSetAlignContent(
+    const YGNodeRef node,
+    const YGAlign alignContent) {
+  StyleProp<YGAlign, &YGStyle::alignContent>::set(node, alignContent);
+}
+YGAlign YGNodeStyleGetAlignContent(const YGNodeRef node) {
+  return StyleProp<YGAlign, &YGStyle::alignContent>::get(node);
+}
+
+void YGNodeStyleSetAlignItems(const YGNodeRef node, const YGAlign alignItems) {
+  StyleProp<YGAlign, &YGStyle::alignItems>::set(node, alignItems);
+}
+YGAlign YGNodeStyleGetAlignItems(const YGNodeRef node) {
+  return StyleProp<YGAlign, &YGStyle::alignItems>::get(node);
+}
+
+void YGNodeStyleSetAlignSelf(const YGNodeRef node, const YGAlign alignSelf) {
+  StyleProp<YGAlign, &YGStyle::alignSelf>::set(node, alignSelf);
+}
+YGAlign YGNodeStyleGetAlignSelf(const YGNodeRef node) {
+  return StyleProp<YGAlign, &YGStyle::alignSelf>::get(node);
+}
+
+void YGNodeStyleSetPositionType(
+    const YGNodeRef node,
+    const YGPositionType positionType) {
+  StyleProp<YGPositionType, &YGStyle::positionType>::set(node, positionType);
+}
+YGPositionType YGNodeStyleGetPositionType(const YGNodeRef node) {
+  return StyleProp<YGPositionType, &YGStyle::positionType>::get(node);
+}
+
+void YGNodeStyleSetFlexWrap(const YGNodeRef node, const YGWrap flexWrap) {
+  StyleProp<YGWrap, &YGStyle::flexWrap>::set(node, flexWrap);
+}
+YGWrap YGNodeStyleGetFlexWrap(const YGNodeRef node) {
+  return StyleProp<YGWrap, &YGStyle::flexWrap>::get(node);
+}
 
-YG_NODE_STYLE_PROPERTY_IMPL(YGDirection, Direction, direction, direction);
-YG_NODE_STYLE_PROPERTY_IMPL(YGFlexDirection, FlexDirection, flexDirection, flexDirection);
-YG_NODE_STYLE_PROPERTY_IMPL(YGJustify, JustifyContent, justifyContent, justifyContent);
-YG_NODE_STYLE_PROPERTY_IMPL(YGAlign, AlignContent, alignContent, alignContent);
-YG_NODE_STYLE_PROPERTY_IMPL(YGAlign, AlignItems, alignItems, alignItems);
-YG_NODE_STYLE_PROPERTY_IMPL(YGAlign, AlignSelf, alignSelf, alignSelf);
-YG_NODE_STYLE_PROPERTY_IMPL(YGPositionType, PositionType, positionType, positionType);
-YG_NODE_STYLE_PROPERTY_IMPL(YGWrap, FlexWrap, flexWrap, flexWrap);
-YG_NODE_STYLE_PROPERTY_IMPL(YGOverflow, Overflow, overflow, overflow);
-YG_NODE_STYLE_PROPERTY_IMPL(YGDisplay, Display, display, display);
+void YGNodeStyleSetOverflow(const YGNodeRef node, const YGOverflow overflow) {
+  StyleProp<YGOverflow, &YGStyle::overflow>::set(node, overflow);
+}
+YGOverflow YGNodeStyleGetOverflow(const YGNodeRef node) {
+  return StyleProp<YGOverflow, &YGStyle::overflow>::get(node);
+}
+
+void YGNodeStyleSetDisplay(const YGNodeRef node, const YGDisplay display) {
+  StyleProp<YGDisplay, &YGStyle::display>::set(node, display);
+}
+YGDisplay YGNodeStyleGetDisplay(const YGNodeRef node) {
+  return StyleProp<YGDisplay, &YGStyle::display>::get(node);
+}
 
 // TODO(T26792433): Change the API to accept YGFloatOptional.
 void YGNodeStyleSetFlex(const YGNodeRef node, const float flex) {
   if (node->getStyle().flex != flex) {
-    YGStyle style = node->getStyle();
-    if (YGFloatIsUndefined(flex)) {
-      style.flex = YGFloatOptional();
-    } else {
-      style.flex = YGFloatOptional(flex);
-    }
-    node->setStyle(style);
+    node->getStyle().flex =
+        YGFloatIsUndefined(flex) ? YGFloatOptional() : YGFloatOptional(flex);
     node->markDirtyAndPropogate();
   }
 }
@@ -807,13 +864,9 @@ float YGNodeStyleGetFlex(const YGNodeRef node) {
 // TODO(T26792433): Change the API to accept YGFloatOptional.
 void YGNodeStyleSetFlexGrow(const YGNodeRef node, const float flexGrow) {
   if (node->getStyle().flexGrow != flexGrow) {
-    YGStyle style = node->getStyle();
-    if (YGFloatIsUndefined(flexGrow)) {
-      style.flexGrow = YGFloatOptional();
-    } else {
-      style.flexGrow = YGFloatOptional(flexGrow);
-    }
-    node->setStyle(style);
+    node->getStyle().flexGrow = YGFloatIsUndefined(flexGrow)
+        ? YGFloatOptional()
+        : YGFloatOptional(flexGrow);
     node->markDirtyAndPropogate();
   }
 }
@@ -821,13 +874,9 @@ void YGNodeStyleSetFlexGrow(const YGNodeRef node, const float flexGrow) {
 // TODO(T26792433): Change the API to accept YGFloatOptional.
 void YGNodeStyleSetFlexShrink(const YGNodeRef node, const float flexShrink) {
   if (node->getStyle().flexShrink != flexShrink) {
-    YGStyle style = node->getStyle();
-    if (YGFloatIsUndefined(flexShrink)) {
-      style.flexShrink = YGFloatOptional();
-    } else {
-      style.flexShrink = YGFloatOptional(flexShrink);
-    }
-    node->setStyle(style);
+    node->getStyle().flexShrink = YGFloatIsUndefined(flexShrink)
+        ? YGFloatOptional()
+        : YGFloatOptional(flexShrink);
     node->markDirtyAndPropogate();
   }
 }
@@ -849,9 +898,7 @@ void YGNodeStyleSetFlexBasis(const YGNodeRef node, const float flexBasis) {
   if ((node->getStyle().flexBasis.value != value.value &&
        value.unit != YGUnitUndefined) ||
       node->getStyle().flexBasis.unit != value.unit) {
-    YGStyle style = node->getStyle();
-    style.flexBasis = value;
-    node->setStyle(style);
+    node->getStyle().flexBasis = value;
     node->markDirtyAndPropogate();
   }
 }
@@ -861,21 +908,16 @@ void YGNodeStyleSetFlexBasisPercent(
     const float flexBasisPercent) {
   if (node->getStyle().flexBasis.value != flexBasisPercent ||
       node->getStyle().flexBasis.unit != YGUnitPercent) {
-    YGStyle style = node->getStyle();
-    style.flexBasis.value = YGFloatSanitize(flexBasisPercent);
-    style.flexBasis.unit =
-        YGFloatIsUndefined(flexBasisPercent) ? YGUnitAuto : YGUnitPercent;
-    node->setStyle(style);
+    node->getStyle().flexBasis = YGFloatIsUndefined(flexBasisPercent)
+        ? YGValue{0, YGUnitAuto}
+        : YGValue{flexBasisPercent, YGUnitPercent};
     node->markDirtyAndPropogate();
   }
 }
 
 void YGNodeStyleSetFlexBasisAuto(const YGNodeRef node) {
   if (node->getStyle().flexBasis.unit != YGUnitAuto) {
-    YGStyle style = node->getStyle();
-    style.flexBasis.value = 0;
-    style.flexBasis.unit = YGUnitAuto;
-    node->setStyle(style);
+    node->getStyle().flexBasis = {0, YGUnitAuto};
     node->markDirtyAndPropogate();
   }
 }
@@ -897,9 +939,7 @@ void YGNodeStyleSetBorder(
   if ((node->getStyle().border[edge].value != value.value &&
        value.unit != YGUnitUndefined) ||
       node->getStyle().border[edge].unit != value.unit) {
-    YGStyle style = node->getStyle();
-    style.border[edge] = value;
-    node->setStyle(style);
+    node->getStyle().border[edge] = value;
     node->markDirtyAndPropogate();
   }
 }
@@ -926,19 +966,74 @@ float YGNodeStyleGetAspectRatio(const YGNodeRef node) {
 // TODO(T26792433): Change the API to accept YGFloatOptional.
 void YGNodeStyleSetAspectRatio(const YGNodeRef node, const float aspectRatio) {
   if (node->getStyle().aspectRatio != aspectRatio) {
-    YGStyle style = node->getStyle();
-    style.aspectRatio = YGFloatOptional(aspectRatio);
-    node->setStyle(style);
+    node->getStyle().aspectRatio = YGFloatOptional(aspectRatio);
     node->markDirtyAndPropogate();
   }
 }
 
-YG_NODE_STYLE_PROPERTY_UNIT_AUTO_IMPL(YGValue, Width, width, dimensions[YGDimensionWidth]);
-YG_NODE_STYLE_PROPERTY_UNIT_AUTO_IMPL(YGValue, Height, height, dimensions[YGDimensionHeight]);
-YG_NODE_STYLE_PROPERTY_UNIT_IMPL(YGValue, MinWidth, minWidth, minDimensions[YGDimensionWidth]);
-YG_NODE_STYLE_PROPERTY_UNIT_IMPL(YGValue, MinHeight, minHeight, minDimensions[YGDimensionHeight]);
-YG_NODE_STYLE_PROPERTY_UNIT_IMPL(YGValue, MaxWidth, maxWidth, maxDimensions[YGDimensionWidth]);
-YG_NODE_STYLE_PROPERTY_UNIT_IMPL(YGValue, MaxHeight, maxHeight, maxDimensions[YGDimensionHeight]);
+YG_NODE_STYLE_PROPERTY_UNIT_AUTO_IMPL(
+    YGValue,
+    Width,
+    width,
+    dimensions[YGDimensionWidth]);
+YG_NODE_STYLE_PROPERTY_UNIT_AUTO_IMPL(
+    YGValue,
+    Height,
+    height,
+    dimensions[YGDimensionHeight]);
+
+void YGNodeStyleSetMinWidth(const YGNodeRef node, const float minWidth) {
+  DimensionProp<&YGStyle::minDimensions>::set<YGDimensionWidth, YGUnitPoint>(
+      node, minWidth);
+}
+void YGNodeStyleSetMinWidthPercent(const YGNodeRef node, const float minWidth) {
+  DimensionProp<&YGStyle::minDimensions>::set<YGDimensionWidth, YGUnitPercent>(
+      node, minWidth);
+}
+YGValue YGNodeStyleGetMinWidth(const YGNodeRef node) {
+  return DimensionProp<&YGStyle::minDimensions>::get<YGDimensionWidth>(node);
+};
+
+void YGNodeStyleSetMinHeight(const YGNodeRef node, const float minHeight) {
+  DimensionProp<&YGStyle::minDimensions>::set<YGDimensionHeight, YGUnitPoint>(
+      node, minHeight);
+}
+void YGNodeStyleSetMinHeightPercent(
+    const YGNodeRef node,
+    const float minHeight) {
+  DimensionProp<&YGStyle::minDimensions>::set<YGDimensionHeight, YGUnitPercent>(
+      node, minHeight);
+}
+YGValue YGNodeStyleGetMinHeight(const YGNodeRef node) {
+  return DimensionProp<&YGStyle::minDimensions>::get<YGDimensionHeight>(node);
+};
+
+void YGNodeStyleSetMaxWidth(const YGNodeRef node, const float maxWidth) {
+  DimensionProp<&YGStyle::maxDimensions>::set<YGDimensionWidth, YGUnitPoint>(
+      node, maxWidth);
+}
+void YGNodeStyleSetMaxWidthPercent(const YGNodeRef node, const float maxWidth) {
+  DimensionProp<&YGStyle::maxDimensions>::set<YGDimensionWidth, YGUnitPercent>(
+      node, maxWidth);
+}
+YGValue YGNodeStyleGetMaxWidth(const YGNodeRef node) {
+  return DimensionProp<&YGStyle::maxDimensions>::get<YGDimensionWidth>(node);
+};
+
+void YGNodeStyleSetMaxHeight(const YGNodeRef node, const float maxHeight) {
+  DimensionProp<&YGStyle::maxDimensions>::set<YGDimensionHeight, YGUnitPoint>(
+      node, maxHeight);
+}
+void YGNodeStyleSetMaxHeightPercent(
+    const YGNodeRef node,
+    const float maxHeight) {
+  DimensionProp<&YGStyle::maxDimensions>::set<YGDimensionHeight, YGUnitPercent>(
+      node, maxHeight);
+}
+YGValue YGNodeStyleGetMaxHeight(const YGNodeRef node) {
+  return DimensionProp<&YGStyle::maxDimensions>::get<YGDimensionHeight>(node);
+};
+
 YG_NODE_LAYOUT_PROPERTY_IMPL(float, Left, position[YGEdgeLeft]);
 YG_NODE_LAYOUT_PROPERTY_IMPL(float, Top, position[YGEdgeTop]);
 YG_NODE_LAYOUT_PROPERTY_IMPL(float, Right, position[YGEdgeRight]);
@@ -958,20 +1053,22 @@ bool YGNodeLayoutGetDidLegacyStretchFlagAffectLayout(const YGNodeRef node) {
 
 uint32_t gCurrentGenerationCount = 0;
 
-bool YGLayoutNodeInternal(const YGNodeRef node,
-                          const float availableWidth,
-                          const float availableHeight,
-                          const YGDirection ownerDirection,
-                          const YGMeasureMode widthMeasureMode,
-                          const YGMeasureMode heightMeasureMode,
-                          const float ownerWidth,
-                          const float ownerHeight,
-                          const bool performLayout,
-                          const char *reason,
-                          const YGConfigRef config);
-
-static void YGNodePrintInternal(const YGNodeRef node,
-                                const YGPrintOptions options) {
+bool YGLayoutNodeInternal(
+    const YGNodeRef node,
+    const float availableWidth,
+    const float availableHeight,
+    const YGDirection ownerDirection,
+    const YGMeasureMode widthMeasureMode,
+    const YGMeasureMode heightMeasureMode,
+    const float ownerWidth,
+    const float ownerHeight,
+    const bool performLayout,
+    const char* reason,
+    const YGConfigRef config);
+
+static void YGNodePrintInternal(
+    const YGNodeRef node,
+    const YGPrintOptions options) {
   std::string str;
   facebook::yoga::YGNodeToString(&str, node, options, 0);
   YGLog(node, YGLogLevelDebug, str.c_str());
@@ -996,15 +1093,18 @@ static const std::array<YGEdge, 4> pos = {{
 static const std::array<YGDimension, 4> dim = {
     {YGDimensionHeight, YGDimensionHeight, YGDimensionWidth, YGDimensionWidth}};
 
-static inline float YGNodePaddingAndBorderForAxis(const YGNodeRef node,
-                                                  const YGFlexDirection axis,
-                                                  const float widthSize) {
+static inline float YGNodePaddingAndBorderForAxis(
+    const YGNodeRef node,
+    const YGFlexDirection axis,
+    const float widthSize) {
   return YGUnwrapFloatOptional(
       node->getLeadingPaddingAndBorder(axis, widthSize) +
       node->getTrailingPaddingAndBorder(axis, widthSize));
 }
 
-static inline YGAlign YGNodeAlignItem(const YGNodeRef node, const YGNodeRef child) {
+static inline YGAlign YGNodeAlignItem(
+    const YGNodeRef node,
+    const YGNodeRef child) {
   const YGAlign align = child->getStyle().alignSelf == YGAlignAuto
       ? node->getStyle().alignItems
       : child->getStyle().alignSelf;
@@ -1021,9 +1121,10 @@ static float YGBaseline(const YGNodeRef node) {
         node,
         node->getLayout().measuredDimensions[YGDimensionWidth],
         node->getLayout().measuredDimensions[YGDimensionHeight]);
-    YGAssertWithNode(node,
-                     !YGFloatIsUndefined(baseline),
-                     "Expect custom baseline function to not return NaN");
+    YGAssertWithNode(
+        node,
+        !YGFloatIsUndefined(baseline),
+        "Expect custom baseline function to not return NaN");
     return baseline;
   }
 
@@ -1074,18 +1175,20 @@ static bool YGIsBaselineLayout(const YGNodeRef node) {
   return false;
 }
 
-static inline float YGNodeDimWithMargin(const YGNodeRef node,
-                                        const YGFlexDirection axis,
-                                        const float widthSize) {
+static inline float YGNodeDimWithMargin(
+    const YGNodeRef node,
+    const YGFlexDirection axis,
+    const float widthSize) {
   return node->getLayout().measuredDimensions[dim[axis]] +
       YGUnwrapFloatOptional(
              node->getLeadingMargin(axis, widthSize) +
              node->getTrailingMargin(axis, widthSize));
 }
 
-static inline bool YGNodeIsStyleDimDefined(const YGNodeRef node,
-                                           const YGFlexDirection axis,
-                                           const float ownerSize) {
+static inline bool YGNodeIsStyleDimDefined(
+    const YGNodeRef node,
+    const YGFlexDirection axis,
+    const float ownerSize) {
   bool isUndefined =
       YGFloatIsUndefined(node->getResolvedDimension(dim[axis]).value);
   return !(
@@ -1099,7 +1202,9 @@ static inline bool YGNodeIsStyleDimDefined(const YGNodeRef node,
         YGFloatIsUndefined(ownerSize))));
 }
 
-static inline bool YGNodeIsLayoutDimDefined(const YGNodeRef node, const YGFlexDirection axis) {
+static inline bool YGNodeIsLayoutDimDefined(
+    const YGNodeRef node,
+    const YGFlexDirection axis) {
   const float value = node->getLayout().measuredDimensions[dim[axis]];
   return !YGFloatIsUndefined(value) && value >= 0.0f;
 }
@@ -1135,23 +1240,24 @@ static YGFloatOptional YGNodeBoundAxisWithinMinAndMax(
   return YGFloatOptional(value);
 }
 
-// Like YGNodeBoundAxisWithinMinAndMax but also ensures that the value doesn't go
-// below the
-// padding and border amount.
-static inline float YGNodeBoundAxis(const YGNodeRef node,
-                                    const YGFlexDirection axis,
-                                    const float value,
-                                    const float axisSize,
-                                    const float widthSize) {
+// Like YGNodeBoundAxisWithinMinAndMax but also ensures that the value doesn't
+// go below the padding and border amount.
+static inline float YGNodeBoundAxis(
+    const YGNodeRef node,
+    const YGFlexDirection axis,
+    const float value,
+    const float axisSize,
+    const float widthSize) {
   return YGFloatMax(
       YGUnwrapFloatOptional(
           YGNodeBoundAxisWithinMinAndMax(node, axis, value, axisSize)),
       YGNodePaddingAndBorderForAxis(node, axis, widthSize));
 }
 
-static void YGNodeSetChildTrailingPosition(const YGNodeRef node,
-                                           const YGNodeRef child,
-                                           const YGFlexDirection axis) {
+static void YGNodeSetChildTrailingPosition(
+    const YGNodeRef node,
+    const YGNodeRef child,
+    const YGFlexDirection axis) {
   const float size = child->getLayout().measuredDimensions[dim[axis]];
   child->setLayoutPosition(
       node->getLayout().measuredDimensions[dim[axis]] - size -
@@ -1159,15 +1265,15 @@ static void YGNodeSetChildTrailingPosition(const YGNodeRef node,
       trailing[axis]);
 }
 
-static void YGConstrainMaxSizeForMode(const YGNodeRef node,
-                                      const enum YGFlexDirection axis,
-                                      const float ownerAxisSize,
-                                      const float ownerWidth,
-                                      YGMeasureMode *mode,
-                                      float *size) {
+static void YGConstrainMaxSizeForMode(
+    const YGNodeRef node,
+    const enum YGFlexDirection axis,
+    const float ownerAxisSize,
+    const float ownerWidth,
+    YGMeasureMode* mode,
+    float* size) {
   const YGFloatOptional maxSize =
-      YGResolveValue(
-          node->getStyle().maxDimensions[dim[axis]], ownerAxisSize) +
+      YGResolveValue(node->getStyle().maxDimensions[dim[axis]], ownerAxisSize) +
       YGFloatOptional(node->getMarginForAxis(axis, ownerWidth));
   switch (*mode) {
     case YGMeasureModeExactly:
@@ -1185,16 +1291,17 @@ static void YGConstrainMaxSizeForMode(const YGNodeRef node,
   }
 }
 
-static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
-                                           const YGNodeRef child,
-                                           const float width,
-                                           const YGMeasureMode widthMode,
-                                           const float height,
-                                           const float ownerWidth,
-                                           const float ownerHeight,
-                                           const YGMeasureMode heightMode,
-                                           const YGDirection direction,
-                                           const YGConfigRef config) {
+static void YGNodeComputeFlexBasisForChild(
+    const YGNodeRef node,
+    const YGNodeRef child,
+    const float width,
+    const YGMeasureMode widthMode,
+    const float height,
+    const float ownerWidth,
+    const float ownerHeight,
+    const YGMeasureMode heightMode,
+    const YGDirection direction,
+    const YGConfigRef config) {
   const YGFlexDirection mainAxis =
       YGResolveFlexDirection(node->getStyle().flexDirection, direction);
   const bool isMainAxisRow = YGFlexDirectionIsRow(mainAxis);
@@ -1208,7 +1315,8 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
 
   const YGFloatOptional resolvedFlexBasis =
       YGResolveValue(child->resolveFlexBasisPtr(), mainAxisownerSize);
-  const bool isRowStyleDimDefined = YGNodeIsStyleDimDefined(child, YGFlexDirectionRow, ownerWidth);
+  const bool isRowStyleDimDefined =
+      YGNodeIsStyleDimDefined(child, YGFlexDirectionRow, ownerWidth);
   const bool isColumnStyleDimDefined =
       YGNodeIsStyleDimDefined(child, YGFlexDirectionColumn, ownerHeight);
 
@@ -1249,9 +1357,9 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
     childWidthMeasureMode = YGMeasureModeUndefined;
     childHeightMeasureMode = YGMeasureModeUndefined;
 
-    const float& marginRow = YGUnwrapFloatOptional(
+    auto marginRow = YGUnwrapFloatOptional(
         child->getMarginForAxis(YGFlexDirectionRow, ownerWidth));
-    const float& marginColumn = YGUnwrapFloatOptional(
+    auto marginColumn = YGUnwrapFloatOptional(
         child->getMarginForAxis(YGFlexDirectionColumn, ownerWidth));
 
     if (isRowStyleDimDefined) {
@@ -1292,7 +1400,8 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
         childHeight = marginColumn +
             (childWidth - marginRow) / child->getStyle().aspectRatio.getValue();
         childHeightMeasureMode = YGMeasureModeExactly;
-      } else if (isMainAxisRow && childHeightMeasureMode == YGMeasureModeExactly) {
+      } else if (
+          isMainAxisRow && childHeightMeasureMode == YGMeasureModeExactly) {
         childWidth = marginRow +
             (childHeight - marginColumn) *
                 child->getStyle().aspectRatio.getValue();
@@ -1304,10 +1413,13 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
     // set the cross
     // axis to be measured exactly with the available inner width
 
-    const bool hasExactWidth = !YGFloatIsUndefined(width) && widthMode == YGMeasureModeExactly;
-    const bool childWidthStretch = YGNodeAlignItem(node, child) == YGAlignStretch &&
-                                   childWidthMeasureMode != YGMeasureModeExactly;
-    if (!isMainAxisRow && !isRowStyleDimDefined && hasExactWidth && childWidthStretch) {
+    const bool hasExactWidth =
+        !YGFloatIsUndefined(width) && widthMode == YGMeasureModeExactly;
+    const bool childWidthStretch =
+        YGNodeAlignItem(node, child) == YGAlignStretch &&
+        childWidthMeasureMode != YGMeasureModeExactly;
+    if (!isMainAxisRow && !isRowStyleDimDefined && hasExactWidth &&
+        childWidthStretch) {
       childWidth = width;
       childWidthMeasureMode = YGMeasureModeExactly;
       if (!child->getStyle().aspectRatio.isUndefined()) {
@@ -1317,10 +1429,13 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
       }
     }
 
-    const bool hasExactHeight = !YGFloatIsUndefined(height) && heightMode == YGMeasureModeExactly;
-    const bool childHeightStretch = YGNodeAlignItem(node, child) == YGAlignStretch &&
-                                    childHeightMeasureMode != YGMeasureModeExactly;
-    if (isMainAxisRow && !isColumnStyleDimDefined && hasExactHeight && childHeightStretch) {
+    const bool hasExactHeight =
+        !YGFloatIsUndefined(height) && heightMode == YGMeasureModeExactly;
+    const bool childHeightStretch =
+        YGNodeAlignItem(node, child) == YGAlignStretch &&
+        childHeightMeasureMode != YGMeasureModeExactly;
+    if (isMainAxisRow && !isColumnStyleDimDefined && hasExactHeight &&
+        childHeightStretch) {
       childHeight = height;
       childHeightMeasureMode = YGMeasureModeExactly;
 
@@ -1332,26 +1447,33 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
     }
 
     YGConstrainMaxSizeForMode(
-        child, YGFlexDirectionRow, ownerWidth, ownerWidth, &childWidthMeasureMode, &childWidth);
-    YGConstrainMaxSizeForMode(child,
-                              YGFlexDirectionColumn,
-                              ownerHeight,
-                              ownerWidth,
-                              &childHeightMeasureMode,
-                              &childHeight);
+        child,
+        YGFlexDirectionRow,
+        ownerWidth,
+        ownerWidth,
+        &childWidthMeasureMode,
+        &childWidth);
+    YGConstrainMaxSizeForMode(
+        child,
+        YGFlexDirectionColumn,
+        ownerHeight,
+        ownerWidth,
+        &childHeightMeasureMode,
+        &childHeight);
 
     // Measure the child
-    YGLayoutNodeInternal(child,
-                         childWidth,
-                         childHeight,
-                         direction,
-                         childWidthMeasureMode,
-                         childHeightMeasureMode,
-                         ownerWidth,
-                         ownerHeight,
-                         false,
-                         "measure",
-                         config);
+    YGLayoutNodeInternal(
+        child,
+        childWidth,
+        childHeight,
+        direction,
+        childWidthMeasureMode,
+        childHeightMeasureMode,
+        ownerWidth,
+        ownerHeight,
+        false,
+        "measure",
+        config);
 
     child->setLayoutComputedFlexBasis(YGFloatOptional(YGFloatMax(
         child->getLayout().measuredDimensions[dim[mainAxis]],
@@ -1360,13 +1482,14 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
   child->setLayoutComputedFlexBasisGeneration(gCurrentGenerationCount);
 }
 
-static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
-                                      const YGNodeRef child,
-                                      const float width,
-                                      const YGMeasureMode widthMode,
-                                      const float height,
-                                      const YGDirection direction,
-                                      const YGConfigRef config) {
+static void YGNodeAbsoluteLayoutChild(
+    const YGNodeRef node,
+    const YGNodeRef child,
+    const float width,
+    const YGMeasureMode widthMode,
+    const float height,
+    const YGDirection direction,
+    const YGConfigRef config) {
   const YGFlexDirection mainAxis =
       YGResolveFlexDirection(node->getStyle().flexDirection, direction);
   const YGFlexDirection crossAxis = YGFlexDirectionCross(mainAxis, direction);
@@ -1377,14 +1500,14 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
   YGMeasureMode childWidthMeasureMode = YGMeasureModeUndefined;
   YGMeasureMode childHeightMeasureMode = YGMeasureModeUndefined;
 
-  const float& marginRow =
+  auto marginRow =
       YGUnwrapFloatOptional(child->getMarginForAxis(YGFlexDirectionRow, width));
-  const float& marginColumn = YGUnwrapFloatOptional(
+  auto marginColumn = YGUnwrapFloatOptional(
       child->getMarginForAxis(YGFlexDirectionColumn, width));
 
   if (YGNodeIsStyleDimDefined(child, YGFlexDirectionRow, width)) {
-    childWidth =
-        YGUnwrapFloatOptional(YGResolveValue(child->getResolvedDimension(YGDimensionWidth), width)) +
+    childWidth = YGUnwrapFloatOptional(YGResolveValue(
+                     child->getResolvedDimension(YGDimensionWidth), width)) +
         marginRow;
   } else {
     // If the child doesn't have a specified width, compute the width based
@@ -1398,13 +1521,14 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
           YGUnwrapFloatOptional(
                        child->getLeadingPosition(YGFlexDirectionRow, width) +
                        child->getTrailingPosition(YGFlexDirectionRow, width));
-      childWidth = YGNodeBoundAxis(child, YGFlexDirectionRow, childWidth, width, width);
+      childWidth =
+          YGNodeBoundAxis(child, YGFlexDirectionRow, childWidth, width, width);
     }
   }
 
   if (YGNodeIsStyleDimDefined(child, YGFlexDirectionColumn, height)) {
-    childHeight =
-        YGUnwrapFloatOptional(YGResolveValue(child->getResolvedDimension(YGDimensionHeight), height)) +
+    childHeight = YGUnwrapFloatOptional(YGResolveValue(
+                      child->getResolvedDimension(YGDimensionHeight), height)) +
         marginColumn;
   } else {
     // If the child doesn't have a specified height, compute the height
@@ -1419,12 +1543,14 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
           YGUnwrapFloatOptional(
               child->getLeadingPosition(YGFlexDirectionColumn, height) +
               child->getTrailingPosition(YGFlexDirectionColumn, height));
-      childHeight = YGNodeBoundAxis(child, YGFlexDirectionColumn, childHeight, height, width);
+      childHeight = YGNodeBoundAxis(
+          child, YGFlexDirectionColumn, childHeight, height, width);
     }
   }
 
-  // Exactly one dimension needs to be defined for us to be able to do aspect ratio
-  // calculation. One dimension being the anchor and the other being flexible.
+  // Exactly one dimension needs to be defined for us to be able to do aspect
+  // ratio calculation. One dimension being the anchor and the other being
+  // flexible.
   if (YGFloatIsUndefined(childWidth) ^ YGFloatIsUndefined(childHeight)) {
     if (!child->getStyle().aspectRatio.isUndefined()) {
       if (YGFloatIsUndefined(childWidth)) {
@@ -1440,14 +1566,17 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
 
   // If we're still missing one or the other dimension, measure the content.
   if (YGFloatIsUndefined(childWidth) || YGFloatIsUndefined(childHeight)) {
-    childWidthMeasureMode =
-        YGFloatIsUndefined(childWidth) ? YGMeasureModeUndefined : YGMeasureModeExactly;
-    childHeightMeasureMode =
-        YGFloatIsUndefined(childHeight) ? YGMeasureModeUndefined : YGMeasureModeExactly;
-
-    // If the size of the owner is defined then try to constrain the absolute child to that size
-    // as well. This allows text within the absolute child to wrap to the size of its owner.
-    // This is the same behavior as many browsers implement.
+    childWidthMeasureMode = YGFloatIsUndefined(childWidth)
+        ? YGMeasureModeUndefined
+        : YGMeasureModeExactly;
+    childHeightMeasureMode = YGFloatIsUndefined(childHeight)
+        ? YGMeasureModeUndefined
+        : YGMeasureModeExactly;
+
+    // If the size of the owner is defined then try to constrain the absolute
+    // child to that size as well. This allows text within the absolute child to
+    // wrap to the size of its owner. This is the same behavior as many browsers
+    // implement.
     if (!isMainAxisRow && YGFloatIsUndefined(childWidth) &&
         widthMode != YGMeasureModeUndefined && !YGFloatIsUndefined(width) &&
         width > 0) {
@@ -1455,17 +1584,18 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
       childWidthMeasureMode = YGMeasureModeAtMost;
     }
 
-    YGLayoutNodeInternal(child,
-                         childWidth,
-                         childHeight,
-                         direction,
-                         childWidthMeasureMode,
-                         childHeightMeasureMode,
-                         childWidth,
-                         childHeight,
-                         false,
-                         "abs-measure",
-                         config);
+    YGLayoutNodeInternal(
+        child,
+        childWidth,
+        childHeight,
+        direction,
+        childWidthMeasureMode,
+        childHeightMeasureMode,
+        childWidth,
+        childHeight,
+        false,
+        "abs-measure",
+        config);
     childWidth = child->getLayout().measuredDimensions[YGDimensionWidth] +
         YGUnwrapFloatOptional(
                      child->getMarginForAxis(YGFlexDirectionRow, width));
@@ -1474,17 +1604,18 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
                       child->getMarginForAxis(YGFlexDirectionColumn, width));
   }
 
-  YGLayoutNodeInternal(child,
-                       childWidth,
-                       childHeight,
-                       direction,
-                       YGMeasureModeExactly,
-                       YGMeasureModeExactly,
-                       childWidth,
-                       childHeight,
-                       true,
-                       "abs-layout",
-                       config);
+  YGLayoutNodeInternal(
+      child,
+      childWidth,
+      childHeight,
+      direction,
+      YGMeasureModeExactly,
+      YGMeasureModeExactly,
+      childWidth,
+      childHeight,
+      true,
+      "abs-layout",
+      config);
 
   if (child->isTrailingPosDefined(mainAxis) &&
       !child->isLeadingPositionDefined(mainAxis)) {
@@ -1543,13 +1674,14 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
   }
 }
 
-static void YGNodeWithMeasureFuncSetMeasuredDimensions(const YGNodeRef node,
-                                                       const float availableWidth,
-                                                       const float availableHeight,
-                                                       const YGMeasureMode widthMeasureMode,
-                                                       const YGMeasureMode heightMeasureMode,
-                                                       const float ownerWidth,
-                                                       const float ownerHeight) {
+static void YGNodeWithMeasureFuncSetMeasuredDimensions(
+    const YGNodeRef node,
+    const float availableWidth,
+    const float availableHeight,
+    const YGMeasureMode widthMeasureMode,
+    const YGMeasureMode heightMeasureMode,
+    const float ownerWidth,
+    const float ownerHeight) {
   YGAssertWithNode(
       node,
       node->getMeasure() != nullptr,
@@ -1557,8 +1689,8 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(const YGNodeRef node,
 
   const float paddingAndBorderAxisRow =
       YGNodePaddingAndBorderForAxis(node, YGFlexDirectionRow, availableWidth);
-  const float paddingAndBorderAxisColumn =
-      YGNodePaddingAndBorderForAxis(node, YGFlexDirectionColumn, availableWidth);
+  const float paddingAndBorderAxisColumn = YGNodePaddingAndBorderForAxis(
+      node, YGFlexDirectionColumn, availableWidth);
   const float marginAxisRow = YGUnwrapFloatOptional(
       node->getMarginForAxis(YGFlexDirectionRow, availableWidth));
   const float marginAxisColumn = YGUnwrapFloatOptional(
@@ -1625,13 +1757,14 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(const YGNodeRef node,
 
 // For nodes with no children, use the available values if they were provided,
 // or the minimum size as indicated by the padding and border sizes.
-static void YGNodeEmptyContainerSetMeasuredDimensions(const YGNodeRef node,
-                                                      const float availableWidth,
-                                                      const float availableHeight,
-                                                      const YGMeasureMode widthMeasureMode,
-                                                      const YGMeasureMode heightMeasureMode,
-                                                      const float ownerWidth,
-                                                      const float ownerHeight) {
+static void YGNodeEmptyContainerSetMeasuredDimensions(
+    const YGNodeRef node,
+    const float availableWidth,
+    const float availableHeight,
+    const YGMeasureMode widthMeasureMode,
+    const YGMeasureMode heightMeasureMode,
+    const float ownerWidth,
+    const float ownerHeight) {
   const float paddingAndBorderAxisRow =
       YGNodePaddingAndBorderForAxis(node, YGFlexDirectionRow, ownerWidth);
   const float paddingAndBorderAxisColumn =
@@ -1666,22 +1799,23 @@ static void YGNodeEmptyContainerSetMeasuredDimensions(const YGNodeRef node,
       YGDimensionHeight);
 }
 
-static bool YGNodeFixedSizeSetMeasuredDimensions(const YGNodeRef node,
-                                                 const float availableWidth,
-                                                 const float availableHeight,
-                                                 const YGMeasureMode widthMeasureMode,
-                                                 const YGMeasureMode heightMeasureMode,
-                                                 const float ownerWidth,
-                                                 const float ownerHeight) {
+static bool YGNodeFixedSizeSetMeasuredDimensions(
+    const YGNodeRef node,
+    const float availableWidth,
+    const float availableHeight,
+    const YGMeasureMode widthMeasureMode,
+    const YGMeasureMode heightMeasureMode,
+    const float ownerWidth,
+    const float ownerHeight) {
   if ((!YGFloatIsUndefined(availableWidth) &&
        widthMeasureMode == YGMeasureModeAtMost && availableWidth <= 0.0f) ||
       (!YGFloatIsUndefined(availableHeight) &&
        heightMeasureMode == YGMeasureModeAtMost && availableHeight <= 0.0f) ||
       (widthMeasureMode == YGMeasureModeExactly &&
        heightMeasureMode == YGMeasureModeExactly)) {
-    const float& marginAxisColumn = YGUnwrapFloatOptional(
+    auto marginAxisColumn = YGUnwrapFloatOptional(
         node->getMarginForAxis(YGFlexDirectionColumn, ownerWidth));
-    const float& marginAxisRow = YGUnwrapFloatOptional(
+    auto marginAxisRow = YGUnwrapFloatOptional(
         node->getMarginForAxis(YGFlexDirectionRow, ownerWidth));
 
     node->setLayoutMeasuredDimension(
@@ -1747,12 +1881,14 @@ static float YGNodeCalculateAvailableInnerDim(
   if (!YGFloatIsUndefined(availableInnerDim)) {
     // We want to make sure our available height does not violate min and max
     // constraints
-    const YGFloatOptional minDimensionOptional = YGResolveValue(node->getStyle().minDimensions[dimension], ownerDim);
+    const YGFloatOptional minDimensionOptional =
+        YGResolveValue(node->getStyle().minDimensions[dimension], ownerDim);
     const float minInnerDim = minDimensionOptional.isUndefined()
         ? 0.0f
         : minDimensionOptional.getValue() - paddingAndBorder;
 
-    const YGFloatOptional maxDimensionOptional = YGResolveValue(node->getStyle().maxDimensions[dimension], ownerDim) ;
+    const YGFloatOptional maxDimensionOptional =
+        YGResolveValue(node->getStyle().maxDimensions[dimension], ownerDim);
 
     const float maxInnerDim = maxDimensionOptional.isUndefined()
         ? FLT_MAX
@@ -1868,7 +2004,7 @@ static YGCollectFlexItemsRowValues YGCalculateCollectFlexItemsRowValues(
 
   // Add items to the current line until it's full or we run out of items.
   uint32_t endOfLineIndex = startOfLineIndex;
-  for (; endOfLineIndex < node->getChildrenCount(); endOfLineIndex++) {
+  for (; endOfLineIndex < node->getChildren().size(); endOfLineIndex++) {
     const YGNodeRef child = node->getChild(endOfLineIndex);
     if (child->getStyle().display == YGDisplayNone ||
         child->getStyle().positionType == YGPositionTypeAbsolute) {
@@ -2286,21 +2422,33 @@ static void YGJustifyMainAxis(
     const float& availableInnerCrossDim,
     const float& availableInnerWidth,
     const bool& performLayout) {
-  const YGStyle style = node->getStyle();
-
-  // If we are using "at most" rules in the main axis. Calculate the remaining
-  // space when constraint by the min size defined for the main axis.
+  const YGStyle& style = node->getStyle();
+  const float leadingPaddingAndBorderMain = YGUnwrapFloatOptional(
+      node->getLeadingPaddingAndBorder(mainAxis, ownerWidth));
+  const float trailingPaddingAndBorderMain = YGUnwrapFloatOptional(
+      node->getTrailingPaddingAndBorder(mainAxis, ownerWidth));
+  // 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 &&
       collectedFlexItemsValues.remainingFreeSpace > 0) {
     if (style.minDimensions[dim[mainAxis]].unit != YGUnitUndefined &&
         !YGResolveValue(style.minDimensions[dim[mainAxis]], mainAxisownerSize)
              .isUndefined()) {
-      collectedFlexItemsValues.remainingFreeSpace = YGFloatMax(
-          0,
+      // This condition makes sure that if the size of main dimension(after
+      // considering child nodes main dim, leading and trailing padding etc)
+      // falls below min dimension, then the remainingFreeSpace is reassigned
+      // considering the min dimension
+
+      // `minAvailableMainDim` denotes minimum available space in which child
+      // can be laid out, it will exclude space consumed by padding and border.
+      const float minAvailableMainDim =
           YGUnwrapFloatOptional(YGResolveValue(
               style.minDimensions[dim[mainAxis]], mainAxisownerSize)) -
-              (availableInnerMainDim -
-               collectedFlexItemsValues.remainingFreeSpace));
+          leadingPaddingAndBorderMain - trailingPaddingAndBorderMain;
+      const float occupiedSpaceByChildNodes =
+          availableInnerMainDim - collectedFlexItemsValues.remainingFreeSpace;
+      collectedFlexItemsValues.remainingFreeSpace =
+          YGFloatMax(0, minAvailableMainDim - occupiedSpaceByChildNodes);
     } else {
       collectedFlexItemsValues.remainingFreeSpace = 0;
     }
@@ -2362,17 +2510,18 @@ static void YGJustifyMainAxis(
     }
   }
 
-  const float leadingPaddingAndBorderMain = YGUnwrapFloatOptional(
-      node->getLeadingPaddingAndBorder(mainAxis, ownerWidth));
   collectedFlexItemsValues.mainDim =
       leadingPaddingAndBorderMain + leadingMainDim;
   collectedFlexItemsValues.crossDim = 0;
 
+  float maxAscentForCurrentLine = 0;
+  float maxDescentForCurrentLine = 0;
+  bool isNodeBaselineLayout = YGIsBaselineLayout(node);
   for (uint32_t i = startOfLineIndex;
        i < collectedFlexItemsValues.endOfLineIndex;
        i++) {
     const YGNodeRef child = node->getChild(i);
-    const YGStyle childStyle = child->getStyle();
+    const YGStyle& childStyle = child->getStyle();
     const YGLayout childLayout = child->getLayout();
     if (childStyle.display == YGDisplayNone) {
       continue;
@@ -2432,11 +2581,30 @@ static void YGJustifyMainAxis(
           collectedFlexItemsValues.mainDim += betweenMainDim +
               YGNodeDimWithMargin(child, mainAxis, availableInnerWidth);
 
-          // The cross dimension is the max of the elements dimension since
-          // there can only be one element in that cross dimension.
-          collectedFlexItemsValues.crossDim = YGFloatMax(
-              collectedFlexItemsValues.crossDim,
-              YGNodeDimWithMargin(child, crossAxis, availableInnerWidth));
+          if (isNodeBaselineLayout) {
+            // If the child is baseline aligned then the cross dimension is
+            // calculated by adding maxAscent and maxDescent from the baseline.
+            const float ascent = YGBaseline(child) +
+                YGUnwrapFloatOptional(child->getLeadingMargin(
+                    YGFlexDirectionColumn, availableInnerWidth));
+            const float descent =
+                child->getLayout().measuredDimensions[YGDimensionHeight] +
+                YGUnwrapFloatOptional(child->getMarginForAxis(
+                    YGFlexDirectionColumn, availableInnerWidth)) -
+                ascent;
+
+            maxAscentForCurrentLine =
+                YGFloatMax(maxAscentForCurrentLine, ascent);
+            maxDescentForCurrentLine =
+                YGFloatMax(maxDescentForCurrentLine, descent);
+          } else {
+            // The cross dimension is the max of the elements dimension since
+            // there can only be one element in that cross dimension in the case
+            // when the items are not baseline aligned
+            collectedFlexItemsValues.crossDim = YGFloatMax(
+                collectedFlexItemsValues.crossDim,
+                YGNodeDimWithMargin(child, crossAxis, availableInnerWidth));
+          }
         }
       } else if (performLayout) {
         child->setLayoutPosition(
@@ -2446,8 +2614,12 @@ static void YGJustifyMainAxis(
       }
     }
   }
-  collectedFlexItemsValues.mainDim += YGUnwrapFloatOptional(
-      node->getTrailingPaddingAndBorder(mainAxis, ownerWidth));
+  collectedFlexItemsValues.mainDim += trailingPaddingAndBorderMain;
+
+  if (isNodeBaselineLayout) {
+    collectedFlexItemsValues.crossDim =
+        maxAscentForCurrentLine + maxDescentForCurrentLine;
+  }
 }
 
 //
@@ -2531,37 +2703,42 @@ static void YGJustifyMainAxis(
 //      - YGMeasureModeExactly: fill available
 //      - YGMeasureModeAtMost: fit content
 //
-//    When calling YGNodelayoutImpl and YGLayoutNodeInternal, if the caller passes
-//    an available size of
-//    undefined then it must also pass a measure mode of YGMeasureModeUndefined
-//    in that dimension.
+//    When calling YGNodelayoutImpl and YGLayoutNodeInternal, if the caller
+//    passes an available size of undefined then it must also pass a measure
+//    mode of YGMeasureModeUndefined in that dimension.
 //
-static void YGNodelayoutImpl(const YGNodeRef node,
-                             const float availableWidth,
-                             const float availableHeight,
-                             const YGDirection ownerDirection,
-                             const YGMeasureMode widthMeasureMode,
-                             const YGMeasureMode heightMeasureMode,
-                             const float ownerWidth,
-                             const float ownerHeight,
-                             const bool performLayout,
-                             const YGConfigRef config) {
-  YGAssertWithNode(node,
-                   YGFloatIsUndefined(availableWidth) ? widthMeasureMode == YGMeasureModeUndefined
-                                                      : true,
-                   "availableWidth is indefinite so widthMeasureMode must be "
-                   "YGMeasureModeUndefined");
-  YGAssertWithNode(node,
-                   YGFloatIsUndefined(availableHeight) ? heightMeasureMode == YGMeasureModeUndefined
-                                                       : true,
-                   "availableHeight is indefinite so heightMeasureMode must be "
-                   "YGMeasureModeUndefined");
+static void YGNodelayoutImpl(
+    const YGNodeRef node,
+    const float availableWidth,
+    const float availableHeight,
+    const YGDirection ownerDirection,
+    const YGMeasureMode widthMeasureMode,
+    const YGMeasureMode heightMeasureMode,
+    const float ownerWidth,
+    const float ownerHeight,
+    const bool performLayout,
+    const YGConfigRef config) {
+  YGAssertWithNode(
+      node,
+      YGFloatIsUndefined(availableWidth)
+          ? widthMeasureMode == YGMeasureModeUndefined
+          : true,
+      "availableWidth is indefinite so widthMeasureMode must be "
+      "YGMeasureModeUndefined");
+  YGAssertWithNode(
+      node,
+      YGFloatIsUndefined(availableHeight)
+          ? heightMeasureMode == YGMeasureModeUndefined
+          : true,
+      "availableHeight is indefinite so heightMeasureMode must be "
+      "YGMeasureModeUndefined");
 
   // Set the resolved resolution in the node's layout.
   const YGDirection direction = node->resolveDirection(ownerDirection);
   node->setLayoutDirection(direction);
 
-  const YGFlexDirection flexRowDirection = YGResolveFlexDirection(YGFlexDirectionRow, direction);
+  const YGFlexDirection flexRowDirection =
+      YGResolveFlexDirection(YGFlexDirectionRow, direction);
   const YGFlexDirection flexColumnDirection =
       YGResolveFlexDirection(YGFlexDirectionColumn, direction);
 
@@ -2606,41 +2783,46 @@ static void YGNodelayoutImpl(const YGNodeRef node,
       YGEdgeBottom);
 
   if (node->getMeasure() != nullptr) {
-    YGNodeWithMeasureFuncSetMeasuredDimensions(node,
-                                               availableWidth,
-                                               availableHeight,
-                                               widthMeasureMode,
-                                               heightMeasureMode,
-                                               ownerWidth,
-                                               ownerHeight);
+    YGNodeWithMeasureFuncSetMeasuredDimensions(
+        node,
+        availableWidth,
+        availableHeight,
+        widthMeasureMode,
+        heightMeasureMode,
+        ownerWidth,
+        ownerHeight);
     return;
   }
 
   const uint32_t childCount = YGNodeGetChildCount(node);
   if (childCount == 0) {
-    YGNodeEmptyContainerSetMeasuredDimensions(node,
-                                              availableWidth,
-                                              availableHeight,
-                                              widthMeasureMode,
-                                              heightMeasureMode,
-                                              ownerWidth,
-                                              ownerHeight);
+    YGNodeEmptyContainerSetMeasuredDimensions(
+        node,
+        availableWidth,
+        availableHeight,
+        widthMeasureMode,
+        heightMeasureMode,
+        ownerWidth,
+        ownerHeight);
     return;
   }
 
-  // If we're not being asked to perform a full layout we can skip the algorithm if we already know
-  // the size
-  if (!performLayout && YGNodeFixedSizeSetMeasuredDimensions(node,
-                                                             availableWidth,
-                                                             availableHeight,
-                                                             widthMeasureMode,
-                                                             heightMeasureMode,
-                                                             ownerWidth,
-                                                             ownerHeight)) {
+  // If we're not being asked to perform a full layout we can skip the algorithm
+  // if we already know the size
+  if (!performLayout &&
+      YGNodeFixedSizeSetMeasuredDimensions(
+          node,
+          availableWidth,
+          availableHeight,
+          widthMeasureMode,
+          heightMeasureMode,
+          ownerWidth,
+          ownerHeight)) {
     return;
   }
 
-  // At this point we know we're going to perform work. Ensure that each child has a mutable copy.
+  // At this point we know we're going to perform work. Ensure that each child
+  // has a mutable copy.
   node->cloneChildrenIfNeeded();
   // Reset layout flags, as they could have changed.
   node->setLayoutHadOverflow(false);
@@ -2657,12 +2839,15 @@ static void YGNodelayoutImpl(const YGNodeRef node,
 
   const float leadingPaddingAndBorderCross = YGUnwrapFloatOptional(
       node->getLeadingPaddingAndBorder(crossAxis, ownerWidth));
-  const float paddingAndBorderAxisMain = YGNodePaddingAndBorderForAxis(node, mainAxis, ownerWidth);
+  const float paddingAndBorderAxisMain =
+      YGNodePaddingAndBorderForAxis(node, mainAxis, ownerWidth);
   const float paddingAndBorderAxisCross =
       YGNodePaddingAndBorderForAxis(node, crossAxis, ownerWidth);
 
-  YGMeasureMode measureModeMainDim = isMainAxisRow ? widthMeasureMode : heightMeasureMode;
-  YGMeasureMode measureModeCrossDim = isMainAxisRow ? heightMeasureMode : widthMeasureMode;
+  YGMeasureMode measureModeMainDim =
+      isMainAxisRow ? widthMeasureMode : heightMeasureMode;
+  YGMeasureMode measureModeCrossDim =
+      isMainAxisRow ? heightMeasureMode : widthMeasureMode;
 
   const float paddingAndBorderAxisRow =
       isMainAxisRow ? paddingAndBorderAxisMain : paddingAndBorderAxisCross;
@@ -2675,13 +2860,16 @@ static void YGNodelayoutImpl(const YGNodeRef node,
       node->getMarginForAxis(YGFlexDirectionColumn, ownerWidth));
 
   const float minInnerWidth =
-      YGUnwrapFloatOptional(YGResolveValue(node->getStyle().minDimensions[YGDimensionWidth], ownerWidth)) -
+      YGUnwrapFloatOptional(YGResolveValue(
+          node->getStyle().minDimensions[YGDimensionWidth], ownerWidth)) -
       paddingAndBorderAxisRow;
   const float maxInnerWidth =
-      YGUnwrapFloatOptional(YGResolveValue(node->getStyle().maxDimensions[YGDimensionWidth], ownerWidth)) -
+      YGUnwrapFloatOptional(YGResolveValue(
+          node->getStyle().maxDimensions[YGDimensionWidth], ownerWidth)) -
       paddingAndBorderAxisRow;
   const float minInnerHeight =
-      YGUnwrapFloatOptional(YGResolveValue(node->getStyle().minDimensions[YGDimensionHeight], ownerHeight)) -
+      YGUnwrapFloatOptional(YGResolveValue(
+          node->getStyle().minDimensions[YGDimensionHeight], ownerHeight)) -
       paddingAndBorderAxisColumn;
   const float maxInnerHeight =
       YGUnwrapFloatOptional(YGResolveValue(
@@ -2764,7 +2952,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
     // the line length, so there's no more space left to distribute.
 
     bool sizeBasedOnContent = false;
-    // If we don't measure with exact main dimension we want to ensure we don't violate min and max
+    // If we don't measure with exact main dimension we want to ensure we don't
+    // violate min and max
     if (measureModeMainDim != YGMeasureModeExactly) {
       if (!YGFloatIsUndefined(minInnerMainDim) &&
           collectedFlexItemsValues.sizeConsumedOnCurrentLine <
@@ -2800,10 +2989,10 @@ static void YGNodelayoutImpl(const YGNodeRef node,
       collectedFlexItemsValues.remainingFreeSpace = availableInnerMainDim -
           collectedFlexItemsValues.sizeConsumedOnCurrentLine;
     } else if (collectedFlexItemsValues.sizeConsumedOnCurrentLine < 0) {
-      // availableInnerMainDim is indefinite which means the node is being sized based on its
-      // content.
-      // sizeConsumedOnCurrentLine is negative which means the node will allocate 0 points for
-      // its content. Consequently, remainingFreeSpace is 0 - sizeConsumedOnCurrentLine.
+      // availableInnerMainDim is indefinite which means the node is being sized
+      // based on its content. sizeConsumedOnCurrentLine is negative which means
+      // the node will allocate 0 points for its content. Consequently,
+      // remainingFreeSpace is 0 - sizeConsumedOnCurrentLine.
       collectedFlexItemsValues.remainingFreeSpace =
           -collectedFlexItemsValues.sizeConsumedOnCurrentLine;
     }
@@ -2905,7 +3094,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
                         crossAxis, availableInnerWidth)),
                 pos[crossAxis]);
           }
-          // If leading position is not defined or calculations result in Nan, default to border + margin
+          // If leading position is not defined or calculations result in Nan,
+          // default to border + margin
           if (!isChildLeadingPosDefined ||
               YGFloatIsUndefined(child->getLayout().position[pos[crossAxis]])) {
             child->setLayoutPosition(
@@ -2931,7 +3121,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
               child->marginTrailingValue(crossAxis).unit != YGUnitAuto) {
             // If the child defines a definite size for its cross axis, there's
             // no need to stretch.
-            if (!YGNodeIsStyleDimDefined(child, crossAxis, availableInnerCrossDim)) {
+            if (!YGNodeIsStyleDimDefined(
+                    child, crossAxis, availableInnerCrossDim)) {
               float childMainSize =
                   child->getLayout().measuredDimensions[dim[mainAxis]];
               float childCrossSize =
@@ -2949,21 +3140,25 @@ static void YGNodelayoutImpl(const YGNodeRef node,
 
               YGMeasureMode childMainMeasureMode = YGMeasureModeExactly;
               YGMeasureMode childCrossMeasureMode = YGMeasureModeExactly;
-              YGConstrainMaxSizeForMode(child,
-                                        mainAxis,
-                                        availableInnerMainDim,
-                                        availableInnerWidth,
-                                        &childMainMeasureMode,
-                                        &childMainSize);
-              YGConstrainMaxSizeForMode(child,
-                                        crossAxis,
-                                        availableInnerCrossDim,
-                                        availableInnerWidth,
-                                        &childCrossMeasureMode,
-                                        &childCrossSize);
-
-              const float childWidth = isMainAxisRow ? childMainSize : childCrossSize;
-              const float childHeight = !isMainAxisRow ? childMainSize : childCrossSize;
+              YGConstrainMaxSizeForMode(
+                  child,
+                  mainAxis,
+                  availableInnerMainDim,
+                  availableInnerWidth,
+                  &childMainMeasureMode,
+                  &childMainSize);
+              YGConstrainMaxSizeForMode(
+                  child,
+                  crossAxis,
+                  availableInnerCrossDim,
+                  availableInnerWidth,
+                  &childCrossMeasureMode,
+                  &childCrossSize);
+
+              const float childWidth =
+                  isMainAxisRow ? childMainSize : childCrossSize;
+              const float childHeight =
+                  !isMainAxisRow ? childMainSize : childCrossSize;
 
               const YGMeasureMode childWidthMeasureMode =
                   YGFloatIsUndefined(childWidth) ? YGMeasureModeUndefined
@@ -3021,46 +3216,46 @@ static void YGNodelayoutImpl(const YGNodeRef node,
   }
 
   // STEP 8: MULTI-LINE CONTENT ALIGNMENT
-  if (performLayout && (lineCount > 1 || YGIsBaselineLayout(node)) &&
-      !YGFloatIsUndefined(availableInnerCrossDim)) {
-    const float remainingAlignContentDim = availableInnerCrossDim - totalLineCrossDim;
-
+  // currentLead stores the size of the cross dim
+  if (performLayout && (lineCount > 1 || YGIsBaselineLayout(node))) {
     float crossDimLead = 0;
     float currentLead = leadingPaddingAndBorderCross;
-
-    switch (node->getStyle().alignContent) {
-      case YGAlignFlexEnd:
-        currentLead += remainingAlignContentDim;
-        break;
-      case YGAlignCenter:
-        currentLead += remainingAlignContentDim / 2;
-        break;
-      case YGAlignStretch:
-        if (availableInnerCrossDim > totalLineCrossDim) {
-          crossDimLead = remainingAlignContentDim / lineCount;
-        }
-        break;
-      case YGAlignSpaceAround:
-        if (availableInnerCrossDim > totalLineCrossDim) {
-          currentLead += remainingAlignContentDim / (2 * lineCount);
-          if (lineCount > 1) {
+    if (!YGFloatIsUndefined(availableInnerCrossDim)) {
+      const float remainingAlignContentDim =
+          availableInnerCrossDim - totalLineCrossDim;
+      switch (node->getStyle().alignContent) {
+        case YGAlignFlexEnd:
+          currentLead += remainingAlignContentDim;
+          break;
+        case YGAlignCenter:
+          currentLead += remainingAlignContentDim / 2;
+          break;
+        case YGAlignStretch:
+          if (availableInnerCrossDim > totalLineCrossDim) {
             crossDimLead = remainingAlignContentDim / lineCount;
           }
-        } else {
-          currentLead += remainingAlignContentDim / 2;
-        }
-        break;
-      case YGAlignSpaceBetween:
-        if (availableInnerCrossDim > totalLineCrossDim && lineCount > 1) {
-          crossDimLead = remainingAlignContentDim / (lineCount - 1);
-        }
-        break;
-      case YGAlignAuto:
-      case YGAlignFlexStart:
-      case YGAlignBaseline:
-        break;
+          break;
+        case YGAlignSpaceAround:
+          if (availableInnerCrossDim > totalLineCrossDim) {
+            currentLead += remainingAlignContentDim / (2 * lineCount);
+            if (lineCount > 1) {
+              crossDimLead = remainingAlignContentDim / lineCount;
+            }
+          } else {
+            currentLead += remainingAlignContentDim / 2;
+          }
+          break;
+        case YGAlignSpaceBetween:
+          if (availableInnerCrossDim > totalLineCrossDim && lineCount > 1) {
+            crossDimLead = remainingAlignContentDim / (lineCount - 1);
+          }
+          break;
+        case YGAlignAuto:
+        case YGAlignFlexStart:
+        case YGAlignBaseline:
+          break;
+      }
     }
-
     uint32_t endIndex = 0;
     for (uint32_t i = 0; i < lineCount; i++) {
       const uint32_t startIndex = endIndex;
@@ -3148,9 +3343,10 @@ static void YGNodelayoutImpl(const YGNodeRef node,
                             crossAxis, availableInnerWidth)),
                     pos[crossAxis]);
 
-                // Remeasure child with the line height as it as been only measured with the
-                // owners height yet.
-                if (!YGNodeIsStyleDimDefined(child, crossAxis, availableInnerCrossDim)) {
+                // Remeasure child with the line height as it as been only
+                // measured with the owners height yet.
+                if (!YGNodeIsStyleDimDefined(
+                        child, crossAxis, availableInnerCrossDim)) {
                   const float childWidth = isMainAxisRow
                       ? (child->getLayout()
                              .measuredDimensions[YGDimensionWidth] +
@@ -3173,17 +3369,18 @@ static void YGNodelayoutImpl(const YGNodeRef node,
                             childHeight,
                             child->getLayout()
                                 .measuredDimensions[YGDimensionHeight]))) {
-                    YGLayoutNodeInternal(child,
-                                         childWidth,
-                                         childHeight,
-                                         direction,
-                                         YGMeasureModeExactly,
-                                         YGMeasureModeExactly,
-                                         availableInnerWidth,
-                                         availableInnerHeight,
-                                         true,
-                                         "multiline-stretch",
-                                         config);
+                    YGLayoutNodeInternal(
+                        child,
+                        childWidth,
+                        childHeight,
+                        direction,
+                        YGMeasureModeExactly,
+                        YGMeasureModeExactly,
+                        availableInnerWidth,
+                        availableInnerHeight,
+                        true,
+                        "multiline-stretch",
+                        config);
                   }
                 }
                 break;
@@ -3205,7 +3402,6 @@ static void YGNodelayoutImpl(const YGNodeRef node,
           }
         }
       }
-
       currentLead += lineHeight;
     }
   }
@@ -3260,7 +3456,6 @@ static void YGNodelayoutImpl(const YGNodeRef node,
        measureModeCrossDim == YGMeasureModeAtMost)) {
     // Clamp the size to the min/max size, if specified, and make sure it
     // doesn't go below the padding and border amount.
-
     node->setLayoutMeasuredDimension(
         YGNodeBoundAxis(
             node,
@@ -3286,7 +3481,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
         dim[crossAxis]);
   }
 
-  // As we only wrapped in normal direction yet, we need to reverse the positions on wrap-reverse.
+  // As we only wrapped in normal direction yet, we need to reverse the
+  // positions on wrap-reverse.
   if (performLayout && node->getStyle().flexWrap == YGWrapWrapReverse) {
     for (uint32_t i = 0; i < childCount; i++) {
       const YGNodeRef child = YGNodeGetChild(node, i);
@@ -3317,10 +3513,10 @@ static void YGNodelayoutImpl(const YGNodeRef node,
     }
 
     // STEP 11: SETTING TRAILING POSITIONS FOR CHILDREN
-    const bool needsMainTrailingPos =
-        mainAxis == YGFlexDirectionRowReverse || mainAxis == YGFlexDirectionColumnReverse;
-    const bool needsCrossTrailingPos =
-        crossAxis == YGFlexDirectionRowReverse || crossAxis == YGFlexDirectionColumnReverse;
+    const bool needsMainTrailingPos = mainAxis == YGFlexDirectionRowReverse ||
+        mainAxis == YGFlexDirectionColumnReverse;
+    const bool needsCrossTrailingPos = crossAxis == YGFlexDirectionRowReverse ||
+        crossAxis == YGFlexDirectionColumnReverse;
 
     // Set trailing position if necessary.
     if (needsMainTrailingPos || needsCrossTrailingPos) {
@@ -3342,13 +3538,13 @@ static void YGNodelayoutImpl(const YGNodeRef node,
 }
 
 uint32_t gDepth = 0;
-bool gPrintTree = false;
 bool gPrintChanges = false;
 bool gPrintSkips = false;
 
-static const char *spacer = "                                                            ";
+static const char* spacer =
+    "                                                            ";
 
-static const char *YGSpacer(const unsigned long level) {
+static const char* YGSpacer(const unsigned long level) {
   const size_t spacerLen = strlen(spacer);
   if (level > spacerLen) {
     return &spacer[0];
@@ -3357,9 +3553,12 @@ static const char *YGSpacer(const unsigned long level) {
   }
 }
 
-static const char *YGMeasureModeName(const YGMeasureMode mode, const bool performLayout) {
-  const char *kMeasureModeNames[YGMeasureModeCount] = {"UNDEFINED", "EXACTLY", "AT_MOST"};
-  const char *kLayoutModeNames[YGMeasureModeCount] = {"LAY_UNDEFINED",
+static const char* YGMeasureModeName(
+    const YGMeasureMode mode,
+    const bool performLayout) {
+  const char* kMeasureModeNames[YGMeasureModeCount] = {
+      "UNDEFINED", "EXACTLY", "AT_MOST"};
+  const char* kLayoutModeNames[YGMeasureModeCount] = {"LAY_UNDEFINED",
                                                       "LAY_EXACTLY",
                                                       "LAY_AT_"
                                                       "MOST"};
@@ -3371,25 +3570,30 @@ static const char *YGMeasureModeName(const YGMeasureMode mode, const bool perfor
   return performLayout ? kLayoutModeNames[mode] : kMeasureModeNames[mode];
 }
 
-static inline bool YGMeasureModeSizeIsExactAndMatchesOldMeasuredSize(YGMeasureMode sizeMode,
-                                                                     float size,
-                                                                     float lastComputedSize) {
-  return sizeMode == YGMeasureModeExactly && YGFloatsEqual(size, lastComputedSize);
+static inline bool YGMeasureModeSizeIsExactAndMatchesOldMeasuredSize(
+    YGMeasureMode sizeMode,
+    float size,
+    float lastComputedSize) {
+  return sizeMode == YGMeasureModeExactly &&
+      YGFloatsEqual(size, lastComputedSize);
 }
 
-static inline bool YGMeasureModeOldSizeIsUnspecifiedAndStillFits(YGMeasureMode sizeMode,
-                                                                 float size,
-                                                                 YGMeasureMode lastSizeMode,
-                                                                 float lastComputedSize) {
-  return sizeMode == YGMeasureModeAtMost && lastSizeMode == YGMeasureModeUndefined &&
-         (size >= lastComputedSize || YGFloatsEqual(size, lastComputedSize));
+static inline bool YGMeasureModeOldSizeIsUnspecifiedAndStillFits(
+    YGMeasureMode sizeMode,
+    float size,
+    YGMeasureMode lastSizeMode,
+    float lastComputedSize) {
+  return sizeMode == YGMeasureModeAtMost &&
+      lastSizeMode == YGMeasureModeUndefined &&
+      (size >= lastComputedSize || YGFloatsEqual(size, lastComputedSize));
 }
 
-static inline bool YGMeasureModeNewMeasureSizeIsStricterAndStillValid(YGMeasureMode sizeMode,
-                                                                      float size,
-                                                                      YGMeasureMode lastSizeMode,
-                                                                      float lastSize,
-                                                                      float lastComputedSize) {
+static inline bool YGMeasureModeNewMeasureSizeIsStricterAndStillValid(
+    YGMeasureMode sizeMode,
+    float size,
+    YGMeasureMode lastSizeMode,
+    float lastSize,
+    float lastComputedSize) {
   return lastSizeMode == YGMeasureModeAtMost &&
       sizeMode == YGMeasureModeAtMost && !YGFloatIsUndefined(lastSize) &&
       !YGFloatIsUndefined(size) && !YGFloatIsUndefined(lastComputedSize) &&
@@ -3397,12 +3601,33 @@ static inline bool YGMeasureModeNewMeasureSizeIsStricterAndStillValid(YGMeasureM
       (lastComputedSize <= size || YGFloatsEqual(size, lastComputedSize));
 }
 
-float YGRoundValueToPixelGrid(const float value,
-                              const float pointScaleFactor,
-                              const bool forceCeil,
-                              const bool forceFloor) {
+float YGRoundValueToPixelGrid(
+    const float value,
+    const float pointScaleFactor,
+    const bool forceCeil,
+    const bool forceFloor) {
   float scaledValue = value * pointScaleFactor;
+  // We want to calculate `fractial` such that `floor(scaledValue) = scaledValue
+  // - fractial`.
   float fractial = fmodf(scaledValue, 1.0f);
+  if (fractial < 0) {
+    // This branch is for handling negative numbers for `value`.
+    //
+    // Regarding `floor` and `ceil`. Note that for a number x, `floor(x) <= x <=
+    // ceil(x)` even for negative numbers. Here are a couple of examples:
+    //   - x =  2.2: floor( 2.2) =  2, ceil( 2.2) =  3
+    //   - x = -2.2: floor(-2.2) = -3, ceil(-2.2) = -2
+    //
+    // Regarding `fmodf`. For fractional negative numbers, `fmodf` returns a
+    // negative number. For example, `fmodf(-2.2) = -0.2`. However, we want
+    // `fractial` to be the number such that subtracting it from `value` will
+    // give us `floor(value)`. In the case of negative numbers, adding 1 to
+    // `fmodf(value)` gives us this. Let's continue the example from above:
+    //   - fractial = fmodf(-2.2) = -0.2
+    //   - Add 1 to the fraction: fractial2 = fractial + 1 = -0.2 + 1 = 0.8
+    //   - Finding the `floor`: -2.2 - fractial2 = -2.2 - 0.8 = -3
+    ++fractial;
+  }
   if (YGFloatsEqual(fractial, 0)) {
     // First we check if the value is already rounded
     scaledValue = scaledValue - fractial;
@@ -3427,66 +3652,74 @@ float YGRoundValueToPixelGrid(const float value,
       : scaledValue / pointScaleFactor;
 }
 
-bool YGNodeCanUseCachedMeasurement(const YGMeasureMode widthMode,
-                                   const float width,
-                                   const YGMeasureMode heightMode,
-                                   const float height,
-                                   const YGMeasureMode lastWidthMode,
-                                   const float lastWidth,
-                                   const YGMeasureMode lastHeightMode,
-                                   const float lastHeight,
-                                   const float lastComputedWidth,
-                                   const float lastComputedHeight,
-                                   const float marginRow,
-                                   const float marginColumn,
-                                   const YGConfigRef config) {
+bool YGNodeCanUseCachedMeasurement(
+    const YGMeasureMode widthMode,
+    const float width,
+    const YGMeasureMode heightMode,
+    const float height,
+    const YGMeasureMode lastWidthMode,
+    const float lastWidth,
+    const YGMeasureMode lastHeightMode,
+    const float lastHeight,
+    const float lastComputedWidth,
+    const float lastComputedHeight,
+    const float marginRow,
+    const float marginColumn,
+    const YGConfigRef config) {
   if ((!YGFloatIsUndefined(lastComputedHeight) && lastComputedHeight < 0) ||
       (!YGFloatIsUndefined(lastComputedWidth) && lastComputedWidth < 0)) {
     return false;
   }
   bool useRoundedComparison =
       config != nullptr && config->pointScaleFactor != 0;
-  const float effectiveWidth =
-      useRoundedComparison ? YGRoundValueToPixelGrid(width, config->pointScaleFactor, false, false)
-                           : width;
-  const float effectiveHeight =
-      useRoundedComparison ? YGRoundValueToPixelGrid(height, config->pointScaleFactor, false, false)
-                           : height;
-  const float effectiveLastWidth =
-      useRoundedComparison
-          ? YGRoundValueToPixelGrid(lastWidth, config->pointScaleFactor, false, false)
-          : lastWidth;
-  const float effectiveLastHeight =
-      useRoundedComparison
-          ? YGRoundValueToPixelGrid(lastHeight, config->pointScaleFactor, false, false)
-          : lastHeight;
-
-  const bool hasSameWidthSpec =
-      lastWidthMode == widthMode && YGFloatsEqual(effectiveLastWidth, effectiveWidth);
-  const bool hasSameHeightSpec =
-      lastHeightMode == heightMode && YGFloatsEqual(effectiveLastHeight, effectiveHeight);
+  const float effectiveWidth = useRoundedComparison
+      ? YGRoundValueToPixelGrid(width, config->pointScaleFactor, false, false)
+      : width;
+  const float effectiveHeight = useRoundedComparison
+      ? YGRoundValueToPixelGrid(height, config->pointScaleFactor, false, false)
+      : height;
+  const float effectiveLastWidth = useRoundedComparison
+      ? YGRoundValueToPixelGrid(
+            lastWidth, config->pointScaleFactor, false, false)
+      : lastWidth;
+  const float effectiveLastHeight = useRoundedComparison
+      ? YGRoundValueToPixelGrid(
+            lastHeight, config->pointScaleFactor, false, false)
+      : lastHeight;
+
+  const bool hasSameWidthSpec = lastWidthMode == widthMode &&
+      YGFloatsEqual(effectiveLastWidth, effectiveWidth);
+  const bool hasSameHeightSpec = lastHeightMode == heightMode &&
+      YGFloatsEqual(effectiveLastHeight, effectiveHeight);
 
   const bool widthIsCompatible =
-      hasSameWidthSpec || YGMeasureModeSizeIsExactAndMatchesOldMeasuredSize(widthMode,
-                                                                            width - marginRow,
-                                                                            lastComputedWidth) ||
-      YGMeasureModeOldSizeIsUnspecifiedAndStillFits(widthMode,
-                                                    width - marginRow,
-                                                    lastWidthMode,
-                                                    lastComputedWidth) ||
+      hasSameWidthSpec ||
+      YGMeasureModeSizeIsExactAndMatchesOldMeasuredSize(
+          widthMode, width - marginRow, lastComputedWidth) ||
+      YGMeasureModeOldSizeIsUnspecifiedAndStillFits(
+          widthMode, width - marginRow, lastWidthMode, lastComputedWidth) ||
       YGMeasureModeNewMeasureSizeIsStricterAndStillValid(
-          widthMode, width - marginRow, lastWidthMode, lastWidth, lastComputedWidth);
+          widthMode,
+          width - marginRow,
+          lastWidthMode,
+          lastWidth,
+          lastComputedWidth);
 
   const bool heightIsCompatible =
-      hasSameHeightSpec || YGMeasureModeSizeIsExactAndMatchesOldMeasuredSize(heightMode,
-                                                                             height - marginColumn,
-                                                                             lastComputedHeight) ||
-      YGMeasureModeOldSizeIsUnspecifiedAndStillFits(heightMode,
-                                                    height - marginColumn,
-                                                    lastHeightMode,
-                                                    lastComputedHeight) ||
+      hasSameHeightSpec ||
+      YGMeasureModeSizeIsExactAndMatchesOldMeasuredSize(
+          heightMode, height - marginColumn, lastComputedHeight) ||
+      YGMeasureModeOldSizeIsUnspecifiedAndStillFits(
+          heightMode,
+          height - marginColumn,
+          lastHeightMode,
+          lastComputedHeight) ||
       YGMeasureModeNewMeasureSizeIsStricterAndStillValid(
-          heightMode, height - marginColumn, lastHeightMode, lastHeight, lastComputedHeight);
+          heightMode,
+          height - marginColumn,
+          lastHeightMode,
+          lastHeight,
+          lastComputedHeight);
 
   return widthIsCompatible && heightIsCompatible;
 }
@@ -3499,17 +3732,18 @@ bool YGNodeCanUseCachedMeasurement(const YGMeasureMode widthMode,
 //  Input parameters are the same as YGNodelayoutImpl (see above)
 //  Return parameter is true if layout was performed, false if skipped
 //
-bool YGLayoutNodeInternal(const YGNodeRef node,
-                          const float availableWidth,
-                          const float availableHeight,
-                          const YGDirection ownerDirection,
-                          const YGMeasureMode widthMeasureMode,
-                          const YGMeasureMode heightMeasureMode,
-                          const float ownerWidth,
-                          const float ownerHeight,
-                          const bool performLayout,
-                          const char *reason,
-                          const YGConfigRef config) {
+bool YGLayoutNodeInternal(
+    const YGNodeRef node,
+    const float availableWidth,
+    const float availableHeight,
+    const YGDirection ownerDirection,
+    const YGMeasureMode widthMeasureMode,
+    const YGMeasureMode heightMeasureMode,
+    const float ownerWidth,
+    const float ownerHeight,
+    const bool performLayout,
+    const char* reason,
+    const YGConfigRef config) {
   YGLayout* layout = &node->getLayout();
 
   gDepth++;
@@ -3521,8 +3755,8 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
   if (needToVisitNode) {
     // Invalidate the cached results.
     layout->nextCachedMeasurementsIndex = 0;
-    layout->cachedLayout.widthMeasureMode = (YGMeasureMode) -1;
-    layout->cachedLayout.heightMeasureMode = (YGMeasureMode) -1;
+    layout->cachedLayout.widthMeasureMode = (YGMeasureMode)-1;
+    layout->cachedLayout.heightMeasureMode = (YGMeasureMode)-1;
     layout->cachedLayout.computedWidth = -1;
     layout->cachedLayout.computedHeight = -1;
   }
@@ -3548,36 +3782,38 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
         node->getMarginForAxis(YGFlexDirectionColumn, ownerWidth));
 
     // First, try to use the layout cache.
-    if (YGNodeCanUseCachedMeasurement(widthMeasureMode,
-                                      availableWidth,
-                                      heightMeasureMode,
-                                      availableHeight,
-                                      layout->cachedLayout.widthMeasureMode,
-                                      layout->cachedLayout.availableWidth,
-                                      layout->cachedLayout.heightMeasureMode,
-                                      layout->cachedLayout.availableHeight,
-                                      layout->cachedLayout.computedWidth,
-                                      layout->cachedLayout.computedHeight,
-                                      marginAxisRow,
-                                      marginAxisColumn,
-                                      config)) {
+    if (YGNodeCanUseCachedMeasurement(
+            widthMeasureMode,
+            availableWidth,
+            heightMeasureMode,
+            availableHeight,
+            layout->cachedLayout.widthMeasureMode,
+            layout->cachedLayout.availableWidth,
+            layout->cachedLayout.heightMeasureMode,
+            layout->cachedLayout.availableHeight,
+            layout->cachedLayout.computedWidth,
+            layout->cachedLayout.computedHeight,
+            marginAxisRow,
+            marginAxisColumn,
+            config)) {
       cachedResults = &layout->cachedLayout;
     } else {
       // Try to use the measurement cache.
       for (uint32_t i = 0; i < layout->nextCachedMeasurementsIndex; i++) {
-        if (YGNodeCanUseCachedMeasurement(widthMeasureMode,
-                                          availableWidth,
-                                          heightMeasureMode,
-                                          availableHeight,
-                                          layout->cachedMeasurements[i].widthMeasureMode,
-                                          layout->cachedMeasurements[i].availableWidth,
-                                          layout->cachedMeasurements[i].heightMeasureMode,
-                                          layout->cachedMeasurements[i].availableHeight,
-                                          layout->cachedMeasurements[i].computedWidth,
-                                          layout->cachedMeasurements[i].computedHeight,
-                                          marginAxisRow,
-                                          marginAxisColumn,
-                                          config)) {
+        if (YGNodeCanUseCachedMeasurement(
+                widthMeasureMode,
+                availableWidth,
+                heightMeasureMode,
+                availableHeight,
+                layout->cachedMeasurements[i].widthMeasureMode,
+                layout->cachedMeasurements[i].availableWidth,
+                layout->cachedMeasurements[i].heightMeasureMode,
+                layout->cachedMeasurements[i].availableHeight,
+                layout->cachedMeasurements[i].computedWidth,
+                layout->cachedMeasurements[i].computedHeight,
+                marginAxisRow,
+                marginAxisColumn,
+                config)) {
           cachedResults = &layout->cachedMeasurements[i];
           break;
         }
@@ -3592,10 +3828,13 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
     }
   } else {
     for (uint32_t i = 0; i < layout->nextCachedMeasurementsIndex; i++) {
-      if (YGFloatsEqual(layout->cachedMeasurements[i].availableWidth, availableWidth) &&
-          YGFloatsEqual(layout->cachedMeasurements[i].availableHeight, availableHeight) &&
+      if (YGFloatsEqual(
+              layout->cachedMeasurements[i].availableWidth, availableWidth) &&
+          YGFloatsEqual(
+              layout->cachedMeasurements[i].availableHeight, availableHeight) &&
           layout->cachedMeasurements[i].widthMeasureMode == widthMeasureMode &&
-          layout->cachedMeasurements[i].heightMeasureMode == heightMeasureMode) {
+          layout->cachedMeasurements[i].heightMeasureMode ==
+              heightMeasureMode) {
         cachedResults = &layout->cachedMeasurements[i];
         break;
       }
@@ -3604,10 +3843,16 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
 
   if (!needToVisitNode && cachedResults != nullptr) {
     layout->measuredDimensions[YGDimensionWidth] = cachedResults->computedWidth;
-    layout->measuredDimensions[YGDimensionHeight] = cachedResults->computedHeight;
+    layout->measuredDimensions[YGDimensionHeight] =
+        cachedResults->computedHeight;
 
     if (gPrintChanges && gPrintSkips) {
-      YGLog(node, YGLogLevelVerbose, "%s%d.{[skipped] ", YGSpacer(gDepth), gDepth);
+      YGLog(
+          node,
+          YGLogLevelVerbose,
+          "%s%d.{[skipped] ",
+          YGSpacer(gDepth),
+          gDepth);
       if (node->getPrintFunc() != nullptr) {
         node->getPrintFunc()(node);
       }
@@ -3646,16 +3891,17 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
           reason);
     }
 
-    YGNodelayoutImpl(node,
-                     availableWidth,
-                     availableHeight,
-                     ownerDirection,
-                     widthMeasureMode,
-                     heightMeasureMode,
-                     ownerWidth,
-                     ownerHeight,
-                     performLayout,
-                     config);
+    YGNodelayoutImpl(
+        node,
+        availableWidth,
+        availableHeight,
+        ownerDirection,
+        widthMeasureMode,
+        heightMeasureMode,
+        ownerWidth,
+        ownerHeight,
+        performLayout,
+        config);
 
     if (gPrintChanges) {
       YGLog(
@@ -3689,13 +3935,14 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
         layout->nextCachedMeasurementsIndex = 0;
       }
 
-      YGCachedMeasurement *newCacheEntry;
+      YGCachedMeasurement* newCacheEntry;
       if (performLayout) {
         // Use the single layout cache entry.
         newCacheEntry = &layout->cachedLayout;
       } else {
         // Allocate a new measurement cache entry.
-        newCacheEntry = &layout->cachedMeasurements[layout->nextCachedMeasurementsIndex];
+        newCacheEntry =
+            &layout->cachedMeasurements[layout->nextCachedMeasurementsIndex];
         layout->nextCachedMeasurementsIndex++;
       }
 
@@ -3703,8 +3950,10 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
       newCacheEntry->availableHeight = availableHeight;
       newCacheEntry->widthMeasureMode = widthMeasureMode;
       newCacheEntry->heightMeasureMode = heightMeasureMode;
-      newCacheEntry->computedWidth = layout->measuredDimensions[YGDimensionWidth];
-      newCacheEntry->computedHeight = layout->measuredDimensions[YGDimensionHeight];
+      newCacheEntry->computedWidth =
+          layout->measuredDimensions[YGDimensionWidth];
+      newCacheEntry->computedHeight =
+          layout->measuredDimensions[YGDimensionHeight];
     }
   }
 
@@ -3725,8 +3974,13 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
   return (needToVisitNode || cachedResults == nullptr);
 }
 
-void YGConfigSetPointScaleFactor(const YGConfigRef config, const float pixelsInPoint) {
-  YGAssertWithConfig(config, pixelsInPoint >= 0.0f, "Scale factor should not be less than zero");
+void YGConfigSetPointScaleFactor(
+    const YGConfigRef config,
+    const float pixelsInPoint) {
+  YGAssertWithConfig(
+      config,
+      pixelsInPoint >= 0.0f,
+      "Scale factor should not be less than zero");
 
   // We store points for Pixel as we will use it for rounding
   if (pixelsInPoint == 0.0f) {
@@ -3737,10 +3991,11 @@ void YGConfigSetPointScaleFactor(const YGConfigRef config, const float pixelsInP
   }
 }
 
-static void YGRoundToPixelGrid(const YGNodeRef node,
-                               const float pointScaleFactor,
-                               const float absoluteLeft,
-                               const float absoluteTop) {
+static void YGRoundToPixelGrid(
+    const YGNodeRef node,
+    const float pointScaleFactor,
+    const float absoluteLeft,
+    const float absoluteTop) {
   if (pointScaleFactor == 0.0f) {
     return;
   }
@@ -3757,8 +4012,8 @@ static void YGRoundToPixelGrid(const YGNodeRef node,
   const float absoluteNodeRight = absoluteNodeLeft + nodeWidth;
   const float absoluteNodeBottom = absoluteNodeTop + nodeHeight;
 
-  // If a node has a custom measure function we never want to round down its size as this could
-  // lead to unwanted text truncation.
+  // If a node has a custom measure function we never want to round down its
+  // size as this could lead to unwanted text truncation.
   const bool textRounding = node->getNodeType() == YGNodeTypeText;
 
   node->setLayoutPosition(
@@ -3769,13 +4024,15 @@ static void YGRoundToPixelGrid(const YGNodeRef node,
       YGRoundValueToPixelGrid(nodeTop, pointScaleFactor, false, textRounding),
       YGEdgeTop);
 
-  // We multiply dimension by scale factor and if the result is close to the whole number, we don't
-  // have any fraction
-  // To verify if the result is close to whole number we want to check both floor and ceil numbers
-  const bool hasFractionalWidth = !YGFloatsEqual(fmodf(nodeWidth * pointScaleFactor, 1.0), 0) &&
-                                  !YGFloatsEqual(fmodf(nodeWidth * pointScaleFactor, 1.0), 1.0);
-  const bool hasFractionalHeight = !YGFloatsEqual(fmodf(nodeHeight * pointScaleFactor, 1.0), 0) &&
-                                   !YGFloatsEqual(fmodf(nodeHeight * pointScaleFactor, 1.0), 1.0);
+  // We multiply dimension by scale factor and if the result is close to the
+  // whole number, we don't have any fraction To verify if the result is close
+  // to whole number we want to check both floor and ceil numbers
+  const bool hasFractionalWidth =
+      !YGFloatsEqual(fmodf(nodeWidth * pointScaleFactor, 1.0), 0) &&
+      !YGFloatsEqual(fmodf(nodeWidth * pointScaleFactor, 1.0), 1.0);
+  const bool hasFractionalHeight =
+      !YGFloatsEqual(fmodf(nodeHeight * pointScaleFactor, 1.0), 0) &&
+      !YGFloatsEqual(fmodf(nodeHeight * pointScaleFactor, 1.0), 1.0);
 
   node->setLayoutDimension(
       YGRoundValueToPixelGrid(
@@ -3852,7 +4109,8 @@ void YGNodeCalculateLayout(
                   node->getStyle().maxDimensions[YGDimensionHeight],
                   ownerHeight)
                   .isUndefined()) {
-    height = YGUnwrapFloatOptional(YGResolveValue(node->getStyle().maxDimensions[YGDimensionHeight], ownerHeight));
+    height = YGUnwrapFloatOptional(YGResolveValue(
+        node->getStyle().maxDimensions[YGDimensionHeight], ownerHeight));
     heightMeasureMode = YGMeasureModeAtMost;
   } else {
     height = ownerHeight;
@@ -3875,7 +4133,7 @@ void YGNodeCalculateLayout(
         node->getLayout().direction, ownerWidth, ownerHeight, ownerWidth);
     YGRoundToPixelGrid(node, node->getConfig()->pointScaleFactor, 0.0f, 0.0f);
 
-    if (gPrintTree) {
+    if (node->getConfig()->printTree) {
       YGNodePrint(
           node,
           (YGPrintOptions)(
@@ -3927,7 +4185,7 @@ void YGNodeCalculateLayout(
       node->setLayoutDoesLegacyFlagAffectsLayout(
           !originalNode->isLayoutTreeEqualToNode(*node));
 
-      if (gPrintTree) {
+      if (originalNode->getConfig()->printTree) {
         YGNodePrint(
             originalNode,
             (YGPrintOptions)(
@@ -3958,12 +4216,14 @@ void YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(
   config->shouldDiffLayoutWithoutLegacyStretchBehaviour = shouldDiffLayout;
 }
 
-static void YGVLog(const YGConfigRef config,
-                   const YGNodeRef node,
-                   YGLogLevel level,
-                   const char *format,
-                   va_list args) {
-  const YGConfigRef logConfig = config != nullptr ? config : YGConfigGetDefault();
+static void YGVLog(
+    const YGConfigRef config,
+    const YGNodeRef node,
+    YGLogLevel level,
+    const char* format,
+    va_list args) {
+  const YGConfigRef logConfig =
+      config != nullptr ? config : YGConfigGetDefault();
   logConfig->logger(logConfig, node, level, format, args);
 
   if (level == YGLogLevelFatal) {
@@ -3971,14 +4231,18 @@ static void YGVLog(const YGConfigRef config,
   }
 }
 
-void YGLogWithConfig(const YGConfigRef config, YGLogLevel level, const char *format, ...) {
+void YGLogWithConfig(
+    const YGConfigRef config,
+    YGLogLevel level,
+    const char* format,
+    ...) {
   va_list args;
   va_start(args, format);
   YGVLog(config, nullptr, level, format, args);
   va_end(args);
 }
 
-void YGLog(const YGNodeRef node, YGLogLevel level, const char *format, ...) {
+void YGLog(const YGNodeRef node, YGLogLevel level, const char* format, ...) {
   va_list args;
   va_start(args, format);
   YGVLog(
@@ -3986,32 +4250,40 @@ void YGLog(const YGNodeRef node, YGLogLevel level, const char *format, ...) {
   va_end(args);
 }
 
-void YGAssert(const bool condition, const char *message) {
+void YGAssert(const bool condition, const char* message) {
   if (!condition) {
     YGLog(nullptr, YGLogLevelFatal, "%s\n", message);
   }
 }
 
-void YGAssertWithNode(const YGNodeRef node, const bool condition, const char *message) {
+void YGAssertWithNode(
+    const YGNodeRef node,
+    const bool condition,
+    const char* message) {
   if (!condition) {
     YGLog(node, YGLogLevelFatal, "%s\n", message);
   }
 }
 
-void YGAssertWithConfig(const YGConfigRef config, const bool condition, const char *message) {
+void YGAssertWithConfig(
+    const YGConfigRef config,
+    const bool condition,
+    const char* message) {
   if (!condition) {
     YGLogWithConfig(config, YGLogLevelFatal, "%s\n", message);
   }
 }
 
-void YGConfigSetExperimentalFeatureEnabled(const YGConfigRef config,
-                                           const YGExperimentalFeature feature,
-                                           const bool enabled) {
+void YGConfigSetExperimentalFeatureEnabled(
+    const YGConfigRef config,
+    const YGExperimentalFeature feature,
+    const bool enabled) {
   config->experimentalFeatures[feature] = enabled;
 }
 
-inline bool YGConfigIsExperimentalFeatureEnabled(const YGConfigRef config,
-                                                 const YGExperimentalFeature feature) {
+inline bool YGConfigIsExperimentalFeatureEnabled(
+    const YGConfigRef config,
+    const YGExperimentalFeature feature) {
   return config->experimentalFeatures[feature];
 }
 
@@ -4019,8 +4291,9 @@ void YGConfigSetUseWebDefaults(const YGConfigRef config, const bool enabled) {
   config->useWebDefaults = enabled;
 }
 
-void YGConfigSetUseLegacyStretchBehaviour(const YGConfigRef config,
-                                          const bool useLegacyStretchBehaviour) {
+void YGConfigSetUseLegacyStretchBehaviour(
+    const YGConfigRef config,
+    const bool useLegacyStretchBehaviour) {
   config->useLegacyStretchBehaviour = useLegacyStretchBehaviour;
 }
 
@@ -4028,26 +4301,32 @@ bool YGConfigGetUseWebDefaults(const YGConfigRef config) {
   return config->useWebDefaults;
 }
 
-void YGConfigSetContext(const YGConfigRef config, void *context) {
+void YGConfigSetContext(const YGConfigRef config, void* context) {
   config->context = context;
 }
 
-void *YGConfigGetContext(const YGConfigRef config) {
+void* YGConfigGetContext(const YGConfigRef config) {
   return config->context;
 }
 
-void YGConfigSetCloneNodeFunc(const YGConfigRef config, const YGCloneNodeFunc callback) {
+void YGConfigSetCloneNodeFunc(
+    const YGConfigRef config,
+    const YGCloneNodeFunc callback) {
   config->cloneNodeCallback = callback;
 }
 
-static void YGTraverseChildrenPreOrder(const YGVector& children, const std::function<void(YGNodeRef node)>& f) {
+static void YGTraverseChildrenPreOrder(
+    const YGVector& children,
+    const std::function<void(YGNodeRef node)>& f) {
   for (YGNodeRef node : children) {
     f(node);
     YGTraverseChildrenPreOrder(node->getChildren(), f);
   }
 }
 
-void YGTraversePreOrder(YGNodeRef const node, std::function<void(YGNodeRef node)>&& f) {
+void YGTraversePreOrder(
+    YGNodeRef const node,
+    std::function<void(YGNodeRef node)>&& f) {
   if (!node) {
     return;
   }
diff --git a/ReactCommon/yoga/yoga/Yoga.h b/ReactCommon/yoga/yoga/Yoga.h
index a9fc89d7df4d2c..d5da362decd815 100644
--- a/ReactCommon/yoga/yoga/Yoga.h
+++ b/ReactCommon/yoga/yoga/Yoga.h
@@ -1,10 +1,10 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * 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 <assert.h>
@@ -45,23 +45,37 @@ typedef struct YGValue {
 extern const YGValue YGValueUndefined;
 extern const YGValue YGValueAuto;
 
-typedef struct YGConfig *YGConfigRef;
+#ifdef __cplusplus
+
+YG_EXTERN_C_END
+
+extern bool operator==(const YGValue& lhs, const YGValue& rhs);
+extern bool operator!=(const YGValue& lhs, const YGValue& rhs);
+
+YG_EXTERN_C_BEGIN
+
+#endif
+
+typedef struct YGConfig* YGConfigRef;
 
 typedef struct YGNode* YGNodeRef;
 
-typedef YGSize (*YGMeasureFunc)(YGNodeRef node,
-                                float width,
-                                YGMeasureMode widthMode,
-                                float height,
-                                YGMeasureMode heightMode);
-typedef float (*YGBaselineFunc)(YGNodeRef node, const float width, const float height);
+typedef YGSize (*YGMeasureFunc)(
+    YGNodeRef node,
+    float width,
+    YGMeasureMode widthMode,
+    float height,
+    YGMeasureMode heightMode);
+typedef float (
+    *YGBaselineFunc)(YGNodeRef node, const float width, const float height);
 typedef void (*YGDirtiedFunc)(YGNodeRef node);
 typedef void (*YGPrintFunc)(YGNodeRef node);
-typedef int (*YGLogger)(const YGConfigRef config,
-                        const YGNodeRef node,
-                        YGLogLevel level,
-                        const char *format,
-                        va_list args);
+typedef int (*YGLogger)(
+    const YGConfigRef config,
+    const YGNodeRef node,
+    YGLogLevel level,
+    const char* format,
+    va_list args);
 typedef YGNodeRef (
     *YGCloneNodeFunc)(YGNodeRef oldNode, YGNodeRef owner, int childIndex);
 
@@ -74,9 +88,10 @@ WIN_EXPORT void YGNodeFreeRecursive(const YGNodeRef node);
 WIN_EXPORT void YGNodeReset(const YGNodeRef node);
 WIN_EXPORT int32_t YGNodeGetInstanceCount(void);
 
-WIN_EXPORT void YGNodeInsertChild(const YGNodeRef node,
-                                  const YGNodeRef child,
-                                  const uint32_t index);
+WIN_EXPORT void YGNodeInsertChild(
+    const YGNodeRef node,
+    const YGNodeRef child,
+    const uint32_t index);
 
 // This function inserts the child YGNodeRef as a children of the node received
 // by parameter and set the Owner of the child object to null. This function is
@@ -99,10 +114,11 @@ WIN_EXPORT void YGNodeSetChildren(
     const YGNodeRef children[],
     const uint32_t count);
 
-WIN_EXPORT void YGNodeCalculateLayout(const YGNodeRef node,
-                                      const float availableWidth,
-                                      const float availableHeight,
-                                      const YGDirection ownerDirection);
+WIN_EXPORT void YGNodeCalculateLayout(
+    const YGNodeRef node,
+    const float availableWidth,
+    const float availableHeight,
+    const YGDirection ownerDirection);
 
 // Mark a node as dirty. Only valid for nodes with a custom measure function
 // set.
@@ -112,75 +128,40 @@ WIN_EXPORT void YGNodeCalculateLayout(const YGNodeRef node,
 // marking manually.
 WIN_EXPORT void YGNodeMarkDirty(const YGNodeRef node);
 
-// This function marks the current node and all its descendants as dirty. This function is added to test yoga benchmarks.
-// This function is not expected to be used in production as calling `YGCalculateLayout` will cause the recalculation of each and every node.
+// This function marks the current node and all its descendants as dirty. This
+// function is added to test yoga benchmarks. This function is not expected to
+// be used in production as calling `YGCalculateLayout` will cause the
+// recalculation of each and every node.
 WIN_EXPORT void YGNodeMarkDirtyAndPropogateToDescendants(const YGNodeRef node);
 
 WIN_EXPORT void YGNodePrint(const YGNodeRef node, const YGPrintOptions options);
 
 WIN_EXPORT bool YGFloatIsUndefined(const float value);
 
-WIN_EXPORT bool YGNodeCanUseCachedMeasurement(const YGMeasureMode widthMode,
-                                              const float width,
-                                              const YGMeasureMode heightMode,
-                                              const float height,
-                                              const YGMeasureMode lastWidthMode,
-                                              const float lastWidth,
-                                              const YGMeasureMode lastHeightMode,
-                                              const float lastHeight,
-                                              const float lastComputedWidth,
-                                              const float lastComputedHeight,
-                                              const float marginRow,
-                                              const float marginColumn,
-                                              const YGConfigRef config);
-
-WIN_EXPORT void YGNodeCopyStyle(const YGNodeRef dstNode, const YGNodeRef srcNode);
-
-#define YG_NODE_PROPERTY(type, name, paramName)                          \
-  WIN_EXPORT void YGNodeSet##name(const YGNodeRef node, type paramName); \
-  WIN_EXPORT type YGNodeGet##name(const YGNodeRef node);
-
-#define YG_NODE_STYLE_PROPERTY(type, name, paramName)                               \
-  WIN_EXPORT void YGNodeStyleSet##name(const YGNodeRef node, const type paramName); \
-  WIN_EXPORT type YGNodeStyleGet##name(const YGNodeRef node);
-
-#define YG_NODE_STYLE_PROPERTY_UNIT(type, name, paramName)                                    \
-  WIN_EXPORT void YGNodeStyleSet##name(const YGNodeRef node, const float paramName);          \
-  WIN_EXPORT void YGNodeStyleSet##name##Percent(const YGNodeRef node, const float paramName); \
-  WIN_EXPORT type YGNodeStyleGet##name(const YGNodeRef node);
-
-#define YG_NODE_STYLE_PROPERTY_UNIT_AUTO(type, name, paramName) \
-  YG_NODE_STYLE_PROPERTY_UNIT(type, name, paramName)            \
-  WIN_EXPORT void YGNodeStyleSet##name##Auto(const YGNodeRef node);
-
-#define YG_NODE_STYLE_EDGE_PROPERTY(type, name, paramName)    \
-  WIN_EXPORT void YGNodeStyleSet##name(const YGNodeRef node,  \
-                                       const YGEdge edge,     \
-                                       const type paramName); \
-  WIN_EXPORT type YGNodeStyleGet##name(const YGNodeRef node, const YGEdge edge);
-
-#define YG_NODE_STYLE_EDGE_PROPERTY_UNIT(type, name, paramName)         \
-  WIN_EXPORT void YGNodeStyleSet##name(const YGNodeRef node,            \
-                                       const YGEdge edge,               \
-                                       const float paramName);          \
-  WIN_EXPORT void YGNodeStyleSet##name##Percent(const YGNodeRef node,   \
-                                                const YGEdge edge,      \
-                                                const float paramName); \
-  WIN_EXPORT WIN_STRUCT(type) YGNodeStyleGet##name(const YGNodeRef node, const YGEdge edge);
-
-#define YG_NODE_STYLE_EDGE_PROPERTY_UNIT_AUTO(type, name) \
-  WIN_EXPORT void YGNodeStyleSet##name##Auto(const YGNodeRef node, const YGEdge edge);
-
-#define YG_NODE_LAYOUT_PROPERTY(type, name) \
-  WIN_EXPORT type YGNodeLayoutGet##name(const YGNodeRef node);
-
-#define YG_NODE_LAYOUT_EDGE_PROPERTY(type, name) \
-  WIN_EXPORT type YGNodeLayoutGet##name(const YGNodeRef node, const YGEdge edge);
-
-void* YGNodeGetContext(YGNodeRef node);
-void YGNodeSetContext(YGNodeRef node, void* context);
+WIN_EXPORT bool YGNodeCanUseCachedMeasurement(
+    const YGMeasureMode widthMode,
+    const float width,
+    const YGMeasureMode heightMode,
+    const float height,
+    const YGMeasureMode lastWidthMode,
+    const float lastWidth,
+    const YGMeasureMode lastHeightMode,
+    const float lastHeight,
+    const float lastComputedWidth,
+    const float lastComputedHeight,
+    const float marginRow,
+    const float marginColumn,
+    const YGConfigRef config);
+
+WIN_EXPORT void YGNodeCopyStyle(
+    const YGNodeRef dstNode,
+    const YGNodeRef srcNode);
+
+WIN_EXPORT void* YGNodeGetContext(YGNodeRef node);
+WIN_EXPORT void YGNodeSetContext(YGNodeRef node, void* context);
+void YGConfigSetPrintTreeFlag(YGConfigRef config, bool enabled);
 YGMeasureFunc YGNodeGetMeasureFunc(YGNodeRef node);
-void YGNodeSetMeasureFunc(YGNodeRef node, YGMeasureFunc measureFunc);
+WIN_EXPORT void YGNodeSetMeasureFunc(YGNodeRef node, YGMeasureFunc measureFunc);
 YGBaselineFunc YGNodeGetBaselineFunc(YGNodeRef node);
 void YGNodeSetBaselineFunc(YGNodeRef node, YGBaselineFunc baselineFunc);
 YGDirtiedFunc YGNodeGetDirtiedFunc(YGNodeRef node);
@@ -194,90 +175,240 @@ void YGNodeSetNodeType(YGNodeRef node, YGNodeType nodeType);
 bool YGNodeIsDirty(YGNodeRef node);
 bool YGNodeLayoutGetDidUseLegacyFlag(const YGNodeRef node);
 
-YG_NODE_STYLE_PROPERTY(YGDirection, Direction, direction);
-YG_NODE_STYLE_PROPERTY(YGFlexDirection, FlexDirection, flexDirection);
-YG_NODE_STYLE_PROPERTY(YGJustify, JustifyContent, justifyContent);
-YG_NODE_STYLE_PROPERTY(YGAlign, AlignContent, alignContent);
-YG_NODE_STYLE_PROPERTY(YGAlign, AlignItems, alignItems);
-YG_NODE_STYLE_PROPERTY(YGAlign, AlignSelf, alignSelf);
-YG_NODE_STYLE_PROPERTY(YGPositionType, PositionType, positionType);
-YG_NODE_STYLE_PROPERTY(YGWrap, FlexWrap, flexWrap);
-YG_NODE_STYLE_PROPERTY(YGOverflow, Overflow, overflow);
-YG_NODE_STYLE_PROPERTY(YGDisplay, Display, display);
-YG_NODE_STYLE_PROPERTY(float, Flex, flex);
-YG_NODE_STYLE_PROPERTY(float, FlexGrow, flexGrow);
-YG_NODE_STYLE_PROPERTY(float, FlexShrink, flexShrink);
-YG_NODE_STYLE_PROPERTY_UNIT_AUTO(YGValue, FlexBasis, flexBasis);
-
-YG_NODE_STYLE_EDGE_PROPERTY_UNIT(YGValue, Position, position);
-YG_NODE_STYLE_EDGE_PROPERTY_UNIT(YGValue, Margin, margin);
-YG_NODE_STYLE_EDGE_PROPERTY_UNIT_AUTO(YGValue, Margin);
-YG_NODE_STYLE_EDGE_PROPERTY_UNIT(YGValue, Padding, padding);
-YG_NODE_STYLE_EDGE_PROPERTY(float, Border, border);
-
-YG_NODE_STYLE_PROPERTY_UNIT_AUTO(YGValue, Width, width);
-YG_NODE_STYLE_PROPERTY_UNIT_AUTO(YGValue, Height, height);
-YG_NODE_STYLE_PROPERTY_UNIT(YGValue, MinWidth, minWidth);
-YG_NODE_STYLE_PROPERTY_UNIT(YGValue, MinHeight, minHeight);
-YG_NODE_STYLE_PROPERTY_UNIT(YGValue, MaxWidth, maxWidth);
-YG_NODE_STYLE_PROPERTY_UNIT(YGValue, MaxHeight, maxHeight);
+WIN_EXPORT void YGNodeStyleSetDirection(
+    const YGNodeRef node,
+    const YGDirection direction);
+WIN_EXPORT YGDirection YGNodeStyleGetDirection(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetFlexDirection(
+    const YGNodeRef node,
+    const YGFlexDirection flexDirection);
+WIN_EXPORT YGFlexDirection YGNodeStyleGetFlexDirection(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetJustifyContent(
+    const YGNodeRef node,
+    const YGJustify justifyContent);
+WIN_EXPORT YGJustify YGNodeStyleGetJustifyContent(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetAlignContent(
+    const YGNodeRef node,
+    const YGAlign alignContent);
+WIN_EXPORT YGAlign YGNodeStyleGetAlignContent(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetAlignItems(
+    const YGNodeRef node,
+    const YGAlign alignItems);
+WIN_EXPORT YGAlign YGNodeStyleGetAlignItems(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetAlignSelf(
+    const YGNodeRef node,
+    const YGAlign alignSelf);
+WIN_EXPORT YGAlign YGNodeStyleGetAlignSelf(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetPositionType(
+    const YGNodeRef node,
+    const YGPositionType positionType);
+WIN_EXPORT YGPositionType YGNodeStyleGetPositionType(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetFlexWrap(
+    const YGNodeRef node,
+    const YGWrap flexWrap);
+WIN_EXPORT YGWrap YGNodeStyleGetFlexWrap(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetOverflow(
+    const YGNodeRef node,
+    const YGOverflow overflow);
+WIN_EXPORT YGOverflow YGNodeStyleGetOverflow(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetDisplay(
+    const YGNodeRef node,
+    const YGDisplay display);
+WIN_EXPORT YGDisplay YGNodeStyleGetDisplay(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetFlex(const YGNodeRef node, const float flex);
+WIN_EXPORT float YGNodeStyleGetFlex(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetFlexGrow(
+    const YGNodeRef node,
+    const float flexGrow);
+WIN_EXPORT float YGNodeStyleGetFlexGrow(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetFlexShrink(
+    const YGNodeRef node,
+    const float flexShrink);
+WIN_EXPORT float YGNodeStyleGetFlexShrink(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetFlexBasis(
+    const YGNodeRef node,
+    const float flexBasis);
+WIN_EXPORT void YGNodeStyleSetFlexBasisPercent(
+    const YGNodeRef node,
+    const float flexBasis);
+WIN_EXPORT void YGNodeStyleSetFlexBasisAuto(const YGNodeRef node);
+WIN_EXPORT YGValue YGNodeStyleGetFlexBasis(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetPosition(
+    const YGNodeRef node,
+    const YGEdge edge,
+    const float position);
+WIN_EXPORT void YGNodeStyleSetPositionPercent(
+    const YGNodeRef node,
+    const YGEdge edge,
+    const float position);
+WIN_EXPORT WIN_STRUCT(YGValue)
+    YGNodeStyleGetPosition(const YGNodeRef node, const YGEdge edge);
+
+WIN_EXPORT void YGNodeStyleSetMargin(
+    const YGNodeRef node,
+    const YGEdge edge,
+    const float margin);
+WIN_EXPORT void YGNodeStyleSetMarginPercent(
+    const YGNodeRef node,
+    const YGEdge edge,
+    const float margin);
+WIN_EXPORT void YGNodeStyleSetMarginAuto(
+    const YGNodeRef node,
+    const YGEdge edge);
+WIN_EXPORT YGValue
+YGNodeStyleGetMargin(const YGNodeRef node, const YGEdge edge);
+
+WIN_EXPORT void YGNodeStyleSetPadding(
+    const YGNodeRef node,
+    const YGEdge edge,
+    const float padding);
+WIN_EXPORT void YGNodeStyleSetPaddingPercent(
+    const YGNodeRef node,
+    const YGEdge edge,
+    const float padding);
+WIN_EXPORT YGValue
+YGNodeStyleGetPadding(const YGNodeRef node, const YGEdge edge);
+
+WIN_EXPORT void YGNodeStyleSetBorder(
+    const YGNodeRef node,
+    const YGEdge edge,
+    const float border);
+WIN_EXPORT float YGNodeStyleGetBorder(const YGNodeRef node, const YGEdge edge);
+
+WIN_EXPORT void YGNodeStyleSetWidth(const YGNodeRef node, const float width);
+WIN_EXPORT void YGNodeStyleSetWidthPercent(
+    const YGNodeRef node,
+    const float width);
+WIN_EXPORT void YGNodeStyleSetWidthAuto(const YGNodeRef node);
+WIN_EXPORT YGValue YGNodeStyleGetWidth(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetHeight(const YGNodeRef node, const float height);
+WIN_EXPORT void YGNodeStyleSetHeightPercent(
+    const YGNodeRef node,
+    const float height);
+WIN_EXPORT void YGNodeStyleSetHeightAuto(const YGNodeRef node);
+WIN_EXPORT YGValue YGNodeStyleGetHeight(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetMinWidth(
+    const YGNodeRef node,
+    const float minWidth);
+WIN_EXPORT void YGNodeStyleSetMinWidthPercent(
+    const YGNodeRef node,
+    const float minWidth);
+WIN_EXPORT YGValue YGNodeStyleGetMinWidth(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetMinHeight(
+    const YGNodeRef node,
+    const float minHeight);
+WIN_EXPORT void YGNodeStyleSetMinHeightPercent(
+    const YGNodeRef node,
+    const float minHeight);
+WIN_EXPORT YGValue YGNodeStyleGetMinHeight(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetMaxWidth(
+    const YGNodeRef node,
+    const float maxWidth);
+WIN_EXPORT void YGNodeStyleSetMaxWidthPercent(
+    const YGNodeRef node,
+    const float maxWidth);
+WIN_EXPORT YGValue YGNodeStyleGetMaxWidth(const YGNodeRef node);
+
+WIN_EXPORT void YGNodeStyleSetMaxHeight(
+    const YGNodeRef node,
+    const float maxHeight);
+WIN_EXPORT void YGNodeStyleSetMaxHeightPercent(
+    const YGNodeRef node,
+    const float maxHeight);
+WIN_EXPORT YGValue YGNodeStyleGetMaxHeight(const YGNodeRef node);
 
 // Yoga specific properties, not compatible with flexbox specification
 // Aspect ratio control the size of the undefined dimension of a node.
-// Aspect ratio is encoded as a floating point value width/height. e.g. A value of 2 leads to a node
-// with a width twice the size of its height while a value of 0.5 gives the opposite effect.
+// Aspect ratio is encoded as a floating point value width/height. e.g. A value
+// of 2 leads to a node with a width twice the size of its height while a value
+// of 0.5 gives the opposite effect.
 //
-// - 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 if
-// unset
-// - On a node with a measure function aspect ratio works as though the measure function measures
-// the flex basis
-// - On a node with flex grow/shrink aspect ratio controls the size of the node in the cross axis if
-// unset
+// - 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 if unset
+// - On a node with a measure function aspect ratio works as though the measure
+// function measures the flex basis
+// - 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
-YG_NODE_STYLE_PROPERTY(float, AspectRatio, aspectRatio);
-
-YG_NODE_LAYOUT_PROPERTY(float, Left);
-YG_NODE_LAYOUT_PROPERTY(float, Top);
-YG_NODE_LAYOUT_PROPERTY(float, Right);
-YG_NODE_LAYOUT_PROPERTY(float, Bottom);
-YG_NODE_LAYOUT_PROPERTY(float, Width);
-YG_NODE_LAYOUT_PROPERTY(float, Height);
-YG_NODE_LAYOUT_PROPERTY(YGDirection, Direction);
-YG_NODE_LAYOUT_PROPERTY(bool, HadOverflow);
+WIN_EXPORT void YGNodeStyleSetAspectRatio(
+    const YGNodeRef node,
+    const float aspectRatio);
+WIN_EXPORT float YGNodeStyleGetAspectRatio(const YGNodeRef node);
+
+WIN_EXPORT float YGNodeLayoutGetLeft(const YGNodeRef node);
+WIN_EXPORT float YGNodeLayoutGetTop(const YGNodeRef node);
+WIN_EXPORT float YGNodeLayoutGetRight(const YGNodeRef node);
+WIN_EXPORT float YGNodeLayoutGetBottom(const YGNodeRef node);
+WIN_EXPORT float YGNodeLayoutGetWidth(const YGNodeRef node);
+WIN_EXPORT float YGNodeLayoutGetHeight(const YGNodeRef node);
+WIN_EXPORT YGDirection YGNodeLayoutGetDirection(const YGNodeRef node);
+WIN_EXPORT bool YGNodeLayoutGetHadOverflow(const YGNodeRef node);
 bool YGNodeLayoutGetDidLegacyStretchFlagAffectLayout(const YGNodeRef node);
 
-// Get the computed values for these nodes after performing layout. If they were set using
-// point values then the returned value will be the same as YGNodeStyleGetXXX. However if
-// they were set using a percentage value then the returned value is the computed value used
-// during layout.
-YG_NODE_LAYOUT_EDGE_PROPERTY(float, Margin);
-YG_NODE_LAYOUT_EDGE_PROPERTY(float, Border);
-YG_NODE_LAYOUT_EDGE_PROPERTY(float, Padding);
+// Get the computed values for these nodes after performing layout. If they were
+// set using point values then the returned value will be the same as
+// YGNodeStyleGetXXX. However if they were set using a percentage value then the
+// returned value is the computed value used during layout.
+WIN_EXPORT float YGNodeLayoutGetMargin(const YGNodeRef node, const YGEdge edge);
+WIN_EXPORT float YGNodeLayoutGetBorder(const YGNodeRef node, const YGEdge edge);
+WIN_EXPORT float YGNodeLayoutGetPadding(
+    const YGNodeRef node,
+    const YGEdge edge);
 
 WIN_EXPORT void YGConfigSetLogger(const YGConfigRef config, YGLogger logger);
-WIN_EXPORT void YGLog(const YGNodeRef node, YGLogLevel level, const char *message, ...);
-WIN_EXPORT void YGLogWithConfig(const YGConfigRef config, YGLogLevel level, const char *format, ...);
-WIN_EXPORT void YGAssert(const bool condition, const char *message);
-WIN_EXPORT void YGAssertWithNode(const YGNodeRef node, const bool condition, const char *message);
-WIN_EXPORT void YGAssertWithConfig(const YGConfigRef config,
-                                   const bool condition,
-                                   const char *message);
+WIN_EXPORT void
+YGLog(const YGNodeRef node, YGLogLevel level, const char* message, ...);
+WIN_EXPORT void YGLogWithConfig(
+    const YGConfigRef config,
+    YGLogLevel level,
+    const char* format,
+    ...);
+WIN_EXPORT void YGAssert(const bool condition, const char* message);
+WIN_EXPORT void YGAssertWithNode(
+    const YGNodeRef node,
+    const bool condition,
+    const char* message);
+WIN_EXPORT void YGAssertWithConfig(
+    const YGConfigRef config,
+    const bool condition,
+    const char* message);
 // Set this to number of pixels in 1 point to round calculation results
 // If you want to avoid rounding - set PointScaleFactor to 0
-WIN_EXPORT void YGConfigSetPointScaleFactor(const YGConfigRef config, const float pixelsInPoint);
+WIN_EXPORT void YGConfigSetPointScaleFactor(
+    const YGConfigRef config,
+    const float pixelsInPoint);
 void YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(
     const YGConfigRef config,
     const bool shouldDiffLayout);
 
-// Yoga previously had an error where containers would take the maximum space possible instead of
-// the minimum
-// like they are supposed to. In practice this 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 void YGConfigSetUseLegacyStretchBehaviour(const YGConfigRef config,
-                                                     const bool useLegacyStretchBehaviour);
+// Yoga previously had an error where containers would take the maximum space
+// possible instead of the minimum like they are supposed to. In practice this
+// 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 void YGConfigSetUseLegacyStretchBehaviour(
+    const YGConfigRef config,
+    const bool useLegacyStretchBehaviour);
 
 // YGConfig
 WIN_EXPORT YGConfigRef YGConfigNew(void);
@@ -285,25 +416,30 @@ WIN_EXPORT void YGConfigFree(const YGConfigRef config);
 WIN_EXPORT void YGConfigCopy(const YGConfigRef dest, const YGConfigRef src);
 WIN_EXPORT int32_t YGConfigGetInstanceCount(void);
 
-WIN_EXPORT void YGConfigSetExperimentalFeatureEnabled(const YGConfigRef config,
-                                                      const YGExperimentalFeature feature,
-                                                      const bool enabled);
-WIN_EXPORT bool YGConfigIsExperimentalFeatureEnabled(const YGConfigRef config,
-                                                     const YGExperimentalFeature feature);
+WIN_EXPORT void YGConfigSetExperimentalFeatureEnabled(
+    const YGConfigRef config,
+    const YGExperimentalFeature feature,
+    const bool enabled);
+WIN_EXPORT bool YGConfigIsExperimentalFeatureEnabled(
+    const YGConfigRef config,
+    const YGExperimentalFeature feature);
 
 // Using the web defaults is the prefered configuration for new projects.
 // Usage of non web defaults should be considered as legacy.
-WIN_EXPORT void YGConfigSetUseWebDefaults(const YGConfigRef config, const bool enabled);
+WIN_EXPORT void YGConfigSetUseWebDefaults(
+    const YGConfigRef config,
+    const bool enabled);
 WIN_EXPORT bool YGConfigGetUseWebDefaults(const YGConfigRef config);
 
-WIN_EXPORT void YGConfigSetCloneNodeFunc(const YGConfigRef config,
-                                          const YGCloneNodeFunc callback);
+WIN_EXPORT void YGConfigSetCloneNodeFunc(
+    const YGConfigRef config,
+    const YGCloneNodeFunc callback);
 
 // Export only for C#
 WIN_EXPORT YGConfigRef YGConfigGetDefault(void);
 
-WIN_EXPORT void YGConfigSetContext(const YGConfigRef config, void *context);
-WIN_EXPORT void *YGConfigGetContext(const YGConfigRef config);
+WIN_EXPORT void YGConfigSetContext(const YGConfigRef config, void* context);
+WIN_EXPORT void* YGConfigGetContext(const YGConfigRef config);
 
 WIN_EXPORT float YGRoundValueToPixelGrid(
     const float value,
@@ -319,7 +455,9 @@ YG_EXTERN_C_END
 #include <vector>
 
 // Calls f on each node in the tree including the given node argument.
-extern void YGTraversePreOrder(YGNodeRef const node, std::function<void(YGNodeRef node)>&& f);
+extern void YGTraversePreOrder(
+    YGNodeRef const node,
+    std::function<void(YGNodeRef node)>&& f);
 
 extern void YGNodeSetChildren(
     YGNodeRef const owner,
diff --git a/Releases.md b/Releases.md
index 0e9492cfda0cd4..f9bab35ab6fcc7 100644
--- a/Releases.md
+++ b/Releases.md
@@ -65,7 +65,7 @@ Circle CI will automatically run the tests and publish to npm with the version y
 
 ### Step 3: Write the release notes
 
-Write the release notes, or post in [React Native Core Contributors](https://www.facebook.com/groups/reactnativeoss/) that the RC is ready to find a voluteer. You can also use [react-native-release-notes](https://github.com/knowbody/react-native-release-notes) to generate a draft of release notes.
+Write the release notes, or post in [React Native Core Contributors](https://www.facebook.com/groups/reactnativeoss/) that the RC is ready to find a volunteer. You can also use [react-native-release-notes](https://github.com/knowbody/react-native-release-notes) to generate a draft of release notes.
 
 To go through all the commits that went into a release, one way is to use the GitHub compare view:
 
diff --git a/android-jsc/android-jsc.aar b/android-jsc/android-jsc.aar
new file mode 100644
index 00000000000000..35f203edb7c221
Binary files /dev/null and b/android-jsc/android-jsc.aar differ
diff --git a/android-jsc/build.gradle b/android-jsc/build.gradle
new file mode 100644
index 00000000000000..dc3e8d0b867b06
--- /dev/null
+++ b/android-jsc/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('android-jsc.aar'))
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000000000..c41066d86eca60
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,48 @@
+environment:
+    ANDROID_HOME: "C:\\android-sdk-windows"
+    ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17c"
+    ANDROID_BUILD_VERSION: 27
+    ANDROID_TOOLS_VERSION: 27.0.3
+
+    GRADLE_OPTS: -Dorg.gradle.daemon=false
+
+    SDK_TOOLS_URL: https://dl.google.com/android/repository/sdk-tools-windows-3859397.zip
+    NDK_TOOLS_URL: https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip
+
+    matrix:
+        - nodejs_version: 8
+        - nodejs_version: 10
+
+install:
+    # Install Android SDK Tools
+    - mkdir "%ANDROID_HOME%"
+    - appveyor DownloadFile "%SDK_TOOLS_URL%" -FileName "%TMP%/sdk-tools.zip"
+    - 7z x "%TMP%/sdk-tools.zip" -o"%ANDROID_HOME%" > nul
+    - set PATH=%PATH%;"%ANDROID_HOME%\tools\bin"
+
+    - yes 2> nul | sdkmanager --licenses > nul
+    - sdkmanager "system-images;android-19;google_apis;armeabi-v7a"
+    - sdkmanager "platforms;android-%ANDROID_BUILD_VERSION%"
+    - sdkmanager  "build-tools;%ANDROID_TOOLS_VERSION%"
+    - sdkmanager "add-ons;addon-google_apis-google-23"
+    - sdkmanager "extras;android;m2repository"
+
+    - appveyor DownloadFile "%NDK_TOOLS_URL%" -FileName "%TMP%/ndk.zip"
+    - 7z x "%TMP%/ndk.zip" -o"%ANDROID_HOME%" > nul
+
+    - ps: Install-Product node $env:nodejs_version
+    - node --version
+    - yarn --version
+    - appveyor-retry yarn install
+
+build_script:
+  - gradlew.bat RNTester:android:app:assembleRelease
+
+test_script:
+    - npm test
+
+cache:
+  - node_modules
+  - "%LOCALAPPDATA%/Yarn"
+  - "%USERPROFILE%/.gradle/caches"
+  - "%USERPROFILE%/.gradle/wrapper"
diff --git a/bots/code-analysis-bot.js b/bots/code-analysis-bot.js
deleted file mode 100644
index d39120e53e0605..00000000000000
--- a/bots/code-analysis-bot.js
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * 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';
-
-if (!process.env.CI_USER) {
-  console.error('Missing CI_USER. Example: facebook');
-  process.exit(1);
-}
-if (!process.env.CI_REPO) {
-  console.error('Missing CI_REPO. Example: react-native');
-  process.exit(1);
-}
-if (!process.env.GITHUB_TOKEN) {
-  console.error(
-    'Missing GITHUB_TOKEN. Example: 5fd88b964fa214c4be2b144dc5af5d486a2f8c1e',
-  );
-  process.exit(1);
-}
-if (!process.env.PULL_REQUEST_NUMBER) {
-  console.error('Missing PULL_REQUEST_NUMBER. Example: 4687');
-  // for master branch don't throw and error
-  process.exit(0);
-}
-
-var GitHubApi = require('github');
-var path = require('path');
-
-var github = new GitHubApi({
-  version: '3.0.0',
-});
-
-github.authenticate({
-  type: 'oauth',
-  token: process.env.GITHUB_TOKEN,
-});
-
-function push(arr, key, value) {
-  if (!arr[key]) {
-    arr[key] = [];
-  }
-  arr[key].push(value);
-}
-
-/**
- * There is unfortunately no standard format to report an error, so we have
- * to write a specific converter for each tool we want to support.
- *
- * Those functions take a json object as input and fill the output with the
- * following format:
- *
- * { [ path: string ]: Array< { message: string, line: number }> }
- *
- * This is an object where the keys are the path of the files and values
- * is an array of objects of the shape message and line.
- */
-var converters = {
-  raw: function(output, input) {
-    for (var key in input) {
-      input[key].forEach(function(message) {
-        push(output, key, message);
-      });
-    }
-  },
-
-  flow: function(output, input) {
-    if (!input || !input.errors) {
-      return;
-    }
-
-    input.errors.forEach(function(error) {
-      push(output, error.message[0].path, {
-        message: error.message.map(message => message.descr).join(' '),
-        line: error.message[0].line,
-      });
-    });
-  },
-
-  eslint: function(output, input) {
-    if (!input) {
-      return;
-    }
-
-    input.forEach(function(file) {
-      file.messages.forEach(function(message) {
-        push(output, file.filePath, {
-          message: message.ruleId + ': ' + message.message,
-          line: message.line,
-        });
-      });
-    });
-  },
-};
-
-function getShaFromPullRequest(user, repo, number, callback) {
-  github.pullRequests.get({user, repo, number}, (error, res) => {
-    if (error) {
-      console.log(error);
-      return;
-    }
-    callback(res.head.sha);
-  });
-}
-
-function getFilesFromCommit(user, repo, sha, callback) {
-  github.repos.getCommit({user, repo, sha}, (error, res) => {
-    if (error) {
-      console.log(error);
-      return;
-    }
-    // A merge commit should not have any new changes to report
-    if (res.parents && res.parents.length > 1) {
-      return;
-    }
-
-    callback(res.files);
-  });
-}
-
-/**
- * Sadly we can't just give the line number to github, we have to give the
- * line number relative to the patch file which is super annoying. This
- * little function builds a map of line number in the file to line number
- * in the patch file
- */
-function getLineMapFromPatch(patchString) {
-  var diffLineIndex = 0;
-  var fileLineIndex = 0;
-  var lineMap = {};
-
-  patchString.split('\n').forEach(line => {
-    if (line.match(/^@@/)) {
-      fileLineIndex = line.match(/\+([0-9]+)/)[1] - 1;
-      return;
-    }
-
-    diffLineIndex++;
-    if (line[0] !== '-') {
-      fileLineIndex++;
-      if (line[0] === '+') {
-        lineMap[fileLineIndex] = diffLineIndex;
-      }
-    }
-  });
-
-  return lineMap;
-}
-
-function sendComment(user, repo, number, sha, filename, lineMap, message) {
-  if (!lineMap[message.line]) {
-    // Do not send messages on lines that did not change
-    return;
-  }
-
-  var opts = {
-    user,
-    repo,
-    number,
-    sha,
-    path: filename,
-    commit_id: sha,
-    body: message.message,
-    position: lineMap[message.line],
-  };
-  github.pullRequests.createComment(opts, function(error, res) {
-    if (error) {
-      console.log(error);
-      return;
-    }
-  });
-  console.log('Sending comment', opts);
-}
-
-function main(messages, user, repo, number) {
-  // No message, we don't need to do anything :)
-  if (Object.keys(messages).length === 0) {
-    return;
-  }
-
-  getShaFromPullRequest(user, repo, number, sha => {
-    getFilesFromCommit(user, repo, sha, files => {
-      files.filter(file => messages[file.filename]).forEach(file => {
-        // github api sometimes does not return a patch on large commits
-        if (!file.patch) {
-          return;
-        }
-        var lineMap = getLineMapFromPatch(file.patch);
-        messages[file.filename].forEach(message => {
-          sendComment(user, repo, number, sha, file.filename, lineMap, message);
-        });
-      });
-    });
-  });
-}
-
-var content = '';
-process.stdin.resume();
-process.stdin.on('data', function(buf) {
-  content += buf.toString();
-});
-process.stdin.on('end', function() {
-  var messages = {};
-
-  // Since we send a few http requests to setup the process, we don't want
-  // to run this file one time per code analysis tool. Instead, we write all
-  // the results in the same stdin stream.
-  // The format of this stream is
-  //
-  //   name-of-the-converter
-  //   {"json":"payload"}
-  //   name-of-the-other-converter
-  //   {"other": ["json", "payload"]}
-  //
-  // In order to generate such stream, here is a sample bash command:
-  //
-  //   cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; flow --json) | node code-analysis-bot.js
-
-  var lines = content.trim().split('\n');
-  for (var i = 0; i < Math.ceil(lines.length / 2); ++i) {
-    var converter = converters[lines[i * 2]];
-    if (!converter) {
-      throw new Error('Unknown converter ' + lines[i * 2]);
-    }
-    var json;
-    try {
-      json = JSON.parse(lines[i * 2 + 1]);
-    } catch (e) {}
-
-    converter(messages, json);
-  }
-
-  // The paths are returned in absolute from code analysis tools but github works
-  // on paths relative from the root of the project. Doing the normalization here.
-  var pwd = path.resolve('.');
-  for (var absolutePath in messages) {
-    var relativePath = path.relative(pwd, absolutePath);
-    if (relativePath === absolutePath) {
-      continue;
-    }
-    messages[relativePath] = messages[absolutePath];
-    delete messages[absolutePath];
-  }
-
-  var user = process.env.CI_USER;
-  var repo = process.env.CI_REPO;
-  var number = process.env.PULL_REQUEST_NUMBER;
-
-  // intentional lint warning to make sure that the bot is working :)
-  main(messages, user, repo, number);
-});
diff --git a/bots/dangerfile.js b/bots/dangerfile.js
index de7c0741634480..6c8118701034df 100644
--- a/bots/dangerfile.js
+++ b/bots/dangerfile.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/build.gradle b/build.gradle
index 71634a0cbefc06..e34e47292a5791 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-// Copyright (c) 2015-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
@@ -7,13 +7,10 @@ buildscript {
     repositories {
         jcenter()
         mavenLocal()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath 'de.undercouch:gradle-download-task:3.4.3'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -25,10 +22,7 @@ allprojects {
     repositories {
         jcenter()
         mavenLocal()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        google()
 
         def androidSdk = System.getenv("ANDROID_SDK")
         maven {
@@ -36,3 +30,8 @@ allprojects {
         }
     }
 }
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '4.4'
+    distributionUrl = distributionUrl.replace("bin", "all")
+}
diff --git a/cli.js b/cli.js
index a57a0a686284b4..a78c9994081b13 100644
--- a/cli.js
+++ b/cli.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/flow-github/metro.js b/flow-github/metro.js
index 2e262712c5ae29..88ef8feae5fdc6 100644
--- a/flow-github/metro.js
+++ b/flow-github/metro.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -27,3 +27,47 @@ declare module 'metro/src/lib/bundle-modules/HMRClient' {
 declare module 'metro/src/lib/TerminalReporter' {
   declare module.exports: any;
 }
+
+declare module 'metro/src/Bundler' {
+  declare module.exports: any;
+}
+
+declare module 'metro/src/DeltaBundler' {
+  declare module.exports: any;
+}
+
+declare module 'metro/src/DeltaBundler/types.flow.js' {
+  declare module.exports: any;
+}
+
+declare module 'metro/src/ModuleGraph/types.flow.js' {
+  declare module.exports: any;
+}
+
+declare module 'metro/src/lib/getMaxWorkers' {
+  declare module.exports: any;
+}
+
+declare module 'metro/src/lib/createModuleIdFactory' {
+  declare module.exports: any;
+}
+
+declare module 'metro/src/shared/types.flow' {
+  declare module.exports: any;
+}
+
+declare module 'metro/src/lib/reporting' {
+  declare module.exports: any;
+}
+
+declare module 'metro/src/Server' {
+  declare module.exports: any;
+}
+
+declare module 'metro/src/ModuleGraph/worker/collectDependencies' {
+  declare module.exports: any;
+}
+
+declare module 'metro/src/JSTransformer/worker' {
+  declare module.exports: any;
+}
diff --git a/flow/Map.js b/flow/Map.js
index 0723ea4266ec62..c8e830529798ff 100644
--- a/flow/Map.js
+++ b/flow/Map.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  * @format
  */
 
diff --git a/flow/Position.js b/flow/Position.js
index 5bd2717c0e742a..b831a3d2097fd1 100644
--- a/flow/Position.js
+++ b/flow/Position.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  * @nolint
  * @format
  */
diff --git a/flow/Promise.js b/flow/Promise.js
index 64350cabc0b5c5..85d70bd41bae02 100644
--- a/flow/Promise.js
+++ b/flow/Promise.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  * @format
  */
 
diff --git a/flow/Set.js b/flow/Set.js
index ea3b1533b830b6..64099c2a6028c3 100644
--- a/flow/Set.js
+++ b/flow/Set.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  * @nolint
  * @format
  */
diff --git a/flow/Stringish.js b/flow/Stringish.js
index 55d0e3707ac526..4fbf0e7853260b 100644
--- a/flow/Stringish.js
+++ b/flow/Stringish.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  * @format
  */
 
diff --git a/flow/console.js b/flow/console.js
index a5d0d31bf36742..4cb3f31f8cfed5 100644
--- a/flow/console.js
+++ b/flow/console.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  * @format
  */
 
diff --git a/flow/create-react-class.js b/flow/create-react-class.js
index dc3fea97e9642d..ae0a19b0f2860e 100644
--- a/flow/create-react-class.js
+++ b/flow/create-react-class.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict
  * @nolint
  */
 
diff --git a/flow/fbjs.js b/flow/fbjs.js
index 9106e436da85d8..b1dff5b0ce3d2a 100644
--- a/flow/fbjs.js
+++ b/flow/fbjs.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,7 +14,3 @@ declare module 'fbjs/lib/invariant' {
     ...args: Array<any>
   ) => void;
 }
-
-declare module 'fbjs/lib/nullthrows' {
-  declare module.exports: <T>(value: ?T) => T;
-}
diff --git a/flow/jest.js b/flow/jest.js
index ebd7c9ec07261b..d26ab844ea2007 100644
--- a/flow/jest.js
+++ b/flow/jest.js
@@ -1,24 +1,11 @@
 /**
- * Copyright (c) 2004-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * Modified from https://raw.githubusercontent.com/flowtype/flow-typed/b43dff3e0ed5ccf7033839045f4819e8db40faa9/definitions/npm/jest_v20.x.x/flow_v0.22.x-/jest_v20.x.x.js
- * Duplicated from www/flow/shared/jest.js
- * List of modifications:
- *  - added function fail
- *  - added jest.requireActual
- *  - added jest.requireMock
- *  - added JestMockFn.mockName
- *  - added JestMockFn.mockRejectedValue
- *  - added JestMockFn.mockRejectedValueOnce
- *  - added JestMockFn.mockResolvedValue
- *  - added JestMockFn.mockResolvedValueOnce
- *  - added JestMockFn.mock.thrownErrors
- *  - added JestMockFn.mock.returnValues
- *  - added jest.setTimeout
- * @flow
+ * Copied from https://raw.githubusercontent.com/flow-typed/flow-typed/master/definitions/npm/jest_v23.x.x/flow_v0.39.x-/jest_v23.x.x.js
+ * @flow strict
  * @format
  */
 
@@ -42,10 +29,10 @@ type JestMockFn<TArguments: $ReadOnlyArray<*>, TReturn> = {
      */
     instances: Array<TReturn>,
     /**
-     * An array containing the results of a method, and whether they were
-     * returned or thrown.
+     * An array that contains all the object results that have been
+     * returned by this mock function call
      */
-    results: Array<{isThrown: boolean}>,
+    results: Array<{isThrow: boolean, value: TReturn}>,
   },
   /**
    * Resets all information stored in the mockFn.mock.calls and
@@ -89,33 +76,35 @@ type JestMockFn<TArguments: $ReadOnlyArray<*>, TReturn> = {
    */
   mockName(name: string): JestMockFn<TArguments, TReturn>,
   /**
-   * Sugar for: jest.fn().mockReturnValue(Promise.reject(value));
+   * Just a simple sugar function for returning `this`
    */
-  mockRejectedValue(value: TReturn): JestMockFn<TArguments, TReturn>,
+  mockReturnThis(): void,
   /**
-   * Sugar for: jest.fn().mockReturnValueOnce(Promise.reject(value));
+   * Accepts a value that will be returned whenever the mock function is called.
    */
-  mockRejectedValueOnce(value: TReturn): JestMockFn<TArguments, TReturn>,
+  mockReturnValue(value: TReturn): JestMockFn<TArguments, TReturn>,
   /**
-   * Sugar for: jest.fn().mockReturnValue(Promise.resolve(value));
+   * Sugar for only returning a value once inside your mock
    */
-  mockResolvedValue(value: TReturn): JestMockFn<TArguments, TReturn>,
+  mockReturnValueOnce(value: TReturn): JestMockFn<TArguments, TReturn>,
   /**
-   * Sugar for: jest.fn().mockReturnValueOnce(Promise.resolve(value));
+   * Sugar for jest.fn().mockImplementation(() => Promise.resolve(value))
    */
-  mockResolvedValueOnce(value: TReturn): JestMockFn<TArguments, TReturn>,
+  mockResolvedValue(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
   /**
-   * Just a simple sugar function for returning `this`
+   * Sugar for jest.fn().mockImplementationOnce(() => Promise.resolve(value))
    */
-  mockReturnThis(): void,
+  mockResolvedValueOnce(
+    value: TReturn,
+  ): JestMockFn<TArguments, Promise<TReturn>>,
   /**
-   * Deprecated: use jest.fn(() => value) instead
+   * Sugar for jest.fn().mockImplementation(() => Promise.reject(value))
    */
-  mockReturnValue(value: TReturn): JestMockFn<TArguments, TReturn>,
+  mockRejectedValue(value: TReturn): JestMockFn<TArguments, Promise<any>>,
   /**
-   * Sugar for only returning a value once inside your mock
+   * Sugar for jest.fn().mockImplementationOnce(() => Promise.reject(value))
    */
-  mockReturnValueOnce(value: TReturn): JestMockFn<TArguments, TReturn>,
+  mockRejectedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<any>>,
 };
 
 type JestAsymmetricEqualityType = {
@@ -147,7 +136,10 @@ type JestMatcherResult = {
   pass: boolean,
 };
 
-type JestMatcher = (actual: any, expected: any) => JestMatcherResult;
+type JestMatcher = (
+  actual: any,
+  expected: any,
+) => JestMatcherResult | Promise<JestMatcherResult>;
 
 type JestPromiseType = {
   /**
@@ -162,6 +154,36 @@ type JestPromiseType = {
   resolves: JestExpectType,
 };
 
+/**
+ * Jest allows functions and classes to be used as test names in test() and
+ * describe()
+ */
+type JestTestName = string | Function;
+
+/**
+ *  Plugin: jest-styled-components
+ */
+
+type JestStyledComponentsMatcherValue =
+  | string
+  | JestAsymmetricEqualityType
+  | RegExp
+  | typeof undefined;
+
+type JestStyledComponentsMatcherOptions = {
+  media?: string,
+  modifier?: string,
+  supports?: string,
+};
+
+type JestStyledComponentsMatchersType = {
+  toHaveStyleRule(
+    property: string,
+    value: JestStyledComponentsMatcherValue,
+    options?: JestStyledComponentsMatcherOptions,
+  ): void,
+};
+
 /**
  *  Plugin: jest-enzyme
  */
@@ -169,14 +191,19 @@ type EnzymeMatchersType = {
   toBeChecked(): void,
   toBeDisabled(): void,
   toBeEmpty(): void,
+  toBeEmptyRender(): void,
   toBePresent(): void,
   toContainReact(element: React$Element<any>): void,
+  toExist(): void,
   toHaveClassName(className: string): void,
   toHaveHTML(html: string): void,
-  toHaveProp(propKey: string, propValue?: any): void,
+  toHaveProp: ((propKey: string, propValue?: any) => void) &
+    ((props: Object) => void),
   toHaveRef(refName: string): void,
-  toHaveState(stateKey: string, stateValue?: any): void,
-  toHaveStyle(styleKey: string, styleValue?: any): void,
+  toHaveState: ((stateKey: string, stateValue?: any) => void) &
+    ((state: Object) => void),
+  toHaveStyle: ((styleKey: string, styleValue?: any) => void) &
+    ((style: Object) => void),
   toHaveTagName(tagName: string): void,
   toHaveText(text: string): void,
   toIncludeText(text: string): void,
@@ -185,133 +212,518 @@ type EnzymeMatchersType = {
   toMatchSelector(selector: string): void,
 };
 
-type JestExpectType = {
-  not: JestExpectType & EnzymeMatchersType,
+// DOM testing library extensions https://github.com/kentcdodds/dom-testing-library#custom-jest-matchers
+type DomTestingLibraryType = {
+  toBeInTheDOM(): void,
+  toHaveTextContent(content: string): void,
+  toHaveAttribute(name: string, expectedValue?: string): void,
+};
+
+// Jest JQuery Matchers: https://github.com/unindented/custom-jquery-matchers
+type JestJQueryMatchersType = {
+  toExist(): void,
+  toHaveLength(len: number): void,
+  toHaveId(id: string): void,
+  toHaveClass(className: string): void,
+  toHaveTag(tag: string): void,
+  toHaveAttr(key: string, val?: any): void,
+  toHaveProp(key: string, val?: any): void,
+  toHaveText(text: string | RegExp): void,
+  toHaveData(key: string, val?: any): void,
+  toHaveValue(val: any): void,
+  toHaveCss(css: {[key: string]: any}): void,
+  toBeChecked(): void,
+  toBeDisabled(): void,
+  toBeEmpty(): void,
+  toBeHidden(): void,
+  toBeSelected(): void,
+  toBeVisible(): void,
+  toBeFocused(): void,
+  toBeInDom(): void,
+  toBeMatchedBy(sel: string): void,
+  toHaveDescendant(sel: string): void,
+  toHaveDescendantWithText(sel: string, text: string | RegExp): void,
+};
+
+// Jest Extended Matchers: https://github.com/jest-community/jest-extended
+type JestExtendedMatchersType = {
+  /**
+   * Note: Currently unimplemented
+   * Passing assertion
+   *
+   * @param {String} message
+   */
+  //  pass(message: string): void;
+
+  /**
+   * Note: Currently unimplemented
+   * Failing assertion
+   *
+   * @param {String} message
+   */
+  //  fail(message: string): void;
+
+  /**
+   * Use .toBeEmpty when checking if a String '', Array [] or Object {} is empty.
+   */
+  toBeEmpty(): void,
+
+  /**
+   * Use .toBeOneOf when checking if a value is a member of a given Array.
+   * @param {Array.<*>} members
+   */
+  toBeOneOf(members: any[]): void,
+
+  /**
+   * Use `.toBeNil` when checking a value is `null` or `undefined`.
+   */
+  toBeNil(): void,
+
+  /**
+   * Use `.toSatisfy` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean`.
+   * @param {Function} predicate
+   */
+  toSatisfy(predicate: (n: any) => boolean): void,
+
+  /**
+   * Use `.toBeArray` when checking if a value is an `Array`.
+   */
+  toBeArray(): void,
+
+  /**
+   * Use `.toBeArrayOfSize` when checking if a value is an `Array` of size x.
+   * @param {Number} x
+   */
+  toBeArrayOfSize(x: number): void,
+
+  /**
+   * Use `.toIncludeAllMembers` when checking if an `Array` contains all of the same members of a given set.
+   * @param {Array.<*>} members
+   */
+  toIncludeAllMembers(members: any[]): void,
+
+  /**
+   * Use `.toIncludeAnyMembers` when checking if an `Array` contains any of the members of a given set.
+   * @param {Array.<*>} members
+   */
+  toIncludeAnyMembers(members: any[]): void,
+
+  /**
+   * Use `.toSatisfyAll` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean` for all values in an array.
+   * @param {Function} predicate
+   */
+  toSatisfyAll(predicate: (n: any) => boolean): void,
+
+  /**
+   * Use `.toBeBoolean` when checking if a value is a `Boolean`.
+   */
+  toBeBoolean(): void,
+
+  /**
+   * Use `.toBeTrue` when checking a value is equal (===) to `true`.
+   */
+  toBeTrue(): void,
+
+  /**
+   * Use `.toBeFalse` when checking a value is equal (===) to `false`.
+   */
+  toBeFalse(): void,
+
+  /**
+   * Use .toBeDate when checking if a value is a Date.
+   */
+  toBeDate(): void,
+
+  /**
+   * Use `.toBeFunction` when checking if a value is a `Function`.
+   */
+  toBeFunction(): void,
+
+  /**
+   * Use `.toHaveBeenCalledBefore` when checking if a `Mock` was called before another `Mock`.
+   *
+   * Note: Required Jest version >22
+   * Note: Your mock functions will have to be asynchronous to cause the timestamps inside of Jest to occur in a differentJS event loop, otherwise the mock timestamps will all be the same
+   *
+   * @param {Mock} mock
+   */
+  toHaveBeenCalledBefore(mock: JestMockFn<any, any>): void,
+
+  /**
+   * Use `.toBeNumber` when checking if a value is a `Number`.
+   */
+  toBeNumber(): void,
+
+  /**
+   * Use `.toBeNaN` when checking a value is `NaN`.
+   */
+  toBeNaN(): void,
+
+  /**
+   * Use `.toBeFinite` when checking if a value is a `Number`, not `NaN` or `Infinity`.
+   */
+  toBeFinite(): void,
+
+  /**
+   * Use `.toBePositive` when checking if a value is a positive `Number`.
+   */
+  toBePositive(): void,
+
+  /**
+   * Use `.toBeNegative` when checking if a value is a negative `Number`.
+   */
+  toBeNegative(): void,
+
+  /**
+   * Use `.toBeEven` when checking if a value is an even `Number`.
+   */
+  toBeEven(): void,
+
+  /**
+   * Use `.toBeOdd` when checking if a value is an odd `Number`.
+   */
+  toBeOdd(): void,
+
+  /**
+   * Use `.toBeWithin` when checking if a number is in between the given bounds of: start (inclusive) and end (exclusive).
+   *
+   * @param {Number} start
+   * @param {Number} end
+   */
+  toBeWithin(start: number, end: number): void,
+
+  /**
+   * Use `.toBeObject` when checking if a value is an `Object`.
+   */
+  toBeObject(): void,
+
+  /**
+   * Use `.toContainKey` when checking if an object contains the provided key.
+   *
+   * @param {String} key
+   */
+  toContainKey(key: string): void,
+
+  /**
+   * Use `.toContainKeys` when checking if an object has all of the provided keys.
+   *
+   * @param {Array.<String>} keys
+   */
+  toContainKeys(keys: string[]): void,
+
+  /**
+   * Use `.toContainAllKeys` when checking if an object only contains all of the provided keys.
+   *
+   * @param {Array.<String>} keys
+   */
+  toContainAllKeys(keys: string[]): void,
+
+  /**
+   * Use `.toContainAnyKeys` when checking if an object contains at least one of the provided keys.
+   *
+   * @param {Array.<String>} keys
+   */
+  toContainAnyKeys(keys: string[]): void,
+
+  /**
+   * Use `.toContainValue` when checking if an object contains the provided value.
+   *
+   * @param {*} value
+   */
+  toContainValue(value: any): void,
+
+  /**
+   * Use `.toContainValues` when checking if an object contains all of the provided values.
+   *
+   * @param {Array.<*>} values
+   */
+  toContainValues(values: any[]): void,
+
+  /**
+   * Use `.toContainAllValues` when checking if an object only contains all of the provided values.
+   *
+   * @param {Array.<*>} values
+   */
+  toContainAllValues(values: any[]): void,
+
+  /**
+   * Use `.toContainAnyValues` when checking if an object contains at least one of the provided values.
+   *
+   * @param {Array.<*>} values
+   */
+  toContainAnyValues(values: any[]): void,
+
+  /**
+   * Use `.toContainEntry` when checking if an object contains the provided entry.
+   *
+   * @param {Array.<String, String>} entry
+   */
+  toContainEntry(entry: [string, string]): void,
+
+  /**
+   * Use `.toContainEntries` when checking if an object contains all of the provided entries.
+   *
+   * @param {Array.<Array.<String, String>>} entries
+   */
+  toContainEntries(entries: [string, string][]): void,
+
+  /**
+   * Use `.toContainAllEntries` when checking if an object only contains all of the provided entries.
+   *
+   * @param {Array.<Array.<String, String>>} entries
+   */
+  toContainAllEntries(entries: [string, string][]): void,
+
+  /**
+   * Use `.toContainAnyEntries` when checking if an object contains at least one of the provided entries.
+   *
+   * @param {Array.<Array.<String, String>>} entries
+   */
+  toContainAnyEntries(entries: [string, string][]): void,
+
+  /**
+   * Use `.toBeExtensible` when checking if an object is extensible.
+   */
+  toBeExtensible(): void,
+
+  /**
+   * Use `.toBeFrozen` when checking if an object is frozen.
+   */
+  toBeFrozen(): void,
+
+  /**
+   * Use `.toBeSealed` when checking if an object is sealed.
+   */
+  toBeSealed(): void,
+
+  /**
+   * Use `.toBeString` when checking if a value is a `String`.
+   */
+  toBeString(): void,
+
+  /**
+   * Use `.toEqualCaseInsensitive` when checking if a string is equal (===) to another ignoring the casing of both strings.
+   *
+   * @param {String} string
+   */
+  toEqualCaseInsensitive(string: string): void,
+
+  /**
+   * Use `.toStartWith` when checking if a `String` starts with a given `String` prefix.
+   *
+   * @param {String} prefix
+   */
+  toStartWith(prefix: string): void,
+
+  /**
+   * Use `.toEndWith` when checking if a `String` ends with a given `String` suffix.
+   *
+   * @param {String} suffix
+   */
+  toEndWith(suffix: string): void,
+
+  /**
+   * Use `.toInclude` when checking if a `String` includes the given `String` substring.
+   *
+   * @param {String} substring
+   */
+  toInclude(substring: string): void,
+
+  /**
+   * Use `.toIncludeRepeated` when checking if a `String` includes the given `String` substring the correct number of times.
+   *
+   * @param {String} substring
+   * @param {Number} times
+   */
+  toIncludeRepeated(substring: string, times: number): void,
+
+  /**
+   * Use `.toIncludeMultiple` when checking if a `String` includes all of the given substrings.
+   *
+   * @param {Array.<String>} substring
+   */
+  toIncludeMultiple(substring: string[]): void,
+};
+
+interface JestExpectType {
+  not: JestExpectType &
+    EnzymeMatchersType &
+    DomTestingLibraryType &
+    JestJQueryMatchersType &
+    JestStyledComponentsMatchersType &
+    JestExtendedMatchersType;
   /**
    * If you have a mock function, you can use .lastCalledWith to test what
    * arguments it was last called with.
    */
-  lastCalledWith(...args: Array<any>): void,
+  lastCalledWith(...args: Array<any>): void;
   /**
    * toBe just checks that a value is what you expect. It uses === to check
    * strict equality.
    */
-  toBe(value: any): void,
-  /**
-   * Use .toHaveBeenCalled to ensure that a mock function got called.
-   */
-  toBeCalled(): void,
+  toBe(value: any): void;
   /**
    * Use .toBeCalledWith to ensure that a mock function was called with
    * specific arguments.
    */
-  toBeCalledWith(...args: Array<any>): void,
+  toBeCalledWith(...args: Array<any>): void;
   /**
    * Using exact equality with floating point numbers is a bad idea. Rounding
    * means that intuitive things fail.
    */
-  toBeCloseTo(num: number, delta: any): void,
+  toBeCloseTo(num: number, delta: any): void;
   /**
    * Use .toBeDefined to check that a variable is not undefined.
    */
-  toBeDefined(): void,
+  toBeDefined(): void;
   /**
    * Use .toBeFalsy when you don't care what a value is, you just want to
    * ensure a value is false in a boolean context.
    */
-  toBeFalsy(): void,
+  toBeFalsy(): void;
   /**
    * To compare floating point numbers, you can use toBeGreaterThan.
    */
-  toBeGreaterThan(number: number): void,
+  toBeGreaterThan(number: number): void;
   /**
    * To compare floating point numbers, you can use toBeGreaterThanOrEqual.
    */
-  toBeGreaterThanOrEqual(number: number): void,
+  toBeGreaterThanOrEqual(number: number): void;
   /**
    * To compare floating point numbers, you can use toBeLessThan.
    */
-  toBeLessThan(number: number): void,
+  toBeLessThan(number: number): void;
   /**
    * To compare floating point numbers, you can use toBeLessThanOrEqual.
    */
-  toBeLessThanOrEqual(number: number): void,
+  toBeLessThanOrEqual(number: number): void;
   /**
    * Use .toBeInstanceOf(Class) to check that an object is an instance of a
    * class.
    */
-  toBeInstanceOf(cls: Class<*>): void,
+  toBeInstanceOf(cls: Class<*>): void;
   /**
    * .toBeNull() is the same as .toBe(null) but the error messages are a bit
    * nicer.
    */
-  toBeNull(): void,
+  toBeNull(): void;
   /**
    * Use .toBeTruthy when you don't care what a value is, you just want to
    * ensure a value is true in a boolean context.
    */
-  toBeTruthy(): void,
+  toBeTruthy(): void;
   /**
    * Use .toBeUndefined to check that a variable is undefined.
    */
-  toBeUndefined(): void,
+  toBeUndefined(): void;
   /**
    * Use .toContain when you want to check that an item is in a list. For
    * testing the items in the list, this uses ===, a strict equality check.
    */
-  toContain(item: any): void,
+  toContain(item: any): void;
   /**
    * Use .toContainEqual when you want to check that an item is in a list. For
    * testing the items in the list, this matcher recursively checks the
    * equality of all fields, rather than checking for object identity.
    */
-  toContainEqual(item: any): void,
+  toContainEqual(item: any): void;
   /**
    * Use .toEqual when you want to check that two objects have the same value.
    * This matcher recursively checks the equality of all fields, rather than
    * checking for object identity.
    */
-  toEqual(value: any): void,
+  toEqual(value: any): void;
   /**
    * Use .toHaveBeenCalled to ensure that a mock function got called.
    */
-  toHaveBeenCalled(): void,
+  toHaveBeenCalled(): void;
+  toBeCalled(): void;
   /**
    * Use .toHaveBeenCalledTimes to ensure that a mock function got called exact
    * number of times.
    */
-  toHaveBeenCalledTimes(number: number): void,
+  toHaveBeenCalledTimes(number: number): void;
+  toBeCalledTimes(number: number): void;
+  /**
+   *
+   */
+  toHaveBeenNthCalledWith(nthCall: number, ...args: Array<any>): void;
+  nthCalledWith(nthCall: number, ...args: Array<any>): void;
+  /**
+   *
+   */
+  toHaveReturned(): void;
+  toReturn(): void;
+  /**
+   *
+   */
+  toHaveReturnedTimes(number: number): void;
+  toReturnTimes(number: number): void;
+  /**
+   *
+   */
+  toHaveReturnedWith(value: any): void;
+  toReturnWith(value: any): void;
+  /**
+   *
+   */
+  toHaveLastReturnedWith(value: any): void;
+  lastReturnedWith(value: any): void;
+  /**
+   *
+   */
+  toHaveNthReturnedWith(nthCall: number, value: any): void;
+  nthReturnedWith(nthCall: number, value: any): void;
   /**
    * Use .toHaveBeenCalledWith to ensure that a mock function was called with
    * specific arguments.
    */
-  toHaveBeenCalledWith(...args: Array<any>): void,
+  toHaveBeenCalledWith(...args: Array<any>): void;
+  toBeCalledWith(...args: Array<any>): void;
   /**
    * Use .toHaveBeenLastCalledWith to ensure that a mock function was last called
    * with specific arguments.
    */
-  toHaveBeenLastCalledWith(...args: Array<any>): void,
+  toHaveBeenLastCalledWith(...args: Array<any>): void;
+  lastCalledWith(...args: Array<any>): void;
   /**
    * Check that an object has a .length property and it is set to a certain
    * numeric value.
    */
-  toHaveLength(number: number): void,
+  toHaveLength(number: number): void;
   /**
    *
    */
-  toHaveProperty(propPath: string, value?: any): void,
+  toHaveProperty(propPath: string, value?: any): void;
   /**
    * Use .toMatch to check that a string matches a regular expression or string.
    */
-  toMatch(regexpOrString: RegExp | string): void,
+  toMatch(regexpOrString: RegExp | string): void;
   /**
    * Use .toMatchObject to check that a javascript object matches a subset of the properties of an object.
    */
-  toMatchObject(object: Object): void,
+  toMatchObject(object: Object | Array<Object>): void;
+  /**
+   * Use .toStrictEqual to check that a javascript object matches a subset of the properties of an object.
+   */
+  toStrictEqual(value: any): void;
+  /**
+   * This ensures that an Object matches the most recent snapshot.
+   */
+  toMatchSnapshot(
+    propertyMatchers?: {[key: string]: JestAsymmetricEqualityType},
+    name?: string,
+  ): void;
   /**
-   * This ensures that a React component matches the most recent snapshot.
+   * This ensures that an Object matches the most recent snapshot.
    */
-  toMatchSnapshot(name?: string): void,
+  toMatchSnapshot(name: string): void;
+
+  toMatchInlineSnapshot(snapshot?: string): void;
+  toMatchInlineSnapshot(
+    propertyMatchers?: {[key: string]: JestAsymmetricEqualityType},
+    snapshot?: string,
+  ): void;
   /**
    * Use .toThrow to test that a function throws when it is called.
    * If you want to test that a specific error gets thrown, you can provide an
@@ -320,14 +732,15 @@ type JestExpectType = {
    *
    * Alias: .toThrowError
    */
-  toThrow(message?: string | Error | RegExp): void,
-  toThrowError(message?: string | Error | RegExp): void,
+  toThrow(message?: string | Error | Class<Error> | RegExp): void;
+  toThrowError(message?: string | Error | Class<Error> | RegExp): void;
   /**
    * Use .toThrowErrorMatchingSnapshot to test that a function throws a error
    * matching the most recent snapshot when it is called.
    */
-  toThrowErrorMatchingSnapshot(): void,
-};
+  toThrowErrorMatchingSnapshot(): void;
+  toThrowErrorMatchingInlineSnapshot(snapshot?: string): void;
+}
 
 type JestObjectType = {
   /**
@@ -407,6 +820,16 @@ type JestObjectType = {
     moduleFactory?: any,
     options?: Object,
   ): JestObjectType,
+  /**
+   * Returns the actual module instead of a mock, bypassing all checks on
+   * whether the module should receive a mock implementation or not.
+   */
+  requireActual(moduleName: string): any,
+  /**
+   * Returns a mock module instead of the actual module, bypassing all checks
+   * on whether the module should be required normally or not.
+   */
+  requireMock(moduleName: string): any,
   /**
    * Resets the module registry - the cache of all required modules. This is
    * useful to isolate modules where local state might conflict between tests.
@@ -470,19 +893,16 @@ type JestObjectType = {
    * Creates a mock function similar to jest.fn but also tracks calls to
    * object[methodName].
    */
-  spyOn(object: Object, methodName: string): JestMockFn<any, any>,
+  spyOn(
+    object: Object,
+    methodName: string,
+    accessType?: 'get' | 'set',
+  ): JestMockFn<any, any>,
   /**
    * Set the default timeout interval for tests and before/after hooks in milliseconds.
    * Note: The default timeout interval is 5 seconds if this method is not called.
    */
   setTimeout(timeout: number): JestObjectType,
-
-  // These methods are added separately and not a part of flow-typed OSS
-  // version of this file. They were added in jest@21.0.0.alpha-2 which is not
-  // yet publicly released yet.
-  // TODO T21262347 Add them to OSS version of flow-typed
-  requireActual(module: string): any,
-  requireMock(module: string): any,
 };
 
 type JestSpyType = {
@@ -515,17 +935,29 @@ declare var describe: {
   /**
    * Creates a block that groups together several related tests in one "test suite"
    */
-  (name: string, fn: () => void): void,
+  (name: JestTestName, fn: () => void): void,
 
   /**
    * Only run this describe block
    */
-  only(name: string, fn: () => void): void,
+  only(name: JestTestName, fn: () => void): void,
 
   /**
    * Skip running this describe block
    */
-  skip(name: string, fn: () => void): void,
+  skip(name: JestTestName, fn: () => void): void,
+
+  /**
+   * each runs this test against array of argument arrays per each run
+   *
+   * @param {table} table of Test
+   */
+  each(
+    table: Array<Array<mixed> | mixed>,
+  ): (
+    name: JestTestName,
+    fn?: (...args: Array<any>) => ?Promise<mixed>,
+  ) => void,
 };
 
 /** An individual test unit */
@@ -533,54 +965,83 @@ declare var it: {
   /**
    * An individual test unit
    *
-   * @param {string} Name of Test
+   * @param {JestTestName} Name of Test
    * @param {Function} Test
    * @param {number} Timeout for the test, in milliseconds.
    */
   (
-    name: string,
+    name: JestTestName,
     fn?: (done: () => void) => ?Promise<mixed>,
     timeout?: number,
   ): void,
+  /**
+   * each runs this test against array of argument arrays per each run
+   *
+   * @param {table} table of Test
+   */
+  each(
+    table: Array<Array<mixed> | mixed>,
+  ): (
+    name: JestTestName,
+    fn?: (...args: Array<any>) => ?Promise<mixed>,
+  ) => void,
   /**
    * Only run this test
    *
-   * @param {string} Name of Test
+   * @param {JestTestName} Name of Test
    * @param {Function} Test
    * @param {number} Timeout for the test, in milliseconds.
    */
   only(
-    name: string,
+    name: JestTestName,
     fn?: (done: () => void) => ?Promise<mixed>,
     timeout?: number,
-  ): void,
+  ): {
+    each(
+      table: Array<Array<mixed> | mixed>,
+    ): (
+      name: JestTestName,
+      fn?: (...args: Array<any>) => ?Promise<mixed>,
+    ) => void,
+  },
   /**
    * Skip running this test
    *
-   * @param {string} Name of Test
+   * @param {JestTestName} Name of Test
    * @param {Function} Test
    * @param {number} Timeout for the test, in milliseconds.
    */
   skip(
-    name: string,
+    name: JestTestName,
     fn?: (done: () => void) => ?Promise<mixed>,
     timeout?: number,
   ): void,
   /**
    * Run the test concurrently
    *
-   * @param {string} Name of Test
+   * @param {JestTestName} Name of Test
    * @param {Function} Test
    * @param {number} Timeout for the test, in milliseconds.
    */
   concurrent(
-    name: string,
+    name: JestTestName,
     fn?: (done: () => void) => ?Promise<mixed>,
     timeout?: number,
   ): void,
+  /**
+   * each runs this test against array of argument arrays per each run
+   *
+   * @param {table} table of Test
+   */
+  each(
+    table: Array<Array<mixed> | mixed>,
+  ): (
+    name: JestTestName,
+    fn?: (...args: Array<any>) => ?Promise<mixed>,
+  ) => void,
 };
 declare function fit(
-  name: string,
+  name: JestTestName,
   fn: (done: () => void) => ?Promise<mixed>,
   timeout?: number,
 ): void;
@@ -595,27 +1056,86 @@ declare var xit: typeof it;
 /** A disabled individual test */
 declare var xtest: typeof it;
 
+type JestPrettyFormatColors = {
+  comment: {close: string, open: string},
+  content: {close: string, open: string},
+  prop: {close: string, open: string},
+  tag: {close: string, open: string},
+  value: {close: string, open: string},
+};
+
+type JestPrettyFormatIndent = string => string;
+type JestPrettyFormatRefs = Array<any>;
+type JestPrettyFormatPrint = any => string;
+type JestPrettyFormatStringOrNull = string | null;
+
+type JestPrettyFormatOptions = {|
+  callToJSON: boolean,
+  edgeSpacing: string,
+  escapeRegex: boolean,
+  highlight: boolean,
+  indent: number,
+  maxDepth: number,
+  min: boolean,
+  plugins: JestPrettyFormatPlugins,
+  printFunctionName: boolean,
+  spacing: string,
+  theme: {|
+    comment: string,
+    content: string,
+    prop: string,
+    tag: string,
+    value: string,
+  |},
+|};
+
+type JestPrettyFormatPlugin = {
+  print: (
+    val: any,
+    serialize: JestPrettyFormatPrint,
+    indent: JestPrettyFormatIndent,
+    opts: JestPrettyFormatOptions,
+    colors: JestPrettyFormatColors,
+  ) => string,
+  test: any => boolean,
+};
+
+type JestPrettyFormatPlugins = Array<JestPrettyFormatPlugin>;
+
 /** The expect function is used every time you want to test a value */
 declare var expect: {
   /** The object that you want to make assertions against */
-  (value: any): JestExpectType & JestPromiseType & EnzymeMatchersType,
+  (
+    value: any,
+  ): JestExpectType &
+    JestPromiseType &
+    EnzymeMatchersType &
+    DomTestingLibraryType &
+    JestJQueryMatchersType &
+    JestStyledComponentsMatchersType &
+    JestExtendedMatchersType,
+
   /** Add additional Jasmine matchers to Jest's roster */
   extend(matchers: {[name: string]: JestMatcher}): void,
   /** Add a module that formats application-specific data structures. */
-  addSnapshotSerializer(serializer: (input: Object) => string): void,
+  addSnapshotSerializer(pluginModule: JestPrettyFormatPlugin): void,
   assertions(expectedAssertions: number): void,
   hasAssertions(): void,
   any(value: mixed): JestAsymmetricEqualityType,
-  anything(): void,
-  arrayContaining(value: Array<mixed>): void,
-  objectContaining(value: Object): void,
+  anything(): any,
+  arrayContaining(value: Array<mixed>): Array<mixed>,
+  objectContaining(value: Object): Object,
   /** Matches any received string that contains the exact expected string. */
-  stringContaining(value: string): void,
-  stringMatching(value: string | RegExp): void,
+  stringContaining(value: string): string,
+  stringMatching(value: string | RegExp): string,
+  not: {
+    arrayContaining: (value: $ReadOnlyArray<mixed>) => Array<mixed>,
+    objectContaining: (value: {}) => Object,
+    stringContaining: (value: string) => string,
+    stringMatching: (value: string | RegExp) => string,
+  },
 };
 
-declare function fail(message?: string): void;
-
 // TODO handle return type
 // http://jasmine.github.io/2.4/introduction.html#section-Spies
 declare function spyOn(value: mixed, method: string): Object;
@@ -624,20 +1144,20 @@ declare function spyOn(value: mixed, method: string): Object;
 declare var jest: JestObjectType;
 
 /**
- * The global Jamine object, this is generally not exposed as the public API,
+ * The global Jasmine object, this is generally not exposed as the public API,
  * using features inside here could break in later versions of Jest.
  */
 declare var jasmine: {
   DEFAULT_TIMEOUT_INTERVAL: number,
   any(value: mixed): JestAsymmetricEqualityType,
-  anything(): void,
-  arrayContaining(value: Array<mixed>): void,
+  anything(): any,
+  arrayContaining(value: Array<mixed>): Array<mixed>,
   clock(): JestClockType,
   createSpy(name: string): JestSpyType,
   createSpyObj(
     baseName: string,
     methodNames: Array<string>,
   ): {[methodName: string]: JestSpyType},
-  objectContaining(value: Object): void,
-  stringMatching(value: string): void,
+  objectContaining(value: Object): Object,
+  stringMatching(value: string): string,
 };
diff --git a/flow/prop-types.js b/flow/prop-types.js
index be239f5bdfb385..b695bcfcff0df0 100644
--- a/flow/prop-types.js
+++ b/flow/prop-types.js
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * 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
  * @nolint
  * @format
  */
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3baa851b28c65f..01b8bf6b1f99ca 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e318290e619bb6..b6517bb1d16502 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,3 @@
-#Mon Jan 16 11:21:59 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 27309d92314c57..cccdd3d517fc52 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f6d5974e72fdac..1934213b6ddee5 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,8 @@
+:: Copyright (c) 2015-present, Facebook, Inc.
+::
+:: This source code is licensed under the MIT license found in the
+:: LICENSE file in the root directory of this source tree.
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -49,7 +54,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +64,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/jest/MockNativeMethods.js b/jest/MockNativeMethods.js
index 9b44fc45fec62e..a7c112e3dd9d90 100644
--- a/jest/MockNativeMethods.js
+++ b/jest/MockNativeMethods.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/jest/__tests__/hasteImpl-test.js b/jest/__tests__/hasteImpl-test.js
new file mode 100644
index 00000000000000..9cfb5a7aea67ef
--- /dev/null
+++ b/jest/__tests__/hasteImpl-test.js
@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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+js_foundation
+ */
+
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+
+const {getHasteName} = require('../hasteImpl');
+
+// RNPM currently does not support plugins when using Yarn Plug 'n Play
+const testIfNotPnP = fs.existsSync(
+  path.join(
+    __dirname,
+    '../..',
+    'node_modules',
+    'react-native-dummy',
+    'package.json',
+  ),
+)
+  ? test
+  : test.skip;
+
+function getPath(...parts) {
+  return path.join(__dirname, '..', '..', ...parts);
+}
+
+it('returns the correct haste name for a RN library file', () => {
+  expect(
+    getHasteName(
+      getPath(
+        'Libraries',
+        'Components',
+        'AccessibilityInfo',
+        'AccessibilityInfo.js',
+      ),
+    ),
+  ).toEqual('AccessibilityInfo');
+});
+
+it('returns the correct haste name for a file with a platform suffix', () => {
+  for (const platform of ['android', 'ios', 'native']) {
+    expect(
+      getHasteName(
+        getPath(
+          'Libraries',
+          'Components',
+          'AccessibilityInfo',
+          `AccessibilityInfo.${platform}.js`,
+        ),
+      ),
+    ).toEqual('AccessibilityInfo');
+  }
+});
+
+testIfNotPnP(
+  'returns the correct haste name for a file with an out-of-tree platform suffix',
+  () => {
+    for (const platform of ['dummy']) {
+      expect(
+        getHasteName(
+          getPath(
+            'Libraries',
+            'Components',
+            'AccessibilityInfo',
+            `AccessibilityInfo.${platform}.js`,
+          ),
+        ),
+      ).toEqual('AccessibilityInfo');
+    }
+  },
+);
+
+it('returns the correct haste name for a file with a flow suffix', () => {
+  expect(
+    getHasteName(
+      getPath(
+        'Libraries',
+        'Components',
+        'AccessibilityInfo',
+        'AccessibilityInfo.ios.js.flow',
+      ),
+    ),
+  ).toEqual('AccessibilityInfo');
+});
+
+it('does not calculate the haste name for a file that is not JS', () => {
+  expect(
+    getHasteName(
+      getPath(
+        'Libraries',
+        'Components',
+        'AccessibilityInfo',
+        'AccessibilityInfo.txt',
+      ),
+    ),
+  ).toBe(undefined);
+});
+
+it('does not calculate the haste name for a file outside of RN', () => {
+  expect(
+    getHasteName(getPath('..', 'Libraries', 'AccessibilityInfo.txt')),
+  ).toBe(undefined);
+});
+
+it('does not calculate the haste name for a blacklisted file', () => {
+  expect(
+    getHasteName(
+      getPath(
+        'Libraries',
+        'Components',
+        '__mocks__',
+        'AccessibilityInfo',
+        'AccessibilityInfo.js',
+      ),
+    ),
+  ).toBe(undefined);
+});
diff --git a/jest/assetFileTransformer.js b/jest/assetFileTransformer.js
index 85f4a7bceb2a7f..cdc477c7d37dbd 100644
--- a/jest/assetFileTransformer.js
+++ b/jest/assetFileTransformer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/jest/hasteImpl.js b/jest/hasteImpl.js
index e72fa4f37b26ab..f2b8abae5213dc 100644
--- a/jest/hasteImpl.js
+++ b/jest/hasteImpl.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,16 +11,40 @@
 'use strict';
 
 const path = require('path');
+const findPlugins = require('../local-cli/core/findPlugins');
 
-const ROOTS = [
-  path.resolve(__dirname, '..') + path.sep,
-  path.resolve(__dirname, '../../react-native-windows') + path.sep,
-];
+const REACT_NATIVE_CI = process.cwd() === path.resolve(__dirname, '..');
+
+let pluginsPath;
+
+if (REACT_NATIVE_CI) {
+  pluginsPath = '..';
+} else {
+  pluginsPath = '../../../';
+}
+
+const plugins = findPlugins([path.resolve(__dirname, pluginsPath)]);
+
+// Detect out-of-tree platforms and add them to the whitelists
+const pluginRoots /*: Array<
+  string,
+> */ = plugins.haste.providesModuleNodeModules.map(
+  name => path.resolve(__dirname, '../../', name) + path.sep,
+);
+
+const pluginNameReducers /*: Array<
+  [RegExp, string],
+> */ = plugins.haste.platforms.map(name => [
+  new RegExp(`^(.*)\.(${name})$`),
+  '$1',
+]);
+
+const ROOTS = [path.resolve(__dirname, '..') + path.sep, ...pluginRoots];
 
 const BLACKLISTED_PATTERNS /*: Array<RegExp> */ = [
-  /.*\/__(mocks|tests)__\/.*/,
-  /^Libraries\/Animated\/src\/polyfills\/.*/,
-  /^Libraries\/Renderer\/fb\/.*/,
+  /.*[\\\/]__(mocks|tests)__[\\\/].*/,
+  /^Libraries[\\\/]Animated[\\\/]src[\\\/]polyfills[\\\/].*/,
+  /^Libraries[\\\/]Renderer[\\\/]fb[\\\/].*/,
 ];
 
 const WHITELISTED_PREFIXES /*: Array<string> */ = [
@@ -32,11 +56,13 @@ const WHITELISTED_PREFIXES /*: Array<string> */ = [
 
 const NAME_REDUCERS /*: Array<[RegExp, string]> */ = [
   // extract basename
-  [/^(?:.*\/)?([a-zA-Z0-9$_.-]+)$/, '$1'],
+  [/^(?:.*[\\\/])?([a-zA-Z0-9$_.-]+)$/, '$1'],
   // strip .js/.js.flow suffix
   [/^(.*)\.js(\.flow)?$/, '$1'],
-  // strip .android/.ios/.native/.web suffix
-  [/^(.*)\.(android|ios|native|web|windows)$/, '$1'],
+  // strip platform suffix
+  [/^(.*)\.(android|ios|native)$/, '$1'],
+  // strip plugin platform suffixes
+  ...pluginNameReducers,
 ];
 
 const haste = {
diff --git a/jest/mockComponent.js b/jest/mockComponent.js
index fdd89e82d740e9..28e222123961ba 100644
--- a/jest/mockComponent.js
+++ b/jest/mockComponent.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,7 @@
 'use strict';
 
 module.exports = (moduleName, instanceMethods) => {
-  const RealComponent = require.requireActual(moduleName);
+  const RealComponent = jest.requireActual(moduleName);
   const React = require('react');
 
   const SuperClass =
diff --git a/jest/preprocessor.js b/jest/preprocessor.js
index b9ae6faf22af6a..320c8bb764c362 100644
--- a/jest/preprocessor.js
+++ b/jest/preprocessor.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -23,7 +23,7 @@ const babelRegisterOnly = require('metro-babel-register');
 const createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction');
 const generate = require('@babel/generator').default;
 
-const nodeFiles = RegExp(
+const nodeFiles = new RegExp(
   [
     '/local-cli/',
     '/metro(?:-[^/]*)?/', // metro, metro-core, metro-source-map, metro-etc
@@ -39,22 +39,24 @@ module.exports = {
   process(src /*: string */, file /*: string */) {
     if (nodeFiles.test(file)) {
       // node specific transforms only
-      return babelTransformSync(
-        src,
-        Object.assign(
-          {filename: file},
-          {sourceType: 'script', ...nodeOptions, ast: false},
-        ),
-      ).code;
+      return babelTransformSync(src, {
+        filename: file,
+        sourceType: 'script',
+        ...nodeOptions,
+        ast: false,
+      }).code;
     }
 
     const {ast} = transformer.transform({
       filename: file,
-      localPath: file,
       options: {
         ast: true, // needed for open source (?) https://github.com/facebook/react-native/commit/f8d6b97140cffe8d18b2558f94570c8d1b410d5c#r28647044
         dev: true,
+        enableBabelRuntime: false,
+        experimentalImportSupport: false,
+        hot: false,
         inlineRequires: true,
+        minify: false,
         platform: '',
         projectRoot: '',
         retainLines: true,
diff --git a/jest/setup.js b/jest/setup.js
index 570c37911175a3..f58eebe9965a8f 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,19 +9,17 @@
 
 'use strict';
 
-const MockNativeMethods = require.requireActual('./MockNativeMethods');
-const mockComponent = require.requireActual('./mockComponent');
+const MockNativeMethods = jest.requireActual('./MockNativeMethods');
+const mockComponent = jest.requireActual('./mockComponent');
 
-require.requireActual('../Libraries/polyfills/babelHelpers.js');
-require.requireActual('../Libraries/polyfills/Object.es7.js');
-require.requireActual('../Libraries/polyfills/error-guard');
+jest.requireActual('../Libraries/polyfills/babelHelpers.js');
+jest.requireActual('../Libraries/polyfills/Object.es7.js');
+jest.requireActual('../Libraries/polyfills/error-guard');
 
 global.__DEV__ = true;
 
-global.Promise = require.requireActual('promise');
-global.regeneratorRuntime = require.requireActual(
-  'regenerator-runtime/runtime',
-);
+global.Promise = jest.requireActual('promise');
+global.regeneratorRuntime = jest.requireActual('regenerator-runtime/runtime');
 
 global.requestAnimationFrame = function(callback) {
   return setTimeout(callback, 0);
@@ -42,12 +40,12 @@ jest
   .mock('TextInput', () => mockComponent('TextInput'))
   .mock('Modal', () => mockComponent('Modal'))
   .mock('View', () => mockComponent('View', MockNativeMethods))
-  .mock('RefreshControl', () => require.requireMock('RefreshControlMock'))
-  .mock('ScrollView', () => require.requireMock('ScrollViewMock'))
+  .mock('RefreshControl', () => jest.requireMock('RefreshControlMock'))
+  .mock('ScrollView', () => jest.requireMock('ScrollViewMock'))
   .mock('ActivityIndicator', () => mockComponent('ActivityIndicator'))
-  .mock('ListView', () => require.requireMock('ListViewMock'))
+  .mock('ListView', () => jest.requireMock('ListViewMock'))
   .mock('ListViewDataSource', () => {
-    const DataSource = require.requireActual('ListViewDataSource');
+    const DataSource = jest.requireActual('ListViewDataSource');
     DataSource.prototype.toJSON = function() {
       function ListViewDataSource(dataBlob) {
         this.items = 0;
@@ -68,9 +66,7 @@ jest
     return DataSource;
   })
   .mock('AnimatedImplementation', () => {
-    const AnimatedImplementation = require.requireActual(
-      'AnimatedImplementation',
-    );
+    const AnimatedImplementation = jest.requireActual('AnimatedImplementation');
     const oldCreate = AnimatedImplementation.createAnimatedComponent;
     AnimatedImplementation.createAnimatedComponent = function(Component) {
       const Wrapped = oldCreate(Component);
@@ -80,7 +76,7 @@ jest
     return AnimatedImplementation;
   })
   .mock('ReactNative', () => {
-    const ReactNative = require.requireActual('ReactNative');
+    const ReactNative = jest.requireActual('ReactNative');
     const NativeMethodsMixin =
       ReactNative.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
         .NativeMethodsMixin;
@@ -92,7 +88,6 @@ jest
   })
   .mock('ensureComponentIsNative', () => () => true);
 
-const mockEmptyObject = {};
 const mockNativeModules = {
   AlertManager: {
     alertWithArgs: jest.fn(),
@@ -148,9 +143,6 @@ const mockNativeModules = {
     logout: jest.fn(),
     queryGraphPath: jest.fn((path, method, params, callback) => callback()),
   },
-  FbRelayNativeAdapter: {
-    updateCLC: jest.fn(),
-  },
   GraphPhotoUpload: {
     upload: jest.fn(),
   },
@@ -257,6 +249,7 @@ const mockNativeModules = {
     createView: jest.fn(),
     dispatchViewManagerCommand: jest.fn(),
     focus: jest.fn(),
+    getViewManagerConfig: jest.fn(),
     setChildren: jest.fn(),
     manageChildren: jest.fn(),
     updateView: jest.fn(),
diff --git a/lib/InitializeJavaScriptAppEngine.js b/lib/InitializeJavaScriptAppEngine.js
index 5048f860e41d0e..3bfab280a03506 100644
--- a/lib/InitializeJavaScriptAppEngine.js
+++ b/lib/InitializeJavaScriptAppEngine.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/lib/RCTEventEmitter.js b/lib/RCTEventEmitter.js
index c225257d105cb4..85010174075aa4 100644
--- a/lib/RCTEventEmitter.js
+++ b/lib/RCTEventEmitter.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/lib/TextInputState.js b/lib/TextInputState.js
index 5345311a518d31..d016523f939b60 100644
--- a/lib/TextInputState.js
+++ b/lib/TextInputState.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/lib/UIManager.js b/lib/UIManager.js
index b846967b626fa7..a8140397c7bdbe 100644
--- a/lib/UIManager.js
+++ b/lib/UIManager.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/lib/UIManagerStatTracker.js b/lib/UIManagerStatTracker.js
index c62aebdf0aee88..2579d1ea10c642 100644
--- a/lib/UIManagerStatTracker.js
+++ b/lib/UIManagerStatTracker.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/lib/View.js b/lib/View.js
index 852e741251bd7f..2eaddd857b6e8f 100644
--- a/lib/View.js
+++ b/lib/View.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/lib/deepDiffer.js b/lib/deepDiffer.js
index 6254047d472671..3d091331852afe 100644
--- a/lib/deepDiffer.js
+++ b/lib/deepDiffer.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/lib/deepFreezeAndThrowOnMutationInDev.js b/lib/deepFreezeAndThrowOnMutationInDev.js
index 6691d2a648b1a2..961a0e1b66615d 100644
--- a/lib/deepFreezeAndThrowOnMutationInDev.js
+++ b/lib/deepFreezeAndThrowOnMutationInDev.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/lib/flattenStyle.js b/lib/flattenStyle.js
index 1c7256c7fca7e0..8c4d4ebee10335 100644
--- a/lib/flattenStyle.js
+++ b/lib/flattenStyle.js
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its 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
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/local-cli/__mocks__/beeper.js b/local-cli/__mocks__/beeper.js
index 6628a2edc06af5..9fbb40caad1604 100644
--- a/local-cli/__mocks__/beeper.js
+++ b/local-cli/__mocks__/beeper.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/__mocks__/fs.js b/local-cli/__mocks__/fs.js
index 3068c0c4e6d7c5..a3691e3f38bd72 100644
--- a/local-cli/__mocks__/fs.js
+++ b/local-cli/__mocks__/fs.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,18 +9,21 @@
 
 'use strict';
 
-const fs = new (require('metro-memory-fs'))({cwd: process.cwd});
+const path = require('path');
+const MemoryFS = require('metro-memory-fs');
+let fs;
 
-function setMockFilesystem(object) {
-  fs.reset();
-  const root = process.platform === 'win32' ? 'c:\\' : '/';
+function setMockFilesystem(object, platform) {
+  reset(platform);
+  const root = platform === 'win32' ? 'c:\\' : '/';
   mockDir(root, {...object});
+  return root;
 }
 
 function mockDir(dirPath, desc) {
   for (const entName in desc) {
     const ent = desc[entName];
-    const entPath = require('path').join(dirPath, entName);
+    const entPath = path.join(dirPath, entName);
     if (typeof ent === 'string' || ent instanceof Buffer) {
       fs.writeFileSync(entPath, ent);
       continue;
@@ -37,7 +40,22 @@ function mockDir(dirPath, desc) {
   }
 }
 
-fs.__setMockFilesystem = setMockFilesystem;
-fs.mock = {clear: () => fs.reset()};
+function reset(platform) {
+  if (path.mock == null) {
+    throw new Error(
+      'to use this "fs" module mock, you must also mock the "path" module',
+    );
+  }
+  path.mock.reset(platform);
+  const cwd = () => (platform === 'win32' ? 'c:\\' : '/');
+  fs = new MemoryFS({platform, cwd});
+  Object.assign(mockFs, fs);
+}
+
+const mockFs = {};
+mockFs.__setMockFilesystem = setMockFilesystem;
+mockFs.mock = {clear: reset};
+
+reset('posix');
 
-module.exports = fs;
+module.exports = mockFs;
diff --git a/local-cli/__mocks__/path.js b/local-cli/__mocks__/path.js
new file mode 100644
index 00000000000000..813a2525c6bfdf
--- /dev/null
+++ b/local-cli/__mocks__/path.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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 mockPath = {};
+
+function reset(platform) {
+  Object.assign(mockPath, jest.requireActual('path')[platform]);
+}
+
+mockPath.mock = {reset};
+
+reset('posix');
+
+module.exports = mockPath;
diff --git a/local-cli/bundle/__mocks__/sign.js b/local-cli/bundle/__mocks__/sign.js
index f8f9174f9b61f0..31fda82f57ca30 100644
--- a/local-cli/bundle/__mocks__/sign.js
+++ b/local-cli/bundle/__mocks__/sign.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js b/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js
index 3b6f3b355e0686..ca336d8fdcc70e 100644
--- a/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js
+++ b/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js b/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js
index cca0ce2af61b4c..792e2676ceff1e 100644
--- a/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js
+++ b/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,6 +14,8 @@ jest.dontMock('../getAssetDestPathAndroid').dontMock('../assetPathUtils');
 
 const getAssetDestPathAndroid = require('../getAssetDestPathAndroid');
 
+const path = require('path');
+
 describe('getAssetDestPathAndroid', () => {
   it('should use the right destination folder', () => {
     const asset = {
@@ -45,7 +47,7 @@ describe('getAssetDestPathAndroid', () => {
     };
 
     expect(getAssetDestPathAndroid(asset, 1)).toBe(
-      'drawable-mdpi/app_test_icon.png',
+      path.normalize('drawable-mdpi/app_test_icon.png'),
     );
   });
 
@@ -66,6 +68,8 @@ describe('getAssetDestPathAndroid', () => {
       httpServerLocation: '/assets/app/test',
     };
 
-    expect(getAssetDestPathAndroid(asset, 1)).toBe('raw/app_test_video.mp4');
+    expect(getAssetDestPathAndroid(asset, 1)).toBe(
+      path.normalize('raw/app_test_video.mp4'),
+    );
   });
 });
diff --git a/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js b/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js
index 620c01571c7501..fb05ba3fb31792 100644
--- a/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js
+++ b/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,6 +13,7 @@
 jest.dontMock('../getAssetDestPathIOS');
 
 const getAssetDestPathIOS = require('../getAssetDestPathIOS');
+const path = require('path');
 
 describe('getAssetDestPathIOS', () => {
   it('should build correct path', () => {
@@ -22,7 +23,9 @@ describe('getAssetDestPathIOS', () => {
       httpServerLocation: '/assets/test',
     };
 
-    expect(getAssetDestPathIOS(asset, 1)).toBe('assets/test/icon.png');
+    expect(getAssetDestPathIOS(asset, 1)).toBe(
+      path.normalize('assets/test/icon.png'),
+    );
   });
 
   it('should consider scale', () => {
@@ -32,7 +35,11 @@ describe('getAssetDestPathIOS', () => {
       httpServerLocation: '/assets/test',
     };
 
-    expect(getAssetDestPathIOS(asset, 2)).toBe('assets/test/icon@2x.png');
-    expect(getAssetDestPathIOS(asset, 3)).toBe('assets/test/icon@3x.png');
+    expect(getAssetDestPathIOS(asset, 2)).toBe(
+      path.normalize('assets/test/icon@2x.png'),
+    );
+    expect(getAssetDestPathIOS(asset, 3)).toBe(
+      path.normalize('assets/test/icon@3x.png'),
+    );
   });
 });
diff --git a/local-cli/bundle/assetPathUtils.js b/local-cli/bundle/assetPathUtils.js
index bcfc880ddf637b..9e98ba684a9756 100644
--- a/local-cli/bundle/assetPathUtils.js
+++ b/local-cli/bundle/assetPathUtils.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index d1e422d4d0b363..0de330e386499c 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,26 +11,15 @@
 'use strict';
 
 const log = require('../util/log').out('bundle');
-/* $FlowFixMe(site=react_native_oss) */
 const Server = require('metro/src/Server');
-const {Terminal} = require('metro-core');
-const TerminalReporter = require('metro/src/lib/TerminalReporter');
 
-const {defaults} = require('metro');
 /* $FlowFixMe(site=react_native_oss) */
 const outputBundle = require('metro/src/shared/output/bundle');
 const path = require('path');
 const saveAssets = require('./saveAssets');
 
-const {ASSET_REGISTRY_PATH} = require('../core/Constants');
-
 import type {RequestOptions, OutputOptions} from './types.flow';
-import type {ConfigT} from 'metro';
-
-const defaultAssetExts = defaults.assetExts;
-const defaultSourceExts = defaults.sourceExts;
-const defaultPlatforms = defaults.platforms;
-const defaultProvidesModuleNodeModules = defaults.providesModuleNodeModules;
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
 async function buildBundle(
   args: OutputOptions & {
@@ -41,12 +30,13 @@ async function buildBundle(
     transformer: string,
     minify: boolean,
   },
-  config: ConfigT,
+  configPromise: Promise<ConfigT>,
   output = outputBundle,
 ) {
   // This is used by a bazillion of npm modules we don't control so we don't
   // have other choice than defining it as an env variable here.
   process.env.NODE_ENV = args.dev ? 'development' : 'production';
+  const config = await configPromise;
 
   let sourceMapUrl = args.sourcemapOutput;
   if (sourceMapUrl && !args.sourcemapUseAbsolutePath) {
@@ -61,69 +51,25 @@ async function buildBundle(
     platform: args.platform,
   };
 
-  const assetExts = (config.getAssetExts && config.getAssetExts()) || [];
-  const sourceExts = (config.getSourceExts && config.getSourceExts()) || [];
-  const platforms = (config.getPlatforms && config.getPlatforms()) || [];
-
-  const transformModulePath = args.transformer
-    ? path.resolve(args.transformer)
-    : config.getTransformModulePath();
-
-  const providesModuleNodeModules =
-    typeof config.getProvidesModuleNodeModules === 'function'
-      ? config.getProvidesModuleNodeModules()
-      : defaultProvidesModuleNodeModules;
+  const server = new Server({...config, resetCache: args.resetCache});
 
-  const terminal = new Terminal(process.stdout);
-  const server = new Server({
-    asyncRequireModulePath: config.getAsyncRequireModulePath(),
-    assetExts: defaultAssetExts.concat(assetExts),
-    assetRegistryPath: ASSET_REGISTRY_PATH,
-    blacklistRE: config.getBlacklistRE(),
-    cacheStores: config.cacheStores,
-    cacheVersion: config.cacheVersion,
-    dynamicDepsInPackages: config.dynamicDepsInPackages,
-    enableBabelRCLookup: config.getEnableBabelRCLookup(),
-    extraNodeModules: config.extraNodeModules,
-    getModulesRunBeforeMainModule: config.getModulesRunBeforeMainModule,
-    getPolyfills: config.getPolyfills,
-    getResolverMainFields: config.getResolverMainFields,
-    getRunModuleStatement: config.getRunModuleStatement,
-    getTransformOptions: config.getTransformOptions,
-    hasteImplModulePath: config.hasteImplModulePath,
-    maxWorkers: args.maxWorkers,
-    platforms: defaultPlatforms.concat(platforms),
-    postMinifyProcess: config.postMinifyProcess,
-    postProcessBundleSourcemap: config.postProcessBundleSourcemap,
-    projectRoot: config.getProjectRoot(),
-    providesModuleNodeModules: providesModuleNodeModules,
-    reporter: new TerminalReporter(terminal),
-    resetCache: args.resetCache,
-    resolveRequest: config.resolveRequest,
-    sourceExts: sourceExts.concat(defaultSourceExts),
-    transformModulePath: transformModulePath,
-    watch: false,
-    watchFolders: config.getWatchFolders(),
-    workerPath: config.getWorkerPath && config.getWorkerPath(),
-  });
+  try {
+    const bundle = await output.build(server, requestOpts);
 
-  const bundle = await output.build(server, requestOpts);
+    await output.save(bundle, args, log);
 
-  await output.save(bundle, args, log);
+    // Save the assets of the bundle
+    const outputAssets = await server.getAssets({
+      ...Server.DEFAULT_BUNDLE_OPTIONS,
+      ...requestOpts,
+      bundleType: 'todo',
+    });
 
-  // Save the assets of the bundle
-  const outputAssets = await server.getAssets({
-    ...Server.DEFAULT_BUNDLE_OPTIONS,
-    ...requestOpts,
-    bundleType: 'todo',
-  });
-
-  // When we're done saving bundle output and the assets, we're done.
-  const assets = await saveAssets(outputAssets, args.platform, args.assetsDest);
-
-  server.end();
-
-  return assets;
+    // When we're done saving bundle output and the assets, we're done.
+    return await saveAssets(outputAssets, args.platform, args.assetsDest);
+  } finally {
+    server.end();
+  }
 }
 
 module.exports = buildBundle;
diff --git a/local-cli/bundle/bundle.js b/local-cli/bundle/bundle.js
index 96d995db46cdc5..8c42982b47b005 100644
--- a/local-cli/bundle/bundle.js
+++ b/local-cli/bundle/bundle.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -16,11 +16,11 @@ const outputBundle = require('metro/src/shared/output/bundle');
 /**
  * Builds the bundle starting to look for dependencies at the given entry path.
  */
-function bundleWithOutput(argv, config, args, output) {
+function bundleWithOutput(argv, configPromise, args, output) {
   if (!output) {
     output = outputBundle;
   }
-  return buildBundle(args, config, output);
+  return buildBundle(args, configPromise, output);
 }
 
 module.exports = {
diff --git a/local-cli/bundle/bundleCommandLineArgs.js b/local-cli/bundle/bundleCommandLineArgs.js
index 4853f877ab7d6f..ef95e2a9fea2c2 100644
--- a/local-cli/bundle/bundleCommandLineArgs.js
+++ b/local-cli/bundle/bundleCommandLineArgs.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/bundle/filterPlatformAssetScales.js b/local-cli/bundle/filterPlatformAssetScales.js
index d6a9f78cced7dd..d75512e86886f1 100644
--- a/local-cli/bundle/filterPlatformAssetScales.js
+++ b/local-cli/bundle/filterPlatformAssetScales.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/bundle/getAssetDestPathAndroid.js b/local-cli/bundle/getAssetDestPathAndroid.js
index 316b56a4dfbbf8..36e54f94e292ad 100644
--- a/local-cli/bundle/getAssetDestPathAndroid.js
+++ b/local-cli/bundle/getAssetDestPathAndroid.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/bundle/getAssetDestPathIOS.js b/local-cli/bundle/getAssetDestPathIOS.js
index 5e6d3a6352fb14..55479c2568c230 100644
--- a/local-cli/bundle/getAssetDestPathIOS.js
+++ b/local-cli/bundle/getAssetDestPathIOS.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/bundle/unbundle.js b/local-cli/bundle/ramBundle.js
similarity index 57%
rename from local-cli/bundle/unbundle.js
rename to local-cli/bundle/ramBundle.js
index da4a4f70d6a8e5..796389034ff073 100644
--- a/local-cli/bundle/unbundle.js
+++ b/local-cli/bundle/ramBundle.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,23 +11,24 @@
 
 const bundleWithOutput = require('./bundle').withOutput;
 const bundleCommandLineArgs = require('./bundleCommandLineArgs');
-const outputUnbundle = require('metro/src/shared/output/unbundle');
+const outputUnbundle = require('metro/src/shared/output/RamBundle');
 
 /**
  * Builds the bundle starting to look for dependencies at the given entry path.
  */
-function unbundle(argv, config, args) {
+function ramBundle(argv, config, args) {
   return bundleWithOutput(argv, config, args, outputUnbundle);
 }
 
 module.exports = {
-  name: 'unbundle',
-  description: 'builds javascript as "unbundle" for offline use',
-  func: unbundle,
+  name: 'ram-bundle',
+  description:
+    'builds javascript as a "Random Access Module" bundle for offline use',
+  func: ramBundle,
   options: bundleCommandLineArgs.concat({
-    command: '--indexed-unbundle',
+    command: '--indexed-ram-bundle',
     description:
-      'Force indexed unbundle file format, even when building for android',
+      'Force the "Indexed RAM" bundle file format, even when building for android',
     default: false,
   }),
 };
diff --git a/local-cli/bundle/saveAssets.js b/local-cli/bundle/saveAssets.js
index 0961ed7d525d00..d43197ec573fb7 100644
--- a/local-cli/bundle/saveAssets.js
+++ b/local-cli/bundle/saveAssets.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/bundle/types.flow.js b/local-cli/bundle/types.flow.js
index 3fb3d930ee1bbb..04bc1c38508bb5 100644
--- a/local-cli/bundle/types.flow.js
+++ b/local-cli/bundle/types.flow.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,5 +10,4 @@
 
 'use strict';
 
-/* $FlowFixMe(site=react_native_oss) */
 export type {OutputOptions, RequestOptions} from 'metro/src/shared/types.flow';
diff --git a/local-cli/cli.js b/local-cli/cli.js
index 04f0950052b292..f34d5742915be5 100644
--- a/local-cli/cli.js
+++ b/local-cli/cli.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/cliEntry.js b/local-cli/cliEntry.js
index d342e9ed0d53a8..e2f78eb9dc0386 100644
--- a/local-cli/cliEntry.js
+++ b/local-cli/cliEntry.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,7 +10,7 @@
 
 'use strict';
 
-const config = require('./core');
+const {configPromise} = require('./core');
 
 const assertRequiredOptions = require('./util/assertRequiredOptions');
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
@@ -137,7 +137,8 @@ const addCommand = (command: CommandT, cfg: RNConfig) => {
   cmd.option('--config [string]', 'Path to the CLI configuration file');
 };
 
-function run() {
+async function run() {
+  const config = await configPromise;
   const setupEnvScript = /^win/.test(process.platform)
     ? 'setup_env.bat'
     : 'setup_env.sh';
diff --git a/local-cli/commands.js b/local-cli/commands.js
index f75207bd3bc5cb..35a7f74def1fff 100644
--- a/local-cli/commands.js
+++ b/local-cli/commands.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -41,7 +41,7 @@ const documentedCommands = [
   require('./runAndroid/runAndroid'),
   require('./library/library'),
   require('./bundle/bundle'),
-  require('./bundle/unbundle'),
+  require('./bundle/ramBundle'),
   require('./eject/eject'),
   require('./link/link'),
   require('./link/unlink'),
diff --git a/local-cli/core/Constants.js b/local-cli/core/Constants.js
index 38d6f22292c4c5..edf9cd51799592 100644
--- a/local-cli/core/Constants.js
+++ b/local-cli/core/Constants.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/core/__fixtures__/android.js b/local-cli/core/__fixtures__/android.js
index 2d6447b875651e..d5f603069fc446 100644
--- a/local-cli/core/__fixtures__/android.js
+++ b/local-cli/core/__fixtures__/android.js
@@ -1,7 +1,14 @@
-/** @format */
+/**
+ * Copyright (c) Facebook, Inc. and its 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.requireActual('fs');
-const path = require('path');
+const fs = jest.requireActual('fs');
+const path = jest.requireActual('path');
 
 const manifest = fs.readFileSync(
   path.join(__dirname, './files/AndroidManifest.xml'),
diff --git a/local-cli/core/__fixtures__/dependencies.js b/local-cli/core/__fixtures__/dependencies.js
index decb08a161c228..3b9c9abc3f9727 100644
--- a/local-cli/core/__fixtures__/dependencies.js
+++ b/local-cli/core/__fixtures__/dependencies.js
@@ -1,6 +1,6 @@
 /** @format */
 
-const fs = require.requireActual('fs');
+const fs = jest.requireActual('fs');
 const path = require('path');
 const android = require('./android');
 
diff --git a/local-cli/core/__fixtures__/files/package.json b/local-cli/core/__fixtures__/files/package.json
index cce13033d3a405..5c197853c521ae 100644
--- a/local-cli/core/__fixtures__/files/package.json
+++ b/local-cli/core/__fixtures__/files/package.json
@@ -50,7 +50,7 @@
     "react-native": ">=0.4.0 || 0.5.0-rc1 || 0.6.0-rc || 0.7.0-rc || 0.7.0-rc.2 || 0.8.0-rc || 0.8.0-rc.2 || 0.9.0-rc || 0.10.0-rc || 0.11.0-rc || 0.12.0-rc || 0.13.0-rc || 0.14.0-rc || 0.15.0-rc || 0.16.0-rc"
   },
   "dependencies": {
-    "lodash": "^3.8.0",
+    "lodash": "^4.17.10",
     "yargs": "^3.30.0",
     "rnpm-plugin-test": "*"
   },
diff --git a/local-cli/core/__fixtures__/ios.js b/local-cli/core/__fixtures__/ios.js
index 99e84080fbacbb..ef0ba538af675a 100644
--- a/local-cli/core/__fixtures__/ios.js
+++ b/local-cli/core/__fixtures__/ios.js
@@ -1,6 +1,6 @@
 /** @format */
 
-const fs = require.requireActual('fs');
+const fs = jest.requireActual('fs');
 const path = require('path');
 
 exports.valid = {
diff --git a/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js b/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
index dcbb8002d3c4c9..331dfe8e178c64 100644
--- a/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
+++ b/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
 const fs = require('fs');
diff --git a/local-cli/core/__tests__/android/findManifest.spec.js b/local-cli/core/__tests__/android/findManifest.spec.js
index 73834b61da6780..242b20a7471347 100644
--- a/local-cli/core/__tests__/android/findManifest.spec.js
+++ b/local-cli/core/__tests__/android/findManifest.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
 const findManifest = require('../../android/findManifest');
diff --git a/local-cli/core/__tests__/android/findPackageClassName.spec.js b/local-cli/core/__tests__/android/findPackageClassName.spec.js
index 36da8b4df31dad..5c15fd658bb6e3 100644
--- a/local-cli/core/__tests__/android/findPackageClassName.spec.js
+++ b/local-cli/core/__tests__/android/findPackageClassName.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,40 +10,49 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
+const mocks = require('../../__fixtures__/android');
 const findPackageClassName = require('../../android/findPackageClassName');
 const fs = require('fs');
-const mocks = require('../../__fixtures__/android');
 
-describe('android::findPackageClassName', () => {
-  beforeAll(() => {
-    fs.__setMockFilesystem({
-      empty: {},
-      flatJava: {
-        android: mocks.valid,
-      },
-      flatKotlin: {
-        android: mocks.validKotlin,
-      },
+['posix', 'win32'].forEach(platform => {
+  let root;
+  describe(`android::findPackageClassName (${platform})`, () => {
+    beforeAll(() => {
+      root = fs.__setMockFilesystem(
+        {
+          empty: {},
+          flatJava: {
+            android: mocks.valid,
+          },
+          flatKotlin: {
+            android: mocks.validKotlin,
+          },
+        },
+        platform,
+      );
     });
-  });
 
-  it('returns manifest content if file exists in the folder', () => {
-    expect(typeof findPackageClassName('/flatJava')).toBe('string');
-  });
+    it('returns manifest content if file exists in the folder', () => {
+      expect(typeof findPackageClassName(root + 'flatJava')).toBe('string');
+    });
 
-  it('returns the name of the java class implementing ReactPackage', () => {
-    expect(findPackageClassName('/flatJava')).toBe('SomeExampleJavaPackage');
-  });
+    it('returns the name of the java class implementing ReactPackage', () => {
+      expect(findPackageClassName(root + 'flatJava')).toBe(
+        'SomeExampleJavaPackage',
+      );
+    });
 
-  it('returns the name of the kotlin class implementing ReactPackage', () => {
-    expect(findPackageClassName('/flatKotlin')).toBe(
-      'SomeExampleKotlinPackage',
-    );
-  });
+    it('returns the name of the kotlin class implementing ReactPackage', () => {
+      expect(findPackageClassName(root + 'flatKotlin')).toBe(
+        'SomeExampleKotlinPackage',
+      );
+    });
 
-  it('returns `null` if there are no matches', () => {
-    expect(findPackageClassName('/empty')).toBeNull();
+    it('returns `null` if there are no matches', () => {
+      expect(findPackageClassName(root + 'empty')).toBeNull();
+    });
   });
 });
diff --git a/local-cli/core/__tests__/android/getDependencyConfig.spec.js b/local-cli/core/__tests__/android/getDependencyConfig.spec.js
index 31ae35ad4f49ba..7a43db319c719b 100644
--- a/local-cli/core/__tests__/android/getDependencyConfig.spec.js
+++ b/local-cli/core/__tests__/android/getDependencyConfig.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
 const getDependencyConfig = require('../../android').dependencyConfig;
diff --git a/local-cli/core/__tests__/android/getProjectConfig.spec.js b/local-cli/core/__tests__/android/getProjectConfig.spec.js
index 02ee04512a4245..863138c9507c7f 100644
--- a/local-cli/core/__tests__/android/getProjectConfig.spec.js
+++ b/local-cli/core/__tests__/android/getProjectConfig.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
 const getProjectConfig = require('../../android').projectConfig;
@@ -37,6 +38,13 @@ describe('android::getProjectConfig', () => {
     });
   });
 
+  it("returns `null` if manifest file hasn't been found and userConfig is not defined", () => {
+    const userConfig = undefined;
+    const folder = '/noManifest';
+
+    expect(getProjectConfig(folder, userConfig)).toBeNull();
+  });
+
   it("returns `null` if manifest file hasn't been found", () => {
     const userConfig = {};
     const folder = '/noManifest';
diff --git a/local-cli/core/__tests__/android/readManifest.spec.js b/local-cli/core/__tests__/android/readManifest.spec.js
index 8a1dead25f15d7..2b8f41e4f5f8ab 100644
--- a/local-cli/core/__tests__/android/readManifest.spec.js
+++ b/local-cli/core/__tests__/android/readManifest.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
 const findManifest = require('../../android/findManifest');
diff --git a/local-cli/core/__tests__/findAssets.spec.js b/local-cli/core/__tests__/findAssets.spec.js
index 768be38029409f..cf880b23df2901 100644
--- a/local-cli/core/__tests__/findAssets.spec.js
+++ b/local-cli/core/__tests__/findAssets.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
 const findAssets = require('../findAssets');
diff --git a/local-cli/core/__tests__/findPlugins.spec.js b/local-cli/core/__tests__/findPlugins.spec.js
index aba8e95d5da142..6d350da542f7d8 100644
--- a/local-cli/core/__tests__/findPlugins.spec.js
+++ b/local-cli/core/__tests__/findPlugins.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -66,4 +66,19 @@ describe('findPlugins', () => {
     }));
     expect(findPlugins([ROOT]).commands).toHaveLength(1);
   });
+
+  it('returns plugins in scoped modules', () => {
+    jest.mock(pjsonPath, () => ({
+      dependencies: {
+        '@org/rnpm-plugin-test': '*',
+        '@org/react-native-test': '*',
+        '@react-native/test': '*',
+        '@react-native-org/test': '*',
+      },
+    }));
+
+    expect(findPlugins([ROOT])).toHaveProperty('commands');
+    expect(findPlugins([ROOT])).toHaveProperty('platforms');
+    expect(findPlugins([ROOT]).commands[0]).toBe('@org/rnpm-plugin-test');
+  });
 });
diff --git a/local-cli/core/__tests__/ios/findPodfilePath.spec.js b/local-cli/core/__tests__/ios/findPodfilePath.spec.js
index 1ada4b658ed61c..227d2451250765 100644
--- a/local-cli/core/__tests__/ios/findPodfilePath.spec.js
+++ b/local-cli/core/__tests__/ios/findPodfilePath.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
 const findPodfilePath = require('../../ios/findPodfilePath');
diff --git a/local-cli/core/__tests__/ios/findPodspecName.spec.js b/local-cli/core/__tests__/ios/findPodspecName.spec.js
index 7829ab6e34eba0..14d73cd7d82dc2 100644
--- a/local-cli/core/__tests__/ios/findPodspecName.spec.js
+++ b/local-cli/core/__tests__/ios/findPodspecName.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
 const findPodspecName = require('../../ios/findPodspecName');
diff --git a/local-cli/core/__tests__/ios/findProject.spec.js b/local-cli/core/__tests__/ios/findProject.spec.js
index 78b4be1e3a0147..0083e9bd0d7ea6 100644
--- a/local-cli/core/__tests__/ios/findProject.spec.js
+++ b/local-cli/core/__tests__/ios/findProject.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
 const findProject = require('../../ios/findProject');
diff --git a/local-cli/core/__tests__/ios/getProjectConfig.spec.js b/local-cli/core/__tests__/ios/getProjectConfig.spec.js
index 5d3c72caeef692..d1af61e4b2982f 100644
--- a/local-cli/core/__tests__/ios/getProjectConfig.spec.js
+++ b/local-cli/core/__tests__/ios/getProjectConfig.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
 const getProjectConfig = require('../../ios').projectConfig;
diff --git a/local-cli/core/__tests__/makeCommand.spec.js b/local-cli/core/__tests__/makeCommand.spec.js
index 95110375cef10b..c9842efa861622 100644
--- a/local-cli/core/__tests__/makeCommand.spec.js
+++ b/local-cli/core/__tests__/makeCommand.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/core/android/findAndroidAppFolder.js b/local-cli/core/android/findAndroidAppFolder.js
index 4eb3416d9533a6..41e1319a048ebe 100644
--- a/local-cli/core/android/findAndroidAppFolder.js
+++ b/local-cli/core/android/findAndroidAppFolder.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/core/android/findManifest.js b/local-cli/core/android/findManifest.js
index 9bacbee4742de4..4c04ed7cba4cf5 100644
--- a/local-cli/core/android/findManifest.js
+++ b/local-cli/core/android/findManifest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/core/android/findPackageClassName.js b/local-cli/core/android/findPackageClassName.js
index 6fe1d3c359ff2d..a1bfaf6f232d2a 100644
--- a/local-cli/core/android/findPackageClassName.js
+++ b/local-cli/core/android/findPackageClassName.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/core/android/index.js b/local-cli/core/android/index.js
index 914341a1223453..2106ed7a9a7753 100644
--- a/local-cli/core/android/index.js
+++ b/local-cli/core/android/index.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -21,7 +21,7 @@ const getPackageName = manifest => manifest.attr.package;
  * Gets android project config by analyzing given folder and taking some
  * defaults specified by user into consideration
  */
-exports.projectConfig = function projectConfigAndroid(folder, userConfig) {
+exports.projectConfig = function projectConfigAndroid(folder, userConfig = {}) {
   const src = userConfig.sourceDir || findAndroidAppFolder(folder);
 
   if (!src) {
@@ -95,7 +95,7 @@ exports.projectConfig = function projectConfigAndroid(folder, userConfig) {
  */
 exports.dependencyConfig = function dependencyConfigAndroid(
   folder,
-  userConfig,
+  userConfig = {},
 ) {
   const src = userConfig.sourceDir || findAndroidAppFolder(folder);
 
diff --git a/local-cli/core/android/readManifest.js b/local-cli/core/android/readManifest.js
index 7d61883ca21c32..159cb601d70a59 100644
--- a/local-cli/core/android/readManifest.js
+++ b/local-cli/core/android/readManifest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/core/findAssets.js b/local-cli/core/findAssets.js
index db8b2360031f6e..a06596d1016325 100644
--- a/local-cli/core/findAssets.js
+++ b/local-cli/core/findAssets.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/core/findPlugins.js b/local-cli/core/findPlugins.js
index 595577ba8e875c..7d76b5b6f5f05e 100644
--- a/local-cli/core/findPlugins.js
+++ b/local-cli/core/findPlugins.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,14 +14,23 @@ const union = require('lodash').union;
 const uniq = require('lodash').uniq;
 const flatten = require('lodash').flatten;
 
+const RNPM_PLUGIN_PATTERNS = [/^rnpm-plugin-/, /^@(.*)\/rnpm-plugin-/];
+
+const REACT_NATIVE_PLUGIN_PATTERNS = [
+  /^react-native-/,
+  /^@(.*)\/react-native-/,
+  /^@react-native(.*)\/(?!rnpm-plugin-)/,
+];
+
 /**
  * Filter dependencies by name pattern
  * @param  {String} dependency Name of the dependency
  * @return {Boolean}           If dependency is a rnpm plugin
  */
-const isRNPMPlugin = dependency => dependency.indexOf('rnpm-plugin-') === 0;
+const isRNPMPlugin = dependency =>
+  RNPM_PLUGIN_PATTERNS.some(pattern => pattern.test(dependency));
 const isReactNativePlugin = dependency =>
-  dependency.indexOf('react-native-') === 0;
+  REACT_NATIVE_PLUGIN_PATTERNS.some(pattern => pattern.test(dependency));
 
 const readPackage = folder => {
   try {
@@ -47,11 +56,37 @@ const findPlatformsInPackage = pjson => {
   return path.join(pjson.name, pjson.rnpm.platform);
 };
 
+const getEmptyPluginConfig = () => ({
+  commands: [],
+  platforms: [],
+  haste: {
+    platforms: [],
+    providesModuleNodeModules: [],
+  },
+});
+
+const findHasteConfigInPackageAndConcat = (pjson, haste) => {
+  if (!pjson.rnpm || !pjson.rnpm.haste) {
+    return;
+  }
+  let pkgHaste = pjson.rnpm.haste;
+
+  if (pkgHaste.platforms) {
+    haste.platforms = haste.platforms.concat(pkgHaste.platforms);
+  }
+
+  if (pkgHaste.providesModuleNodeModules) {
+    haste.providesModuleNodeModules = haste.providesModuleNodeModules.concat(
+      pkgHaste.providesModuleNodeModules,
+    );
+  }
+};
+
 const findPluginInFolder = folder => {
   const pjson = readPackage(folder);
 
   if (!pjson) {
-    return {commands: [], platforms: []};
+    return getEmptyPluginConfig();
   }
 
   const deps = union(
@@ -59,24 +94,23 @@ const findPluginInFolder = folder => {
     Object.keys(pjson.devDependencies || {}),
   );
 
-  return deps.reduce(
-    (acc, pkg) => {
-      let commands = acc.commands;
-      let platforms = acc.platforms;
-      if (isRNPMPlugin(pkg)) {
-        commands = commands.concat(pkg);
-      }
-      if (isReactNativePlugin(pkg)) {
-        const pkgJson = readPackage(path.join(folder, 'node_modules', pkg));
-        if (pkgJson) {
-          commands = commands.concat(findPluginsInReactNativePackage(pkgJson));
-          platforms = platforms.concat(findPlatformsInPackage(pkgJson));
-        }
+  return deps.reduce((acc, pkg) => {
+    let commands = acc.commands;
+    let platforms = acc.platforms;
+    let haste = acc.haste;
+    if (isRNPMPlugin(pkg)) {
+      commands = commands.concat(pkg);
+    }
+    if (isReactNativePlugin(pkg)) {
+      const pkgJson = readPackage(path.join(folder, 'node_modules', pkg));
+      if (pkgJson) {
+        commands = commands.concat(findPluginsInReactNativePackage(pkgJson));
+        platforms = platforms.concat(findPlatformsInPackage(pkgJson));
+        findHasteConfigInPackageAndConcat(pkgJson, haste);
       }
-      return {commands: commands, platforms: platforms};
-    },
-    {commands: [], platforms: []},
-  );
+    }
+    return {commands: commands, platforms: platforms, haste: haste};
+  }, getEmptyPluginConfig());
 };
 
 /**
@@ -89,5 +123,11 @@ module.exports = function findPlugins(folders) {
   return {
     commands: uniq(flatten(plugins.map(p => p.commands))),
     platforms: uniq(flatten(plugins.map(p => p.platforms))),
+    haste: {
+      platforms: uniq(flatten(plugins.map(p => p.haste.platforms))),
+      providesModuleNodeModules: uniq(
+        flatten(plugins.map(p => p.haste.providesModuleNodeModules)),
+      ),
+    },
   };
 };
diff --git a/local-cli/core/index.js b/local-cli/core/index.js
index 4d94aaebef4bac..438dadd55b2216 100644
--- a/local-cli/core/index.js
+++ b/local-cli/core/index.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -16,6 +16,7 @@ const findPlugins = require('./findPlugins');
 const findAssets = require('./findAssets');
 const ios = require('./ios');
 const wrapCommands = require('./wrapCommands');
+const {ASSET_REGISTRY_PATH} = require('./Constants');
 
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
  * found when Flow v0.54 was deployed. To see the error delete this comment and
@@ -28,7 +29,7 @@ const minimist = require('minimist');
 const path = require('path');
 
 import type {CommandT} from '../commands';
-import type {ConfigT} from 'metro';
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
 export type RNConfig = {
   ...ConfigT,
@@ -36,10 +37,6 @@ export type RNConfig = {
    * Returns an object with all platform configurations.
    */
   getPlatformConfig(): Object,
-  /**
-   * Returns an array of project commands used by the CLI to load
-   */
-  getProjectCommands(): Array<CommandT>,
   /**
    * Returns project config from the current working directory
    */
@@ -69,30 +66,19 @@ const pluginPlatforms = plugins.platforms.reduce((acc, pathToPlatforms) => {
   );
 }, {});
 
-const defaultRNConfig = {
+const defaultConfig = {
   hasteImplModulePath: require.resolve('../../jest/hasteImpl'),
 
   getPlatforms(): Array<string> {
-    return ['ios', 'android', 'windows', 'web'];
+    return ['ios', 'android', 'native', ...plugins.haste.platforms];
   },
 
   getProvidesModuleNodeModules(): Array<string> {
-    return ['react-native', 'react-native-windows'];
-  },
-
-  getProjectCommands(): Array<CommandT> {
-    const commands = plugins.commands.map(pathToCommands => {
-      const name = pathToCommands.split(path.sep)[0];
-
-      return attachPackage(
-        require(path.join(appRoot, 'node_modules', pathToCommands)),
-        require(path.join(appRoot, 'node_modules', name, 'package.json')),
-      );
-    });
-
-    return flatten(commands);
+    return ['react-native', ...plugins.haste.providesModuleNodeModules];
   },
+};
 
+const defaultRNConfig = {
   getPlatformConfig(): Object {
     return {
       ios,
@@ -120,9 +106,7 @@ const defaultRNConfig = {
   getDependencyConfig(packageName: string) {
     const platforms = this.getPlatformConfig();
     const folder = path.join(process.cwd(), 'node_modules', packageName);
-    const rnpm = getRNPMConfig(
-      path.join(process.cwd(), 'node_modules', packageName),
-    );
+    const rnpm = getRNPMConfig(folder);
 
     let config = Object.assign({}, rnpm, {
       assets: findAssets(folder, rnpm.assets),
@@ -141,14 +125,50 @@ const defaultRNConfig = {
 /**
  * Loads the CLI configuration
  */
-function getCliConfig(): RNConfig {
+async function getCliConfig(): Promise<RNConfig> {
   const cliArgs = minimist(process.argv.slice(2));
-  const config =
-    cliArgs.config != null
-      ? Config.load(path.resolve(__dirname, cliArgs.config))
-      : Config.findOptional(__dirname);
+  const config = await Config.load(
+    cliArgs.config != null ? path.resolve(__dirname, cliArgs.config) : null,
+  );
+
+  // $FlowFixMe Metro configuration is immutable.
+  config.transformer.assetRegistryPath = ASSET_REGISTRY_PATH;
+  config.resolver.hasteImplModulePath =
+    config.resolver.hasteImplModulePath || defaultConfig.hasteImplModulePath;
+  config.resolver.platforms = config.resolver.platforms
+    ? config.resolver.platforms.concat(defaultConfig.getPlatforms())
+    : defaultConfig.getPlatforms();
+  config.resolver.providesModuleNodeModules = config.resolver
+    .providesModuleNodeModules
+    ? config.resolver.providesModuleNodeModules.concat(
+        defaultConfig.getProvidesModuleNodeModules(),
+      )
+    : defaultConfig.getProvidesModuleNodeModules();
 
   return {...defaultRNConfig, ...config};
 }
 
-module.exports = getCliConfig();
+/**
+ * Returns an array of project commands used by the CLI to load
+ */
+function getProjectCommands(): Array<CommandT> {
+  const commands = plugins.commands.map(pathToCommands => {
+    const name =
+      pathToCommands[0] === '@'
+        ? pathToCommands
+            .split(path.sep)
+            .slice(0, 2)
+            .join(path.sep)
+        : pathToCommands.split(path.sep)[0];
+
+    return attachPackage(
+      require(path.join(appRoot, 'node_modules', pathToCommands)),
+      require(path.join(appRoot, 'node_modules', name, 'package.json')),
+    );
+  });
+
+  return flatten(commands);
+}
+
+module.exports.configPromise = getCliConfig();
+module.exports.getProjectCommands = getProjectCommands;
diff --git a/local-cli/core/ios/findProject.js b/local-cli/core/ios/findProject.js
index 3a6547015af295..d98695d67fb370 100644
--- a/local-cli/core/ios/findProject.js
+++ b/local-cli/core/ios/findProject.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/core/ios/index.js b/local-cli/core/ios/index.js
index f99a270fbc7ea4..df876115046faf 100644
--- a/local-cli/core/ios/index.js
+++ b/local-cli/core/ios/index.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/core/makeCommand.js b/local-cli/core/makeCommand.js
index 07fe346918ea99..d1d0fe8194f525 100644
--- a/local-cli/core/makeCommand.js
+++ b/local-cli/core/makeCommand.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/core/wrapCommands.js b/local-cli/core/wrapCommands.js
index b5876a69977b0c..1f3ce34ab3f582 100644
--- a/local-cli/core/wrapCommands.js
+++ b/local-cli/core/wrapCommands.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/dependencies/dependencies.js b/local-cli/dependencies/dependencies.js
index baa6ec4a7a4da4..192926a84d1063 100644
--- a/local-cli/dependencies/dependencies.js
+++ b/local-cli/dependencies/dependencies.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -15,41 +15,19 @@ const denodeify = require('denodeify');
 const fs = require('fs');
 const path = require('path');
 
-const {ASSET_REGISTRY_PATH} = require('../core/Constants');
-
-function dependencies(argv, config, args, packagerInstance) {
+async function dependencies(argv, configPromise, args, packagerInstance) {
   const rootModuleAbsolutePath = args.entryFile;
+  const config = await configPromise;
   if (!fs.existsSync(rootModuleAbsolutePath)) {
     return Promise.reject(
       new Error(`File ${rootModuleAbsolutePath} does not exist`),
     );
   }
 
-  const transformModulePath = args.transformer
-    ? path.resolve(args.transformer)
-    : typeof config.getTransformModulePath === 'function'
-      ? config.getTransformModulePath()
-      : undefined;
-
-  const packageOpts = {
-    assetRegistryPath: ASSET_REGISTRY_PATH,
-    cacheStores: [],
-    projectRoot: config.getProjectRoot(),
-    blacklistRE: config.getBlacklistRE(),
-    dynamicDepsInPackages: config.dynamicDepsInPackages,
-    getPolyfills: config.getPolyfills,
-    getTransformOptions: config.getTransformOptions,
-    hasteImplModulePath: config.hasteImplModulePath,
-    postMinifyProcess: config.postMinifyProcess,
-    transformModulePath: transformModulePath,
-    extraNodeModules: config.extraNodeModules,
-    verbose: config.verbose,
-    watchFolders: config.getWatchFolders(),
-    workerPath: config.getWorkerPath(),
-  };
+  config.cacheStores = [];
 
   const relativePath = path.relative(
-    packageOpts.projectRoot,
+    config.projectRoot,
     rootModuleAbsolutePath,
   );
 
@@ -66,29 +44,26 @@ function dependencies(argv, config, args, packagerInstance) {
     ? fs.createWriteStream(args.output)
     : process.stdout;
 
-  return Promise.resolve(
-    (packagerInstance
-      ? packagerInstance.getOrderedDependencyPaths(options)
-      : Metro.getOrderedDependencyPaths(packageOpts, options)
-    ).then(deps => {
-      deps.forEach(modulePath => {
-        // Temporary hack to disable listing dependencies not under this directory.
-        // Long term, we need either
-        // (a) JS code to not depend on anything outside this directory, or
-        // (b) Come up with a way to declare this dependency in Buck.
-        const isInsideProjectRoots =
-          packageOpts.watchFolders.filter(root => modulePath.startsWith(root))
-            .length > 0;
+  const deps = packagerInstance
+    ? await packagerInstance.getOrderedDependencyPaths(options)
+    : await Metro.getOrderedDependencyPaths(config, options);
 
-        if (isInsideProjectRoots) {
-          outStream.write(modulePath + '\n');
-        }
-      });
-      return writeToFile
-        ? denodeify(outStream.end).bind(outStream)()
-        : Promise.resolve();
-    }),
-  );
+  deps.forEach(modulePath => {
+    // Temporary hack to disable listing dependencies not under this directory.
+    // Long term, we need either
+    // (a) JS code to not depend on anything outside this directory, or
+    // (b) Come up with a way to declare this dependency in Buck.
+    const isInsideProjectRoots =
+      config.watchFolders.filter(root => modulePath.startsWith(root)).length >
+      0;
+
+    if (isInsideProjectRoots) {
+      outStream.write(modulePath + '\n');
+    }
+  });
+  return writeToFile
+    ? denodeify(outStream.end).bind(outStream)()
+    : Promise.resolve();
 }
 
 module.exports = {
diff --git a/local-cli/eject/eject.js b/local-cli/eject/eject.js
index 6c18a91fb9b25a..ff7d085be54f43 100644
--- a/local-cli/eject/eject.js
+++ b/local-cli/eject/eject.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/generator/copyProjectTemplateAndReplace.js b/local-cli/generator/copyProjectTemplateAndReplace.js
index 607b3b8ed2659f..8f04b439faeb30 100644
--- a/local-cli/generator/copyProjectTemplateAndReplace.js
+++ b/local-cli/generator/copyProjectTemplateAndReplace.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -68,7 +68,7 @@ function copyProjectTemplateAndReplace(
     }
 
     const relativeFilePath = path.relative(srcPath, absoluteSrcFilePath);
-    const relativeRenamedPath = dotFilePath(relativeFilePath)
+    const relativeRenamedPath = translateFilePath(relativeFilePath)
       .replace(/HelloWorld/g, newProjectName)
       .replace(/helloworld/g, newProjectName.toLowerCase());
 
@@ -112,18 +112,19 @@ function copyProjectTemplateAndReplace(
 }
 
 /**
- * There are various dotfiles in the templates folder in the RN repo. We want
+ * There are various files in the templates folder in the RN repo. We want
  * these to be ignored by tools when working with React Native itself.
  * Example: _babelrc file is ignored by Babel, renamed to .babelrc inside
  *          a real app folder.
  * This is especially important for .gitignore because npm has some special
  * behavior of automatically renaming .gitignore to .npmignore.
  */
-function dotFilePath(path) {
+function translateFilePath(path) {
   if (!path) {
     return path;
   }
   return path
+    .replace('_BUCK', 'BUCK')
     .replace('_gitignore', '.gitignore')
     .replace('_gitattributes', '.gitattributes')
     .replace('_babelrc', '.babelrc')
diff --git a/local-cli/generator/printRunInstructions.js b/local-cli/generator/printRunInstructions.js
index eaa8e5cd8b0b9a..7110f646a7f4b0 100644
--- a/local-cli/generator/printRunInstructions.js
+++ b/local-cli/generator/printRunInstructions.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/generator/templates.js b/local-cli/generator/templates.js
index 17e4379a72b359..54a09613b2b0cf 100644
--- a/local-cli/generator/templates.js
+++ b/local-cli/generator/templates.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,45 +14,6 @@ const execSync = require('child_process').execSync;
 const fs = require('fs');
 const path = require('path');
 
-/**
- * Templates released as part of react-native in local-cli/templates.
- */
-const builtInTemplates = {
-  navigation: 'HelloNavigation',
-};
-
-function listTemplatesAndExit(newProjectName, options) {
-  if (options.template === true) {
-    // Just listing templates using 'react-native init --template'.
-    // Not creating a new app.
-    // Print available templates and exit.
-    const templateKeys = Object.keys(builtInTemplates);
-    if (templateKeys.length === 0) {
-      // Just a guard, should never happen as long builtInTemplates
-      // above is defined correctly :)
-      console.log(
-        'There are no templates available besides ' +
-          'the default "Hello World" one.',
-      );
-    } else {
-      console.log(
-        'The available templates are:\n' +
-          templateKeys.join('\n') +
-          '\nYou can use these to create an app based on a template, for example: ' +
-          'you could run: ' +
-          'react-native init ' +
-          newProjectName +
-          ' --template ' +
-          templateKeys[0],
-      );
-    }
-    // Exit 'react-native init'
-    return true;
-  }
-  // Continue 'react-native init'
-  return false;
-}
-
 /**
  * @param destPath Create the new project at this path.
  * @param newProjectName For example 'AwesomeApp'.
@@ -92,41 +53,7 @@ function createProjectFromTemplate(
   // This way we don't have to duplicate the native files in every template.
   // If we duplicated them we'd make RN larger and risk that people would
   // forget to maintain all the copies so they would go out of sync.
-  const builtInTemplateName = builtInTemplates[template];
-  if (builtInTemplateName) {
-    // template is e.g. 'navigation',
-    // use the built-in local-cli/templates/HelloNavigation folder
-    createFromBuiltInTemplate(
-      builtInTemplateName,
-      destPath,
-      newProjectName,
-      yarnVersion,
-    );
-  } else {
-    // template is e.g. 'ignite',
-    // use the template react-native-template-ignite from npm
-    createFromRemoteTemplate(template, destPath, newProjectName, yarnVersion);
-  }
-}
-
-// (We might want to get rid of built-in templates in the future -
-// publish them to npm and install from there.)
-function createFromBuiltInTemplate(
-  templateName,
-  destPath,
-  newProjectName,
-  yarnVersion,
-) {
-  const templatePath = path.resolve(
-    'node_modules',
-    'react-native',
-    'local-cli',
-    'templates',
-    templateName,
-  );
-  copyProjectTemplateAndReplace(templatePath, destPath, newProjectName);
-  installTemplateDependencies(templatePath, yarnVersion);
-  installTemplateDevDependencies(templatePath, yarnVersion);
+  createFromRemoteTemplate(template, destPath, newProjectName, yarnVersion);
 }
 
 /**
@@ -171,7 +98,11 @@ function createFromRemoteTemplate(
       // only for publishing the template to npm.
       // We want to ignore this dummy file, otherwise it would overwrite
       // our project's package.json file.
-      ignorePaths: ['package.json', 'dependencies.json'],
+      ignorePaths: [
+        'package.json',
+        'dependencies.json',
+        'devDependencies.json',
+      ],
     });
     installTemplateDependencies(templatePath, yarnVersion);
     installTemplateDevDependencies(templatePath, yarnVersion);
@@ -264,6 +195,5 @@ function installTemplateDevDependencies(templatePath, yarnVersion) {
 }
 
 module.exports = {
-  listTemplatesAndExit,
   createProjectFromTemplate,
 };
diff --git a/local-cli/info/info.js b/local-cli/info/info.js
index dc605e0529046e..9f09de587c888b 100644
--- a/local-cli/info/info.js
+++ b/local-cli/info/info.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/init/init.js b/local-cli/init/init.js
index d7497a4a828476..cbb189533438bb 100644
--- a/local-cli/init/init.js
+++ b/local-cli/init/init.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,10 +9,7 @@
 
 'use strict';
 
-const {
-  listTemplatesAndExit,
-  createProjectFromTemplate,
-} = require('../generator/templates');
+const {createProjectFromTemplate} = require('../generator/templates');
 const execSync = require('child_process').execSync;
 const fs = require('fs');
 const minimist = require('minimist');
@@ -44,14 +41,8 @@ function init(projectDir, argsOrName) {
   const newProjectName = args[0];
   const options = minimist(args);
 
-  if (listTemplatesAndExit(newProjectName, options)) {
-    // Just listing templates using 'react-native init --template'
-    // Not creating a new app.
-    return;
-  } else {
-    console.log('Setting up new React Native app in ' + projectDir);
-    generateProject(projectDir, newProjectName, options);
-  }
+  console.log('Setting up new React Native app in ' + projectDir);
+  generateProject(projectDir, newProjectName, options);
 }
 
 /**
@@ -99,7 +90,7 @@ function generateProject(destinationRoot, newProjectName, options) {
     });
   }
   if (!options['skip-jest']) {
-    const jestDeps = `jest babel-jest babel-preset-react-native@^5 react-test-renderer@${reactVersion}`;
+    const jestDeps = `jest babel-jest metro-react-native-babel-preset react-test-renderer@${reactVersion}`;
     if (yarnVersion) {
       console.log('Adding Jest...');
       execSync(`yarn add ${jestDeps} --dev --exact`, {stdio: 'inherit'});
diff --git a/local-cli/install/install.js b/local-cli/install/install.js
index 5a0a7afc67ed3d..b15a3e6d50f279 100644
--- a/local-cli/install/install.js
+++ b/local-cli/install/install.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/install/uninstall.js b/local-cli/install/uninstall.js
index 6a71100677dba4..0963962204756a 100644
--- a/local-cli/install/uninstall.js
+++ b/local-cli/install/uninstall.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/library/library.js b/local-cli/library/library.js
index 4dcc81cbfcd906..23a82a1ee204bc 100644
--- a/local-cli/library/library.js
+++ b/local-cli/library/library.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__fixtures__/android/build.gradle b/local-cli/link/__fixtures__/android/build.gradle
index 9eb0a44ae5245f..4dd26f8e088024 100644
--- a/local-cli/link/__fixtures__/android/build.gradle
+++ b/local-cli/link/__fixtures__/android/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.android.support:appcompat-v7:26.1.0"
-    compile "com.facebook.react:react-native:+"
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.android.support:appcompat-v7:27.1.1"
+    implementation "com.facebook.react:react-native:+"
 }
diff --git a/local-cli/link/__fixtures__/android/patchedBuild.gradle b/local-cli/link/__fixtures__/android/patchedBuild.gradle
index f6b9a22054cf0f..425aaaf7f44427 100644
--- a/local-cli/link/__fixtures__/android/patchedBuild.gradle
+++ b/local-cli/link/__fixtures__/android/patchedBuild.gradle
@@ -1,9 +1,9 @@
 dependencies {
-    compile project(':test')
-    compile(project(':test2')) {
+    implementation project(':test')
+    implementation(project(':test2')) {
       exclude(group: 'org.unwanted', module: 'test10')
     }
-    compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.android.support:appcompat-v7:26.1.0"
-    compile "com.facebook.react:react-native:+"
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.android.support:appcompat-v7:27.1.1"
+    implementation "com.facebook.react:react-native:+"
 }
diff --git a/local-cli/link/__tests__/android/applyPatch.spec.js b/local-cli/link/__tests__/android/applyPatch.spec.js
index 79b67f68974e94..aea686d084d880 100644
--- a/local-cli/link/__tests__/android/applyPatch.spec.js
+++ b/local-cli/link/__tests__/android/applyPatch.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/android/isInstalled.spec.js b/local-cli/link/__tests__/android/isInstalled.spec.js
index a90649f0339f5f..28bc43f11fbb81 100644
--- a/local-cli/link/__tests__/android/isInstalled.spec.js
+++ b/local-cli/link/__tests__/android/isInstalled.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/android/makeBuildPatch.spec.js b/local-cli/link/__tests__/android/makeBuildPatch.spec.js
index 51873daf1d0236..e630f766434e55 100644
--- a/local-cli/link/__tests__/android/makeBuildPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeBuildPatch.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -26,12 +26,12 @@ describe('makeBuildPatch', () => {
 
   it('should make a correct patch', () => {
     const {patch} = makeBuildPatch(name);
-    expect(patch).toBe(`    compile project(':${name}')\n`);
+    expect(patch).toBe(`    implementation project(':${name}')\n`);
   });
 
   it('should make a correct install check pattern', () => {
     const {installPattern} = makeBuildPatch(name);
-    const match = `/\\s{4}(compile)(\\(|\\s)(project)\\(\\':${name}\\'\\)(\\)|\\s)/`;
+    const match = `/\\s{4}(implementation)(\\(|\\s)(project)\\(\\':${name}\\'\\)(\\)|\\s)/`;
     expect(installPattern.toString()).toBe(match);
   });
 });
@@ -39,12 +39,14 @@ describe('makeBuildPatch', () => {
 describe('makeBuildPatchWithScopedPackage', () => {
   it('should make a correct patch', () => {
     const {patch} = makeBuildPatch(scopedName);
-    expect(patch).toBe(`    compile project(':${normalizedScopedName}')\n`);
+    expect(patch).toBe(
+      `    implementation project(':${normalizedScopedName}')\n`,
+    );
   });
 
   it('should make a correct install check pattern', () => {
     const {installPattern} = makeBuildPatch(scopedName);
-    const match = `/\\s{4}(compile)(\\(|\\s)(project)\\(\\':${normalizedScopedName}\\'\\)(\\)|\\s)/`;
+    const match = `/\\s{4}(implementation)(\\(|\\s)(project)\\(\\':${normalizedScopedName}\\'\\)(\\)|\\s)/`;
     expect(installPattern.toString()).toBe(match);
   });
 });
diff --git a/local-cli/link/__tests__/android/makeImportPatch.spec.js b/local-cli/link/__tests__/android/makeImportPatch.spec.js
index e00977a09617d4..8a5d32358f1cda 100644
--- a/local-cli/link/__tests__/android/makeImportPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeImportPatch.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/android/makePackagePatch.spec.js b/local-cli/link/__tests__/android/makePackagePatch.spec.js
index 48e7a3c30f568e..6dada45081fd8a 100644
--- a/local-cli/link/__tests__/android/makePackagePatch.spec.js
+++ b/local-cli/link/__tests__/android/makePackagePatch.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/android/makeSettingsPatch.spec.js b/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
index 80b2be70343509..6df7b0dd969fe3 100644
--- a/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/android/makeStringsPatch.spec.js b/local-cli/link/__tests__/android/makeStringsPatch.spec.js
index f8b6c07ed94639..4ea281640328e1 100644
--- a/local-cli/link/__tests__/android/makeStringsPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeStringsPatch.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/android/normalizeProjectName.spec.js b/local-cli/link/__tests__/android/normalizeProjectName.spec.js
index 2a69e2e09844c5..93f425fd22a812 100644
--- a/local-cli/link/__tests__/android/normalizeProjectName.spec.js
+++ b/local-cli/link/__tests__/android/normalizeProjectName.spec.js
@@ -1,11 +1,9 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @format
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/getDependencyConfig.spec.js b/local-cli/link/__tests__/getDependencyConfig.spec.js
index dda764853ee6d2..1e3813d067bd8d 100644
--- a/local-cli/link/__tests__/getDependencyConfig.spec.js
+++ b/local-cli/link/__tests__/getDependencyConfig.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,21 +11,22 @@
 'use strict';
 
 const getDependencyConfig = require('../getDependencyConfig');
-const sinon = require('sinon');
 
 describe('getDependencyConfig', () => {
   it("should return an array of dependencies' rnpm config", () => {
     const config = {
-      getDependencyConfig: sinon.stub(),
+      getDependencyConfig: jest.fn(),
     };
 
     expect(Array.isArray(getDependencyConfig(config, ['abcd']))).toBeTruthy();
-    expect(config.getDependencyConfig.callCount).toEqual(1);
+    expect(config.getDependencyConfig.mock.calls.length).toEqual(1);
   });
 
   it('should filter out invalid react-native projects', () => {
     const config = {
-      getDependencyConfig: sinon.stub().throws(new Error('Cannot require')),
+      getDependencyConfig: jest.fn().mockImplementation(() => {
+        throw new Error('Cannot require');
+      }),
     };
 
     expect(getDependencyConfig(config, ['abcd'])).toEqual([]);
diff --git a/local-cli/link/__tests__/getProjectDependencies.spec.js b/local-cli/link/__tests__/getProjectDependencies.spec.js
index 1a2916351a201f..2437e1cee3e4a9 100644
--- a/local-cli/link/__tests__/getProjectDependencies.spec.js
+++ b/local-cli/link/__tests__/getProjectDependencies.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/groupFilesByType.spec.js b/local-cli/link/__tests__/groupFilesByType.spec.js
index d4c4e959886075..173857927aa9e3 100644
--- a/local-cli/link/__tests__/groupFilesByType.spec.js
+++ b/local-cli/link/__tests__/groupFilesByType.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/addFileToProject.spec.js b/local-cli/link/__tests__/ios/addFileToProject.spec.js
index 1b6d3ab6954033..47605e5366ef07 100644
--- a/local-cli/link/__tests__/ios/addFileToProject.spec.js
+++ b/local-cli/link/__tests__/ios/addFileToProject.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js b/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
index 6caac1636a6010..9a921c21787745 100644
--- a/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
+++ b/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/addSharedLibraries.spec.js b/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
index 4a645bc3fe32af..c4a262015c0170 100644
--- a/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
+++ b/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/createGroup.spec.js b/local-cli/link/__tests__/ios/createGroup.spec.js
index cee24213f62ddb..6100b92d02a250 100644
--- a/local-cli/link/__tests__/ios/createGroup.spec.js
+++ b/local-cli/link/__tests__/ios/createGroup.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/getBuildProperty.spec.js b/local-cli/link/__tests__/ios/getBuildProperty.spec.js
index 991c43dfe8ff0b..ff5c622ebabd3b 100644
--- a/local-cli/link/__tests__/ios/getBuildProperty.spec.js
+++ b/local-cli/link/__tests__/ios/getBuildProperty.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/getGroup.spec.js b/local-cli/link/__tests__/ios/getGroup.spec.js
index eb6716af7d43b5..a08434d263cb0e 100644
--- a/local-cli/link/__tests__/ios/getGroup.spec.js
+++ b/local-cli/link/__tests__/ios/getGroup.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js b/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
index bc1669e59d8406..5518346074d2cc 100644
--- a/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
+++ b/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js b/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
index 1793755d979e8d..d590d6c7360698 100644
--- a/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
+++ b/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/getPlist.spec.js b/local-cli/link/__tests__/ios/getPlist.spec.js
index 10e1315dd98f22..f229af7a4e34e7 100644
--- a/local-cli/link/__tests__/ios/getPlist.spec.js
+++ b/local-cli/link/__tests__/ios/getPlist.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/getPlistPath.spec.js b/local-cli/link/__tests__/ios/getPlistPath.spec.js
index 9cbce096ea13c2..ae2de5914f18f4 100644
--- a/local-cli/link/__tests__/ios/getPlistPath.spec.js
+++ b/local-cli/link/__tests__/ios/getPlistPath.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -25,6 +25,6 @@ describe('ios::getPlistPath', () => {
 
   it('should return path without Xcode $(SRCROOT)', () => {
     const plistPath = getPlistPath(project, '/');
-    expect(plistPath).toBe('/Basic/Info.plist');
+    expect(plistPath).toBe(path.normalize('/Basic/Info.plist'));
   });
 });
diff --git a/local-cli/link/__tests__/ios/getProducts.spec.js b/local-cli/link/__tests__/ios/getProducts.spec.js
index 88c7515d7678b6..7457a7c39cc691 100644
--- a/local-cli/link/__tests__/ios/getProducts.spec.js
+++ b/local-cli/link/__tests__/ios/getProducts.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/getTargets.spec.js b/local-cli/link/__tests__/ios/getTargets.spec.js
index 7acf9df43ed6f0..0f1142b5efae4b 100644
--- a/local-cli/link/__tests__/ios/getTargets.spec.js
+++ b/local-cli/link/__tests__/ios/getTargets.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/hasLibraryImported.spec.js b/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
index a74e7b59388c4c..b36fbd78d6c3dc 100644
--- a/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
+++ b/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/isInstalled.spec.js b/local-cli/link/__tests__/ios/isInstalled.spec.js
index 3946677c35385e..5998c2e5184cbd 100644
--- a/local-cli/link/__tests__/ios/isInstalled.spec.js
+++ b/local-cli/link/__tests__/ios/isInstalled.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js b/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
index 785e6bdd73f364..0be5740c2c9ac4 100644
--- a/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
+++ b/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/removeProjectFromLibraries.js b/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
index 2c882be27d572c..1abf072a1ff958 100644
--- a/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
+++ b/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js b/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
index 16dc3b374e4998..257e9f0e7fd565 100644
--- a/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
+++ b/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js b/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
index ee69b5c6adfcbc..5f983e551e08b4 100644
--- a/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
+++ b/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/ios/writePlist.spec.js b/local-cli/link/__tests__/ios/writePlist.spec.js
index 40a7e549255b53..6c11361749c8fb 100644
--- a/local-cli/link/__tests__/ios/writePlist.spec.js
+++ b/local-cli/link/__tests__/ios/writePlist.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,20 +10,24 @@
 
 'use strict';
 
+jest.mock('path');
 jest.mock('fs');
 
 let plistPath = null;
 jest.mock('../../ios/getPlistPath', () => () => plistPath);
 
-const {readFileSync} = require.requireActual('fs');
+const {readFileSync} = jest.requireActual('fs');
 const fs = require('fs');
 
 const xcode = require('xcode');
-const path = require('path');
 const writePlist = require('../../ios/writePlist');
 
-const projectPath = path.join(__dirname, '../../__fixtures__/project.pbxproj');
-const infoPlistPath = path.join(__dirname, '../../__fixtures__/Info.plist');
+const realPath = jest.requireActual('path');
+const projectPath = realPath.join(
+  __dirname,
+  '../../__fixtures__/project.pbxproj',
+);
+const infoPlistPath = realPath.join(__dirname, '../../__fixtures__/Info.plist');
 
 fs.readFileSync = jest.fn(() => readFileSync(projectPath).toString());
 
diff --git a/local-cli/link/__tests__/link.spec.js b/local-cli/link/__tests__/link.spec.js
index 9cbe601f2fb474..cab9a24c40dd89 100644
--- a/local-cli/link/__tests__/link.spec.js
+++ b/local-cli/link/__tests__/link.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,9 +10,7 @@
 
 'use strict';
 
-const sinon = require('sinon');
 const log = require('npmlog');
-const path = require('path');
 jest.setMock('chalk', {grey: str => str});
 
 describe('link', () => {
@@ -37,20 +35,38 @@ describe('link', () => {
     const config = {
       getPlatformConfig: () => ({ios: {}, android: {}}),
       getProjectConfig: () => ({assets: []}),
-      getDependencyConfig: sinon.stub().returns({assets: [], commands: {}}),
+      getDependencyConfig: jest
+        .fn()
+        .mockReturnValue({assets: [], commands: {}}),
     };
 
     const link = require('../link').func;
     link(['react-native-gradient'], config).then(() => {
-      expect(
-        config.getDependencyConfig.calledWith('react-native-gradient'),
-      ).toBeTruthy();
+      expect(config.getDependencyConfig.mock.calls[0]).toEqual([
+        'react-native-gradient',
+      ]);
       done();
     });
   });
 
+  it('should accept the name of a dependency with a scope / tag', async () => {
+    const config = {
+      getPlatformConfig: () => ({ios: {}, android: {}}),
+      getProjectConfig: () => ({assets: []}),
+      getDependencyConfig: jest
+        .fn()
+        .mockReturnValue({assets: [], commands: {}}),
+    };
+
+    const link = require('../link').func;
+    await link(['@scope/something@latest'], config);
+    expect(config.getDependencyConfig.mock.calls[0]).toEqual([
+      '@scope/something',
+    ]);
+  });
+
   it('should register native module when android/ios projects are present', done => {
-    const registerNativeModule = sinon.stub();
+    const registerNativeModule = jest.fn();
     const dependencyConfig = {android: {}, ios: {}, assets: [], commands: {}};
     const androidLinkConfig = require('../android');
     const iosLinkConfig = require('../ios');
@@ -60,37 +76,37 @@ describe('link', () => {
         android: {linkConfig: androidLinkConfig},
       }),
       getProjectConfig: () => ({android: {}, ios: {}, assets: []}),
-      getDependencyConfig: sinon.stub().returns(dependencyConfig),
+      getDependencyConfig: jest.fn().mockReturnValue(dependencyConfig),
     };
 
-    jest.setMock('../android/isInstalled.js', sinon.stub().returns(false));
+    jest.setMock('../android/isInstalled.js', jest.fn().mockReturnValue(false));
 
     jest.setMock('../android/registerNativeModule.js', registerNativeModule);
 
-    jest.setMock('../ios/isInstalled.js', sinon.stub().returns(false));
+    jest.setMock('../ios/isInstalled.js', jest.fn().mockReturnValue(false));
 
     jest.setMock('../ios/registerNativeModule.js', registerNativeModule);
 
     const link = require('../link').func;
 
     link(['react-native-blur'], config).then(() => {
-      expect(registerNativeModule.calledTwice).toBeTruthy();
+      expect(registerNativeModule.mock.calls.length).toBe(2);
       done();
     });
   });
 
   it('should not register modules when they are already installed', done => {
-    const registerNativeModule = sinon.stub();
+    const registerNativeModule = jest.fn();
     const dependencyConfig = {ios: {}, android: {}, assets: [], commands: {}};
     const config = {
       getPlatformConfig: () => ({ios: {}, android: {}}),
       getProjectConfig: () => ({ios: {}, android: {}, assets: []}),
-      getDependencyConfig: sinon.stub().returns(dependencyConfig),
+      getDependencyConfig: jest.fn().mockReturnValue(dependencyConfig),
     };
 
-    jest.setMock('../ios/isInstalled.js', sinon.stub().returns(true));
+    jest.setMock('../ios/isInstalled.js', jest.fn().mockReturnValue(true));
 
-    jest.setMock('../android/isInstalled.js', sinon.stub().returns(true));
+    jest.setMock('../android/isInstalled.js', jest.fn().mockReturnValue(true));
 
     jest.setMock('../ios/registerNativeModule.js', registerNativeModule);
 
@@ -99,13 +115,13 @@ describe('link', () => {
     const link = require('../link').func;
 
     link(['react-native-blur'], config).then(() => {
-      expect(registerNativeModule.callCount).toEqual(0);
+      expect(registerNativeModule.mock.calls.length).toEqual(0);
       done();
     });
   });
 
   it('should register native modules for plugins', done => {
-    const registerNativeModule = sinon.stub();
+    const registerNativeModule = jest.fn();
     const dependencyConfig = {
       ios: {},
       android: {},
@@ -124,23 +140,23 @@ describe('link', () => {
         test: {linkConfig: () => linkPluginConfig},
       }),
       getProjectConfig: () => ({ios: {}, android: {}, test: {}, assets: []}),
-      getDependencyConfig: sinon.stub().returns(dependencyConfig),
+      getDependencyConfig: jest.fn().mockReturnValue(dependencyConfig),
     };
 
-    jest.setMock('../ios/isInstalled.js', sinon.stub().returns(true));
+    jest.setMock('../ios/isInstalled.js', jest.fn().mockReturnValue(true));
 
-    jest.setMock('../android/isInstalled.js', sinon.stub().returns(true));
+    jest.setMock('../android/isInstalled.js', jest.fn().mockReturnValue(true));
 
     const link = require('../link').func;
 
     link(['react-native-blur'], config).then(() => {
-      expect(registerNativeModule.calledOnce).toBeTruthy();
+      expect(registerNativeModule.mock.calls.length).toBe(1);
       done();
     });
   });
 
   it('should not register native modules for plugins when already installed', done => {
-    const registerNativeModule = sinon.stub();
+    const registerNativeModule = jest.fn();
     const dependencyConfig = {
       ios: {},
       android: {},
@@ -159,35 +175,35 @@ describe('link', () => {
         test: {linkConfig: () => linkPluginConfig},
       }),
       getProjectConfig: () => ({ios: {}, android: {}, test: {}, assets: []}),
-      getDependencyConfig: sinon.stub().returns(dependencyConfig),
+      getDependencyConfig: jest.fn().mockReturnValue(dependencyConfig),
     };
 
-    jest.setMock('../ios/isInstalled.js', sinon.stub().returns(true));
+    jest.setMock('../ios/isInstalled.js', jest.fn().mockReturnValue(true));
 
-    jest.setMock('../android/isInstalled.js', sinon.stub().returns(true));
+    jest.setMock('../android/isInstalled.js', jest.fn().mockReturnValue(true));
 
     const link = require('../link').func;
 
     link(['react-native-blur'], config).then(() => {
-      expect(registerNativeModule.callCount).toEqual(0);
+      expect(registerNativeModule.mock.calls.length).toEqual(0);
       done();
     });
   });
 
-  it('should run prelink and postlink commands at the appropriate times', done => {
-    const registerNativeModule = sinon.stub();
-    const prelink = sinon.stub().yieldsAsync();
-    const postlink = sinon.stub().yieldsAsync();
+  it('should run prelink and postlink commands at the appropriate times', async () => {
+    const registerNativeModule = jest.fn();
+    const prelink = jest.fn().mockImplementation(cb => cb());
+    const postlink = jest.fn().mockImplementation(cb => cb());
 
     jest.setMock('../ios/registerNativeModule.js', registerNativeModule);
 
-    jest.setMock('../ios/isInstalled.js', sinon.stub().returns(false));
+    jest.setMock('../ios/isInstalled.js', jest.fn().mockReturnValue(false));
 
     const linkConfig = require('../ios');
     const config = {
       getPlatformConfig: () => ({ios: {linkConfig: linkConfig}}),
       getProjectConfig: () => ({ios: {}, assets: []}),
-      getDependencyConfig: sinon.stub().returns({
+      getDependencyConfig: jest.fn().mockReturnValue({
         ios: {},
         assets: [],
         commands: {prelink, postlink},
@@ -195,19 +211,21 @@ describe('link', () => {
     };
 
     const link = require('../link').func;
-
-    link(['react-native-blur'], config).then(() => {
-      expect(prelink.calledBefore(registerNativeModule)).toBeTruthy();
-      expect(postlink.calledAfter(registerNativeModule)).toBeTruthy();
-      done();
-    });
+    await link(['react-native-blur'], config);
+
+    expect(prelink.mock.invocationCallOrder[0]).toBeLessThan(
+      registerNativeModule.mock.invocationCallOrder[0],
+    );
+    expect(postlink.mock.invocationCallOrder[0]).toBeGreaterThan(
+      registerNativeModule.mock.invocationCallOrder[0],
+    );
   });
 
   it('should copy assets from both project and dependencies projects', done => {
     const dependencyAssets = ['Fonts/Font.ttf'];
     const dependencyConfig = {assets: dependencyAssets, ios: {}, commands: {}};
     const projectAssets = ['Fonts/FontC.ttf'];
-    const copyAssets = sinon.stub();
+    const copyAssets = jest.fn();
 
     jest.setMock('../ios/copyAssets.js', copyAssets);
 
@@ -215,14 +233,14 @@ describe('link', () => {
     const config = {
       getPlatformConfig: () => ({ios: {linkConfig: linkConfig}}),
       getProjectConfig: () => ({ios: {}, assets: projectAssets}),
-      getDependencyConfig: sinon.stub().returns(dependencyConfig),
+      getDependencyConfig: jest.fn().mockReturnValue(dependencyConfig),
     };
 
     const link = require('../link').func;
 
     link(['react-native-blur'], config).then(() => {
-      expect(copyAssets.calledOnce).toBeTruthy();
-      expect(copyAssets.getCall(0).args[0]).toEqual(
+      expect(copyAssets.mock.calls.length).toBe(1);
+      expect(copyAssets.mock.calls[0][0]).toEqual(
         projectAssets.concat(dependencyAssets),
       );
       done();
diff --git a/local-cli/link/__tests__/pods/findLineToAddPod.spec.js b/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
index e0b179a8f943b4..d27b341dd4580d 100644
--- a/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
+++ b/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js b/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
index 7dd2b77af939f5..2c9d8decd53b3a 100644
--- a/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
+++ b/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/pods/findPodTargetLine.spec.js b/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
index 04b142856f82c9..6b7b360e0e51c7 100644
--- a/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
+++ b/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/pods/isInstalled.spec.js b/local-cli/link/__tests__/pods/isInstalled.spec.js
index ba9b3f03753883..dbf4845749c55b 100644
--- a/local-cli/link/__tests__/pods/isInstalled.spec.js
+++ b/local-cli/link/__tests__/pods/isInstalled.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/pods/removePodEntry.spec.js b/local-cli/link/__tests__/pods/removePodEntry.spec.js
index 576664970ba36b..83106805c61e0a 100644
--- a/local-cli/link/__tests__/pods/removePodEntry.spec.js
+++ b/local-cli/link/__tests__/pods/removePodEntry.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/__tests__/promiseWaterfall.spec.js b/local-cli/link/__tests__/promiseWaterfall.spec.js
index 3f9adc55a2c969..3507ce991df688 100644
--- a/local-cli/link/__tests__/promiseWaterfall.spec.js
+++ b/local-cli/link/__tests__/promiseWaterfall.spec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,35 +10,38 @@
 
 'use strict';
 
-const sinon = require('sinon');
 const promiseWaterfall = require('../promiseWaterfall');
 
 describe('promiseWaterfall', () => {
-  it('should run promises in a sequence', done => {
-    const tasks = [sinon.stub(), sinon.stub()];
+  it('should run promises in a sequence', async () => {
+    const tasks = [jest.fn(), jest.fn()];
 
-    promiseWaterfall(tasks).then(() => {
-      expect(tasks[0].calledBefore(tasks[1])).toBeTruthy();
-      done();
-    });
+    await promiseWaterfall(tasks);
+
+    // Check that tasks[0] is executed before tasks[1].
+    expect(tasks[0].mock.invocationCallOrder[0]).toBeLessThan(
+      tasks[1].mock.invocationCallOrder[0],
+    );
   });
 
-  it('should resolve with last promise value', done => {
-    const tasks = [sinon.stub().returns(1), sinon.stub().returns(2)];
+  it('should resolve with last promise value', async () => {
+    const tasks = [jest.fn().mockReturnValue(1), jest.fn().mockReturnValue(2)];
 
-    promiseWaterfall(tasks).then(value => {
-      expect(value).toEqual(2);
-      done();
-    });
+    expect(await promiseWaterfall(tasks)).toEqual(2);
   });
 
   it('should stop the sequence when one of promises is rejected', done => {
     const error = new Error();
-    const tasks = [sinon.stub().throws(error), sinon.stub().returns(2)];
+    const tasks = [
+      jest.fn().mockImplementation(() => {
+        throw error;
+      }),
+      jest.fn().mockReturnValue(2),
+    ];
 
     promiseWaterfall(tasks).catch(err => {
       expect(err).toEqual(error);
-      expect(tasks[1].callCount).toEqual(0);
+      expect(tasks[1].mock.calls.length).toEqual(0);
       done();
     });
   });
diff --git a/local-cli/link/android/copyAssets.js b/local-cli/link/android/copyAssets.js
index dbaeaa24e93ecd..4b58f46fb86865 100644
--- a/local-cli/link/android/copyAssets.js
+++ b/local-cli/link/android/copyAssets.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/android/fs.js b/local-cli/link/android/fs.js
index 51ee62136b42d9..a7cf3d029a59c5 100644
--- a/local-cli/link/android/fs.js
+++ b/local-cli/link/android/fs.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/android/isInstalled.js b/local-cli/link/android/isInstalled.js
index 43a53396e9228d..24f07788702f03 100644
--- a/local-cli/link/android/isInstalled.js
+++ b/local-cli/link/android/isInstalled.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/android/patches/applyParams.js b/local-cli/link/android/patches/applyParams.js
index 2fd193ad685259..11b66bef280b3d 100644
--- a/local-cli/link/android/patches/applyParams.js
+++ b/local-cli/link/android/patches/applyParams.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/android/patches/applyPatch.js b/local-cli/link/android/patches/applyPatch.js
index 05393a894722e6..fd17c80b263494 100644
--- a/local-cli/link/android/patches/applyPatch.js
+++ b/local-cli/link/android/patches/applyPatch.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/android/patches/makeBuildPatch.js b/local-cli/link/android/patches/makeBuildPatch.js
index dfaab8f6998bfe..db8feb5a895c47 100644
--- a/local-cli/link/android/patches/makeBuildPatch.js
+++ b/local-cli/link/android/patches/makeBuildPatch.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -12,12 +12,12 @@ const normalizeProjectName = require('./normalizeProjectName');
 module.exports = function makeBuildPatch(name) {
   const normalizedProjectName = normalizeProjectName(name);
   const installPattern = new RegExp(
-    `\\s{4}(compile)(\\(|\\s)(project)\\(\\\':${normalizedProjectName}\\\'\\)(\\)|\\s)`,
+    `\\s{4}(implementation)(\\(|\\s)(project)\\(\\\':${normalizedProjectName}\\\'\\)(\\)|\\s)`,
   );
 
   return {
     installPattern,
     pattern: /[^ \t]dependencies {(\r\n|\n)/,
-    patch: `    compile project(':${normalizedProjectName}')\n`,
+    patch: `    implementation project(':${normalizedProjectName}')\n`,
   };
 };
diff --git a/local-cli/link/android/patches/makeImportPatch.js b/local-cli/link/android/patches/makeImportPatch.js
index 90bd0f50326b64..983f2a4e0367e5 100644
--- a/local-cli/link/android/patches/makeImportPatch.js
+++ b/local-cli/link/android/patches/makeImportPatch.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/android/patches/makePackagePatch.js b/local-cli/link/android/patches/makePackagePatch.js
index 29c01b76bb84f0..a4791ef5b4864b 100644
--- a/local-cli/link/android/patches/makePackagePatch.js
+++ b/local-cli/link/android/patches/makePackagePatch.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/android/patches/makeSettingsPatch.js b/local-cli/link/android/patches/makeSettingsPatch.js
index 76885f706606b0..a6bf7ca2bb3dc6 100644
--- a/local-cli/link/android/patches/makeSettingsPatch.js
+++ b/local-cli/link/android/patches/makeSettingsPatch.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,8 +10,6 @@
 const path = require('path');
 const normalizeProjectName = require('./normalizeProjectName');
 
-const isWin = process.platform === 'win32';
-
 module.exports = function makeSettingsPatch(
   name,
   androidConfig,
@@ -23,16 +21,6 @@ module.exports = function makeSettingsPatch(
   );
   const normalizedProjectName = normalizeProjectName(name);
 
-  /*
-   * Fix for Windows
-   * Backslashes is the escape character and will result in
-   * an invalid path in settings.gradle
-   * https://github.com/rnpm/rnpm/issues/113
-   */
-  if (isWin) {
-    projectDir = projectDir.replace(/\\/g, '/');
-  }
-
   return {
     pattern: '\n',
     patch:
diff --git a/local-cli/link/android/patches/makeStringsPatch.js b/local-cli/link/android/patches/makeStringsPatch.js
index a6b40e46f2cad8..efda88671e6d3a 100644
--- a/local-cli/link/android/patches/makeStringsPatch.js
+++ b/local-cli/link/android/patches/makeStringsPatch.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/android/patches/revokePatch.js b/local-cli/link/android/patches/revokePatch.js
index 14972e46ed9651..070972e424ef39 100644
--- a/local-cli/link/android/patches/revokePatch.js
+++ b/local-cli/link/android/patches/revokePatch.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/android/registerNativeModule.js b/local-cli/link/android/registerNativeModule.js
index f73932c0235469..67ddfc7eb97a65 100644
--- a/local-cli/link/android/registerNativeModule.js
+++ b/local-cli/link/android/registerNativeModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/android/unlinkAssets.js b/local-cli/link/android/unlinkAssets.js
index 81e90c5e71ae52..fc6f7db3913a6c 100644
--- a/local-cli/link/android/unlinkAssets.js
+++ b/local-cli/link/android/unlinkAssets.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/android/unregisterNativeModule.js b/local-cli/link/android/unregisterNativeModule.js
index 880070afa503c4..27aa977a3c4003 100644
--- a/local-cli/link/android/unregisterNativeModule.js
+++ b/local-cli/link/android/unregisterNativeModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/commandStub.js b/local-cli/link/commandStub.js
index 768a94f98d32ed..332acf7f203c36 100644
--- a/local-cli/link/commandStub.js
+++ b/local-cli/link/commandStub.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/getDependencyConfig.js b/local-cli/link/getDependencyConfig.js
index 19c54324e77d01..fcecae2efb5078 100644
--- a/local-cli/link/getDependencyConfig.js
+++ b/local-cli/link/getDependencyConfig.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/getProjectDependencies.js b/local-cli/link/getProjectDependencies.js
index 9b4838ba923fad..0cb1165c02dff6 100644
--- a/local-cli/link/getProjectDependencies.js
+++ b/local-cli/link/getProjectDependencies.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/groupFilesByType.js b/local-cli/link/groupFilesByType.js
index 47aa7f6b52edec..d35e8e59e30cac 100644
--- a/local-cli/link/groupFilesByType.js
+++ b/local-cli/link/groupFilesByType.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/addFileToProject.js b/local-cli/link/ios/addFileToProject.js
index d3a560529c049e..a534399667b59a 100644
--- a/local-cli/link/ios/addFileToProject.js
+++ b/local-cli/link/ios/addFileToProject.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/addProjectToLibraries.js b/local-cli/link/ios/addProjectToLibraries.js
index e15c8baf410e70..269f30d726a722 100644
--- a/local-cli/link/ios/addProjectToLibraries.js
+++ b/local-cli/link/ios/addProjectToLibraries.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/addSharedLibraries.js b/local-cli/link/ios/addSharedLibraries.js
index e12d913ba236cc..c8050689dcc79e 100644
--- a/local-cli/link/ios/addSharedLibraries.js
+++ b/local-cli/link/ios/addSharedLibraries.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/addToHeaderSearchPaths.js b/local-cli/link/ios/addToHeaderSearchPaths.js
index dd3923451b34b7..e3cd6db2f95422 100644
--- a/local-cli/link/ios/addToHeaderSearchPaths.js
+++ b/local-cli/link/ios/addToHeaderSearchPaths.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/copyAssets.js b/local-cli/link/ios/copyAssets.js
index 0510569900e073..943bd9410022b8 100644
--- a/local-cli/link/ios/copyAssets.js
+++ b/local-cli/link/ios/copyAssets.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/createGroup.js b/local-cli/link/ios/createGroup.js
index 4e9cbccc4188ad..473bb4ccd34fb4 100644
--- a/local-cli/link/ios/createGroup.js
+++ b/local-cli/link/ios/createGroup.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/createGroupWithMessage.js b/local-cli/link/ios/createGroupWithMessage.js
index 7d9f1aaa05ddae..c353d915929d7e 100644
--- a/local-cli/link/ios/createGroupWithMessage.js
+++ b/local-cli/link/ios/createGroupWithMessage.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/getBuildProperty.js b/local-cli/link/ios/getBuildProperty.js
index 074e37816e921f..bf0291a2d5cd72 100644
--- a/local-cli/link/ios/getBuildProperty.js
+++ b/local-cli/link/ios/getBuildProperty.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/getGroup.js b/local-cli/link/ios/getGroup.js
index fcbfbf16da83ef..d7b54ad5b583b4 100644
--- a/local-cli/link/ios/getGroup.js
+++ b/local-cli/link/ios/getGroup.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/getHeaderSearchPath.js b/local-cli/link/ios/getHeaderSearchPath.js
index 74246abafb60b6..bd1b5f5c5e8b77 100644
--- a/local-cli/link/ios/getHeaderSearchPath.js
+++ b/local-cli/link/ios/getHeaderSearchPath.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/getHeadersInFolder.js b/local-cli/link/ios/getHeadersInFolder.js
index c63c450c767f83..562cac9a549a10 100644
--- a/local-cli/link/ios/getHeadersInFolder.js
+++ b/local-cli/link/ios/getHeadersInFolder.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/getPlist.js b/local-cli/link/ios/getPlist.js
index 3948e8d5ec7916..61d0b51256d218 100644
--- a/local-cli/link/ios/getPlist.js
+++ b/local-cli/link/ios/getPlist.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/getPlistPath.js b/local-cli/link/ios/getPlistPath.js
index 72c6be75d176e4..f8d570b9f21768 100644
--- a/local-cli/link/ios/getPlistPath.js
+++ b/local-cli/link/ios/getPlistPath.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/getProducts.js b/local-cli/link/ios/getProducts.js
index dd0b0431938ea4..0144808e7466aa 100644
--- a/local-cli/link/ios/getProducts.js
+++ b/local-cli/link/ios/getProducts.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/getTargets.js b/local-cli/link/ios/getTargets.js
index b81145a5e987eb..15f958598e61c8 100644
--- a/local-cli/link/ios/getTargets.js
+++ b/local-cli/link/ios/getTargets.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/hasLibraryImported.js b/local-cli/link/ios/hasLibraryImported.js
index eed9c6e1cb2af6..62805eb3a5004a 100644
--- a/local-cli/link/ios/hasLibraryImported.js
+++ b/local-cli/link/ios/hasLibraryImported.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/isInstalled.js b/local-cli/link/ios/isInstalled.js
index 084c8addda6fb1..07cfb12543b2d5 100644
--- a/local-cli/link/ios/isInstalled.js
+++ b/local-cli/link/ios/isInstalled.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/mapHeaderSearchPaths.js b/local-cli/link/ios/mapHeaderSearchPaths.js
index 64a8f6560cac46..2754602d4ce087 100644
--- a/local-cli/link/ios/mapHeaderSearchPaths.js
+++ b/local-cli/link/ios/mapHeaderSearchPaths.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/registerNativeModule.js b/local-cli/link/ios/registerNativeModule.js
index 41cca896709f8d..18d86c56f54da6 100644
--- a/local-cli/link/ios/registerNativeModule.js
+++ b/local-cli/link/ios/registerNativeModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/removeFromHeaderSearchPaths.js b/local-cli/link/ios/removeFromHeaderSearchPaths.js
index ac9ead94c65a9a..e7fc30fa1e80f5 100644
--- a/local-cli/link/ios/removeFromHeaderSearchPaths.js
+++ b/local-cli/link/ios/removeFromHeaderSearchPaths.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/removeFromPbxItemContainerProxySection.js b/local-cli/link/ios/removeFromPbxItemContainerProxySection.js
index d7e8f05f16612a..b2277ce882481c 100644
--- a/local-cli/link/ios/removeFromPbxItemContainerProxySection.js
+++ b/local-cli/link/ios/removeFromPbxItemContainerProxySection.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/removeFromPbxReferenceProxySection.js b/local-cli/link/ios/removeFromPbxReferenceProxySection.js
index 05346ccabff940..52f8056a5f414e 100644
--- a/local-cli/link/ios/removeFromPbxReferenceProxySection.js
+++ b/local-cli/link/ios/removeFromPbxReferenceProxySection.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/removeFromProjectReferences.js b/local-cli/link/ios/removeFromProjectReferences.js
index 4eafe81e84131c..8a776bf7206b5f 100644
--- a/local-cli/link/ios/removeFromProjectReferences.js
+++ b/local-cli/link/ios/removeFromProjectReferences.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/removeFromStaticLibraries.js b/local-cli/link/ios/removeFromStaticLibraries.js
index 1fa674331a844f..7beaf880446f2a 100644
--- a/local-cli/link/ios/removeFromStaticLibraries.js
+++ b/local-cli/link/ios/removeFromStaticLibraries.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/removeProductGroup.js b/local-cli/link/ios/removeProductGroup.js
index a15fd9d750f4a1..f012ff25c0c787 100644
--- a/local-cli/link/ios/removeProductGroup.js
+++ b/local-cli/link/ios/removeProductGroup.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/removeProjectFromLibraries.js b/local-cli/link/ios/removeProjectFromLibraries.js
index 5dc572b9ef5072..0402d777a3213c 100644
--- a/local-cli/link/ios/removeProjectFromLibraries.js
+++ b/local-cli/link/ios/removeProjectFromLibraries.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/removeProjectFromProject.js b/local-cli/link/ios/removeProjectFromProject.js
index 76e9348184e1f6..fbae783f4eeaa3 100644
--- a/local-cli/link/ios/removeProjectFromProject.js
+++ b/local-cli/link/ios/removeProjectFromProject.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/removeSharedLibraries.js b/local-cli/link/ios/removeSharedLibraries.js
index e0306d28b0ce5a..1a34b7c1afa0dc 100644
--- a/local-cli/link/ios/removeSharedLibraries.js
+++ b/local-cli/link/ios/removeSharedLibraries.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/unlinkAssets.js b/local-cli/link/ios/unlinkAssets.js
index 67f91cf6c6109e..1df299fdda811a 100644
--- a/local-cli/link/ios/unlinkAssets.js
+++ b/local-cli/link/ios/unlinkAssets.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/unregisterNativeModule.js b/local-cli/link/ios/unregisterNativeModule.js
index c686b8c4969fe8..87955219890fad 100644
--- a/local-cli/link/ios/unregisterNativeModule.js
+++ b/local-cli/link/ios/unregisterNativeModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/ios/writePlist.js b/local-cli/link/ios/writePlist.js
index b2ea1ae1efc8ec..009de34e26f079 100644
--- a/local-cli/link/ios/writePlist.js
+++ b/local-cli/link/ios/writePlist.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/link.js b/local-cli/link/link.js
index 892e4f71063bc1..752e75e2294ff0 100644
--- a/local-cli/link/link.js
+++ b/local-cli/link/link.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -143,9 +143,9 @@ function link(args: Array<string>, config: RNConfig) {
   }
 
   let packageName = args[0];
-  // Check if install package by specific version (eg. package@latest)
+  // Trim the version / tag out of the package name (eg. package@latest)
   if (packageName !== undefined) {
-    packageName = packageName.split('@')[0];
+    packageName = packageName.replace(/^(.+?)(@.+?)$/gi, '$1');
   }
 
   const dependencies = getDependencyConfig(
diff --git a/local-cli/link/pods/addPodEntry.js b/local-cli/link/pods/addPodEntry.js
index 8ce5654ea4aa97..e89716eb60dd4d 100644
--- a/local-cli/link/pods/addPodEntry.js
+++ b/local-cli/link/pods/addPodEntry.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/pods/findLineToAddPod.js b/local-cli/link/pods/findLineToAddPod.js
index 629296e9f662ad..d6902838ea336e 100644
--- a/local-cli/link/pods/findLineToAddPod.js
+++ b/local-cli/link/pods/findLineToAddPod.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/pods/findMarkedLinesInPodfile.js b/local-cli/link/pods/findMarkedLinesInPodfile.js
index b58a0d48679d29..5df1c33ac2be33 100644
--- a/local-cli/link/pods/findMarkedLinesInPodfile.js
+++ b/local-cli/link/pods/findMarkedLinesInPodfile.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/pods/findPodTargetLine.js b/local-cli/link/pods/findPodTargetLine.js
index 10617584affccf..22070f8ddf8160 100644
--- a/local-cli/link/pods/findPodTargetLine.js
+++ b/local-cli/link/pods/findPodTargetLine.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/pods/isInstalled.js b/local-cli/link/pods/isInstalled.js
index 7f5d773d8a803b..d7602d14dda18c 100644
--- a/local-cli/link/pods/isInstalled.js
+++ b/local-cli/link/pods/isInstalled.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/pods/readPodfile.js b/local-cli/link/pods/readPodfile.js
index f70609628f27e9..281a0a0e496d5a 100644
--- a/local-cli/link/pods/readPodfile.js
+++ b/local-cli/link/pods/readPodfile.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/pods/registerNativeModule.js b/local-cli/link/pods/registerNativeModule.js
index 8ae16a3059885f..f8e757b2708607 100644
--- a/local-cli/link/pods/registerNativeModule.js
+++ b/local-cli/link/pods/registerNativeModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/pods/removePodEntry.js b/local-cli/link/pods/removePodEntry.js
index 83f063ad289c76..02ef4746f81b33 100644
--- a/local-cli/link/pods/removePodEntry.js
+++ b/local-cli/link/pods/removePodEntry.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/pods/savePodFile.js b/local-cli/link/pods/savePodFile.js
index e050c822c057af..640bb646f88640 100644
--- a/local-cli/link/pods/savePodFile.js
+++ b/local-cli/link/pods/savePodFile.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/pods/unregisterNativeModule.js b/local-cli/link/pods/unregisterNativeModule.js
index 539e0389a5df0d..048e3e8de7e075 100644
--- a/local-cli/link/pods/unregisterNativeModule.js
+++ b/local-cli/link/pods/unregisterNativeModule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/pollParams.js b/local-cli/link/pollParams.js
index 66aa53e9682511..6cf23020d46f09 100644
--- a/local-cli/link/pollParams.js
+++ b/local-cli/link/pollParams.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/promiseWaterfall.js b/local-cli/link/promiseWaterfall.js
index 9b6177d6903258..0a2ddac88cefbe 100644
--- a/local-cli/link/promiseWaterfall.js
+++ b/local-cli/link/promiseWaterfall.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/promisify.js b/local-cli/link/promisify.js
index b99f2f43a0f731..2605bf95e12140 100644
--- a/local-cli/link/promisify.js
+++ b/local-cli/link/promisify.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/link/unlink.js b/local-cli/link/unlink.js
index c886c4f46b7dd3..48ed5f192c0e0f 100644
--- a/local-cli/link/unlink.js
+++ b/local-cli/link/unlink.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/logAndroid/logAndroid.js b/local-cli/logAndroid/logAndroid.js
index b8608e96e40880..322bc8eae444f1 100644
--- a/local-cli/logAndroid/logAndroid.js
+++ b/local-cli/logAndroid/logAndroid.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/logIOS/logIOS.js b/local-cli/logIOS/logIOS.js
index 272dc038260243..9d9aa68faf4237 100644
--- a/local-cli/logIOS/logIOS.js
+++ b/local-cli/logIOS/logIOS.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/runAndroid/adb.js b/local-cli/runAndroid/adb.js
index 310fbad04ab7b0..7846a4724d91d3 100644
--- a/local-cli/runAndroid/adb.js
+++ b/local-cli/runAndroid/adb.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/runAndroid/runAndroid.js b/local-cli/runAndroid/runAndroid.js
index 6835c97bcb0bf0..f94caa2661b57f 100644
--- a/local-cli/runAndroid/runAndroid.js
+++ b/local-cli/runAndroid/runAndroid.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -60,7 +60,7 @@ function runAndroid(argv, config, args) {
     } else {
       // result == 'not_running'
       console.log(chalk.bold('Starting JS server...'));
-      startServerInNewWindow(args.port);
+      startServerInNewWindow(args.port, args.terminal);
     }
     return buildAndRun(args);
   });
@@ -121,7 +121,7 @@ function buildAndRun(args) {
   const adbPath = getAdbPath();
   if (args.deviceId) {
     if (isString(args.deviceId)) {
-      runOnSpecificDevice(
+      return runOnSpecificDevice(
         args,
         cmd,
         packageNameWithSuffix,
@@ -132,7 +132,13 @@ function buildAndRun(args) {
       console.log(chalk.red('Argument missing for parameter --deviceId'));
     }
   } else {
-    runOnAllDevices(args, cmd, packageNameWithSuffix, packageName, adbPath);
+    return runOnAllDevices(
+      args,
+      cmd,
+      packageNameWithSuffix,
+      packageName,
+      adbPath,
+    );
   }
 }
 
@@ -305,7 +311,7 @@ function runOnAllDevices(
     // stderr is automatically piped from the gradle process, so the user
     // should see the error already, there is no need to do
     // `console.log(e.stderr)`
-    return Promise.reject();
+    return Promise.reject(e);
   }
   const devices = adb.getDevices();
   if (devices && devices.length > 0) {
@@ -343,12 +349,12 @@ function runOnAllDevices(
       // stderr is automatically piped from the gradle process, so the user
       // should see the error already, there is no need to do
       // `console.log(e.stderr)`
-      return Promise.reject();
+      return Promise.reject(e);
     }
   }
 }
 
-function startServerInNewWindow(port) {
+function startServerInNewWindow(port, terminal = process.env.REACT_TERMINAL) {
   // set up OS-specific filenames and commands
   const isWindows = /^win/.test(process.platform);
   const scriptFile = isWindows
@@ -363,7 +369,6 @@ function startServerInNewWindow(port) {
   const scriptsDir = path.resolve(__dirname, '..', '..', 'scripts');
   const launchPackagerScript = path.resolve(scriptsDir, scriptFile);
   const procConfig = {cwd: scriptsDir};
-  const terminal = process.env.REACT_TERMINAL;
 
   // set up the .packager.(env|bat) file to ensure the packager starts on the right port
   const packagerEnvFile = path.join(
@@ -390,14 +395,16 @@ function startServerInNewWindow(port) {
     }
     return child_process.spawnSync('open', [launchPackagerScript], procConfig);
   } else if (process.platform === 'linux') {
-    procConfig.detached = true;
     if (terminal) {
+      procConfig.detached = true;
       return child_process.spawn(
         terminal,
         ['-e', 'sh ' + launchPackagerScript],
         procConfig,
       );
     }
+    // By default, the child shell process will be attached to the parent
+    procConfig.detached = false;
     return child_process.spawn('sh', [launchPackagerScript], procConfig);
   } else if (/^win/.test(process.platform)) {
     procConfig.detached = true;
@@ -474,5 +481,11 @@ module.exports = {
       default: process.env.RCT_METRO_PORT || 8081,
       parse: (val: string) => Number(val),
     },
+    {
+      command: '--terminal [string]',
+      description:
+        'Launches the Metro Bundler in a new window using the specified terminal path.',
+      default: '',
+    },
   ],
 };
diff --git a/local-cli/runIOS/__tests__/findMatchingSimulator-test.js b/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
index 3c59b06839a232..f49b16c473bbea 100644
--- a/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
+++ b/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
@@ -1,6 +1,6 @@
 /**
  * /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -65,6 +65,58 @@ describe('findMatchingSimulator', () => {
     });
   });
 
+  it('should find simulator with new xcrun format', () => {
+    expect(
+      findMatchingSimulator(
+        {
+          devices: {
+            'iOS 12.1': [
+              {
+                state: 'Shutdown',
+                isAvailable: 'YES',
+                name: 'iPhone 6s',
+                udid: 'D0F29BE7-CC3C-4976-888D-C739B4F50508',
+              },
+              {
+                state: 'Shutdown',
+                isAvailable: 'YES',
+                name: 'iPhone 6',
+                udid: 'BA0D93BD-07E6-4182-9B0A-F60A2474139C',
+              },
+              {
+                state: 'Shutdown',
+                isAvailable: 'YES',
+                name: 'iPhone XS Max',
+                udid: 'B9B5E161-416B-43C4-A78F-729CB96CC8C6',
+                availabilityError: '',
+              },
+              {
+                state: 'Shutdown',
+                isAvailable: 'YES',
+                name: 'iPad Air',
+                udid: '1CCBBF8B-5773-4EA6-BD6F-C308C87A1ADB',
+                availabilityError: '',
+              },
+              {
+                state: 'Shutdown',
+                isAvailable: 'YES',
+                name: 'iPad (5th generation)',
+                udid: '9564ABEE-9EC2-4B4A-B443-D3710929A45A',
+                availabilityError: '',
+              },
+            ],
+          },
+        },
+        'iPhone 6',
+      ),
+    ).toEqual({
+      udid: 'BA0D93BD-07E6-4182-9B0A-F60A2474139C',
+      name: 'iPhone 6',
+      booted: false,
+      version: 'iOS 12.1',
+    });
+  });
+
   it('should return null if no simulators available', () => {
     expect(
       findMatchingSimulator(
@@ -487,6 +539,139 @@ describe('findMatchingSimulator', () => {
     });
   });
 
+  it('should return the simulator with the specified version (multi ios versions)', () => {
+    expect(findMatchingSimulator({
+        'devices': {
+          'iOS 9.2': [
+            {
+              'state': 'Shutdown',
+              'availability': '(unavailable, runtime profile not found)',
+              'name': 'iPhone 4s',
+              'udid': 'B9B5E161-416B-43C4-A78F-729CB96CC8C6'
+            },
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 5',
+              'udid': '1CCBBF8B-5773-4EA6-BD6F-C308C87A1ADB'
+            },
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 6',
+              'udid': 'BA0D93BD-07E6-4182-9B0A-F60A2474139C'
+            },
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 6 (Plus)',
+              'udid': '9564ABEE-9EC2-4B4A-B443-D3710929A45A'
+            },
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 6s',
+              'udid': 'D0F29BE7-CC3C-4976-888D-C739B4F50508'
+            }
+          ],
+          'iOS 10.0': [
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 6',
+              'udid': '2FF48AE5-CC3B-4C80-8D25-48966A6BE2C0'
+            },
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 6 (Plus)',
+              'udid': '841E33FE-E8A1-4B65-9FF8-6EAA6442A3FC'
+            },
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 6s',
+              'udid': 'CBBB8FB8-77AB-49A9-8297-4CCFE3189C22'
+            },
+            {
+              'state': 'Booted',
+              'availability': '(available)',
+              'name': 'iPhone 7',
+              'udid': '3A409DC5-5188-42A6-8598-3AA6F34607A5'
+            }
+          ]
+        }
+      },
+      'iPhone 6s (10.0)'
+    )).toEqual({
+      udid: 'CBBB8FB8-77AB-49A9-8297-4CCFE3189C22',
+      name: 'iPhone 6s',
+      booted: false,
+      version: 'iOS 10.0'
+    });
+  });
+
+  it('should return null if the version is specified and no device with the exact version exists (multi ios versions)', () => {
+    expect(findMatchingSimulator({
+        'devices': {
+          'iOS 9.2': [
+            {
+              'state': 'Shutdown',
+              'availability': '(unavailable, runtime profile not found)',
+              'name': 'iPhone 4s',
+              'udid': 'B9B5E161-416B-43C4-A78F-729CB96CC8C6'
+            },
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 5',
+              'udid': '1CCBBF8B-5773-4EA6-BD6F-C308C87A1ADB'
+            },
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 6',
+              'udid': 'BA0D93BD-07E6-4182-9B0A-F60A2474139C'
+            },
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 6 (Plus)',
+              'udid': '9564ABEE-9EC2-4B4A-B443-D3710929A45A'
+            },
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 6s',
+              'udid': 'D0F29BE7-CC3C-4976-888D-C739B4F50508'
+            }
+          ],
+          'iOS 10.0': [
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 6',
+              'udid': '2FF48AE5-CC3B-4C80-8D25-48966A6BE2C0'
+            },
+            {
+              'state': 'Shutdown',
+              'availability': '(available)',
+              'name': 'iPhone 6 (Plus)',
+              'udid': '841E33FE-E8A1-4B65-9FF8-6EAA6442A3FC'
+            },
+            {
+              'state': 'Booted',
+              'availability': '(available)',
+              'name': 'iPhone 7',
+              'udid': '3A409DC5-5188-42A6-8598-3AA6F34607A5'
+            }
+          ]
+        }
+      },
+      'iPhone 6s (10.0)'
+    )).toEqual(null);
+  });
+
   it('should return AppleTV devices if in the list', () => {
     expect(
       findMatchingSimulator(
diff --git a/local-cli/runIOS/__tests__/findXcodeProject-test.js b/local-cli/runIOS/__tests__/findXcodeProject-test.js
index 7e63560b2b2ea7..8071d728f5a59b 100644
--- a/local-cli/runIOS/__tests__/findXcodeProject-test.js
+++ b/local-cli/runIOS/__tests__/findXcodeProject-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js b/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js
index 89fca8364ac792..8914b5937396dd 100644
--- a/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js
+++ b/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/runIOS/findMatchingSimulator.js b/local-cli/runIOS/findMatchingSimulator.js
index f4794c389f1f88..d6769ce9c3a35e 100644
--- a/local-cli/runIOS/findMatchingSimulator.js
+++ b/local-cli/runIOS/findMatchingSimulator.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,31 +10,48 @@
 'use strict';
 
 /**
- * Takes in a parsed simulator list and a desired name, and returns an object with the matching simulator.
+ * Takes in a parsed simulator list and a desired name, and returns an object with the matching simulator. The desired
+ * name can optionally include the iOS version in between parenthesis after the device name. Ex: "iPhone 6 (9.2)" in
+ * which case it'll attempt to find a simulator with the exact version specified.
  *
- * If the simulatorName argument is null, we'll go into default mode and return the currently booted simulator, or if
+ * If the simulatorString argument is null, we'll go into default mode and return the currently booted simulator, or if
  * none is booted, it will be the first in the list.
  *
  * @param Object simulators a parsed list from `xcrun simctl list --json devices` command
- * @param String|null simulatorName the string with the name of desired simulator. If null, it will use the currently
+ * @param String|null simulatorString the string with the name of desired simulator. If null, it will use the currently
  *        booted simulator, or if none are booted, the first in the list.
  * @returns {Object} {udid, name, version}
  */
-function findMatchingSimulator(simulators, simulatorName) {
+function findMatchingSimulator(simulators, simulatorString) {
   if (!simulators.devices) {
     return null;
   }
   const devices = simulators.devices;
+
+  const parsedSimulatorName = simulatorString ? simulatorString.match(/(.*)? (?:\((.*)?\))?/) : [];
+  if (parsedSimulatorName[2] !== undefined) {
+    var simulatorVersion = parsedSimulatorName[2];
+    var simulatorName = parsedSimulatorName[1];
+  } else {
+    simulatorName = simulatorString;
+  }
+
   var match;
   for (let version in devices) {
     // Making sure the version of the simulator is an iOS or tvOS (Removes Apple Watch, etc)
     if (!version.startsWith('iOS') && !version.startsWith('tvOS')) {
       continue;
     }
+    if (simulatorVersion && !version.endsWith(simulatorVersion)) {
+      continue;
+    }
     for (let i in devices[version]) {
       let simulator = devices[version][i];
       // Skipping non-available simulator
-      if (simulator.availability !== '(available)') {
+      if (
+        simulator.availability !== '(available)' &&
+        simulator.isAvailable !== 'YES'
+      ) {
         continue;
       }
       let booted = simulator.state === 'Booted';
diff --git a/local-cli/runIOS/findXcodeProject.js b/local-cli/runIOS/findXcodeProject.js
index 57260a37253a8a..318f11ec849870 100644
--- a/local-cli/runIOS/findXcodeProject.js
+++ b/local-cli/runIOS/findXcodeProject.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/runIOS/parseIOSDevicesList.js b/local-cli/runIOS/parseIOSDevicesList.js
index fedb426042101e..0209c796b39807 100644
--- a/local-cli/runIOS/parseIOSDevicesList.js
+++ b/local-cli/runIOS/parseIOSDevicesList.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js
index dfabb92b894a4b..6c7af3242c94e5 100644
--- a/local-cli/runIOS/runIOS.js
+++ b/local-cli/runIOS/runIOS.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -409,8 +409,10 @@ module.exports = {
   options: [
     {
       command: '--simulator [string]',
-      description: 'Explicitly set simulator to use',
-      default: 'iPhone 6',
+      description:
+        'Explicitly set simulator to use. Optionally include iOS version between' + 
+        'parenthesis at the end to match an exact version: "iPhone 6 (10.0)"',
+      default: 'iPhone X',
     },
     {
       command: '--configuration [string]',
diff --git a/local-cli/server/checkNodeVersion.js b/local-cli/server/checkNodeVersion.js
index 7eb55a6d87d715..1f73a1e38fb9f3 100644
--- a/local-cli/server/checkNodeVersion.js
+++ b/local-cli/server/checkNodeVersion.js
@@ -1,10 +1,13 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
+ * Be mindful that this script may be run by legacy NodeJS runtimes. Keep this
+ * script ES5 compatible (e.g. do not insert the `@format` pragma here which
+ * may introduce non-ES5 compatible syntax.)
+ *
  */
 
 'use strict';
@@ -14,7 +17,7 @@ var formatBanner = require('metro-core/src/formatBanner');
 var semver = require('semver');
 
 module.exports = function() {
-  if (!semver.satisfies(process.version, '>=8')) {
+  if (!semver.satisfies(process.version, '>=8.3')) {
     var engine = semver.satisfies(process.version, '<1') ? 'Node' : 'io.js';
 
     var message =
@@ -24,22 +27,19 @@ module.exports = function() {
       process.version +
       '.\n' +
       '\n' +
-      'React Native runs on Node 8.0 or newer. There are several ways to ' +
+      'React Native runs on Node 8.3 or newer. There are several ways to ' +
       'upgrade Node.js depending on your preference.\n' +
       '\n' +
-      'nvm:       nvm install node && nvm alias default node\n' +
-      'Homebrew:  brew unlink iojs; brew install node\n' +
-      'Installer: download the Mac .pkg from https://nodejs.org/\n' +
-      '\n' +
-      'About Node.js:   https://nodejs.org\n' +
-      'Follow along at: https://github.com/facebook/react-native/issues/19226';
+      'nvm:       nvm install 8.3 --reinstall-packages-from=node\n' +
+      'Homebrew:  brew update && brew upgrade node\n' +
+      'Installer: download from https://nodejs.org/\n';
     console.log(
       formatBanner(message, {
         chalkFunction: chalk.green,
         marginLeft: 1,
         marginRight: 1,
         paddingBottom: 1,
-      }),
+      })
     );
     process.exit(1);
   }
diff --git a/local-cli/server/middleware/MiddlewareManager.js b/local-cli/server/middleware/MiddlewareManager.js
index 5402caf6f8ed12..50c8a59f077d4c 100644
--- a/local-cli/server/middleware/MiddlewareManager.js
+++ b/local-cli/server/middleware/MiddlewareManager.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,10 +17,11 @@ const WebSocketServer = require('ws').Server;
 
 const indexPageMiddleware = require('./indexPage');
 const copyToClipBoardMiddleware = require('./copyToClipBoardMiddleware');
+const getSecurityHeadersMiddleware =  require('./getSecurityHeadersMiddleware');
 const loadRawBodyMiddleware = require('./loadRawBodyMiddleware');
 const openStackFrameInEditorMiddleware = require('./openStackFrameInEditorMiddleware');
-const statusPageMiddleware = require('./statusPageMiddleware.js');
-const systraceProfileMiddleware = require('./systraceProfileMiddleware.js');
+const statusPageMiddleware = require('./statusPageMiddleware');
+const systraceProfileMiddleware = require('./systraceProfileMiddleware');
 const getDevToolsMiddleware = require('./getDevToolsMiddleware');
 
 type Options = {
@@ -44,6 +45,7 @@ module.exports = class MiddlewareManager {
 
     this.options = options;
     this.app = connect()
+      .use(getSecurityHeadersMiddleware)
       .use(loadRawBodyMiddleware)
       .use(compression())
       .use('/debugger-ui', serveStatic(debuggerUIFolder))
diff --git a/local-cli/server/middleware/copyToClipBoardMiddleware.js b/local-cli/server/middleware/copyToClipBoardMiddleware.js
index 3f04c69a1584cb..69a3171f958645 100644
--- a/local-cli/server/middleware/copyToClipBoardMiddleware.js
+++ b/local-cli/server/middleware/copyToClipBoardMiddleware.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/middleware/getDevToolsMiddleware.js b/local-cli/server/middleware/getDevToolsMiddleware.js
index 77aab8df9578df..f03fd0bbcec1c6 100644
--- a/local-cli/server/middleware/getDevToolsMiddleware.js
+++ b/local-cli/server/middleware/getDevToolsMiddleware.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/middleware/getSecurityHeadersMiddleware.js b/local-cli/server/middleware/getSecurityHeadersMiddleware.js
new file mode 100644
index 00000000000000..d3bad6bf9511b4
--- /dev/null
+++ b/local-cli/server/middleware/getSecurityHeadersMiddleware.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @strict
+ * @format
+ */
+
+module.exports = function(req, res, next) {
+  const address = req.client.server.address();
+
+  // Block any cross origin request.
+  if (
+    req.headers.origin &&
+    req.headers.origin !== `http://localhost:${address.port}`
+  ) {
+    next(new Error('Unauthorized'));
+    return;
+  }
+
+  // Block MIME-type sniffing.
+  res.setHeader('X-Content-Type-Options', 'nosniff');
+
+  next();
+};
diff --git a/local-cli/server/middleware/indexPage.js b/local-cli/server/middleware/indexPage.js
index 55b55c0f79221d..ee6fc61ad6db8b 100644
--- a/local-cli/server/middleware/indexPage.js
+++ b/local-cli/server/middleware/indexPage.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/middleware/loadRawBodyMiddleware.js b/local-cli/server/middleware/loadRawBodyMiddleware.js
index 1530c28fa84c43..553f041292576f 100644
--- a/local-cli/server/middleware/loadRawBodyMiddleware.js
+++ b/local-cli/server/middleware/loadRawBodyMiddleware.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/middleware/openStackFrameInEditorMiddleware.js b/local-cli/server/middleware/openStackFrameInEditorMiddleware.js
index f285489ec20fa4..36cc69ba0d9217 100644
--- a/local-cli/server/middleware/openStackFrameInEditorMiddleware.js
+++ b/local-cli/server/middleware/openStackFrameInEditorMiddleware.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/middleware/statusPageMiddleware.js b/local-cli/server/middleware/statusPageMiddleware.js
index bbc189223ff9c8..b08539d57d647b 100644
--- a/local-cli/server/middleware/statusPageMiddleware.js
+++ b/local-cli/server/middleware/statusPageMiddleware.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/middleware/systraceProfileMiddleware.js b/local-cli/server/middleware/systraceProfileMiddleware.js
index dbf71d41d8cb2c..c66d6f7beaa8c4 100644
--- a/local-cli/server/middleware/systraceProfileMiddleware.js
+++ b/local-cli/server/middleware/systraceProfileMiddleware.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/middleware/unless.js b/local-cli/server/middleware/unless.js
index 016adfa7f22a96..e1aa78ac636008 100644
--- a/local-cli/server/middleware/unless.js
+++ b/local-cli/server/middleware/unless.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index 7f660bde298f31..e393a8a61241b0 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -16,11 +16,13 @@ const Metro = require('metro');
 
 const {Terminal} = require('metro-core');
 
+const messageSocket = require('./util/messageSocket');
 const morgan = require('morgan');
 const path = require('path');
+const webSocketProxy = require('./util/webSocketProxy');
 const MiddlewareManager = require('./middleware/MiddlewareManager');
 
-import type {ConfigT} from 'metro';
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
 export type Args = {|
   +assetExts: $ReadOnlyArray<string>,
@@ -52,24 +54,38 @@ async function runServer(args: Args, config: ConfigT) {
 
   args.watchFolders.forEach(middlewareManager.serveStatic);
 
-  const serverInstance = await Metro.runServer({
-    config: {
-      ...config,
-      hmrEnabled: true,
-      maxWorkers: args.maxWorkers,
-      reporter,
-      secure: args.https,
-      secureKey: args.key,
-      secureCert: args.cert,
-      transformModulePath: args.transformer
-        ? path.resolve(args.transformer)
-        : config.getTransformModulePath(),
-      watch: !args.nonPersistent,
-    },
+  // $FlowFixMe Metro configuration is immutable.
+  config.maxWorkers = args.maxWorkers;
+  // $FlowFixMe Metro configuration is immutable.
+  config.server.port = args.port;
+  // $FlowFixMe Metro configuration is immutable.
+  config.reporter = reporter;
+  // $FlowFixMe Metro configuration is immutable.
+  config.resetCache = args.resetCache;
+  // $FlowFixMe Metro configuration is immutable.
+  config.projectRoot = args.projectRoot;
+  // $FlowFixMe Metro configuration is immutable.
+  config.watchFolders = args.watchFolders.slice(0);
+  // $FlowFixMe Metro configuration is immutable.
+  config.server.enhanceMiddleware = middleware =>
+    middlewareManager.getConnectInstance().use(middleware);
+
+  const serverInstance = await Metro.runServer(config, {
     host: args.host,
-    port: args.port,
+    secure: args.https,
+    secureCert: args.cert,
+    secureKey: args.key,
+    hmrEnabled: true,
   });
 
+  const wsProxy = webSocketProxy.attachToServer(
+    serverInstance,
+    '/debugger-proxy',
+  );
+  const ms = messageSocket.attachToServer(serverInstance, '/message');
+  middlewareManager.attachDevToolsSocket(wsProxy);
+  middlewareManager.attachDevToolsSocket(ms);
+
   // In Node 8, the default keep-alive for an HTTP connection is 5 seconds. In
   // early versions of Node 8, this was implemented in a buggy way which caused
   // some HTTP responses (like those containing large JS bundles) to be
@@ -80,7 +96,6 @@ async function runServer(args: Args, config: ConfigT) {
   //
   // For more info: https://github.com/nodejs/node/issues/13391
   //
-  // $FlowFixMe (site=react_native_fb)
   serverInstance.keepAliveTimeout = 30000;
 }
 
diff --git a/local-cli/server/server.js b/local-cli/server/server.js
index 42423f5583759a..f7ded732ff139c 100644
--- a/local-cli/server/server.js
+++ b/local-cli/server/server.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,7 +13,7 @@
 const runServer = require('./runServer');
 
 import type {RNConfig} from '../core';
-import type {ConfigT} from 'metro';
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type {Args as RunServerArgs} from './runServer';
 
 /**
@@ -32,8 +32,8 @@ module.exports = {
   options: [
     {
       command: '--port [number]',
-      default: process.env.RCT_METRO_PORT || 8081,
       parse: (val: string) => Number(val),
+      default: (config: ConfigT) => config.server.port,
     },
     {
       command: '--host [string]',
@@ -42,51 +42,42 @@ module.exports = {
     {
       command: '--projectRoot [string]',
       description: 'Specify the main project root',
-      default: (config: ConfigT) => {
-        return config.getProjectRoot();
-      },
+      default: (config: ConfigT) => config.projectRoot,
     },
     {
       command: '--watchFolders [list]',
       description:
         'Specify any additional folders to be added to the watch list',
       parse: (val: string) => val.split(','),
-      default: (config: ConfigT) => {
-        return config.getWatchFolders();
-      },
+      default: (config: ConfigT) => config.watchFolders,
     },
     {
       command: '--assetExts [list]',
       description:
         'Specify any additional asset extensions to be used by the packager',
       parse: (val: string) => val.split(','),
-      default: (config: ConfigT) => config.getAssetExts(),
+      default: (config: ConfigT) => config.resolver.assetExts,
     },
     {
       command: '--sourceExts [list]',
       description:
         'Specify any additional source extensions to be used by the packager',
       parse: (val: string) => val.split(','),
-      default: (config: ConfigT) => config.getSourceExts(),
+      default: (config: ConfigT) => config.resolver.sourceExts,
     },
     {
       command: '--platforms [list]',
       description:
         'Specify any additional platforms to be used by the packager',
       parse: (val: string) => val.split(','),
-      default: (config: ConfigT) => config.getPlatforms(),
+      default: (config: ConfigT) => config.resolver.platforms,
     },
     {
       command: '--providesModuleNodeModules [list]',
       description:
         'Specify any npm packages that import dependencies with providesModule',
       parse: (val: string) => val.split(','),
-      default: (config: RNConfig) => {
-        if (typeof config.getProvidesModuleNodeModules === 'function') {
-          return config.getProvidesModuleNodeModules();
-        }
-        return null;
-      },
+      default: (config: ConfigT) => config.resolver.providesModuleNodeModules,
     },
     {
       command: '--max-workers [number]',
@@ -94,6 +85,7 @@ module.exports = {
         'Specifies the maximum number of workers the worker-pool ' +
         'will spawn for transforming files. This defaults to the number of the ' +
         'cores available on your machine.',
+      default: (config: ConfigT) => config.maxWorkers,
       parse: (workers: string) => Number(workers),
     },
     {
diff --git a/local-cli/server/util/copyToClipBoard.js b/local-cli/server/util/copyToClipBoard.js
index 0dbf3a786835da..1f22477b9b16a3 100644
--- a/local-cli/server/util/copyToClipBoard.js
+++ b/local-cli/server/util/copyToClipBoard.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/util/debugger-ui/DeltaPatcher.js b/local-cli/server/util/debugger-ui/DeltaPatcher.js
index ecc92dce7b0ec1..f99dfd2c201e5f 100644
--- a/local-cli/server/util/debugger-ui/DeltaPatcher.js
+++ b/local-cli/server/util/debugger-ui/DeltaPatcher.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/util/debugger-ui/debuggerWorker.js b/local-cli/server/util/debugger-ui/debuggerWorker.js
index ad820c16fc025d..070d753b712485 100644
--- a/local-cli/server/util/debugger-ui/debuggerWorker.js
+++ b/local-cli/server/util/debugger-ui/debuggerWorker.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js b/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
index d916ad4e955e79..32334244868083 100644
--- a/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
+++ b/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -41,12 +41,16 @@
 
     // If nothing changed, avoid recreating a bundle blob by reusing the
     // previous one.
-    if (deltaPatcher.getLastNumModifiedFiles() === 0 && cachedBundle) {
+    if (
+      deltaPatcher.getLastNumModifiedFiles() === 0 &&
+      cachedBundle != null &&
+      cachedBundle !== ''
+    ) {
       return cachedBundle;
     }
 
     // Clean up the previous bundle URL to not leak memory.
-    if (cachedBundle) {
+    if (cachedBundle != null && cachedBundle !== '') {
       URL.revokeObjectURL(cachedBundle);
     }
 
diff --git a/local-cli/server/util/debugger-ui/index.html b/local-cli/server/util/debugger-ui/index.html
index c4f825145acbb1..320b482899363e 100644
--- a/local-cli/server/util/debugger-ui/index.html
+++ b/local-cli/server/util/debugger-ui/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-  Copyright (c) 2015-present, Facebook, Inc.
+  Copyright (c) Facebook, Inc. and its affiliates.
 
   This source code is licensed under the MIT license found in the
   LICENSE file in the root directory of this source tree.
@@ -247,10 +247,10 @@
   }
   body.dark {
     background-color: #242424;
-    color: #666;
+    color: #afafaf;
   }
   .dark .shortcut {
-    color: #777;
+    color: #c1c1c1;
   }
   .dark a {
     color: #3b99fc;
diff --git a/local-cli/server/util/jsPackagerClient.js b/local-cli/server/util/jsPackagerClient.js
index 0052198228dddb..08e6516f5aae16 100644
--- a/local-cli/server/util/jsPackagerClient.js
+++ b/local-cli/server/util/jsPackagerClient.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/util/launchChrome.js b/local-cli/server/util/launchChrome.js
index f37f06b088c0c4..854ae20c80b805 100644
--- a/local-cli/server/util/launchChrome.js
+++ b/local-cli/server/util/launchChrome.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/util/launchEditor.js b/local-cli/server/util/launchEditor.js
index 8b9f1729e10f35..ac965b08531285 100644
--- a/local-cli/server/util/launchEditor.js
+++ b/local-cli/server/util/launchEditor.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -42,6 +42,11 @@ var COMMON_EDITORS = {
   '/Applications/WebStorm.app/Contents/MacOS/webstorm': 'webstorm',
 };
 
+// Transpiled version of: /^[\p{L}0-9/.\-_\\]+$/u
+// Non-transpiled version requires support for Unicode property regex. Allows
+// alphanumeric characters, periods, dashes, slashes, and underscores.
+const WINDOWS_FILE_NAME_WHITELIST = /^(?:[\x2D-9A-Z\\_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16F1-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1878\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEF\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA7B9\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA8FE\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF2D-\uDF40\uDF42-\uDF49\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF]|\uD801[\uDC00-\uDC9D\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE35\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2\uDD00-\uDD23\uDF00-\uDF1C\uDF27\uDF30-\uDF45]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD44\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF1A]|\uD806[\uDC00-\uDC2B\uDCA0-\uDCDF\uDCFF\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE83\uDE86-\uDE89\uDE9D\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46\uDD60-\uDD65\uDD67\uDD68\uDD6A-\uDD89\uDD98\uDEE0-\uDEF2]|\uD808[\uDC00-\uDF99]|\uD809[\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDE40-\uDE7F\uDF00-\uDF44\uDF50\uDF93-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFF1]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4\uDD00-\uDD43]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D])+$/;
+
 function addWorkspaceToArgumentsIfExists(args, workspace) {
   if (workspace) {
     args.unshift(workspace);
@@ -176,6 +181,32 @@ function launchEditor(fileName, lineNumber, projectRoots) {
   } else {
     args.push(fileName);
   }
+
+  // cmd.exe on Windows is vulnerable to RCE attacks given a file name of the
+  // form "C:\Users\myusername\Downloads\& curl 172.21.93.52". Use a whitelist
+  // to validate user-provided file names. This doesn't cover the entire range
+  // of valid file names but should cover almost all of them in practice.
+  if (
+    process.platform === 'win32' &&
+    !WINDOWS_FILE_NAME_WHITELIST.test(fileName.trim())
+  ) {
+    console.log();
+    console.log(
+      chalk.red(
+        'Could not open ' + path.basename(fileName) + ' in the editor.',
+      ),
+    );
+    console.log();
+    console.log(
+      'When running on Windows, file names are checked against a whitelist ' +
+        'to protect against remote code execution attacks. File names may ' +
+        'consist only of alphanumeric characters (all languages), periods, ' +
+        'dashes, slashes, and underscores.',
+    );
+    console.log();
+    return;
+  }
+
   console.log(
     'Opening ' + chalk.underline(fileName) + ' with ' + chalk.bold(editor),
   );
diff --git a/local-cli/server/util/messageSocket.js b/local-cli/server/util/messageSocket.js
index 87772789a348a9..a151f7916ba5f2 100644
--- a/local-cli/server/util/messageSocket.js
+++ b/local-cli/server/util/messageSocket.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/server/util/webSocketProxy.js b/local-cli/server/util/webSocketProxy.js
index d419e51589767b..097a5de53003a7 100644
--- a/local-cli/server/util/webSocketProxy.js
+++ b/local-cli/server/util/webSocketProxy.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/setup_env.bat b/local-cli/setup_env.bat
index e5c135e5abff82..68318546b76c55 100755
--- a/local-cli/setup_env.bat
+++ b/local-cli/setup_env.bat
@@ -1,4 +1,4 @@
-:: Copyright (c) 2015-present, Facebook, Inc.
+:: Copyright (c) Facebook, Inc. and its affiliates.
 ::
 :: This source code is licensed under the MIT license found in the
 :: LICENSE file in the root directory of this source tree.
diff --git a/local-cli/setup_env.sh b/local-cli/setup_env.sh
index 0087df50c04aa4..eaf581048964b4 100755
--- a/local-cli/setup_env.sh
+++ b/local-cli/setup_env.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2015-present, Facebook, Inc.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
diff --git a/local-cli/templates/HelloNavigation/App.js b/local-cli/templates/HelloNavigation/App.js
deleted file mode 100644
index 4ccc87f1791026..00000000000000
--- a/local-cli/templates/HelloNavigation/App.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * This is an example React Native app demonstrates ListViews, text input and
- * navigation between a few screens.
- * https://github.com/facebook/react-native
- *
- * @format
- */
-
-import React, {Component} from 'react';
-import {StackNavigator} from 'react-navigation';
-
-import HomeScreenTabNavigator from './views/HomeScreenTabNavigator';
-import ChatScreen from './views/chat/ChatScreen';
-
-/**
- * Top-level navigator. Renders the application UI.
- */
-const App = StackNavigator({
-  Home: {
-    screen: HomeScreenTabNavigator,
-  },
-  Chat: {
-    screen: ChatScreen,
-  },
-});
-
-export default App;
diff --git a/local-cli/templates/HelloNavigation/README.md b/local-cli/templates/HelloNavigation/README.md
deleted file mode 100644
index 2c3d94b4c9dd67..00000000000000
--- a/local-cli/templates/HelloNavigation/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# App template for new React Native apps
-
-This is a simple React Native app template which demonstrates a few basics concepts such as navigation between a few screens, FlatLists, and handling text input.
-
-<img src="https://cloud.githubusercontent.com/assets/346214/22697898/ced66f52-ed4a-11e6-9b90-df6daef43199.gif" alt="Android Example" height="800" style="float: left"/>
-
-<img src="https://cloud.githubusercontent.com/assets/346214/22697901/cfeab3e4-ed4a-11e6-8552-d76585317ac2.gif" alt="iOS Example" height="800"/>
-
-## Purpose
-
-The idea is to make it easier for people to get started with React Native. Currently `react-native init` creates a very simple app that contains one screen with static text. Everyone new to React Native then needs to figure out how to do very basic things such as:
-- Rendering a list of items fetched from a server
-- Navigating between screens
-- Handling text input and the software keyboard
-
-This app serves as a template used by `react-native init` so it is easier for anyone to get up and running quickly by having an app with a few screens and a FlatList ready to go.
-
-### Best practices
-
-Another purpose of this app is to define best practices such as the folder structure of a standalone React Native app and naming conventions.
-
-## Not using Redux
-
-This template intentionally doesn't use Redux. After discussing with a few people who have experience using Redux we concluded that adding Redux to this app targeted at beginners would make the code more confusing, and wouldn't clearly show the benefits of Redux (because the app is too small). There are already a few concepts to grasp - the React component lifecycle, rendering lists, using async / await, handling the software keyboard. We thought that's the maximum amount of things to learn at once. It's better for everyone to see patterns in their codebase as the app grows and decide for themselves whether and when they need Redux. See also the post [You Might Not Need Redux](https://medium.com/@dan_abramov/you-might-not-need-redux-be46360cf367#.f3q7kq4b3) by [Dan Abramov](https://twitter.com/dan_abramov).
-
-## Not using Flow (for now)
-
-Many people are new to React Native, some are new to ES6 and most people will be new to Flow. Therefore we didn't want to introduce all these concepts all at once in a single codebase. However, it might make sense to later introduce a separate version of this template that uses Flow annotations.
-
-## Provide feedback
-
-We need your feedback. Do you have a lot of experience building React Native apps? If so, please carefully read the code of the template and if you think something should be done differently, use issues in the repo [mkonicek/AppTemplateFeedback](https://github.com/mkonicek/AppTemplateFeedback) to discuss what should be done differently.
-
-## How to use the template
-
-```
-$ react-native init MyApp --template navigation
-$ cd MyApp
-$ react-native run-android
-$ react-native run-ios
-```
diff --git a/local-cli/templates/HelloNavigation/components/KeyboardSpacer.js b/local-cli/templates/HelloNavigation/components/KeyboardSpacer.js
deleted file mode 100644
index 9b73a41bab2dd4..00000000000000
--- a/local-cli/templates/HelloNavigation/components/KeyboardSpacer.js
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * 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';
-
-/* @flow */
-
-import React, {Component} from 'react';
-import PropTypes from 'prop-types';
-import {Platform, View, Keyboard, LayoutAnimation} from 'react-native';
-
-type Props = {
-  offset?: number,
-};
-
-type State = {
-  keyboardHeight: number,
-};
-
-// Consider contributing this to the popular library:
-// https://github.com/Andr3wHur5t/react-native-keyboard-spacer
-
-/**
- * On iOS, the software keyboard covers the screen by default.
- * This is not desirable if there are TextInputs near the bottom of the screen -
- * they would be covered by the keyboard and the user cannot see what they
- * are typing.
- * To get around this problem, place a `<KeyboardSpacer />` at the bottom
- * of the screen, after your TextInputs. The keyboard spacer has size 0 and
- * when the keyboard is shown it will grow to the same size as the keyboard,
- * shifting all views above it and therefore making them visible.
- *
- * On Android, this component is not needed because resizing the UI when
- * the keyboard is shown is supported by the OS.
- * Simply set the `android:windowSoftInputMode="adjustResize"` attribute
- * on the <activity> element in your AndroidManifest.xml.
- *
- * How is this different from KeyboardAvoidingView?
- * The KeyboardAvoidingView doesn't work when used together with
- * a ScrollView/ListView.
- */
-const KeyboardSpacer = () =>
-  Platform.OS === 'ios' ? <KeyboardSpacerIOS /> : null;
-
-class KeyboardSpacerIOS extends Component<Props, State> {
-  static propTypes = {
-    offset: PropTypes.number,
-  };
-
-  static defaultProps = {
-    offset: 0,
-  };
-
-  state: State = {
-    keyboardHeight: 0,
-  };
-
-  UNSAFE_componentWillMount() {
-    this._registerEvents();
-  }
-
-  componentWillUnmount() {
-    this._unRegisterEvents();
-  }
-
-  _keyboardWillShowSubscription: {+remove: Function};
-  _keyboardWillHideSubscription: {+remove: Function};
-
-  _registerEvents = () => {
-    this._keyboardWillShowSubscription = Keyboard.addListener(
-      'keyboardWillShow',
-      this._keyboardWillShow,
-    );
-    this._keyboardWillHideSubscription = Keyboard.addListener(
-      'keyboardWillHide',
-      this._keyboardWillHide,
-    );
-  };
-
-  _unRegisterEvents = () => {
-    this._keyboardWillShowSubscription.remove();
-    this._keyboardWillHideSubscription.remove();
-  };
-
-  _configureLayoutAnimation = () => {
-    // Any duration is OK here. The `type: 'keyboard defines the animation.
-    LayoutAnimation.configureNext({
-      duration: 100,
-      update: {
-        type: 'keyboard',
-      },
-    });
-  };
-
-  _keyboardWillShow = (e: any) => {
-    this._configureLayoutAnimation();
-    this.setState({
-      keyboardHeight: e.endCoordinates.height - (this.props.offset || 0),
-    });
-  };
-
-  _keyboardWillHide = () => {
-    this._configureLayoutAnimation();
-    this.setState({
-      keyboardHeight: 0,
-    });
-  };
-
-  render() {
-    return <View style={{height: this.state.keyboardHeight}} />;
-  }
-}
-
-export default KeyboardSpacer;
diff --git a/local-cli/templates/HelloNavigation/components/ListItem.js b/local-cli/templates/HelloNavigation/components/ListItem.js
deleted file mode 100644
index c93e819b5c146d..00000000000000
--- a/local-cli/templates/HelloNavigation/components/ListItem.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/** @format */
-
-'use strict';
-
-import React, {Component} from 'react';
-import {
-  Platform,
-  StyleSheet,
-  Text,
-  TouchableHighlight,
-  TouchableNativeFeedback,
-  View,
-} from 'react-native';
-
-/**
- * Renders the right type of Touchable for the list item, based on platform.
- */
-const Touchable = ({onPress, children}) => {
-  const child = React.Children.only(children);
-  if (Platform.OS === 'android') {
-    return (
-      <TouchableNativeFeedback onPress={onPress}>
-        {child}
-      </TouchableNativeFeedback>
-    );
-  } else {
-    return (
-      <TouchableHighlight onPress={onPress} underlayColor="#ddd">
-        {child}
-      </TouchableHighlight>
-    );
-  }
-};
-
-const ListItem = ({label, onPress}) => (
-  <Touchable onPress={onPress}>
-    <View style={styles.item}>
-      <Text style={styles.label}>{label}</Text>
-    </View>
-  </Touchable>
-);
-
-const styles = StyleSheet.create({
-  item: {
-    height: 48,
-    justifyContent: 'center',
-    paddingLeft: 12,
-    borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: '#ddd',
-  },
-  label: {
-    fontSize: 16,
-  },
-});
-
-export default ListItem;
diff --git a/local-cli/templates/HelloNavigation/dependencies.json b/local-cli/templates/HelloNavigation/dependencies.json
deleted file mode 100644
index 2317f38b79c837..00000000000000
--- a/local-cli/templates/HelloNavigation/dependencies.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "react-navigation": "1.0.0-beta.11"
-}
diff --git a/local-cli/templates/HelloNavigation/lib/Backend.js b/local-cli/templates/HelloNavigation/lib/Backend.js
deleted file mode 100644
index a85f0ae753fe15..00000000000000
--- a/local-cli/templates/HelloNavigation/lib/Backend.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/** @format */
-
-'use strict';
-
-// This file just a dummy example of a HTTP API to talk to the backend.
-// The state of the "database" that would normally live on the server
-// is simply held here in memory.
-
-const backendStateForLoggedInPerson = {
-  chats: [
-    {
-      name: 'Claire',
-      messages: [
-        {
-          name: 'Claire',
-          text: 'I ❤️ React Native!',
-        },
-      ],
-    },
-    {
-      name: 'John',
-      messages: [
-        {
-          name: 'John',
-          text: 'I ❤️ React Native!',
-        },
-      ],
-    },
-  ],
-};
-
-/**
- * Randomly simulate network failures.
- * It is useful to enable this during development to make sure our app works
- * in real-world conditions.
- */
-function isNetworkFailure() {
-  const chanceOfFailure = 0; // 0..1
-  return Math.random() < chanceOfFailure;
-}
-
-/**
- * Helper for the other functions in this file.
- * Simulates a short delay and then returns a provided value or failure.
- * This is just a dummy example. Normally we'd make a HTTP request,
- * see http://facebook.github.io/react-native/docs/network.html
- */
-function _makeSimulatedNetworkRequest(getValue) {
-  const durationMs = 400;
-  return new Promise(function(resolve, reject) {
-    setTimeout(function() {
-      if (isNetworkFailure()) {
-        reject(new Error('Network failure'));
-      } else {
-        getValue(resolve, reject);
-      }
-    }, durationMs);
-  });
-}
-
-/**
- * Fetch a list of all chats for the logged in person.
- */
-async function fetchChatList() {
-  return _makeSimulatedNetworkRequest((resolve, reject) => {
-    resolve(backendStateForLoggedInPerson.chats.map(chat => chat.name));
-  });
-}
-
-/**
- * Fetch a single chat.
- */
-async function fetchChat(name) {
-  return _makeSimulatedNetworkRequest((resolve, reject) => {
-    resolve(
-      backendStateForLoggedInPerson.chats.find(chat => chat.name === name),
-    );
-  });
-}
-
-/**
- * Send given message to given person.
- */
-async function sendMessage({name, message}) {
-  return _makeSimulatedNetworkRequest((resolve, reject) => {
-    const chatForName = backendStateForLoggedInPerson.chats.find(
-      chat => chat.name === name,
-    );
-    if (chatForName) {
-      chatForName.messages.push({
-        name: 'Me',
-        text: message,
-      });
-      resolve();
-    } else {
-      reject(new Error('Uknown person: ' + name));
-    }
-  });
-}
-
-const Backend = {
-  fetchChatList,
-  fetchChat,
-  sendMessage,
-};
-
-export default Backend;
-
-// In case you are looking into using Redux for state management,
-// this is how network requests are done in the f8 app which uses Redux:
-// - To load some data, a Component fires a Redux action, such as loadSession()
-// - That action makes the HTTP requests and then dispatches a redux action
-//   {type: 'LOADED_SESSIONS', results}
-// - Then all reducers get called and one of them updates a part of the application
-//   state by storing the results
-// - Redux re-renders the connected Components
-// See https://github.com/fbsamples/f8app/search?utf8=%E2%9C%93&q=loaded_sessions
diff --git a/local-cli/templates/HelloNavigation/views/HomeScreenTabNavigator.js b/local-cli/templates/HelloNavigation/views/HomeScreenTabNavigator.js
deleted file mode 100644
index 09e411a471a948..00000000000000
--- a/local-cli/templates/HelloNavigation/views/HomeScreenTabNavigator.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/** @format */
-
-import {TabNavigator} from 'react-navigation';
-
-import ChatListScreen from './chat/ChatListScreen';
-import WelcomeScreen from './welcome/WelcomeScreen';
-
-/**
- * Screen with tabs shown on app startup.
- */
-const HomeScreenTabNavigator = TabNavigator({
-  Welcome: {
-    screen: WelcomeScreen,
-  },
-  Chats: {
-    screen: ChatListScreen,
-  },
-});
-
-export default HomeScreenTabNavigator;
diff --git a/local-cli/templates/HelloNavigation/views/chat/ChatListScreen.js b/local-cli/templates/HelloNavigation/views/chat/ChatListScreen.js
deleted file mode 100644
index 121deb36d3370a..00000000000000
--- a/local-cli/templates/HelloNavigation/views/chat/ChatListScreen.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/** @format */
-
-import React, {Component} from 'react';
-import {
-  ActivityIndicator,
-  Image,
-  FlatList,
-  Platform,
-  StyleSheet,
-  View,
-} from 'react-native';
-import ListItem from '../../components/ListItem';
-import Backend from '../../lib/Backend';
-
-export default class ChatListScreen extends Component {
-  static navigationOptions = {
-    title: 'Chats',
-    header: Platform.OS === 'ios' ? undefined : null,
-    tabBarIcon: ({tintColor}) => (
-      <Image
-        // Using react-native-vector-icons works here too
-        source={require('./chat-icon.png')}
-        style={[styles.icon, {tintColor: tintColor}]}
-      />
-    ),
-  };
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      isLoading: true,
-    };
-  }
-
-  async componentDidMount() {
-    const chatList = await Backend.fetchChatList();
-    this.setState(prevState => ({
-      chatList,
-      isLoading: false,
-    }));
-  }
-
-  // Binding the function so it can be passed to FlatList below
-  // and 'this' works properly inside renderItem
-  renderItem = ({item}) => {
-    return (
-      <ListItem
-        label={item}
-        onPress={() => {
-          // Start fetching in parallel with animating
-          this.props.navigation.navigate('Chat', {
-            name: item,
-          });
-        }}
-      />
-    );
-  };
-
-  render() {
-    if (this.state.isLoading) {
-      return (
-        <View style={styles.loadingScreen}>
-          <ActivityIndicator />
-        </View>
-      );
-    }
-    return (
-      <FlatList
-        data={this.state.chatList}
-        renderItem={this.renderItem}
-        keyExtractor={(item, index) => index}
-        style={styles.listView}
-      />
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  loadingScreen: {
-    backgroundColor: 'white',
-    paddingTop: 8,
-    flex: 1,
-  },
-  listView: {
-    backgroundColor: 'white',
-  },
-  icon: {
-    width: 30,
-    height: 26,
-  },
-});
diff --git a/local-cli/templates/HelloNavigation/views/chat/ChatScreen.js b/local-cli/templates/HelloNavigation/views/chat/ChatScreen.js
deleted file mode 100644
index 0d1e322d151c39..00000000000000
--- a/local-cli/templates/HelloNavigation/views/chat/ChatScreen.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/** @format */
-
-import React, {Component} from 'react';
-import {
-  ActivityIndicator,
-  Button,
-  FlatList,
-  StyleSheet,
-  Text,
-  TextInput,
-  View,
-} from 'react-native';
-import KeyboardSpacer from '../../components/KeyboardSpacer';
-import Backend from '../../lib/Backend';
-
-export default class ChatScreen extends Component {
-  static navigationOptions = ({navigation}) => ({
-    title: `Chat with ${navigation.state.params.name}`,
-  });
-  constructor(props) {
-    super(props);
-    this.state = {
-      messages: [],
-      myMessage: '',
-      isLoading: true,
-    };
-  }
-
-  async componentDidMount() {
-    let chat;
-    try {
-      chat = await Backend.fetchChat(this.props.navigation.state.params.name);
-    } catch (err) {
-      // Here we would handle the fact the request failed, e.g.
-      // set state to display "Messages could not be loaded".
-      // We should also check network connection first before making any
-      // network requests - maybe we're offline? See React Native's NetInfo
-      // module.
-      this.setState({
-        isLoading: false,
-      });
-      return;
-    }
-    this.setState(prevState => ({
-      messages: chat.messages,
-      isLoading: false,
-    }));
-  }
-
-  onAddMessage = async () => {
-    // Optimistically update the UI
-    this.addMessageLocal();
-    // Send the request
-    try {
-      await Backend.sendMessage({
-        name: this.props.navigation.state.params.name,
-        // TODO Is reading state like this outside of setState OK?
-        // Can it contain a stale value?
-        message: this.state.myMessage,
-      });
-    } catch (err) {
-      // Here we would handle the request failure, e.g. call setState
-      // to display a visual hint showing the message could not be sent.
-    }
-  };
-
-  addMessageLocal = () => {
-    this.setState(prevState => {
-      if (!prevState.myMessage) {
-        return prevState;
-      }
-      const messages = [
-        ...prevState.messages,
-        {
-          name: 'Me',
-          text: prevState.myMessage,
-        },
-      ];
-      return {
-        messages: messages,
-        myMessage: '',
-      };
-    });
-    this.textInput.clear();
-  };
-
-  onMyMessageChange = event => {
-    this.setState({myMessage: event.nativeEvent.text});
-  };
-
-  renderItem = ({item}) => (
-    <View style={styles.bubble}>
-      <Text style={styles.name}>{item.name}</Text>
-      <Text>{item.text}</Text>
-    </View>
-  );
-
-  render() {
-    if (this.state.isLoading) {
-      return (
-        <View style={styles.container}>
-          <ActivityIndicator />
-        </View>
-      );
-    }
-    return (
-      <View style={styles.container}>
-        <FlatList
-          data={this.state.messages}
-          renderItem={this.renderItem}
-          keyExtractor={(item, index) => index}
-          style={styles.listView}
-        />
-
-        <View style={styles.composer}>
-          <TextInput
-            ref={textInput => {
-              this.textInput = textInput;
-            }}
-            style={styles.textInput}
-            placeholder="Type a message..."
-            text={this.state.myMessage}
-            onSubmitEditing={this.onAddMessage}
-            onChange={this.onMyMessageChange}
-          />
-          {this.state.myMessage !== '' && (
-            <Button title="Send" onPress={this.onAddMessage} />
-          )}
-        </View>
-        <KeyboardSpacer />
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    padding: 8,
-    backgroundColor: 'white',
-  },
-  listView: {
-    flex: 1,
-    alignSelf: 'stretch',
-  },
-  bubble: {
-    alignSelf: 'flex-end',
-    backgroundColor: '#d6f3fc',
-    padding: 12,
-    borderRadius: 4,
-    marginBottom: 4,
-  },
-  name: {
-    fontWeight: 'bold',
-  },
-  composer: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    height: 36,
-  },
-  textInput: {
-    flex: 1,
-    borderColor: '#ddd',
-    borderWidth: 1,
-    padding: 4,
-    height: 30,
-    fontSize: 13,
-    marginRight: 8,
-  },
-});
diff --git a/local-cli/templates/HelloNavigation/views/chat/chat-icon.png b/local-cli/templates/HelloNavigation/views/chat/chat-icon.png
deleted file mode 100644
index 07c56c71da4efd..00000000000000
Binary files a/local-cli/templates/HelloNavigation/views/chat/chat-icon.png and /dev/null differ
diff --git a/local-cli/templates/HelloNavigation/views/welcome/WelcomeScreen.js b/local-cli/templates/HelloNavigation/views/welcome/WelcomeScreen.js
deleted file mode 100644
index 942a8fbae42de8..00000000000000
--- a/local-cli/templates/HelloNavigation/views/welcome/WelcomeScreen.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/** @format */
-
-import React, {Component} from 'react';
-import {Image, Platform, StyleSheet} from 'react-native';
-
-import ListItem from '../../components/ListItem';
-import WelcomeText from './WelcomeText';
-
-export default class WelcomeScreen extends Component {
-  static navigationOptions = {
-    title: 'Welcome',
-    // You can now set header: null on any component to hide the header
-    header: Platform.OS === 'ios' ? undefined : null,
-    tabBarIcon: ({tintColor}) => (
-      <Image
-        // Using react-native-vector-icons works here too
-        source={require('./welcome-icon.png')}
-        style={[styles.icon, {tintColor: tintColor}]}
-      />
-    ),
-  };
-
-  render() {
-    return <WelcomeText />;
-  }
-}
-
-const styles = StyleSheet.create({
-  icon: {
-    width: 30,
-    height: 26,
-  },
-});
diff --git a/local-cli/templates/HelloNavigation/views/welcome/WelcomeText.android.js b/local-cli/templates/HelloNavigation/views/welcome/WelcomeText.android.js
deleted file mode 100644
index 9f185d56cc6c7b..00000000000000
--- a/local-cli/templates/HelloNavigation/views/welcome/WelcomeText.android.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/** @format */
-
-import React, {Component} from 'react';
-import {StyleSheet, Text, View} from 'react-native';
-
-export default class WelcomeText extends Component {
-  render() {
-    return (
-      <View style={styles.container}>
-        <Text style={styles.welcome}>Welcome to React Native!</Text>
-        <Text style={styles.instructions}>
-          This app shows the basics of navigating between a few screens, working
-          with ListView and handling text input.
-        </Text>
-        <Text style={styles.instructions}>
-          Modify any files to get started. For example try changing the file
-          views/welcome/WelcomeText.android.js.
-        </Text>
-        <Text style={styles.instructions}>
-          Double tap R on your keyboard to reload,{'\n'}
-          Shake or press menu button for dev menu.
-        </Text>
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: 'white',
-    padding: 20,
-  },
-  welcome: {
-    fontSize: 20,
-    textAlign: 'center',
-    margin: 16,
-  },
-  instructions: {
-    textAlign: 'center',
-    color: '#333333',
-    marginBottom: 12,
-  },
-});
diff --git a/local-cli/templates/HelloNavigation/views/welcome/WelcomeText.ios.js b/local-cli/templates/HelloNavigation/views/welcome/WelcomeText.ios.js
deleted file mode 100644
index 673e6889bbba8c..00000000000000
--- a/local-cli/templates/HelloNavigation/views/welcome/WelcomeText.ios.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/** @format */
-
-import React, {Component} from 'react';
-import {StyleSheet, Text, View} from 'react-native';
-
-export default class WelcomeText extends Component {
-  render() {
-    return (
-      <View style={styles.container}>
-        <Text style={styles.welcome}>Welcome to React Native!</Text>
-        <Text style={styles.instructions}>
-          This app shows the basics of navigating between a few screens, working
-          with ListView and handling text input.
-        </Text>
-        <Text style={styles.instructions}>
-          Modify any files to get started. For example try changing the file{
-            '\n'
-          }views/welcome/WelcomeText.ios.js.
-        </Text>
-        <Text style={styles.instructions}>
-          Press Cmd+R to reload,{'\n'}
-          Cmd+D or shake for dev menu.
-        </Text>
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: 'white',
-    padding: 20,
-  },
-  welcome: {
-    fontSize: 20,
-    textAlign: 'center',
-    margin: 16,
-  },
-  instructions: {
-    textAlign: 'center',
-    color: '#333333',
-    marginBottom: 12,
-  },
-});
diff --git a/local-cli/templates/HelloNavigation/views/welcome/welcome-icon.png b/local-cli/templates/HelloNavigation/views/welcome/welcome-icon.png
deleted file mode 100644
index 16252eb4d38628..00000000000000
Binary files a/local-cli/templates/HelloNavigation/views/welcome/welcome-icon.png and /dev/null differ
diff --git a/local-cli/templates/HelloWorld/_babelrc b/local-cli/templates/HelloWorld/_babelrc
index a9ce1369e617e9..d4b74b5be7b43d 100644
--- a/local-cli/templates/HelloWorld/_babelrc
+++ b/local-cli/templates/HelloWorld/_babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["react-native"]
+  "presets": ["module:metro-react-native-babel-preset"]
 }
diff --git a/local-cli/templates/HelloWorld/_flowconfig b/local-cli/templates/HelloWorld/_flowconfig
index db178bd0c093f8..818888f0e2a024 100644
--- a/local-cli/templates/HelloWorld/_flowconfig
+++ b/local-cli/templates/HelloWorld/_flowconfig
@@ -29,6 +29,9 @@ node_modules/react-native/flow-github/
 [options]
 emoji=true
 
+esproposal.optional_chaining=enable
+esproposal.nullish_coalescing=enable
+
 module.system=haste
 module.system.haste.use_name_reducers=true
 # get basename
@@ -64,4 +67,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.76.0
+^0.83.0
diff --git a/local-cli/templates/HelloWorld/android/app/BUCK b/local-cli/templates/HelloWorld/android/app/_BUCK
similarity index 73%
rename from local-cli/templates/HelloWorld/android/app/BUCK
rename to local-cli/templates/HelloWorld/android/app/_BUCK
index e2f125692c4893..0e779048347e02 100644
--- a/local-cli/templates/HelloWorld/android/app/BUCK
+++ b/local-cli/templates/HelloWorld/android/app/_BUCK
@@ -8,23 +8,13 @@
 # - `buck install -r android/app` - compile, install and run application
 #
 
+load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
+
 lib_deps = []
 
-for jarfile in glob(['libs/*.jar']):
-  name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
-  lib_deps.append(':' + name)
-  prebuilt_jar(
-    name = name,
-    binary_jar = jarfile,
-  )
+create_aar_targets(glob(["libs/*.aar"]))
 
-for aarfile in glob(['libs/*.aar']):
-  name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
-  lib_deps.append(':' + name)
-  android_prebuilt_aar(
-    name = name,
-    aar = aarfile,
-  )
+create_jar_targets(glob(["libs/*.jar"]))
 
 android_library(
     name = "all-libs",
diff --git a/local-cli/templates/HelloWorld/android/app/build.gradle b/local-cli/templates/HelloWorld/android/app/build.gradle
index 31a0da9a576ea7..a123b6cfb34a73 100644
--- a/local-cli/templates/HelloWorld/android/app/build.gradle
+++ b/local-cli/templates/HelloWorld/android/app/build.gradle
@@ -103,16 +103,13 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
     }
     splits {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86"
+            include "armeabi-v7a", "x86", "arm64-v8a"
         }
     }
     buildTypes {
@@ -126,7 +123,7 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a":1, "x86":2]
+            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
@@ -137,9 +134,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    compile "com.facebook.react:react-native:+"  // From node_modules
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+    implementation "com.facebook.react:react-native:+"  // From node_modules
 }
 
 // Run this once to be able to run the application with BUCK
diff --git a/local-cli/templates/HelloWorld/android/app/build_defs.bzl b/local-cli/templates/HelloWorld/android/app/build_defs.bzl
new file mode 100644
index 00000000000000..fff270f8d1d484
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/build_defs.bzl
@@ -0,0 +1,19 @@
+"""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/local-cli/templates/HelloWorld/android/app/src/main/AndroidManifest.xml b/local-cli/templates/HelloWorld/android/app/src/main/AndroidManifest.xml
index 25d166dccedc7b..a6eda6784a2950 100644
--- a/local-cli/templates/HelloWorld/android/app/src/main/AndroidManifest.xml
+++ b/local-cli/templates/HelloWorld/android/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme">
       <activity
diff --git a/local-cli/templates/HelloWorld/android/build.gradle b/local-cli/templates/HelloWorld/android/build.gradle
index 49569e4db5f7e7..f939d78227a997 100644
--- a/local-cli/templates/HelloWorld/android/build.gradle
+++ b/local-cli/templates/HelloWorld/android/build.gradle
@@ -1,15 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext {
+        buildToolsVersion = "27.0.3"
+        minSdkVersion = 16
+        compileSdkVersion = 27
+        targetSdkVersion = 27
+        supportLibVersion = "27.1.1"
+    }
     repositories {
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -24,17 +28,12 @@ allprojects {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        google()
     }
 }
 
-ext {
-    buildToolsVersion = "26.0.3"
-    minSdkVersion = 16
-    compileSdkVersion = 26
-    targetSdkVersion = 26
-    supportLibVersion = "26.1.0"
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '4.4'
+    distributionUrl = distributionUrl.replace("bin", "all")
 }
diff --git a/local-cli/templates/HelloWorld/android/gradle.properties b/local-cli/templates/HelloWorld/android/gradle.properties
index 1fd964e90b1c5e..89e0d99e2173fc 100644
--- a/local-cli/templates/HelloWorld/android/gradle.properties
+++ b/local-cli/templates/HelloWorld/android/gradle.properties
@@ -16,5 +16,3 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
-android.useDeprecatedNdk=true
diff --git a/local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.jar b/local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.jar
index b5166dad4d9002..01b8bf6b1f99ca 100644
Binary files a/local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.jar and b/local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/local-cli/templates/HelloWorld/android/gradlew b/local-cli/templates/HelloWorld/android/gradlew
index 91a7e269e19dfc..cccdd3d517fc52 100755
--- a/local-cli/templates/HelloWorld/android/gradlew
+++ b/local-cli/templates/HelloWorld/android/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,20 +6,38 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/local-cli/templates/HelloWorld/android/gradlew.bat b/local-cli/templates/HelloWorld/android/gradlew.bat
index aec99730b4e8fc..e95643d6a2ca62 100644
--- a/local-cli/templates/HelloWorld/android/gradlew.bat
+++ b/local-cli/templates/HelloWorld/android/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/local-cli/templates/HelloWorld/android/keystores/BUCK b/local-cli/templates/HelloWorld/android/keystores/_BUCK
similarity index 100%
rename from local-cli/templates/HelloWorld/android/keystores/BUCK
rename to local-cli/templates/HelloWorld/android/keystores/_BUCK
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
index 7346f2749ea6ae..975ce5700159f2 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
@@ -13,6 +13,7 @@
 		00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
 		00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
 		00E356F31AD99517003FC87E /* HelloWorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* HelloWorldTests.m */; };
+		11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
 		133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
 		139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
 		139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
@@ -35,9 +36,10 @@
 		2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
 		2DCD954D1E0B4F2C00145EB5 /* HelloWorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* HelloWorldTests.m */; };
 		2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
-		5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
 		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
+		ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; };
+		ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2971642150620600B7C4FE /* JavaScriptCore.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -343,6 +345,8 @@
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
 		ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
+		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
+		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -358,10 +362,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */,
 				ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
-				5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
+				11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */,
 				146834051AC3E58100842450 /* libReact.a in Frameworks */,
-				5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
 				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
 				00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
 				00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
@@ -378,6 +382,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */,
 				2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */,
 				2D02E4C21E0B4AEC006451C7 /* libRCTAnimation.a in Frameworks */,
 				2D02E4C31E0B4AEC006451C7 /* libRCTImage-tvOS.a in Frameworks */,
@@ -519,6 +524,8 @@
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
+				ED2971642150620600B7C4FE /* JavaScriptCore.framework */,
 				2D16E6891FA4F8E400B85C8A /* libReact.a */,
 			);
 			name = Frameworks;
@@ -685,7 +692,7 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
@@ -1179,6 +1186,7 @@
 					"-ObjC",
 					"-lc++",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HelloWorld.app/HelloWorld";
 			};
@@ -1196,6 +1204,7 @@
 					"-ObjC",
 					"-lc++",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HelloWorld.app/HelloWorld";
 			};
@@ -1214,6 +1223,7 @@
 					"-ObjC",
 					"-lc++",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = HelloWorld;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -1231,6 +1241,7 @@
 					"-ObjC",
 					"-lc++",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = HelloWorld;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -1346,20 +1357,32 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -1387,13 +1410,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1401,6 +1434,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme
index f058c975222f79..a4c88796c96134 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme
index 6c71a80d8e44ee..2c4df7880c02ac 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h
index d4f2580b1ea1b8..4b5644f21d2c18 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m
index 23a3b137c46c99..d4d87a689fb567 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -22,7 +22,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
                                                       moduleName:@"HelloWorld"
                                                initialProperties:nil
                                                    launchOptions:launchOptions];
-  rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
+  rootView.backgroundColor = [UIColor blackColor];
 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
   UIViewController *rootViewController = [UIViewController new];
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/Info.plist b/local-cli/templates/HelloWorld/ios/HelloWorld/Info.plist
index 51c65f5421210f..1a61ccf151e341 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld/Info.plist
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -24,6 +24,8 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string></string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/main.m b/local-cli/templates/HelloWorld/ios/HelloWorld/main.m
index c73e006253a31d..c316cf816e736a 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld/main.m
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld/main.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m b/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
index 45fba113383af7..e9db2f118ab97e 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
+++ b/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorldTests/Info.plist b/local-cli/templates/HelloWorld/ios/HelloWorldTests/Info.plist
index 886825ccc9bf0d..ba72822e8728ef 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorldTests/Info.plist
+++ b/local-cli/templates/HelloWorld/ios/HelloWorldTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/local-cli/upgrade/upgrade.js b/local-cli/upgrade/upgrade.js
index f433961ebe59b3..c849ee3c3590eb 100644
--- a/local-cli/upgrade/upgrade.js
+++ b/local-cli/upgrade/upgrade.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -144,7 +144,7 @@ function validateAndUpgrade() {
  * Once all checks passed, upgrade the project files.
  */
 function upgradeProjectFiles(projectDir, projectName) {
-  // Just owerwrite
+  // Just overwrite
   copyProjectTemplateAndReplace(
     path.resolve(
       'node_modules',
diff --git a/local-cli/util/Config.js b/local-cli/util/Config.js
index 2e78e5041eb4fa..f3ae068937bb2b 100644
--- a/local-cli/util/Config.js
+++ b/local-cli/util/Config.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,23 +10,18 @@
 'use strict';
 
 const findSymlinkedModules = require('./findSymlinkedModules');
-const fs = require('fs');
 const getPolyfills = require('../../rn-get-polyfills');
-const invariant = require('fbjs/lib/invariant');
 const path = require('path');
 
-const {Config: MetroConfig, createBlacklist} = require('metro');
-
-const RN_CLI_CONFIG = 'rn-cli.config.js';
-
-import type {ConfigT as MetroConfigT} from 'metro';
+const {createBlacklist} = require('metro');
+const {loadConfig} = require('metro-config');
 
 /**
  * Configuration file of the CLI.
  */
-export type ConfigT = MetroConfigT;
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
-function getProjectPath() {
+function getProjectRoot() {
   if (
     __dirname.match(/node_modules[\/\\]react-native[\/\\]local-cli[\/\\]util$/)
   ) {
@@ -49,12 +44,12 @@ const resolveSymlinksForRoots = roots =>
     [...roots],
   );
 
-const getProjectRoots = () => {
+const getWatchFolders = () => {
   const root = process.env.REACT_NATIVE_APP_ROOT;
   if (root) {
     return resolveSymlinksForRoots([path.resolve(root)]);
   }
-  return resolveSymlinksForRoots([getProjectPath()]);
+  return [];
 };
 
 const getBlacklistRE = () => {
@@ -70,68 +65,34 @@ const getBlacklistRE = () => {
  * hierarchy, an error will be thrown.
  */
 const Config = {
-  DEFAULT: ({
-    ...MetroConfig.DEFAULT,
-    getBlacklistRE,
-    getModulesRunBeforeMainModule: () => [
-      require.resolve('../../Libraries/Core/InitializeCore'),
-    ],
-    getProjectRoots,
-    getPolyfills,
-    getWatchFolders: () => [getProjectPath()],
-    getResolverMainFields: () => ['react-native', 'browser', 'main'],
-    getTransformModulePath: () =>
-      require.resolve('metro/src/reactNativeTransformer'),
-  }: ConfigT),
-
-  find(startDir: string): ConfigT {
-    return this.findWithPath(startDir).config;
-  },
-
-  findWithPath(startDir: string): {config: ConfigT, projectPath: string} {
-    const configPath = findConfigPath(startDir);
-    invariant(
-      configPath,
-      `Can't find "${RN_CLI_CONFIG}" file in any parent folder of "${startDir}"`,
-    );
-    const projectPath = path.dirname(configPath);
-    return {config: this.load(configPath, startDir), projectPath};
-  },
-
-  findOptional(startDir: string): ConfigT {
-    const configPath = findConfigPath(startDir);
-    return configPath ? this.load(configPath, startDir) : {...Config.DEFAULT};
+  DEFAULT: {
+    resolver: {
+      resolverMainFields: ['react-native', 'browser', 'main'],
+      blacklistRE: getBlacklistRE(),
+    },
+    serializer: {
+      getModulesRunBeforeMainModule: () => [
+        require.resolve('../../Libraries/Core/InitializeCore'),
+      ],
+      getPolyfills,
+    },
+    server: {
+      port: process.env.RCT_METRO_PORT || 8081,
+    },
+    transformer: {
+      babelTransformerPath: require.resolve('metro/src/reactNativeTransformer'),
+    },
+    watchFolders: getWatchFolders(),
   },
 
-  getProjectPath,
-  getProjectRoots,
+  async load(configFile: ?string): Promise<ConfigT> {
+    const argv = {cwd: getProjectRoot()};
 
-  load(configFile: string): ConfigT {
-    return MetroConfig.load(configFile, Config.DEFAULT);
+    return await loadConfig(
+      configFile ? {...argv, config: configFile} : argv,
+      this.DEFAULT,
+    );
   },
 };
 
-function findConfigPath(cwd: string): ?string {
-  const parentDir = findParentDirectory(cwd, RN_CLI_CONFIG);
-  return parentDir ? path.join(parentDir, RN_CLI_CONFIG) : null;
-}
-
-// Finds the most near ancestor starting at `currentFullPath` that has
-// a file named `filename`
-function findParentDirectory(currentFullPath, filename) {
-  const root = path.parse(currentFullPath).root;
-  const testDir = parts => {
-    if (parts.length === 0) {
-      return null;
-    }
-
-    const fullPath = path.join(root, parts.join(path.sep));
-
-    var exists = fs.existsSync(path.join(fullPath, filename));
-    return exists ? fullPath : testDir(parts.slice(0, -1));
-  };
-
-  return testDir(currentFullPath.substring(root.length).split(path.sep));
-}
-
 module.exports = Config;
diff --git a/local-cli/util/PackageManager.js b/local-cli/util/PackageManager.js
index 5493ebf56a3454..fe0783ec758808 100644
--- a/local-cli/util/PackageManager.js
+++ b/local-cli/util/PackageManager.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/__mocks__/log.js b/local-cli/util/__mocks__/log.js
index 19247b9490102e..330cae48f76237 100644
--- a/local-cli/util/__mocks__/log.js
+++ b/local-cli/util/__mocks__/log.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/__tests__/findSymlinkedModules-test.js b/local-cli/util/__tests__/findSymlinkedModules-test.js
index 25c1b52d27ad99..fbdfd7463fc028 100644
--- a/local-cli/util/__tests__/findSymlinkedModules-test.js
+++ b/local-cli/util/__tests__/findSymlinkedModules-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,6 +8,7 @@
  * @emails oncall+javascript_foundation
  */
 
+jest.mock('path');
 jest.mock('fs');
 
 const fs = require('fs');
diff --git a/local-cli/util/assertRequiredOptions.js b/local-cli/util/assertRequiredOptions.js
index 4974d072876d45..379ad1fc165b69 100644
--- a/local-cli/util/assertRequiredOptions.js
+++ b/local-cli/util/assertRequiredOptions.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/copyAndReplace.js b/local-cli/util/copyAndReplace.js
index 9d42fad51f6ce2..d0d4eb15a4a7fe 100644
--- a/local-cli/util/copyAndReplace.js
+++ b/local-cli/util/copyAndReplace.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/findReactNativeScripts.js b/local-cli/util/findReactNativeScripts.js
index 26e8b7decfed71..5d43e29482d213 100644
--- a/local-cli/util/findReactNativeScripts.js
+++ b/local-cli/util/findReactNativeScripts.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/findSymlinkedModules.js b/local-cli/util/findSymlinkedModules.js
index fd6eecdba53ed6..d7e5d30f447353 100644
--- a/local-cli/util/findSymlinkedModules.js
+++ b/local-cli/util/findSymlinkedModules.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/findSymlinksPaths.js b/local-cli/util/findSymlinksPaths.js
index 8fc275fe5a7f26..5efa20e886b410 100644
--- a/local-cli/util/findSymlinksPaths.js
+++ b/local-cli/util/findSymlinksPaths.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/isPackagerRunning.js b/local-cli/util/isPackagerRunning.js
index faae20676eea97..f8c33e584c5fae 100644
--- a/local-cli/util/isPackagerRunning.js
+++ b/local-cli/util/isPackagerRunning.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/isValidPackageName.js b/local-cli/util/isValidPackageName.js
index c0f5d1c93bcef3..45a02319cea5c2 100644
--- a/local-cli/util/isValidPackageName.js
+++ b/local-cli/util/isValidPackageName.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/log.js b/local-cli/util/log.js
index 345d68905533ca..e74d74f18a0973 100644
--- a/local-cli/util/log.js
+++ b/local-cli/util/log.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/parseCommandLine.js b/local-cli/util/parseCommandLine.js
index f26c4acf73bea0..e0d58308a12a4a 100644
--- a/local-cli/util/parseCommandLine.js
+++ b/local-cli/util/parseCommandLine.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/walk.js b/local-cli/util/walk.js
index 3f97405812a7c2..b7658dbb874211 100644
--- a/local-cli/util/walk.js
+++ b/local-cli/util/walk.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/util/yarn.js b/local-cli/util/yarn.js
index ed3a74a498dec7..b5f73bee629017 100644
--- a/local-cli/util/yarn.js
+++ b/local-cli/util/yarn.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/local-cli/wrong-react-native.js b/local-cli/wrong-react-native.js
index 3b949818a05c43..9f7790784fa61b 100755
--- a/local-cli/wrong-react-native.js
+++ b/local-cli/wrong-react-native.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/package.json b/package.json
index 61fcd31221a365..b2f1e9f6fb55bd 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "url": "git@github.com:facebook/react-native.git"
   },
   "engines": {
-    "node": ">=8"
+    "node": ">=8.3"
   },
   "prettier": {
     "requirePragma": true,
@@ -33,7 +33,8 @@
     "testPathIgnorePatterns": [
       "Libraries/Renderer",
       "/node_modules/",
-      "local-cli/templates/"
+      "local-cli/templates/",
+      "RNTester/e2e"
     ],
     "haste": {
       "defaultPlatform": "ios",
@@ -67,7 +68,6 @@
       "node_modules/fbjs/lib/flattenArray.js",
       "node_modules/fbjs/lib/forEachObject.js",
       "node_modules/fbjs/lib/isEmpty.js",
-      "node_modules/fbjs/lib/nullthrows.js",
       "node_modules/fbjs/lib/removeFromArray.js",
       "node_modules/fbjs/lib/resolveImmediate.js",
       "node_modules/fbjs/lib/someObject.js",
@@ -85,8 +85,7 @@
       "source-map",
       "fastpath",
       "denodeify",
-      "fbjs",
-      "sinon"
+      "fbjs"
     ],
     "testEnvironment": "node"
   },
@@ -122,12 +121,14 @@
     "third-party-podspecs"
   ],
   "scripts": {
+    "start": "node ./local-cli/cli.js start",
     "test": "jest",
     "test-ci": "JEST_JUNIT_OUTPUT=\"reports/junit/js-test-results.xml\" jest --maxWorkers=2 --ci --testResultsProcessor=\"jest-junit\"",
     "flow": "flow",
+    "flow-check-ios": "flow check",
+    "flow-check-android": "flow check --flowconfig-name .flowconfig.android",
     "lint": "eslint .",
     "prettier": "prettier \"./**/*.js\" --write",
-    "start": "/usr/bin/env bash -c './scripts/packager.sh \"$@\" || true' --",
     "docker-setup-android": "docker pull reactnativeci/android-base:latest",
     "docker-build-android-base": "docker build -t reactnativeci/android-base -f ContainerShip/Dockerfile.android-base .",
     "docker-build-android": "docker build -t reactnativeci/android -f ContainerShip/Dockerfile.android .",
@@ -137,15 +138,18 @@
     "test-android-all": "yarn run docker-build-android && yarn run test-android-run-unit && yarn run test-android-run-instrumentation && yarn run test-android-run-e2e",
     "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-android-e2e": "yarn run docker-build-android && yarn run test-android-run-e2e",
+    "build-ios-e2e": "detox build -c ios.sim.release",
+    "test-ios-e2e": "detox test -c ios.sim.release --cleanup"
   },
   "bin": {
     "react-native": "local-cli/wrong-react-native.js"
   },
   "peerDependencies": {
-    "react": "16.4.1"
+    "react": "16.6.0-alpha.8af6728"
   },
   "dependencies": {
+    "@babel/runtime": "^7.0.0",
     "absolute-path": "^0.0.0",
     "art": "^0.10.0",
     "base64-js": "^1.1.2",
@@ -160,32 +164,33 @@
     "errorhandler": "^1.5.0",
     "escape-string-regexp": "^1.0.5",
     "event-target-shim": "^1.0.5",
-    "fbjs": "0.8.17",
+    "fbjs": "^1.0.0",
     "fbjs-scripts": "^0.8.1",
     "fs-extra": "^1.0.0",
     "glob": "^7.1.1",
     "graceful-fs": "^4.1.3",
     "inquirer": "^3.0.6",
     "lodash": "^4.17.5",
-    "metro": "^0.42.1",
-    "metro-babel-register": "^0.42.1",
-    "metro-core": "^0.42.1",
-    "metro-memory-fs": "^0.42.1",
+    "metro": "^0.48.1",
+    "metro-babel-register": "^0.48.1",
+    "metro-core": "^0.48.1",
+    "metro-memory-fs": "^0.48.1",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "morgan": "^1.9.0",
-    "node-fetch": "^1.3.3",
+    "node-fetch": "^2.2.0",
     "node-notifier": "^5.2.1",
     "npmlog": "^2.0.4",
+    "nullthrows": "^1.1.0",
     "opn": "^3.0.2",
     "optimist": "^0.6.1",
     "plist": "^3.0.0",
-    "pretty-format": "^4.2.1",
+    "pretty-format": "^23.4.1",
     "promise": "^7.1.1",
     "prop-types": "^15.5.8",
     "react-clone-referenced-element": "^1.0.1",
-    "react-devtools-core": "^3.2.2",
+    "react-devtools-core": "^3.4.0",
     "react-timer-mixin": "^0.13.2",
     "regenerator-runtime": "^0.11.0",
     "rimraf": "^2.5.4",
@@ -194,15 +199,16 @@
     "shell-quote": "1.6.1",
     "stacktrace-parser": "^0.1.3",
     "ws": "^1.1.0",
-    "xcode": "^0.9.1",
+    "xcode": "^1.0.0",
     "xmldoc": "^0.4.0",
     "yargs": "^9.0.0"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0-beta.48",
+    "@babel/core": "^7.0.0",
     "async": "^2.4.0",
-    "babel-eslint": "9.0.0-beta.2",
+    "babel-eslint": "9.0.0",
     "babel-generator": "^6.26.0",
+    "detox": "9.0.4",
     "eslint": "5.1.0",
     "eslint-config-fb-strict": "22.1.0",
     "eslint-config-fbjs": "2.0.1",
@@ -212,13 +218,26 @@
     "eslint-plugin-prettier": "2.6.0",
     "eslint-plugin-react": "7.8.2",
     "eslint-plugin-react-native": "^3.2.1",
-    "flow-bin": "^0.76.0",
-    "jest": "23.4.0",
+    "flow-bin": "^0.83.0",
+    "jest": "23.4.1",
     "jest-junit": "5.1.0",
     "prettier": "1.13.6",
-    "react": "16.4.1",
-    "react-test-renderer": "16.4.1",
-    "shelljs": "^0.7.8",
-    "sinon": "^2.2.0"
+    "react": "16.6.0-alpha.8af6728",
+    "react-native-dummy": "0.1.0",
+    "react-test-renderer": "16.6.0-alpha.8af6728",
+    "shelljs": "^0.7.8"
+  },
+  "detox": {
+    "test-runner": "jest",
+    "runner-config": "RNTester/e2e/config.json",
+    "specs": "RNTester/e2e",
+    "configurations": {
+      "ios.sim.release": {
+        "binaryPath": "RNTester/build/Build/Products/Release-iphonesimulator/RNTester.app/",
+        "build": "xcodebuild -project RNTester/RNTester.xcodeproj -scheme RNTester -configuration Release -sdk iphonesimulator -derivedDataPath RNTester/build -quiet",
+        "type": "ios.simulator",
+        "name": "iPhone 8"
+      }
+    }
   }
 }
diff --git a/react-native-cli/README.md b/react-native-cli/README.md
index 6634e124f9454a..bfb02a683c52ca 100644
--- a/react-native-cli/README.md
+++ b/react-native-cli/README.md
@@ -35,6 +35,10 @@ Running it for the first time creates a default config file. Open `~/.config/sin
         allow_access: $all
         allow_publish: $all
 
+      '**':
+        allow_access: $all
+        proxy: npmjs
+
       '*':
         allow_access: $all
         proxy: npmjs
diff --git a/react-native-cli/index.js b/react-native-cli/index.js
index fa83050700cedd..a3f4fcbf01b416 100755
--- a/react-native-cli/index.js
+++ b/react-native-cli/index.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/react-native-git-upgrade/checks.js b/react-native-git-upgrade/checks.js
index 88be3ac07853d6..615648b98418d7 100644
--- a/react-native-git-upgrade/checks.js
+++ b/react-native-git-upgrade/checks.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/react-native-git-upgrade/cli.js b/react-native-git-upgrade/cli.js
index 19103c9fefb9df..5f9766782e8024 100644
--- a/react-native-git-upgrade/cli.js
+++ b/react-native-git-upgrade/cli.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,7 @@
 'use strict';
 
 require('babel-register')({
+  babelrc: false,
   presets: [
     require('babel-preset-es2015-node'),
     require('babel-preset-stage-3'),
diff --git a/react-native-git-upgrade/cliEntry.js b/react-native-git-upgrade/cliEntry.js
index bb3afc61e6f65d..9a2807293eccef 100644
--- a/react-native-git-upgrade/cliEntry.js
+++ b/react-native-git-upgrade/cliEntry.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/react-native-git-upgrade/index.js b/react-native-git-upgrade/index.js
index c5e927312507cb..235a3b4ddca826 100644
--- a/react-native-git-upgrade/index.js
+++ b/react-native-git-upgrade/index.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/react-native-git-upgrade/yarn.js b/react-native-git-upgrade/yarn.js
index b215cfa4a4ac39..1fea500cefb203 100644
--- a/react-native-git-upgrade/yarn.js
+++ b/react-native-git-upgrade/yarn.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/react.gradle b/react.gradle
index f048c07d4e3e82..bcc24b0c24cd18 100644
--- a/react.gradle
+++ b/react.gradle
@@ -1,3 +1,8 @@
+// Copyright (c) Facebook, Inc. and its affiliates.
+
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+
 import org.apache.tools.ant.taskdefs.condition.Os
 
 def config = project.hasProperty("react") ? project.react : [];
@@ -6,131 +11,138 @@ def cliPath = config.cliPath ?: "node_modules/react-native/local-cli/cli.js"
 def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
 def entryFile = config.entryFile ?: "index.android.js"
 def bundleCommand = config.bundleCommand ?: "bundle"
-
-// because elvis operator
-def elvisFile(thing) {
-    return thing ? file(thing) : null;
-}
-
-def reactRoot = elvisFile(config.root) ?: file("../../")
+def reactRoot = file(config.root ?: "../../")
 def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"]
 def bundleConfig = config.bundleConfig ? "${reactRoot}/${config.bundleConfig}" : null ;
 
-void runBefore(String dependentTaskName, Task task) {
-    Task dependentTask = tasks.findByPath(dependentTaskName);
-    if (dependentTask != null) {
-        dependentTask.dependsOn task
-    }
-}
 
 afterEvaluate {
-    def isAndroidLibrary = plugins.hasPlugin("com.android.library")
-    // Grab all build types and product flavors
-    def buildTypes = android.buildTypes.collect { type -> type.name }
-    def productFlavors = android.productFlavors.collect { flavor -> flavor.name }
-
-    // When no product flavors defined, use empty
-    if (!productFlavors) productFlavors.add('')
-
-    productFlavors.each { productFlavorName ->
-        buildTypes.each { buildTypeName ->
-            // Create variant and target names
-            def flavorNameCapitalized = "${productFlavorName.capitalize()}"
-            def buildNameCapitalized = "${buildTypeName.capitalize()}"
-            def targetName = "${flavorNameCapitalized}${buildNameCapitalized}"
-            def targetPath = productFlavorName ?
-                    "${productFlavorName}/${buildTypeName}" :
-                    "${buildTypeName}"
-
-            // React js bundle directories
-            def jsBundleDirConfigName = "jsBundleDir${targetName}"
-            def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
-                    file("$buildDir/intermediates/assets/${targetPath}")
-
-            def resourcesDirConfigName = "resourcesDir${targetName}"
-            def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
-                    file("$buildDir/intermediates/res/merged/${targetPath}")
-            def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
-
-            // Bundle task name for variant
-            def bundleJsAndAssetsTaskName = "bundle${targetName}JsAndAssets"
-
-            // Additional node and packager commandline arguments
-            def nodeExecutableAndArgs = config.nodeExecutableAndArgs ?: ["node"]
-            def extraPackagerArgs = config.extraPackagerArgs ?: []
-
-            def currentBundleTask = tasks.create(
-                    name: bundleJsAndAssetsTaskName,
-                    type: Exec) {
-                group = "react"
-                description = "bundle JS and assets for ${targetName}."
+    android.applicationVariants.all { def variant ->
+        // Create variant and target names
+        def targetName = variant.name.capitalize()
+        def targetPath = variant.dirName
+
+        // React js bundle directories
+        def jsBundleDir = file("$buildDir/generated/assets/react/${targetPath}")
+        def resourcesDir = file("$buildDir/generated/res/react/${targetPath}")
+
+        def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
+
+        // Additional node and packager commandline arguments
+        def nodeExecutableAndArgs = config.nodeExecutableAndArgs ?: ["node"]
+        def extraPackagerArgs = config.extraPackagerArgs ?: []
+
+        def currentBundleTask = tasks.create(
+            name: "bundle${targetName}JsAndAssets",
+            type: Exec) {
+            group = "react"
+            description = "bundle JS and assets for ${targetName}."
+
+            // Create dirs if they are not there (e.g. the "clean" task just ran)
+            doFirst {
+                jsBundleDir.deleteDir()
+                jsBundleDir.mkdirs()
+                resourcesDir.deleteDir()
+                resourcesDir.mkdirs()
+            }
 
-                // Create dirs if they are not there (e.g. the "clean" task just ran)
-                doFirst {
-                    jsBundleDir.mkdirs()
-                    resourcesDir.mkdirs()
-                }
+            // Set up inputs and outputs so gradle can cache the result
+            inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
+            outputs.dir jsBundleDir
+            outputs.dir resourcesDir
 
-                // Set up inputs and outputs so gradle can cache the result
-                inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
-                outputs.dir jsBundleDir
-                outputs.dir resourcesDir
+            // Set up the call to the react-native cli
+            workingDir reactRoot
 
-                // Set up the call to the react-native cli
-                workingDir reactRoot
+            // Set up dev mode
+            def devEnabled = !(config."devDisabledIn${targetName}"
+                || targetName.toLowerCase().contains("release"))
 
-                // Set up dev mode
-                def devEnabled = !(config."devDisabledIn${targetName}"
-                    || targetName.toLowerCase().contains("release"))
+            def extraArgs = extraPackagerArgs;
 
-                def extraArgs = extraPackagerArgs;
+            if (bundleConfig) {
+                extraArgs = extraArgs.clone()
+                extraArgs.add("--config");
+                extraArgs.add(bundleConfig);
+            }
 
-                if (bundleConfig) {
-                  extraArgs = extraArgs.clone()
-                  extraArgs.add("--config");
-                  extraArgs.add(bundleConfig);
-                }
+            if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                commandLine("cmd", "/c", *nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
+                    "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
+            } else {
+                commandLine(*nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
+                    "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
+            }
 
-                if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                    commandLine("cmd", "/c", *nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
-                            "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
-                } else {
-                    commandLine(*nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
-                            "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
+            enabled config."bundleIn${targetName}" ||
+                config."bundleIn${variant.buildType.name.capitalize()}" ?:
+                targetName.toLowerCase().contains("release")
+        }
+
+        // Expose a minimal interface on the application variant and the task itself:
+        variant.ext.bundleJsAndAssets = currentBundleTask
+        currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
+        currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
+
+        // registerGeneratedResFolders for Android plugin 3.x
+        if (variant.respondsTo("registerGeneratedResFolders")) {
+            variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)
+        } else {
+            variant.registerResGeneratingTask(currentBundleTask)
+        }
+        variant.mergeResources.dependsOn(currentBundleTask)
+
+        // packageApplication for Android plugin 3.x
+        def packageTask = variant.hasProperty("packageApplication")
+            ? variant.packageApplication
+            : tasks.findByName("package${targetName}")
+
+        def resourcesDirConfigValue = config."resourcesDir${targetName}"
+        if (resourcesDirConfigValue) {
+            def currentCopyResTask = tasks.create(
+                name: "copy${targetName}BundledResources",
+                type: Copy) {
+                group = "react"
+                description = "copy bundled resources into custom location for ${targetName}."
+
+                from resourcesDir
+                into file(resourcesDirConfigValue)
+
+                dependsOn(currentBundleTask)
+
+                enabled currentBundleTask.enabled
+            }
+
+            packageTask.dependsOn(currentCopyResTask)
+        }
+
+        def currentAssetsCopyTask = tasks.create(
+            name: "copy${targetName}BundledJs",
+            type: Copy) {
+            group = "react"
+            description = "copy bundled JS into ${targetName}."
+
+            if (config."jsBundleDir${targetName}") {
+                from jsBundleDir
+                into file(config."jsBundleDir${targetName}")
+            } else {
+                into ("$buildDir/intermediates")
+                into ("assets/${targetPath}") {
+                    from jsBundleDir
                 }
 
-                enabled config."bundleIn${targetName}" ||
-                    config."bundleIn${buildTypeName.capitalize()}" ?:
-                            targetName.toLowerCase().contains("release")
-
-                if (isAndroidLibrary) {
-                    doLast {
-                        def moveFunc = { resSuffix ->
-                            File originalDir = file("${resourcesDir}/drawable-${resSuffix}")
-                            if (originalDir.exists()) {
-                                File destDir = file("${resourcesDir}/drawable-${resSuffix}-v4")
-                                ant.move(file: originalDir, tofile: destDir)
-                            }
-                        }
-                        moveFunc.curry("ldpi").call()
-                        moveFunc.curry("mdpi").call()
-                        moveFunc.curry("hdpi").call()
-                        moveFunc.curry("xhdpi").call()
-                        moveFunc.curry("xxhdpi").call()
-                        moveFunc.curry("xxxhdpi").call()
-                    }
+                // Workaround for Android Gradle Plugin 3.2+ new asset directory
+                into ("merged_assets/${targetPath}/merge${targetName}Assets/out") {
+                    from jsBundleDir
                 }
             }
 
-            // Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process
-            currentBundleTask.dependsOn("merge${targetName}Resources")
-            currentBundleTask.dependsOn("merge${targetName}Assets")
+            // mergeAssets must run first, as it clears the intermediates directory
+            dependsOn(variant.mergeAssets)
 
-            runBefore("process${flavorNameCapitalized}Armeabi-v7a${buildNameCapitalized}Resources", currentBundleTask)
-            runBefore("process${flavorNameCapitalized}X86${buildNameCapitalized}Resources", currentBundleTask)
-            runBefore("processUniversal${targetName}Resources", currentBundleTask)
-            runBefore("process${targetName}Resources", currentBundleTask)
-            runBefore("dataBindingProcessLayouts${targetName}", currentBundleTask)
+            enabled currentBundleTask.enabled
         }
+
+        packageTask.dependsOn(currentAssetsCopyTask)
     }
 }
diff --git a/rn-cli.config.js b/rn-cli.config.js
index 694fd8d6399ee6..92b626ca6ca9fe 100644
--- a/rn-cli.config.js
+++ b/rn-cli.config.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/rn-get-polyfills.js b/rn-get-polyfills.js
index db65ff2245b704..121fa00ab66543 100644
--- a/rn-get-polyfills.js
+++ b/rn-get-polyfills.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -18,5 +18,4 @@ module.exports = () => [
   require.resolve('./Libraries/polyfills/Array.prototype.es6.js'),
   require.resolve('./Libraries/polyfills/Array.es6.js'),
   require.resolve('./Libraries/polyfills/Object.es7.js'),
-  require.resolve('./Libraries/polyfills/babelHelpers.js'),
 ];
diff --git a/runXcodeTests.sh b/runXcodeTests.sh
index b1b6e7f4fba322..05cd982769541a 100755
--- a/runXcodeTests.sh
+++ b/runXcodeTests.sh
@@ -1,7 +1,12 @@
-#!/bin/sh
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # This script should be run from the react-native root
 
-THIS_DIR=$(dirname "$0")
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 source "scripts/.tests.env"
 
 if [ -n "$1" ]
diff --git a/scripts/.tests.env b/scripts/.tests.env
index e9d918ec476ec1..062c6ceabb6577 100644
--- a/scripts/.tests.env
+++ b/scripts/.tests.env
@@ -4,9 +4,9 @@
 
 ## ANDROID ##
 # Android SDK Build Tools revision
-export ANDROID_SDK_BUILD_TOOLS_REVISION=26.0.3
+export ANDROID_SDK_BUILD_TOOLS_REVISION=27.0.3
 # Android API Level we build with
-export ANDROID_SDK_BUILD_API_LEVEL="26"
+export ANDROID_SDK_BUILD_API_LEVEL="27"
 # Google APIs for Android level
 export ANDROID_GOOGLE_API_LEVEL="23"
 # Minimum Android API Level we target
@@ -31,4 +31,3 @@ if [ $CI ]; then
   # Use ARM on Circle CI
   export AVD_ABI=armeabi-v7a
 fi
-
diff --git a/scripts/android-e2e-test.js b/scripts/android-e2e-test.js
index f23371b106c214..0de168b63b6536 100644
--- a/scripts/android-e2e-test.js
+++ b/scripts/android-e2e-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh
index 6492173f3f8de1..c76f520b931854 100644
--- a/scripts/android-setup.sh
+++ b/scripts/android-setup.sh
@@ -1,5 +1,12 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # inspired by https://github.com/Originate/guide/blob/master/android/guide/Continuous%20Integration.md
 
+# shellcheck disable=SC1091
 source "scripts/.tests.env"
 
 function getAndroidPackages {
@@ -8,7 +15,7 @@ function getAndroidPackages {
   DEPS="$ANDROID_HOME/installed-dependencies"
 
   # Package names can be obtained using `sdkmanager --list`
-  if [ ! -e $DEPS ] || [ ! $CI ]; then
+  if [ ! -e "$DEPS" ] || [ ! "$CI" ]; then
     echo "Installing Android API level $ANDROID_SDK_TARGET_API_LEVEL, Google APIs, $AVD_ABI system image..."
     sdkmanager "system-images;android-$ANDROID_SDK_TARGET_API_LEVEL;google_apis;$AVD_ABI"
     echo "Installing build SDK for Android API level $ANDROID_SDK_BUILD_API_LEVEL..."
@@ -22,7 +29,7 @@ function getAndroidPackages {
     sdkmanager "add-ons;addon-google_apis-google-$ANDROID_GOOGLE_API_LEVEL"
     echo "Installing Android Support Repository"
     sdkmanager "extras;android;m2repository"
-    $CI && touch $DEPS
+    $CI && touch "$DEPS"
   fi
 }
 
@@ -31,9 +38,9 @@ function getAndroidNDK {
   DEPS="$NDK_HOME/installed-dependencies"
 
   if [ ! -e $DEPS ]; then
-    cd $NDK_HOME
+    cd $NDK_HOME || exit
     echo "Downloading NDK..."
-    curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip
+    curl -o ndk.zip https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip
     unzip -o -q ndk.zip
     echo "Installed Android NDK at $NDK_HOME"
     touch $DEPS
@@ -44,25 +51,23 @@ function getAndroidNDK {
 function createAVD {
   AVD_PACKAGES="system-images;android-$ANDROID_SDK_TARGET_API_LEVEL;google_apis;$AVD_ABI"
   echo "Creating AVD with packages $AVD_PACKAGES"
-  echo no | avdmanager create avd --name $AVD_NAME --force --package $AVD_PACKAGES --tag google_apis --abi $AVD_ABI
+  echo no | avdmanager create avd --name "$AVD_NAME" --force --package "$AVD_PACKAGES" --tag google_apis --abi "$AVD_ABI"
 }
 
 function launchAVD {
-  export PATH="$ANDROID_HOME/emulator:$PATH"
-
   # The AVD name here should match the one created in createAVD
-  if [ $CI ]
+  if [ "$CI" ]
   then
-    emulator -avd $AVD_NAME -no-audio -no-window
+    "$ANDROID_HOME/emulator/emulator" -avd "$AVD_NAME" -no-audio -no-window
   else
-    emulator -avd $AVD_NAME
+    "$ANDROID_HOME/emulator/emulator" -avd "$AVD_NAME"
   fi
 }
 
 function waitForAVD {
   echo "Waiting for Android Virtual Device to finish booting..."
   local bootanim=""
-  export PATH=$(dirname $(dirname $(which android)))/platform-tools:$PATH
+  export PATH=$(dirname $(dirname $(command -v android)))/platform-tools:$PATH
   until [[ "$bootanim" =~ "stopped" ]]; do
     sleep 5
     bootanim=$(adb -e shell getprop init.svc.bootanim 2>&1)
diff --git a/scripts/bump-oss-version.js b/scripts/bump-oss-version.js
index 6af9eb22706e94..9518de37388df1 100755
--- a/scripts/bump-oss-version.js
+++ b/scripts/bump-oss-version.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/scripts/circleci/analyze_code.sh b/scripts/circleci/analyze_code.sh
index 9569a4fa8e73ff..ef55d484e91a46 100755
--- a/scripts/circleci/analyze_code.sh
+++ b/scripts/circleci/analyze_code.sh
@@ -1,12 +1,15 @@
 #!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
-cat <(echo eslint; yarn --silent lint --format=json; echo flow; yarn --silent flow check --json) | GITHUB_TOKEN=$GITHUB_TOKEN CI_USER=$CI_USER CI_REPO=$CI_REPO PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER node bots/code-analysis-bot.js
+cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; npm run flow --silent -- check --json) | node scripts/circleci/code-analysis-bot.js
 
 # check status
 STATUS=$?
 if [ $STATUS == 0 ]; then
-  echo "Code analyzed successfully"
+  echo "Code analyzed successfully."
 else
-  echo "Code analyzis failed, error status $STATUS"
+  echo "Code analysis failed, error status $STATUS."
 fi
-
diff --git a/scripts/circleci/analyze_scripts.sh b/scripts/circleci/analyze_scripts.sh
new file mode 100755
index 00000000000000..052688cab9bafa
--- /dev/null
+++ b/scripts/circleci/analyze_scripts.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+IFS=$'\n'
+
+results=( "$(find . -type f -not -path "*node_modules*" -not -path "*third-party*" -name '*.sh' -exec sh -c  'shellcheck "$1" -f json' -- {} \;)" )
+
+cat <(echo shellcheck; printf '%s\n' "${results[@]}" | jq .,[] | jq -s . | jq --compact-output --raw-output '[ (.[] | .[] | . ) ]') | node scripts/circleci/code-analysis-bot.js
+
+# check status
+STATUS=$?
+if [ $STATUS == 0 ]; then
+  echo "Shell scripts analyzed successfully."
+else
+  echo "Shell script analysis failed, error status $STATUS."
+fi
diff --git a/scripts/circleci/apt-get-android-deps.sh b/scripts/circleci/apt-get-android-deps.sh
index 8305f6244cccb7..b90e8818b28918 100755
--- a/scripts/circleci/apt-get-android-deps.sh
+++ b/scripts/circleci/apt-get-android-deps.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 set -e
 
@@ -13,7 +17,7 @@ fi
 if ! [[ -d ~/vendor/apt/archives ]]; then
   # It doesn't so download the packages
   echo "Downloading build dependencies..."
-  sudo apt-get install --download-only ant autoconf automake g++ gcc libqt5widgets5 lib32z1 lib32stdc++6 make maven python-dev python3-dev qml-module-qtquick-controls qtdeclarative5-dev file -y
+  sudo apt-get install --download-only ant autoconf automake g++ gcc libqt5widgets5 lib32z1 lib32stdc++6 make maven python-dev python3-dev qml-module-qtquick-controls qtdeclarative5-dev libpulse0 file -y
   # Then move them to our cache directory
   sudo cp -R /var/cache/apt ~/vendor/
   # Making sure our user has ownership, in order to cache
diff --git a/scripts/circleci/buck_fetch.sh b/scripts/circleci/buck_fetch.sh
new file mode 100755
index 00000000000000..5c4ca33a45bd1f
--- /dev/null
+++ b/scripts/circleci/buck_fetch.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+set -ex
+
+buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
+buck fetch ReactAndroid/src/main/java/com/facebook/react
+buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
+buck fetch ReactAndroid/src/test/...
+buck fetch ReactAndroid/src/androidTest/...
diff --git a/scripts/circleci/check_cache.sh b/scripts/circleci/check_cache.sh
index 5cd3b68251eef1..a0378b4005c915 100755
--- a/scripts/circleci/check_cache.sh
+++ b/scripts/circleci/check_cache.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 set -e
 
diff --git a/scripts/circleci/check_license.sh b/scripts/circleci/check_license.sh
index 68b41d6ac441b6..cd2def252d831f 100755
--- a/scripts/circleci/check_license.sh
+++ b/scripts/circleci/check_license.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 set -e
 
diff --git a/scripts/circleci/code-analysis-bot.js b/scripts/circleci/code-analysis-bot.js
new file mode 100644
index 00000000000000..86f21ab69f5233
--- /dev/null
+++ b/scripts/circleci/code-analysis-bot.js
@@ -0,0 +1,324 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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';
+
+if (!process.env.GITHUB_OWNER) {
+  console.error('Missing GITHUB_OWNER. Example: facebook');
+  process.exit(1);
+}
+if (!process.env.GITHUB_REPO) {
+  console.error('Missing GITHUB_REPO. Example: react-native');
+  process.exit(1);
+}
+
+// https://octokit.github.io/rest.js/
+const octokit = require('@octokit/rest')();
+
+const path = require('path');
+
+function push(arr, key, value) {
+  if (!arr[key]) {
+    arr[key] = [];
+  }
+  arr[key].push(value);
+}
+
+/**
+ * There is unfortunately no standard format to report an error, so we have
+ * to write a specific converter for each tool we want to support.
+ *
+ * Those functions take a json object as input and fill the output with the
+ * following format:
+ *
+ * { [ path: string ]: Array< { message: string, line: number }> }
+ *
+ * This is an object where the keys are the path of the files and values
+ * is an array of objects of the shape message and line.
+ */
+const converters = {
+  raw: function(output, input) {
+    for (let key in input) {
+      input[key].forEach(function(message) {
+        push(output, key, message);
+      });
+    }
+  },
+
+  flow: function(output, input) {
+    if (!input || !input.errors) {
+      return;
+    }
+
+    input.errors.forEach(function(error) {
+      push(output, error.message[0].path, {
+        message: error.message.map(message => message.descr).join(' '),
+        line: error.message[0].line,
+        converter: 'flow',
+      });
+    });
+  },
+
+  eslint: function(output, input) {
+    if (!input) {
+      return;
+    }
+
+    input.forEach(function(file) {
+      file.messages.forEach(function(message) {
+        push(output, file.filePath, {
+          message: message.ruleId + ': ' + message.message,
+          line: message.line,
+          converter: 'eslint',
+        });
+      });
+    });
+  },
+
+  shellcheck: function(output, input) {
+    if (!input) {
+      return;
+    }
+
+    input.forEach(function(report) {
+      push(output, report.file, {
+        message:
+          '**[SC' +
+          report.code +
+          '](https://github.com/koalaman/shellcheck/wiki/SC' +
+          report.code +
+          '):** (' +
+          report.level +
+          ') ' +
+          report.message,
+        line: report.line,
+        endLine: report.endLine,
+        column: report.column,
+        endColumn: report.endColumn,
+        converter: 'shellcheck',
+      });
+    });
+  },
+};
+
+function getShaFromPullRequest(owner, repo, number, callback) {
+  octokit.pullRequests.get({owner, repo, number}, (error, res) => {
+    if (error) {
+      console.error(error);
+      return;
+    }
+
+    callback(res.data.head.sha);
+  });
+}
+
+function getFilesFromCommit(owner, repo, sha, callback) {
+  octokit.repos.getCommit({owner, repo, sha}, (error, res) => {
+    if (error) {
+      console.error(error);
+      return;
+    }
+    // A merge commit should not have any new changes to report
+    if (res.parents && res.parents.length > 1) {
+      return;
+    }
+
+    callback(res.data.files);
+  });
+}
+
+/**
+ * Sadly we can't just give the line number to github, we have to give the
+ * line number relative to the patch file which is super annoying. This
+ * little function builds a map of line number in the file to line number
+ * in the patch file
+ */
+function getLineMapFromPatch(patchString) {
+  let diffLineIndex = 0;
+  let fileLineIndex = 0;
+  let lineMap = {};
+
+  patchString.split('\n').forEach(line => {
+    if (line.match(/^@@/)) {
+      fileLineIndex = line.match(/\+([0-9]+)/)[1] - 1;
+      return;
+    }
+
+    diffLineIndex++;
+    if (line[0] !== '-') {
+      fileLineIndex++;
+      if (line[0] === '+') {
+        lineMap[fileLineIndex] = diffLineIndex;
+      }
+    }
+  });
+
+  return lineMap;
+}
+
+function sendReview(owner, repo, number, commit_id, body, comments) {
+  if (process.env.GITHUB_TOKEN) {
+    if (comments.length === 0) {
+      // Do not leave an empty review.
+      return;
+    }
+
+    const event = 'REQUEST_CHANGES';
+
+    const opts = {
+      owner,
+      repo,
+      number,
+      commit_id,
+      body,
+      event,
+      comments,
+    };
+
+    octokit.pullRequests.createReview(opts, function(error, res) {
+      if (error) {
+        console.error(error);
+        return;
+      }
+    });
+  } else {
+    if (comments.length === 0) {
+      console.log('No issues found.');
+      return;
+    }
+
+    if (process.env.CIRCLE_CI) {
+      console.error(
+        'Code analysis found issues, but the review cannot be posted to GitHub without an access token.',
+      );
+      process.exit(1);
+    }
+
+    let results = body + '\n';
+    comments.forEach(comment => {
+      results +=
+        comment.path + ':' + comment.position + ': ' + comment.body + '\n';
+    });
+    console.log(results);
+  }
+}
+
+function main(messages, owner, repo, number) {
+  // No message, we don't need to do anything :)
+  if (Object.keys(messages).length === 0) {
+    return;
+  }
+
+  if (process.env.GITHUB_TOKEN) {
+    octokit.authenticate({
+      type: 'oauth',
+      token: process.env.GITHUB_TOKEN,
+    });
+  } else {
+    console.log(
+      'Missing GITHUB_TOKEN. Example: 5fd88b964fa214c4be2b144dc5af5d486a2f8c1e. Review feedback with code analysis results will not be provided on GitHub.',
+    );
+  }
+
+  getShaFromPullRequest(owner, repo, number, sha => {
+    getFilesFromCommit(owner, repo, sha, files => {
+      let comments = [];
+      let convertersUsed = [];
+      files.filter(file => messages[file.filename]).forEach(file => {
+        // github api sometimes does not return a patch on large commits
+        if (!file.patch) {
+          return;
+        }
+        const lineMap = getLineMapFromPatch(file.patch);
+        messages[file.filename].forEach(message => {
+          if (lineMap[message.line]) {
+            const comment = {
+              path: file.filename,
+              position: lineMap[message.line],
+              body: message.message,
+            };
+            convertersUsed.push(message.converter);
+            comments.push(comment);
+          }
+        }); // forEach
+      }); // filter
+
+      let body = '**Code analysis results:**\n\n';
+      const uniqueconvertersUsed = [...new Set(convertersUsed)];
+      uniqueconvertersUsed.forEach(converter => {
+        body += '* `' + converter + '` found some issues.\n';
+      });
+
+      sendReview(owner, repo, number, sha, body, comments);
+    }); // getFilesFromCommit
+  }); // getShaFromPullRequest
+}
+
+let content = '';
+process.stdin.resume();
+process.stdin.on('data', function(buf) {
+  content += buf.toString();
+});
+process.stdin.on('end', function() {
+  let messages = {};
+
+  // Since we send a few http requests to setup the process, we don't want
+  // to run this file one time per code analysis tool. Instead, we write all
+  // the results in the same stdin stream.
+  // The format of this stream is
+  //
+  //   name-of-the-converter
+  //   {"json":"payload"}
+  //   name-of-the-other-converter
+  //   {"other": ["json", "payload"]}
+  //
+  // In order to generate such stream, here is a sample bash command:
+  //
+  //   cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; flow --json) | node code-analysis-bot.js
+
+  const lines = content.trim().split('\n');
+  for (let i = 0; i < Math.ceil(lines.length / 2); ++i) {
+    const converter = converters[lines[i * 2]];
+    if (!converter) {
+      throw new Error('Unknown converter ' + lines[i * 2]);
+    }
+    let json;
+    try {
+      json = JSON.parse(lines[i * 2 + 1]);
+    } catch (e) {}
+
+    converter(messages, json);
+  }
+
+  // The paths are returned in absolute from code analysis tools but github works
+  // on paths relative from the root of the project. Doing the normalization here.
+  const pwd = path.resolve('.');
+  for (let absolutePath in messages) {
+    const relativePath = path.relative(pwd, absolutePath);
+    if (relativePath === absolutePath) {
+      continue;
+    }
+    messages[relativePath] = messages[absolutePath];
+    delete messages[absolutePath];
+  }
+
+  const owner = process.env.GITHUB_OWNER;
+  const repo = process.env.GITHUB_REPO;
+
+  if (!process.env.GITHUB_PR_NUMBER) {
+    console.error('Missing GITHUB_PR_NUMBER. Example: 4687');
+    // for master branch, don't throw an error
+    process.exit(0);
+  }
+
+  const number = process.env.GITHUB_PR_NUMBER;
+
+  // intentional lint warning to make sure that the bot is working :)
+  main(messages, owner, repo, number);
+});
diff --git a/scripts/circleci/exec_author_check.sh b/scripts/circleci/exec_author_check.sh
new file mode 100755
index 00000000000000..f0b7fb7a124633
--- /dev/null
+++ b/scripts/circleci/exec_author_check.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
+# This is meant to be used to keep failing tests from
+# running for regular contributors, while still letting
+# them run on PRs submitted by core contributors.
+# Useful when working to bring a failing step back to green.
+
+# Add yourself here if you'd like to pass the whitelist.
+# Once N > 1 we should change this into an array check.
+if [ "$CIRCLE_USERNAME" == "hramos" ]; then
+  # execute command
+  "$@"
+else
+  echo "Skipping" "$@" ", user is not whitelisted"
+fi
diff --git a/scripts/circleci/exec_swallow_error.sh b/scripts/circleci/exec_swallow_error.sh
index 297cf5b01219d9..54a3a62283c7e9 100755
--- a/scripts/circleci/exec_swallow_error.sh
+++ b/scripts/circleci/exec_swallow_error.sh
@@ -1,13 +1,16 @@
 #!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 # execute command
-$@
+"$@"
 
 # check status
 STATUS=$?
 if [ $STATUS == 0 ]; then
-  echo "Command '$@' completed successfully"
+  echo "Command " "$@" " completed successfully"
 else
-  echo "Command '$@' exited with error status $STATUS"
+  echo "Command " "$@" " exited with error status $STATUS"
 fi
-
diff --git a/scripts/circleci/gradle_download_deps.sh b/scripts/circleci/gradle_download_deps.sh
index 1e093de55a0b7f..16aca6e6b841f8 100755
--- a/scripts/circleci/gradle_download_deps.sh
+++ b/scripts/circleci/gradle_download_deps.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 set -e
 
-./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog :ReactAndroid:downloadJSCHeaders
\ No newline at end of file
+./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog :ReactAndroid:downloadJSCHeaders
diff --git a/scripts/circleci/validate_yarn_lockfile.sh b/scripts/circleci/validate_yarn_lockfile.sh
new file mode 100755
index 00000000000000..5626dd9567b5e0
--- /dev/null
+++ b/scripts/circleci/validate_yarn_lockfile.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Abort the mission if any command fails
+set -e
+
+# Allow the script to be invoked from various environments
+if [[ -z "${OVERRIDE_YARN_BINARY}" ]]; then
+  YARN_BINARY=$(command -v yarn)
+else
+  YARN_BINARY="${OVERRIDE_YARN_BINARY}"
+fi
+
+REACT_NATIVE_TEMP_DIR=$(mktemp -d /tmp/react-native-XXXXXXXX)
+
+function cleanup {
+  set +e
+  rm -rf "$REACT_NATIVE_TEMP_DIR"
+  set -e
+}
+
+function msg {
+  echo -e " "
+  echo -e "\\x1B[36m${1}\\x1B[0m";
+  echo -e "\\x1B[36m${1//?/=}\\x1B[0m"
+}
+
+trap cleanup EXIT
+
+cp -R ./package.json "$REACT_NATIVE_TEMP_DIR"
+cp -R ./yarn.lock "$REACT_NATIVE_TEMP_DIR"
+pushd "$REACT_NATIVE_TEMP_DIR" >/dev/null
+
+if ! $YARN_BINARY --ignore-scripts --silent --non-interactive --mutex network --frozen-lockfile; then
+  msg "Yarn validation failed."
+  echo "This means the package.json and yarn.lock disagree in some way."
+  echo "Try fixing it by running \`yarn\` and committing the changes."
+fi
+
+popd >/dev/null
diff --git a/scripts/ios-configure-glog.sh b/scripts/ios-configure-glog.sh
index 3840fc4ebc719c..1ec1b70c2942fe 100755
--- a/scripts/ios-configure-glog.sh
+++ b/scripts/ios-configure-glog.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
 set -e
 
 PLATFORM_NAME="${PLATFORM_NAME:-iphoneos}"
@@ -10,7 +15,7 @@ if [ -z "$CURRENT_ARCH" ] || [ "$CURRENT_ARCH" == "undefined_arch" ]; then
 
     if [[ "$PLATFORM_NAME" == *"simulator"* ]]; then
         CURRENT_ARCH="x86_64"
-    else 
+    else
         CURRENT_ARCH="armv7"
     fi
 fi
diff --git a/scripts/ios-install-third-party.sh b/scripts/ios-install-third-party.sh
index f10b23b32a6f28..9d1ce0aa37d21c 100755
--- a/scripts/ios-install-third-party.sh
+++ b/scripts/ios-install-third-party.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 cachedir="$HOME/.rncache"
 mkdir -p "$cachedir"
@@ -45,7 +49,7 @@ function fetch_and_unpack () {
     done
 
     dir=$(basename "$file" .tar.gz)
-    if [ "$fetched" = "yes" ] || [ ! -d "third-party/$dir" ]; then
+    if [ "$fetched" = "yes" ] || [ ! -f "third-party/$dir/.installed" ]; then
         (cd third-party;
          rm -rf "$dir"
          echo Unpacking "$cachedir/$file"...
@@ -53,15 +57,15 @@ function fetch_and_unpack () {
              file_fail "$cachedir/$file" "Unpacking '$cachedir/$file' failed"
          fi
          cd "$dir"
-         eval "${cmd:-true}")
+         eval "${cmd:-true}" && touch .installed)
     fi
 }
 
 mkdir -p third-party
 
-SCRIPTDIR=$(dirname "$0")
+SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 
-fetch_and_unpack glog-0.3.4.tar.gz https://github.com/google/glog/archive/v0.3.4.tar.gz 69f91cd5a1de35ead0bc4103ea87294b0206a456 "\"$SCRIPTDIR/ios-configure-glog.sh\""
-fetch_and_unpack double-conversion-1.1.5.tar.gz https://github.com/google/double-conversion/archive/v1.1.5.tar.gz 96a8aba1b4ce7d4a7a3c123be26c379c2fed1def
+fetch_and_unpack glog-0.3.5.tar.gz https://github.com/google/glog/archive/v0.3.5.tar.gz 61067502c5f9769d111ea1ee3f74e6ddf0a5f9cc "\"$SCRIPTDIR/ios-configure-glog.sh\""
+fetch_and_unpack double-conversion-1.1.6.tar.gz https://github.com/google/double-conversion/archive/v1.1.6.tar.gz 1c7d88afde3aaeb97bb652776c627b49e132e8e0
 fetch_and_unpack boost_1_63_0.tar.gz https://github.com/react-native-community/boost-for-react-native/releases/download/v1.63.0-0/boost_1_63_0.tar.gz c3f57e1d22a995e608983effbb752b54b6eab741
 fetch_and_unpack folly-2016.10.31.00.tar.gz https://github.com/facebook/folly/archive/v2016.10.31.00.tar.gz fb8cdf8962d8c9d0c20a150b6ec3b75d1fa50696
diff --git a/scripts/launchPackager.bat b/scripts/launchPackager.bat
index b85ecc6822ce4a..bd3381e99ebc27 100644
--- a/scripts/launchPackager.bat
+++ b/scripts/launchPackager.bat
@@ -1,4 +1,4 @@
-:: Copyright (c) 2015-present, Facebook, Inc.
+:: Copyright (c) Facebook, Inc. and its affiliates.
 ::
 :: This source code is licensed under the MIT license found in the
 :: LICENSE file in the root directory of this source tree.
diff --git a/scripts/launchPackager.command b/scripts/launchPackager.command
index b4570cd3c63027..49e22f2596dedb 100755
--- a/scripts/launchPackager.command
+++ b/scripts/launchPackager.command
@@ -1,6 +1,5 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2015-present, Facebook, Inc.
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
@@ -9,7 +8,7 @@
 echo -en "\033]0;Metro Bundler\a"
 clear
 
-THIS_DIR=$(dirname "$0")
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 . "$THIS_DIR/packager.sh"
 
 echo "Process terminated. Press <enter> to close the window"
diff --git a/scripts/objc-test-ios.sh b/scripts/objc-test-ios.sh
index d466f877540add..5e1fe274d1014e 100755
--- a/scripts/objc-test-ios.sh
+++ b/scripts/objc-test-ios.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
-set -ex
-
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # Script used to run iOS tests.
 # If not arguments are passed to the script, it will only compile
 # the RNTester.
@@ -8,6 +11,8 @@ set -ex
 # also run the RNTester integration test (needs JS and packager):
 # ./objc-test-ios.sh test
 
+set -ex
+
 SCRIPTS=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ROOT=$(dirname "$SCRIPTS")
 
diff --git a/scripts/objc-test-tvos.sh b/scripts/objc-test-tvos.sh
index 98016598df0ff4..2738c7ba41977b 100755
--- a/scripts/objc-test-tvos.sh
+++ b/scripts/objc-test-tvos.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
-set -ex
-
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # Script used to run tvOS tests.
 # If not arguments are passed to the script, it will only compile
 # the RNTester.
@@ -8,6 +11,8 @@ set -ex
 # also run the RNTester integration test (needs JS and packager):
 # ./objc-test-tvos.sh test
 
+set -ex
+
 SCRIPTS=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ROOT=$(dirname "$SCRIPTS")
 
diff --git a/scripts/objc-test.sh b/scripts/objc-test.sh
index c2a9a94d182e7b..1791b5efa30d8b 100755
--- a/scripts/objc-test.sh
+++ b/scripts/objc-test.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
-set -ex
-
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # Script used to run iOS and tvOS tests.
 # Environment variables are used to configure what test to run.
 # If not arguments are passed to the script, it will only compile
@@ -9,6 +12,8 @@ set -ex
 # also run the RNTester integration test (needs JS and packager).
 # ./objc-test.sh test
 
+set -ex
+
 SCRIPTS=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ROOT=$(dirname $SCRIPTS)
 
@@ -56,7 +61,7 @@ function waitForPackager {
 if [ "$1" = "test" ]; then
 
 # Start the packager
-./scripts/packager.sh --max-workers=1 || echo "Can't start packager automatically" &
+npm run start --max-workers=1 || echo "Can't start packager automatically" &
 # Start the WebSocket test server
 open "./IntegrationTests/launchWebSocketServer.command" || echo "Can't start web socket server automatically"
 
diff --git a/scripts/packager.sh b/scripts/packager.sh
index ee3966923a2bb0..976f059a37b6de 100755
--- a/scripts/packager.sh
+++ b/scripts/packager.sh
@@ -1,11 +1,10 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2015-present, Facebook, Inc.
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-THIS_DIR=$(dirname "$0")
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 source "${THIS_DIR}/.packager.env"
 cd "$THIS_DIR/.."
 node "./local-cli/cli.js" start "$@"
diff --git a/scripts/process-podspecs.sh b/scripts/process-podspecs.sh
index 6c66f1d87ea921..539a4fea34ec0e 100755
--- a/scripts/process-podspecs.sh
+++ b/scripts/process-podspecs.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
 set -ex
 
 SCRIPTS=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/scripts/publish-npm.js b/scripts/publish-npm.js
index f9492a93577646..55f35e6b905ebb 100644
--- a/scripts/publish-npm.js
+++ b/scripts/publish-npm.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,26 +13,28 @@
  * This script publishes a new version of react-native to NPM.
  * It is supposed to run in CI environment, not on a developer's machine.
  *
- * To make it easier for developers it uses some logic to identify with which version to publish the package.
+ * To make it easier for developers it uses some logic to identify with which
+ * version to publish the package.
  *
  * To cut a branch (and release RC):
  * - Developer: `git checkout -b 0.XY-stable`
- * - Developer: `git tag v0.XY.0-rc` and `git push --tags` to git@github.com:facebook/react-native.git
- * - CI: test and deploy to npm (run this script) with version 0.XY.0-rc with tag "next"
+ * - Developer: `./scripts/bump-oss-version.js v0.XY.0-rc.0`
+ * - CI: test and deploy to npm (run this script) with version `0.XY.0-rc.0`
+ *   with tag "next"
  *
  * To update RC release:
  * - Developer: `git checkout 0.XY-stable`
  * - Developer: cherry-pick whatever changes needed
- * - Developer: `git tag v0.XY.0-rc1` and `git push --tags` to git@github.com:facebook/react-native.git
- * - CI: test and deploy to npm (run this script) with version 0.XY.0-rc1 with tag "next"
+ * - Developer: `./scripts/bump-oss-version.js v0.XY.0-rc.1`
+ * - CI: test and deploy to npm (run this script) with version `0.XY.0-rc.1`
+ *   with tag "next"
  *
  * To publish a release:
  * - Developer: `git checkout 0.XY-stable`
  * - Developer: cherry-pick whatever changes needed
- * - Developer: `git tag latest`
- * - Developer: `git tag v0.XY.0`
- * - Developer: `git push --tags` to git@github.com:facebook/react-native.git
- * - CI: test and deploy to npm (run this script) with version 0.XY.0 with and not tag (latest is implied by npm)
+ * - Developer: `./scripts/bump-oss-version.js v0.XY.0`
+ * - CI: test and deploy to npm (run this script) with version `0.XY.0`
+ *   and no tag ("latest" is implied by npm)
  *
  * To patch old release:
  * - Developer: `git checkout 0.XY-stable`
@@ -43,22 +45,28 @@
  * there is a version higher than XY
  *
  * Important tags:
- * If tag v0.XY.0-rcZ is present on the commit then publish to npm with version 0.XY.0-rcZ and tag next
+ * If tag v0.XY.0-rc.Z is present on the commit then publish to npm with version 0.XY.0-rc.Z and tag next
  * If tag v0.XY.Z is present on the commit then publish to npm with version 0.XY.Z and no tag (npm will consider it latest)
  */
 
 /*eslint-disable no-undef */
 require('shelljs/global');
 
-const buildBranch = process.env.CIRCLE_BRANCH;
+const buildTag = process.env.CIRCLE_TAG;
+const otp = process.env.NPM_CONFIG_OTP;
 
-let branchVersion;
-if (buildBranch.indexOf('-stable') !== -1) {
-  branchVersion = buildBranch.slice(0, buildBranch.indexOf('-stable'));
-} else {
-  echo('Error: We publish only from stable branches');
-  exit(0);
+if (!buildTag) {
+  echo('Error: We publish only from git tags');
+  exit(1);
+}
+
+let match = buildTag.match(/^v(\d+\.\d+)\.\d+(?:-.+)?$/);
+if (!match) {
+  echo('Error: We publish only from release version git tags');
+  exit(1);
 }
+// 0.33
+let [, branchVersion] = match;
 
 // 34c034298dc9cad5a4553964a5a324450fda0385
 const currentCommit = exec('git rev-parse HEAD', {silent: true}).stdout.trim();
@@ -79,7 +87,7 @@ const tagsWithVersion = exec(`git ls-remote origin | grep ${currentCommit}`, {
 
 if (tagsWithVersion.length === 0) {
   echo(
-    "Error: Can't find version tag in current commit. To deploy to NPM you must add tag v0.XY.Z[-rc] to your commit",
+    'Error: Cannot find version tag in current commit. To deploy to NPM you must add tag v0.XY.Z[-rc] to your commit',
   );
   exit(1);
 }
@@ -96,7 +104,7 @@ if (tagsWithVersion[0].indexOf('-rc') === -1) {
 
 // -------- Generating Android Artifacts with JavaDoc
 if (exec('./gradlew :ReactAndroid:installArchives').code) {
-  echo("Couldn't generate artifacts");
+  echo('Could not generate artifacts');
   exit(1);
 }
 
@@ -121,15 +129,18 @@ artifacts.forEach(name => {
   }
 });
 
-if (releaseVersion.indexOf('-rc') === -1) {
-  // release, package will be installed by default
-  exec('npm publish');
+// if version contains -rc, tag as prerelease
+const tagFlag = releaseVersion.indexOf('-rc') === -1 ? '' : '--tag next';
+
+// use otp from envvars if available
+const otpFlag = otp ? `--otp ${otp}` : '';
+
+if (exec(`npm publish ${tagFlag} ${otpFlag}`).code) {
+  echo('Failed to publish package to npm');
+  exit(1);
 } else {
-  // RC release, package will be installed only if users specifically do it
-  exec('npm publish --tag next');
+  echo(`Published to npm ${releaseVersion}`);
+  exit(0);
 }
 
-echo(`Published to npm ${releaseVersion}`);
-
-exit(0);
 /*eslint-enable no-undef */
diff --git a/scripts/react-native-xcode.sh b/scripts/react-native-xcode.sh
index 88ea804a806324..bc8382dc422eed 100755
--- a/scripts/react-native-xcode.sh
+++ b/scripts/react-native-xcode.sh
@@ -1,13 +1,27 @@
 #!/bin/bash
-# Copyright (c) 2015-present, Facebook, Inc.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-
+#
 # Bundle React Native app's code and image assets.
 # This script is supposed to be invoked as part of Xcode build process
 # and relies on environment variables (including PWD) set by Xcode
 
+# Print commands before executing them (useful for troubleshooting)
+set -x
+DEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH
+
+# Enables iOS devices to get the IP address of the machine running Metro Bundler
+if [[ "$CONFIGURATION" = *Debug* && ! "$PLATFORM_NAME" == *simulator ]]; then
+  IP=$(ipconfig getifaddr en0)
+  if [ -z "$IP" ]; then
+    IP=$(ifconfig | grep 'inet ' | grep -v ' 127.' | cut -d\   -f2  | awk 'NR==1{print $1}')
+  fi
+
+  echo "$IP" > "$DEST/ip.txt"
+fi
+
 if [[ "$SKIP_BUNDLING" ]]; then
   echo "SKIP_BUNDLING enabled; skipping."
   exit 0;
@@ -90,19 +104,6 @@ nodejs_not_found()
 
 type $NODE_BINARY >/dev/null 2>&1 || nodejs_not_found
 
-# Print commands before executing them (useful for troubleshooting)
-set -x
-DEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH
-
-if [[ "$CONFIGURATION" = *Debug* && ! "$PLATFORM_NAME" == *simulator ]]; then
-  IP=$(ipconfig getifaddr en0)
-  if [ -z "$IP" ]; then
-    IP=$(ifconfig | grep 'inet ' | grep -v ' 127.' | cut -d\   -f2  | awk 'NR==1{print $1}')
-  fi
-
-  echo "$IP" > "$DEST/ip.txt"
-fi
-
 BUNDLE_FILE="$DEST/main.jsbundle"
 
 $NODE_BINARY "$CLI_PATH" $BUNDLE_COMMAND \
diff --git a/scripts/run-android-ci-instrumentation-tests.js b/scripts/run-android-ci-instrumentation-tests.js
index 9a87de4f83ab50..e4812b004166dc 100644
--- a/scripts/run-android-ci-instrumentation-tests.js
+++ b/scripts/run-android-ci-instrumentation-tests.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/scripts/run-android-emulator.sh b/scripts/run-android-emulator.sh
index d7307120b0edb8..b1d28e56f46cf4 100755
--- a/scripts/run-android-emulator.sh
+++ b/scripts/run-android-emulator.sh
@@ -1,12 +1,16 @@
 #!/bin/bash
-
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # Runs an Android emulator locally.
 # If there already is a running emulator, this just uses that.
 # The only reason to use this config is that it represents a known-good
 # virtual device configuration.
 # This is useful for running integration tests on a local machine.
 
-THIS_DIR=$(dirname "$0")
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 
 STATE=`adb get-state`
 
diff --git a/scripts/run-android-local-integration-tests.sh b/scripts/run-android-local-integration-tests.sh
index a85d02be37cfa2..80286b00c8f031 100755
--- a/scripts/run-android-local-integration-tests.sh
+++ b/scripts/run-android-local-integration-tests.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
-
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # Runs all Android integration tests locally.
 # See http://facebook.github.io/react-native/docs/testing.html
 
diff --git a/scripts/run-android-local-unit-tests.sh b/scripts/run-android-local-unit-tests.sh
index 31daf6aef2e215..6efcd40097a2a1 100755
--- a/scripts/run-android-local-unit-tests.sh
+++ b/scripts/run-android-local-unit-tests.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
-
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # Runs all Android unit tests locally.
 # See http://facebook.github.io/react-native/docs/testing.html
 
diff --git a/scripts/run-ci-e2e-tests.js b/scripts/run-ci-e2e-tests.js
index ba436a27ad46a7..59be220ac03320 100644
--- a/scripts/run-ci-e2e-tests.js
+++ b/scripts/run-ci-e2e-tests.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/scripts/run-instrumentation-tests-via-adb-shell.sh b/scripts/run-instrumentation-tests-via-adb-shell.sh
index 5a9a976a97da4e..7b0e0e5de0d938 100755
--- a/scripts/run-instrumentation-tests-via-adb-shell.sh
+++ b/scripts/run-instrumentation-tests-via-adb-shell.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
-
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # Python script to run instrumentation tests, copied from https://github.com/circleci/circle-dummy-android
 # Example: ./scripts/run-android-instrumentation-tests.sh com.facebook.react.tests com.facebook.react.tests.ReactPickerTestCase
 #
@@ -24,7 +28,7 @@ test_class = None
 
 if len(sys.argv) > 2:
   test_class = sys.argv[2]
-  
+
 def update():
   # prevent CircleCI from killing the process for inactivity
   while not done:
@@ -38,10 +42,10 @@ t.start()
 def run():
   sp.Popen(['adb', 'wait-for-device']).communicate()
   if (test_class != None):
-    p = sp.Popen('adb shell am instrument -w -e class %s %s/android.support.test.runner.AndroidJUnitRunner' 
+    p = sp.Popen('adb shell am instrument -w -e class %s %s/android.support.test.runner.AndroidJUnitRunner'
       % (test_class, test_app), shell=True, stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE)
   else :
-    p = sp.Popen('adb shell am instrument -w %s/android.support.test.runner.AndroidJUnitRunner' 
+    p = sp.Popen('adb shell am instrument -w %s/android.support.test.runner.AndroidJUnitRunner'
       % (test_app), shell=True, stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE)
   return p.communicate()
 
diff --git a/scripts/sync-css-layout.sh b/scripts/sync-css-layout.sh
index 6c2f2f3c01f2a4..d38f0ffe2564fa 100755
--- a/scripts/sync-css-layout.sh
+++ b/scripts/sync-css-layout.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
 
 function usage {
   echo "usage: sync-css-layout.sh <pathToGithubRepo> <pathToFbSourceRepo>";
diff --git a/scripts/test-manual-e2e.sh b/scripts/test-manual-e2e.sh
index 09c73c0d9c5e90..ac1157df60514f 100755
--- a/scripts/test-manual-e2e.sh
+++ b/scripts/test-manual-e2e.sh
@@ -8,16 +8,16 @@ BLUE="\033[0;35m"
 ENDCOLOR="\033[0m"
 
 error() {
-    echo -e $RED"$@"$ENDCOLOR
+    echo -e "$RED""$*""$ENDCOLOR"
     exit 1
 }
 
 success() {
-    echo -e $GREEN"$@"$ENDCOLOR
+    echo -e "$GREEN""$*""$ENDCOLOR"
 }
 
 info() {
-    echo -e $BLUE"$@"$ENDCOLOR
+    echo -e "$BLUE""$*""$ENDCOLOR"
 }
 
 PACKAGE_VERSION=$(cat package.json \
diff --git a/scripts/try-n-times.js b/scripts/try-n-times.js
index 1be7209360b6f1..dfd1b350006307 100644
--- a/scripts/try-n-times.js
+++ b/scripts/try-n-times.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/scripts/validate-android-device-env.sh b/scripts/validate-android-device-env.sh
index 35e7d87d321cda..cfb51c9c58e731 100755
--- a/scripts/validate-android-device-env.sh
+++ b/scripts/validate-android-device-env.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
-
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # This script validates that the Android environment is set up to run
 # tests on a device or emulator (as opposed to a plain Java environment).
 
@@ -24,8 +28,9 @@ fi
 
 while :
 do
-    BOOTANIM=`adb -e shell getprop init.svc.bootanim`
-    if [ -n `echo $BOOTANIM | grep stopped` ]; then
+    BOOTANIM=$(adb -e shell getprop init.svc.bootanim)
+    # shellcheck disable=SC2143
+    if [[ -n $(echo "$BOOTANIM" | grep stopped) ]]; then
         break
     fi
     echo "Waiting for the emulator to finish booting..."
diff --git a/scripts/validate-android-sdk.sh b/scripts/validate-android-sdk.sh
index 64ab285fd7c9e2..8480235dbb3dfe 100755
--- a/scripts/validate-android-sdk.sh
+++ b/scripts/validate-android-sdk.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
-
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # This script validates that the Android SDK is installed correctly.
 # This means setting ANDROID_HOME and adding its subdirectories to PATH.
 # If the Android SDK is not installed correctly, this script exits
@@ -48,4 +52,4 @@ if [ -z `which adb` ]; then
   echo "See https://facebook.github.io/react-native/docs/getting-started.html for instructions."
   exit 1
 fi
-  
+
diff --git a/scripts/validate-android-test-env.sh b/scripts/validate-android-test-env.sh
index a4b97c6d0f0d4e..965a191cb582fb 100755
--- a/scripts/validate-android-test-env.sh
+++ b/scripts/validate-android-test-env.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
-
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
 # This script validates that Android is set up correctly for the
 # testing environment.
 #
@@ -52,7 +56,7 @@ fi
 BUILD_TOOLS_VERSION=`grep buildToolsVersion $(dirname $0)/../ReactAndroid/build.gradle | sed 's/^[^"]*\"//' | sed 's/"//'`
 
 # MAJOR is something like "23"
-MAJOR=`echo $BUILD_TOOLS_VERSION | sed 's/\..*//'`
+MAJOR=`grep compileSdkVersion $(dirname $0)/../ReactAndroid/build.gradle | sed 's/[^[:digit:]]//g'`
 
 # Check that we have the right major version of the Android SDK.
 PLATFORM_DIR="$ANDROID_HOME/platforms/android-$MAJOR"
@@ -107,7 +111,7 @@ if [ -n "$(which csrutil)" ]; then
     exit 1
   fi
 fi
-  
+
 if [ -z "$JAVA_HOME" ]; then
   echo "Error: \$JAVA_HOME is not configured."
   echo "Try adding export JAVA_HOME=\$(/usr/libexec/java_home) to your .bashrc or equivalent."
diff --git a/scripts/validate-ios-test-env.sh b/scripts/validate-ios-test-env.sh
new file mode 100755
index 00000000000000..ee25a3ea2a3c17
--- /dev/null
+++ b/scripts/validate-ios-test-env.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
+# This script validates that iOS is set up correctly for the
+# testing environment.
+#
+# In particular, it checks that the minimum required Xcode version is installed.
+# It also checks that the correct Node version is installed. Node 10 is not fully
+# supported at the time and Node 6 is no longer supported.
+
+# Function used to compare dot seperated version numbers
+function version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; }
+
+# Check that node is installed.
+if [ -z "$(which node)" ]; then
+  echo "Could not find Node binary. Please check your nodejs install."
+  echo "See http://facebook.github.io/react-native/docs/getting-started.html for instructions."
+  exit 1
+fi
+
+# Check that the correct version of node is installed
+NODE_VERSION="$(command node --version | sed 's/[-/a-zA-Z]//g' |sed 's/.\{2\}$//')"
+
+if (( $(echo "${NODE_VERSION} <= 6.0" | bc -l) )); then
+  echo "Node ${NODE_VERSION} detected. This version of Node is not supported."
+  echo "See https://facebook.github.io/react-native/docs/getting-started.html for instructions."
+  exit 1
+fi
+
+# Check that Xcode is installed.
+if [ -z "$(which xcodebuild)" ]; then
+  echo "Could not find Xcode build tools. Please check your Xcode install."
+  echo "See https://facebook.github.io/react-native/docs/getting-started.html for instructions."
+  exit 1
+fi
+
+MIN_XCODE_VERSION=9.4
+# Check that the correct version of Xcode is installed
+XCODE_VERSION="$(command xcodebuild -version | sed '$ d' | sed 's/[-/a-zA-Z]//g')"
+if (version_gt $MIN_XCODE_VERSION $XCODE_VERSION) && [ "$XCODE_VERSION" != "$MIN_XCODE_VERSION" ]; then
+  echo "Xcode ${XCODE_VERSION} detected. React Native requires ${MIN_XCODE_VERSION} or newer."
+  echo "Older versions of Xcode may cause cryptic build errors."
+  echo "See https://facebook.github.io/react-native/docs/getting-started.html for instructions."
+  exit 1
+fi
diff --git a/scripts/versiontemplates/RCTVersion.m.template b/scripts/versiontemplates/RCTVersion.m.template
index a550fb3216014d..cfc4d668281e49 100644
--- a/scripts/versiontemplates/RCTVersion.m.template
+++ b/scripts/versiontemplates/RCTVersion.m.template
@@ -1,7 +1,7 @@
 /**
  * @generated by scripts/bump-oss-version.js
  *
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/scripts/versiontemplates/ReactNativeVersion.java.template b/scripts/versiontemplates/ReactNativeVersion.java.template
index 12d55c3db4df0f..94d103f10002a9 100644
--- a/scripts/versiontemplates/ReactNativeVersion.java.template
+++ b/scripts/versiontemplates/ReactNativeVersion.java.template
@@ -1,7 +1,7 @@
 /**
  * @generated by scripts/bump-oss-version.js
  *
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/scripts/versiontemplates/ReactNativeVersion.js.template b/scripts/versiontemplates/ReactNativeVersion.js.template
index 80f4b280a86fc6..9e05c12fd81042 100644
--- a/scripts/versiontemplates/ReactNativeVersion.js.template
+++ b/scripts/versiontemplates/ReactNativeVersion.js.template
@@ -1,7 +1,7 @@
 /**
  * @generated by scripts/bump-oss-version.js
  *
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/settings.gradle b/settings.gradle
index c68c5a20fdf80d..e3df53aef2e6f4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,8 @@
-// Copyright (c) 2004-present, Facebook, Inc.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-include ':ReactAndroid', ':RNTester:android:app'
+include ':ReactAndroid'
+include ':RNTester:android:app'
+include ':android-jsc'
diff --git a/setupBabel.js b/setupBabel.js
index 7c6784f7901861..f047a7e442fb80 100644
--- a/setupBabel.js
+++ b/setupBabel.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
diff --git a/third-party-podspecs/DoubleConversion.podspec b/third-party-podspecs/DoubleConversion.podspec
index 42965eee743cf7..2ea6c84a4b02b6 100644
--- a/third-party-podspecs/DoubleConversion.podspec
+++ b/third-party-podspecs/DoubleConversion.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name = 'DoubleConversion'
-  spec.version = '1.1.5'
+  spec.version = '1.1.6'
   spec.license = { :type => 'MIT' }
   spec.homepage = 'https://github.com/google/double-conversion'
   spec.summary = 'Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles'
diff --git a/third-party-podspecs/glog.podspec b/third-party-podspecs/glog.podspec
index 03f106b4c64548..bc4bb1e182cf20 100644
--- a/third-party-podspecs/glog.podspec
+++ b/third-party-podspecs/glog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name = 'glog'
-  spec.version = '0.3.4'
+  spec.version = '0.3.5'
   spec.license = { :type => 'Google', :file => 'COPYING' }
   spec.homepage = 'https://github.com/google/glog'
   spec.summary = 'Google logging module'
diff --git a/ReactNative/DEFS.bzl b/tools/build_defs/oss/rn_defs.bzl
similarity index 70%
rename from ReactNative/DEFS.bzl
rename to tools/build_defs/oss/rn_defs.bzl
index 711688eb4f9fd9..c4420b22e4ef13 100644
--- a/ReactNative/DEFS.bzl
+++ b/tools/build_defs/oss/rn_defs.bzl
@@ -22,8 +22,6 @@ GLOG_DEP = "//ReactAndroid/build/third-party-ndk/glog:glog"
 
 INSPECTOR_FLAGS = []
 
-APPLE_JSC_INTERNAL_DEPS = []
-
 APPLE_JSC_DEPS = []
 
 ANDROID_JSC_INTERNAL_DEPS = [
@@ -62,58 +60,61 @@ def rn_xplat_cxx_library(name, **kwargs):
     }
 
     native.cxx_library(
-        name=name,
-        visibility=kwargs.get("visibility", []),
+        name = name,
+        visibility = kwargs.get("visibility", []),
         **new_kwargs
     )
 
 # Example: react_native_target('java/com/facebook/react/common:common')
 def react_native_target(path):
-    return '//ReactAndroid/src/main/' + path
+    return "//ReactAndroid/src/main/" + path
 
 # Example: react_native_xplat_target('bridge:bridge')
 def react_native_xplat_target(path):
-    return '//ReactCommon/' + path
+    return "//ReactCommon/" + path
 
 # Example: react_native_tests_target('java/com/facebook/react/modules:modules')
 def react_native_tests_target(path):
-    return '//ReactAndroid/src/test/' + path
+    return "//ReactAndroid/src/test/" + path
 
 # Example: react_native_integration_tests_target('java/com/facebook/react/testing:testing')
 def react_native_integration_tests_target(path):
-    return '//ReactAndroid/src/androidTest/' + path
+    return "//ReactAndroid/src/androidTest/" + path
 
-# Helper for referring to non-RN code from RN OSS code.
+# Helpers for referring to non-RN code from RN OSS code.
 # Example: react_native_dep('java/com/facebook/systrace:systrace')
 def react_native_dep(path):
-    return '//ReactAndroid/src/main/' + path
+    return "//ReactAndroid/src/main/" + path
 
-# React property preprocessor
-def rn_android_library(name, deps=[], plugins=[], *args, **kwargs):
+# Example: react_native_xplat_dep('java/com/facebook/systrace:systrace')
+def react_native_xplat_dep(path):
+    return "//ReactCommon/" + path
 
+# React property preprocessor
+def rn_android_library(name, deps = [], plugins = [], *args, **kwargs):
     if react_native_target(
-        'java/com/facebook/react/uimanager/annotations:annotations'
-    ) in deps and name != 'processing':
+        "java/com/facebook/react/uimanager/annotations:annotations",
+    ) in deps and name != "processing":
         react_property_plugins = [
             react_native_target(
-                'java/com/facebook/react/processing:processing'
+                "java/com/facebook/react/processing:processing",
             ),
         ]
 
         plugins = list(set(plugins + react_property_plugins))
 
     if react_native_target(
-        'java/com/facebook/react/module/annotations:annotations'
-    ) in deps and name != 'processing':
+        "java/com/facebook/react/module/annotations:annotations",
+    ) in deps and name != "processing":
         react_module_plugins = [
             react_native_target(
-                'java/com/facebook/react/module/processing:processing'
+                "java/com/facebook/react/module/processing:processing",
             ),
         ]
 
         plugins = list(set(plugins + react_module_plugins))
 
-    native.android_library(name=name, deps=deps, plugins=plugins, *args, **kwargs)
+    native.android_library(name = name, deps = deps, plugins = plugins, *args, **kwargs)
 
 def rn_android_binary(*args, **kwargs):
     native.android_binary(*args, **kwargs)
@@ -139,40 +140,40 @@ def rn_prebuilt_native_library(*args, **kwargs):
 def rn_prebuilt_jar(*args, **kwargs):
     native.prebuilt_jar(*args, **kwargs)
 
-def rn_robolectric_test(name, srcs, vm_args=None, *args, **kwargs):
+def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs):
     vm_args = vm_args or []
 
     extra_vm_args = [
-        '-XX:+UseConcMarkSweepGC',  # required by -XX:+CMSClassUnloadingEnabled
-        '-XX:+CMSClassUnloadingEnabled',
-        '-XX:ReservedCodeCacheSize=150M',
-        '-Drobolectric.dependency.dir=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric3/robolectric',
-        '-Dlibraries=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/*.jar',
-        '-Drobolectric.logging.enabled=true',
-        '-XX:MaxPermSize=620m',
-        '-Drobolectric.offline=true',
+        "-XX:+UseConcMarkSweepGC",  # required by -XX:+CMSClassUnloadingEnabled
+        "-XX:+CMSClassUnloadingEnabled",
+        "-XX:ReservedCodeCacheSize=150M",
+        "-Drobolectric.dependency.dir=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric3/robolectric",
+        "-Dlibraries=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/*.jar",
+        "-Drobolectric.logging.enabled=true",
+        "-XX:MaxPermSize=620m",
+        "-Drobolectric.offline=true",
     ]
     if native.read_config("user", "use_dev_shm"):
-        extra_vm_args.append('-Djava.io.tmpdir=/dev/shm')
+        extra_vm_args.append("-Djava.io.tmpdir=/dev/shm")
 
     # RN tests use  Powermock, which means they get their own ClassLoaders.
     # Because the yoga native library (or any native library) can only be loaded into one
     # ClassLoader at a time, we need to run each in its own process, hence fork_mode = 'per_test'.
     native.robolectric_test(
-        name=name,
-        use_cxx_libraries=True,
-        cxx_library_whitelist=[
-            '//ReactCommon/yoga:yoga',
-            '//ReactAndroid/src/main/jni/first-party/yogajni:jni',
+        name = name,
+        use_cxx_libraries = True,
+        cxx_library_whitelist = [
+            "//ReactCommon/yoga:yoga",
+            "//ReactAndroid/src/main/jni/first-party/yogajni:jni",
         ],
-        fork_mode='per_test',
-        srcs=srcs,
-        vm_args=vm_args + extra_vm_args,
+        fork_mode = "per_test",
+        srcs = srcs,
+        vm_args = vm_args + extra_vm_args,
         *args,
         **kwargs
     )
 
-def cxx_library(allow_jni_merging=None, **kwargs):
+def cxx_library(allow_jni_merging = None, **kwargs):
     args = {
         k: v
         for k, v in kwargs.items()
@@ -181,18 +182,18 @@ def cxx_library(allow_jni_merging=None, **kwargs):
     native.cxx_library(**args)
 
 def _paths_join(path, *others):
-  """Joins one or more path components."""
-  result = path
-
-  for p in others:
-    if p.startswith("/"):  # absolute
-      result = p
-    elif not result or result.endswith("/"):
-      result += p
-    else:
-      result += "/" + p
+    """Joins one or more path components."""
+    result = path
+
+    for p in others:
+        if p.startswith("/"):  # absolute
+            result = p
+        elif not result or result.endswith("/"):
+            result += p
+        else:
+            result += "/" + p
 
-  return result
+    return result
 
 def subdir_glob(glob_specs, exclude = None, prefix = ""):
     """Returns a dict of sub-directory relative paths to full paths.
@@ -260,3 +261,14 @@ def _single_subdir_glob(dirpath, glob_pattern, exclude = None, prefix = None):
         results[key] = f
 
     return results
+
+def oss_cxx_library(**kwargs):
+    cxx_library(**kwargs)
+
+def jni_instrumentation_test_lib(**kwargs):
+    """A noop stub for OSS build."""
+    pass
+
+def fb_xplat_cxx_test(**kwargs):
+    """A noop stub for OSS build."""
+    pass
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 00000000000000..2d54b1fd6edbcd
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,6845 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/core@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.0.tgz#08958f1371179f62df6966d8a614003d11faeb04"
+  integrity sha512-9EWmD0cQAbcXSc+31RIoYgEHx3KQ2CCSMDBhnXrShWvo45TMw+3/55KVxlhkG53kw9tl87DqINgHDgFVhZJV/Q==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.0.0"
+    "@babel/helpers" "^7.1.0"
+    "@babel/parser" "^7.1.0"
+    "@babel/template" "^7.1.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    convert-source-map "^1.1.0"
+    debug "^3.1.0"
+    json5 "^0.5.0"
+    lodash "^4.17.10"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa"
+  integrity sha512-/BM2vupkpbZXq22l1ALO7MqXJZH2k8bKVv8Y+pABFnzWdztDB/ZLveP5At21vLz5c2YtSE6p7j2FZEsqafMz5Q==
+  dependencies:
+    "@babel/types" "^7.0.0"
+    jsesc "^2.5.1"
+    lodash "^4.17.10"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/helper-annotate-as-pure@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
+  integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
+  integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-builder-react-jsx@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0.tgz#fa154cb53eb918cf2a9a7ce928e29eb649c5acdb"
+  integrity sha512-ebJ2JM6NAKW0fQEqN8hOLxK84RbRz9OkUhGS/Xd5u56ejMfVbayJ4+LykERZCOUM6faa6Fp3SZNX3fcT16MKHw==
+  dependencies:
+    "@babel/types" "^7.0.0"
+    esutils "^2.0.0"
+
+"@babel/helper-call-delegate@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
+  integrity sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.0.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-define-map@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
+  integrity sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==
+  dependencies:
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    lodash "^4.17.10"
+
+"@babel/helper-explode-assignable-expression@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
+  integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==
+  dependencies:
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-function-name@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.0.0"
+    "@babel/template" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-get-function-arity@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-hoist-variables@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
+  integrity sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-member-expression-to-functions@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
+  integrity sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-module-imports@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
+  integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-module-transforms@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz#470d4f9676d9fad50b324cdcce5fbabbc3da5787"
+  integrity sha512-0JZRd2yhawo79Rcm4w0LwSMILFmFXjugG3yqf+P/UsKsRS1mJCmMwwlHDlMg7Avr9LrvSpp4ZSULO9r8jpCzcw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-simple-access" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/template" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    lodash "^4.17.10"
+
+"@babel/helper-optimise-call-expression@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
+  integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@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-regex@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
+  integrity sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==
+  dependencies:
+    lodash "^4.17.10"
+
+"@babel/helper-remap-async-to-generator@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
+  integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-wrap-function" "^7.1.0"
+    "@babel/template" "^7.1.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-replace-supers@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz#5fc31de522ec0ef0899dc9b3e7cf6a5dd655f362"
+  integrity sha512-BvcDWYZRWVuDeXTYZWxekQNO5D4kO55aArwZOTFXw6rlLQA8ZaDicJR1sO47h+HrnCiDFiww0fSPV0d713KBGQ==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.0.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-simple-access@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
+  integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==
+  dependencies:
+    "@babel/template" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-split-export-declaration@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-wrap-function@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz#8cf54e9190706067f016af8f75cb3df829cc8c66"
+  integrity sha512-R6HU3dete+rwsdAfrOzTlE9Mcpk4RjU3aX3gi9grtmugQY0u79X7eogUvfXA5sI81Mfq1cn6AgxihfN33STjJA==
+  dependencies:
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/template" "^7.1.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helpers@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.0.tgz#429bf0f0020be56a4242883432084e3d70a8a141"
+  integrity sha512-V1jXUTNdTpBn37wqqN73U+eBpzlLHmxA4aDaghJBggmzly/FpIJMHXse9lgdzQQT4gs5jZ5NmYxOL8G3ROc29g==
+  dependencies:
+    "@babel/template" "^7.1.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.0.tgz#a7cd42cb3c12aec52e24375189a47b39759b783e"
+  integrity sha512-SmjnXCuPAlai75AFtzv+KCBcJ3sDDWbIn+WytKw1k+wAtEy6phqI2RqKh/zAnw53i1NR8su3Ep/UoqaKcimuLg==
+
+"@babel/plugin-check-constants@^7.0.0-beta.38":
+  version "7.0.0-beta.38"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-check-constants/-/plugin-check-constants-7.0.0-beta.38.tgz#bbda6306d45a4f097ccb416c0b52d6503f6502cf"
+  integrity sha512-MjdGn/2sMLu0fnNFbkILut0OsegzRTeCOJ/uGHH88TwTXPzxONx2cTVJ36i3cTQXHMiIOUT3hX6HqzWM99Q6vA==
+
+"@babel/plugin-external-helpers@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-external-helpers/-/plugin-external-helpers-7.0.0.tgz#61ee7ba5dba27d7cad72a13d46bec23c060b762e"
+  integrity sha512-tZKTMdhZvTy0KCEX5EGQQm1RHr7jUa36q/yax1baEA0yZapVYmu10yW7LTqijITgSq416gPVjrcexiA6y4pJlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-proposal-class-properties@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.1.0.tgz#9af01856b1241db60ec8838d84691aa0bd1e8df4"
+  integrity sha512-/PCJWN+CKt5v1xcGn4vnuu13QDoV+P7NcICP44BoonAJoPSGwVkgrXihFIQGiEjjPlUDBIw1cM7wYFLARS2/hw==
+  dependencies:
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-member-expression-to-functions" "^7.0.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.1.0"
+    "@babel/plugin-syntax-class-properties" "^7.0.0"
+
+"@babel/plugin-proposal-export-default-from@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.0.0.tgz#a057bbfd4649facfe39f33a537e18554bdd2b5da"
+  integrity sha512-cWhkx6SyjZ4caFOanoPmDNgQCuYYTmou4QXy886JsyLTw/vhWQbop2gLKsWyyswrJkKTB7fSNxVYbP/oEsoySA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-export-default-from" "^7.0.0"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.0.0.tgz#b72ec31adf612d062dc0348316246127a451e45f"
+  integrity sha512-QIN3UFo1ul4ruAsjIqK43PeXedo1qY74zeGrODJl1KfCGeMc6qJC4rb5Ylml/smzxibqsDeVZGH+TmWHCldRQQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0"
+
+"@babel/plugin-proposal-object-rest-spread@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz#9a17b547f64d0676b6c9cecd4edf74a82ab85e7e"
+  integrity sha512-14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz#b610d928fe551ff7117d42c8bb410eec312a6425"
+  integrity sha512-JPqAvLG1s13B/AuoBjdBYvn38RqW6n1TzrQO839/sIpqLpbnXKacsAgpZHzLD83Sm8SDXMkkrAvEnJ25+0yIpw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
+
+"@babel/plugin-proposal-optional-chaining@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.0.0.tgz#3d344d4152253379b8758e7d041148e8787c4a9d"
+  integrity sha512-7x8HLa71OzNiofbQUVakS0Kmg++6a+cXNfS7QKHbbv03SuSaumJyaWsfNgw+T7aqrJlqurYpZqrkPgXu0iZK0w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.0.0"
+
+"@babel/plugin-syntax-class-properties@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0.tgz#e051af5d300cbfbcec4a7476e37a803489881634"
+  integrity sha512-cR12g0Qzn4sgkjrbrzWy2GE7m9vMl/sFkqZ3gIpAQdrvPDnLM8180i+ANDFIXfjHo9aqp0ccJlQ0QNZcFUbf9w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-dynamic-import@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0.tgz#6dfb7d8b6c3be14ce952962f658f3b7eb54c33ee"
+  integrity sha512-Gt9xNyRrCHCiyX/ZxDGOcBnlJl0I3IWicpZRC4CdC0P5a/I07Ya2OAMEBU+J7GmRFVmIetqEYRko6QYRuKOESw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-export-default-from@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.0.0.tgz#084b639bce3d42f3c5bf3f68ccb42220bb2d729d"
+  integrity sha512-HNnjg/fFFbnuLAqr/Ocp1Y3GB4AjmXcu1xxn3ql3bS2kGrB/qi+Povshb8i3hOkE5jNozzh8r/0/lq1w8oOWbQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-flow@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0.tgz#70638aeaad9ee426bc532e51523cff8ff02f6f17"
+  integrity sha512-zGcuZWiWWDa5qTZ6iAnpG0fnX/GOu49pGR5PFvkQ9GmKNaSphXQnlNXh/LG20sqWtNrx/eB6krzfEzcwvUyeFA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-jsx@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0.tgz#034d5e2b4e14ccaea2e4c137af7e4afb39375ffd"
+  integrity sha512-PdmL2AoPsCLWxhIr3kG2+F9v4WH06Q3z+NoGVpQgnUNGcagXHq5sB3OXxkSahKq9TLdNMN/AJzFYSOo8UKDMHg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.0.0.tgz#b60931d5a15da82625fff6657c39419969598743"
+  integrity sha512-oAJmMsAvTSIk9y0sZdU2S/nY44PEUuHN7EzNDMgbuR4e/OwyfR9lSmoBJBZ2lslFZIqhksrTt4i+av7uKfNYDw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-object-rest-spread@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz#37d8fbcaf216bd658ea1aebbeb8b75e88ebc549b"
+  integrity sha512-5A0n4p6bIiVe5OvQPxBnesezsgFJdHhSs3uFSvaPdMqtsovajLZ+G2vZyvNe10EzJBWWo3AcHGKhAFUxqwp2dw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz#886f72008b3a8b185977f7cb70713b45e51ee475"
+  integrity sha512-Wc+HVvwjcq5qBg1w5RG9o9RVzmCaAg/Vp0erHCKpAYV8La6I94o4GQAmFYNmkzoMO6gzoOSulpKeSSz6mPEoZw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.0.0.tgz#1e6ecba124310b5d3a8fc1e00d50b1c4c2e05e68"
+  integrity sha512-QXedQsZf8yua1nNrXSePT0TsGSQH9A1iK08m9dhCMdZeJaaxYcQfXdgHWVV6Cp7WE/afPVvSKIsAHK5wP+yxDA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-typescript@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.0.0.tgz#90f4fe0a741ae9c0dcdc3017717c05a0cbbd5158"
+  integrity sha512-5fxmdqiAQVQTIS+KSvYeZuTt91wKtBTYi6JlIkvbQ6hmO+9fZE81ezxmMiFMIsxE7CdRSgzn7nQ1BChcvK9OpA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-arrow-functions@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz#a6c14875848c68a3b4b3163a486535ef25c7e749"
+  integrity sha512-2EZDBl1WIO/q4DIkIp4s86sdp4ZifL51MoIviLY/gG/mLSuOIEg7J8o6mhbxOTvUJkaN50n+8u41FVsr5KLy/w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-async-to-generator@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz#109e036496c51dd65857e16acab3bafdf3c57811"
+  integrity sha512-rNmcmoQ78IrvNCIt/R9U+cixUHeYAzgusTFgIAv+wQb9HJU4szhpDD6e5GCACmj/JP5KxuCwM96bX3L9v4ZN/g==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.1.0"
+
+"@babel/plugin-transform-block-scoped-functions@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz#482b3f75103927e37288b3b67b65f848e2aa0d07"
+  integrity sha512-AOBiyUp7vYTqz2Jibe1UaAWL0Hl9JUXEgjFvvvcSc9MVDItv46ViXFw2F7SVt1B5k+KWjl44eeXOAk3UDEaJjQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-block-scoping@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0.tgz#1745075edffd7cdaf69fab2fb6f9694424b7e9bc"
+  integrity sha512-GWEMCrmHQcYWISilUrk9GDqH4enf3UmhOEbNbNrlNAX1ssH3MsS1xLOS6rdjRVPgA7XXVPn87tRkdTEoA/dxEg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    lodash "^4.17.10"
+
+"@babel/plugin-transform-classes@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz#ab3f8a564361800cbc8ab1ca6f21108038432249"
+  integrity sha512-rNaqoD+4OCBZjM7VaskladgqnZ1LO6o2UxuWSDzljzW21pN1KXkB7BstAVweZdxQkHAujps5QMNOTWesBciKFg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-define-map" "^7.1.0"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz#2fbb8900cd3e8258f2a2ede909b90e7556185e31"
+  integrity sha512-ubouZdChNAv4AAWAgU7QKbB93NU5sHwInEWfp+/OzJKA02E6Woh9RVoX4sZrbRwtybky/d7baTUqwFx+HgbvMA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-destructuring@^7.0.0":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.1.2.tgz#5fa77d473f5a0a3f5266ad7ce2e8c995a164d60a"
+  integrity sha512-cvToXvp/OsYxtEn57XJu9BvsGSEYjAh9UeUuXpoi7x6QHB7YdWyQ4lRU/q0Fu1IJNT0o0u4FQ1DMQBzJ8/8vZg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-exponentiation-operator@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz#9c34c2ee7fd77e02779cfa37e403a2e1003ccc73"
+  integrity sha512-uZt9kD1Pp/JubkukOGQml9tqAeI8NkE98oZnHZ2qHRElmeKCodbTZgOEUtujSCSLhHSBWbzNiFSDIMC4/RBTLQ==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-flow-strip-types@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0.tgz#c40ced34c2783985d90d9f9ac77a13e6fb396a01"
+  integrity sha512-WhXUNb4It5a19RsgKKbQPrjmy4yWOY1KynpEbNw7bnd1QTcrT/EIl3MJvnGgpgvrKyKbqX7nUNOJfkpLOnoDKA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-flow" "^7.0.0"
+
+"@babel/plugin-transform-for-of@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz#f2ba4eadb83bd17dc3c7e9b30f4707365e1c3e39"
+  integrity sha512-TlxKecN20X2tt2UEr2LNE6aqA0oPeMT1Y3cgz8k4Dn1j5ObT8M3nl9aA37LLklx0PBZKETC9ZAf9n/6SujTuXA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-function-name@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz#29c5550d5c46208e7f730516d41eeddd4affadbb"
+  integrity sha512-VxOa1TMlFMtqPW2IDYZQaHsFrq/dDoIjgN098NowhexhZcz3UGlvPgZXuE1jEvNygyWyxRacqDpCZt+par1FNg==
+  dependencies:
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-literals@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz#2aec1d29cdd24c407359c930cdd89e914ee8ff86"
+  integrity sha512-1NTDBWkeNXgpUcyoVFxbr9hS57EpZYXpje92zv0SUzjdu3enaRwF/l3cmyRnXLtIdyJASyiS6PtybK+CgKf7jA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-member-expression-literals@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.0.0.tgz#96a265bf61a9ed6f75c39db0c30d41ef7aabf072"
+  integrity sha512-kgAGWcjVdflNPSaRb9rDPdGJ9/gF80VPmxx80gdKz6NSofHvxA2LofECQ+7GrDVzzH8zBJzTn1xlV4xnmWj/nw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-modules-commonjs@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz#0a9d86451cbbfb29bd15186306897c67f6f9a05c"
+  integrity sha512-wtNwtMjn1XGwM0AXPspQgvmE6msSJP15CX2RVfpTSTNPLhKhaOjaIfBaVfj4iUZ/VrFSodcFedwtPg/NxwQlPA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-simple-access" "^7.1.0"
+
+"@babel/plugin-transform-object-assign@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.0.0.tgz#fca6d7500d9675c42868b8f3882979201b9a5ad8"
+  integrity sha512-Dag8mxx7/03oj8F8PkNso8GEMhwGfeT0TL6KfMsa9Brjx4IpwZVl3WBvEmYks8BMhPmrvM5NQ/tjaMbwEj5ijA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-object-super@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz#b1ae194a054b826d8d4ba7ca91486d4ada0f91bb"
+  integrity sha512-/O02Je1CRTSk2SSJaq0xjwQ8hG4zhZGNjE8psTsSNPXyLRCODv7/PBozqT5AmQMzp7MI3ndvMhGdqp9c96tTEw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.1.0"
+
+"@babel/plugin-transform-parameters@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz#44f492f9d618c9124026e62301c296bf606a7aed"
+  integrity sha512-vHV7oxkEJ8IHxTfRr3hNGzV446GAb+0hgbA7o/0Jd76s+YzccdWuTU296FOCOl/xweU4t/Ya4g41yWz80RFCRw==
+  dependencies:
+    "@babel/helper-call-delegate" "^7.1.0"
+    "@babel/helper-get-function-arity" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-property-literals@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.0.0.tgz#0b95a91dbd1f0be5b5a99ed86571ef5b5ae77009"
+  integrity sha512-7HK6/jB4MLpwQUJQ3diaX0pbCRcoL9asJscQfU3D1HpDwYdrH6yAUKleUNFHFyGNYBI9UeJrS2Jpx2JhtPKu5g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-react-display-name@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0.tgz#93759e6c023782e52c2da3b75eca60d4f10533ee"
+  integrity sha512-BX8xKuQTO0HzINxT6j/GiCwoJB0AOMs0HmLbEnAvcte8U8rSkNa/eSCAY+l1OA4JnCVq2jw2p6U8QQryy2fTPg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-react-jsx-source@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0.tgz#28e00584f9598c0dd279f6280eee213fa0121c3c"
+  integrity sha512-OSeEpFJEH5dw/TtxTg4nijl4nHBbhqbKL94Xo/Y17WKIf2qJWeIk/QeXACF19lG1vMezkxqruwnTjVizaW7u7w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.0.0"
+
+"@babel/plugin-transform-react-jsx@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0.tgz#524379e4eca5363cd10c4446ba163f093da75f3e"
+  integrity sha512-0TMP21hXsSUjIQJmu/r7RiVxeFrXRcMUigbKu0BLegJK9PkYodHstaszcig7zxXfaBji2LYUdtqIkHs+hgYkJQ==
+  dependencies:
+    "@babel/helper-builder-react-jsx" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.0.0"
+
+"@babel/plugin-transform-regenerator@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
+  integrity sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==
+  dependencies:
+    regenerator-transform "^0.13.3"
+
+"@babel/plugin-transform-runtime@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.1.0.tgz#9f76920d42551bb577e2dc594df229b5f7624b63"
+  integrity sha512-WFLMgzu5DLQEah0lKTJzYb14vd6UiES7PTnXcvrPZ1VrwFeJ+mTbvr65fFAsXYMt2bIoOoC0jk76zY1S7HZjUg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    resolve "^1.8.1"
+    semver "^5.5.1"
+
+"@babel/plugin-transform-shorthand-properties@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15"
+  integrity sha512-g/99LI4vm5iOf5r1Gdxq5Xmu91zvjhEG5+yZDJW268AZELAu4J1EiFLnkSG3yuUsZyOipVOVUKoGPYwfsTymhw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-spread@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz#93583ce48dd8c85e53f3a46056c856e4af30b49b"
+  integrity sha512-L702YFy2EvirrR4shTj0g2xQp7aNwZoWNCkNu2mcoU0uyzMl0XRwDSwzB/xp6DSUFiBmEXuyAyEN16LsgVqGGQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-sticky-regex@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz#30a9d64ac2ab46eec087b8530535becd90e73366"
+  integrity sha512-LFUToxiyS/WD+XEWpkx/XJBrUXKewSZpzX68s+yEOtIbdnsRjpryDw9U06gYc6klYEij/+KQVRnD3nz3AoKmjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
+
+"@babel/plugin-transform-template-literals@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz#084f1952efe5b153ddae69eb8945f882c7a97c65"
+  integrity sha512-vA6rkTCabRZu7Nbl9DfLZE1imj4tzdWcg5vtdQGvj+OH9itNNB6hxuRMHuIY8SGnEt1T9g5foqs9LnrHzsqEFg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-typescript@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.1.0.tgz#81e7b4be90e7317cbd04bf1163ebf06b2adee60b"
+  integrity sha512-TOTtVeT+fekAesiCHnPz+PSkYSdOSLyLn42DI45nxg6iCdlQY6LIj/tYqpMB0y+YicoTUiYiXqF8rG6SKfhw6Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.0.0"
+
+"@babel/plugin-transform-unicode-regex@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz#c6780e5b1863a76fe792d90eded9fcd5b51d68fc"
+  integrity sha512-uJBrJhBOEa3D033P95nPHu3nbFwFE9ZgXsfEitzoIXIwqAZWk7uXcg06yFKXz9FSxBH5ucgU/cYdX0IV8ldHKw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
+    regexpu-core "^4.1.3"
+
+"@babel/register@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.0.0.tgz#fa634bae1bfa429f60615b754fc1f1d745edd827"
+  integrity sha512-f/+CRmaCe7rVEvcvPvxeA8j5aJhHC3aJie7YuqcMDhUOuyWLA7J/aNrTaHIzoWPEhpHA54mec4Mm8fv8KBlv3g==
+  dependencies:
+    core-js "^2.5.7"
+    find-cache-dir "^1.0.0"
+    home-or-tmp "^3.0.0"
+    lodash "^4.17.10"
+    mkdirp "^0.5.1"
+    pirates "^4.0.0"
+    source-map-support "^0.5.9"
+
+"@babel/runtime@^7.0.0":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.2.tgz#81c89935f4647706fc54541145e6b4ecfef4b8e3"
+  integrity sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==
+  dependencies:
+    regenerator-runtime "^0.12.0"
+
+"@babel/template@^7.0.0", "@babel/template@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.0.tgz#58cc9572e1bfe24fe1537fdf99d839d53e517e22"
+  integrity sha512-yZ948B/pJrwWGY6VxG6XRFsVTee3IQ7bihq9zFpM00Vydu6z5Xwg0C3J644kxI9WOTzd+62xcIsQ+AT1MGhqhA==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.0.tgz#503ec6669387efd182c3888c4eec07bcc45d91b2"
+  integrity sha512-bwgln0FsMoxm3pLOgrrnGaXk18sSM9JNf1/nHC/FksmNGFbYnPWY4GYCfLxyP1KRmfsxqkRpfoa6xr6VuuSxdw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.0.0"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.10"
+
+"@babel/types@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0.tgz#6e191793d3c854d19c6749989e3bc55f0e962118"
+  integrity sha512-5tPDap4bGKTLPtci2SUl/B7Gv8RnuJFuQoWx26RJobS0fFrz4reUA3JnwIM+HVHEmWE0C1mzKhDtTp8NsWY02Q==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.10"
+    to-fast-properties "^2.0.0"
+
+abab@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
+  integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
+absolute-path@^0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7"
+  integrity sha1-p4di+9rftSl76ZsV01p4Wy8JW/c=
+
+accepts@~1.3.3, accepts@~1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
+  dependencies:
+    mime-types "~2.1.18"
+    negotiator "0.6.1"
+
+acorn-globals@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz#e3b6f8da3c1552a95ae627571f7dd6923bb54103"
+  integrity sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==
+  dependencies:
+    acorn "^6.0.1"
+    acorn-walk "^6.0.1"
+
+acorn-jsx@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e"
+  integrity sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==
+  dependencies:
+    acorn "^5.0.3"
+
+acorn-walk@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.0.1.tgz#c7827bdbb8e21aa97b609adfa225400d9ae348ba"
+  integrity sha512-PqVQ8c6a3kyqdsUZlC7nljp3FFuxipBRHKu+7C1h8QygBFlzTaDX5HD383jej3Peed+1aDG8HwkfB1Z1HMNPkw==
+
+acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+
+acorn@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.1.tgz#66e6147e1027704479dc6d9b20d884c572db3cc1"
+  integrity sha512-SiwgrRuRD2D1R6qjwwoopKcCTkmmIWjy1M15Wv+Nk/7VUsBad4P8GOPft2t6coDZG0TuR5dq9o1v0g8wo7F6+A==
+
+ajv-keywords@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
+
+ajv@^5.3.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+ajv@^6.0.1, ajv@^6.5.0:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
+  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ansi-colors@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
+  dependencies:
+    ansi-wrap "^0.1.0"
+
+ansi-cyan@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
+  integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-escapes@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
+
+ansi-gray@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-red@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
+  integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=
+  dependencies:
+    ansi-wrap "0.1.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 sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
+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-wrap@0.1.0, ansi-wrap@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
+
+ansi@^0.3.0, ansi@~0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
+  integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
+
+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"
+
+append-transform@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  integrity sha1-126/jKlNJ24keja61EpLdKthGZE=
+  dependencies:
+    default-require-extensions "^1.0.0"
+
+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.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  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"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
+  integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo=
+  dependencies:
+    arr-flatten "^1.0.1"
+    array-slice "^0.2.3"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
+  dependencies:
+    arr-flatten "^1.0.1"
+
+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.0.1, 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@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
+  integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=
+
+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-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+
+array-filter@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
+  integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
+
+array-includes@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
+array-map@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
+  integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
+
+array-reduce@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
+  integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
+
+array-slice@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
+  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
+
+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=
+
+arrify@^1.0.0, arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+
+art@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/art/-/art-0.10.3.tgz#b01d84a968ccce6208df55a733838c96caeeaea2"
+  integrity sha512-HXwbdofRTiJT6qZX/FnchtldzJjS3vkLJxQilc3Xj+ma2MXjY4UAyQ0ls1XZYVnDvVIBiFZbC6QsvtW86TD6tQ==
+
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
+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=
+
+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=
+
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+
+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@^2.1.4, async@^2.4.0, async@^2.5.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
+  dependencies:
+    lodash "^4.17.10"
+
+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.1:
+  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.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+
+babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.7.2:
+  version "6.26.3"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.1"
+    debug "^2.6.9"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.8"
+    slash "^1.0.0"
+    source-map "^0.5.7"
+
+babel-eslint@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-9.0.0.tgz#7d9445f81ed9f60aff38115f838970df9f2b6220"
+  integrity sha512-itv1MwE3TMbY0QtNfeL7wzak1mV47Uy+n6HtSOO4Xd7rvmO+tsGQSgyOEEgo6Y2vHZKZphaoelNeSVj4vkLA1g==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.0.0"
+    "@babel/traverse" "^7.0.0"
+    "@babel/types" "^7.0.0"
+    eslint-scope "3.7.1"
+    eslint-visitor-keys "^1.0.0"
+
+babel-generator@^6.18.0, babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-helper-builder-react-jsx@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
+  integrity sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    esutils "^2.0.2"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo=
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-jest@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1"
+  integrity sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==
+  dependencies:
+    babel-plugin-istanbul "^4.1.6"
+    babel-preset-jest "^23.2.0"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-istanbul@^4.1.6:
+  version "4.1.6"
+  resolved "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
+  integrity sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.13.0"
+    find-up "^2.1.0"
+    istanbul-lib-instrument "^1.10.1"
+    test-exclude "^4.2.1"
+
+babel-plugin-jest-hoist@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
+  integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=
+
+babel-plugin-syntax-class-properties@^6.8.0:
+  version "6.13.0"
+  resolved "http://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
+  integrity sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=
+
+babel-plugin-syntax-flow@^6.18.0, babel-plugin-syntax-flow@^6.8.0:
+  version "6.18.0"
+  resolved "http://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
+  integrity sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=
+
+babel-plugin-syntax-jsx@^6.8.0:
+  version "6.18.0"
+  resolved "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
+  integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
+
+babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-spread@^6.8.0:
+  version "6.13.0"
+  resolved "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+  integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
+
+babel-plugin-syntax-trailing-function-commas@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+  integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=
+
+babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
+  version "7.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf"
+  integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==
+
+babel-plugin-transform-class-properties@^6.8.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
+  integrity sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-arrow-functions@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.8.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+  integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-plugin-transform-es2015-classes@^6.8.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.8.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@^6.8.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-for-of@^6.8.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.8.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-literals@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.8.0:
+  version "6.26.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
+  integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-transform-es2015-object-super@^6.8.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40=
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.8.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.8.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-spread@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-template-literals@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es3-member-expression-literals@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es3-member-expression-literals/-/babel-plugin-transform-es3-member-expression-literals-6.22.0.tgz#733d3444f3ecc41bef8ed1a6a4e09657b8969ebb"
+  integrity sha1-cz00RPPsxBvvjtGmpOCWV7iWnrs=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es3-property-literals@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es3-property-literals/-/babel-plugin-transform-es3-property-literals-6.22.0.tgz#b2078d5842e22abf40f73e8cde9cd3711abd5758"
+  integrity sha1-sgeNWELiKr9A9z6M3pzTcRq9V1g=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-flow-strip-types@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
+  integrity sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=
+  dependencies:
+    babel-plugin-syntax-flow "^6.18.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-object-rest-spread@^6.8.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+  integrity sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.26.0"
+
+babel-plugin-transform-react-display-name@^6.8.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1"
+  integrity sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-jsx@^6.8.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3"
+  integrity sha1-hAoCjn30YN/DotKfDA2R9jduZqM=
+  dependencies:
+    babel-helper-builder-react-jsx "^6.24.1"
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-preset-fbjs@^2.1.2:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-2.3.0.tgz#92ff81307c18b926895114f9828ae1674c097f80"
+  integrity sha512-ZOpAI1/bN0Y3J1ZAK9gRsFkHy9gGgJoDRUjtUCla/129LC7uViq9nIK22YdHfey8szohYoZY3f9L2lGOv0Edqw==
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.8.0"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-plugin-syntax-flow "^6.8.0"
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-plugin-syntax-trailing-function-commas "^6.8.0"
+    babel-plugin-transform-class-properties "^6.8.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.8.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.8.0"
+    babel-plugin-transform-es2015-block-scoping "^6.8.0"
+    babel-plugin-transform-es2015-classes "^6.8.0"
+    babel-plugin-transform-es2015-computed-properties "^6.8.0"
+    babel-plugin-transform-es2015-destructuring "^6.8.0"
+    babel-plugin-transform-es2015-for-of "^6.8.0"
+    babel-plugin-transform-es2015-function-name "^6.8.0"
+    babel-plugin-transform-es2015-literals "^6.8.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.8.0"
+    babel-plugin-transform-es2015-object-super "^6.8.0"
+    babel-plugin-transform-es2015-parameters "^6.8.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.8.0"
+    babel-plugin-transform-es2015-spread "^6.8.0"
+    babel-plugin-transform-es2015-template-literals "^6.8.0"
+    babel-plugin-transform-es3-member-expression-literals "^6.8.0"
+    babel-plugin-transform-es3-property-literals "^6.8.0"
+    babel-plugin-transform-flow-strip-types "^6.8.0"
+    babel-plugin-transform-object-rest-spread "^6.8.0"
+    babel-plugin-transform-react-display-name "^6.8.0"
+    babel-plugin-transform-react-jsx "^6.8.0"
+
+babel-preset-fbjs@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.0.1.tgz#0be99c39367d6fb5bbcf1f6c33be0321b5234c1c"
+  integrity sha512-Fc0t7v8T1tBwv5AVyDDZEnS3T7OQ97qV0XawVZg1ouarlM9xCHL994C5tU8TBIKPk3yZXG+SaEM1YQcx/yLlcg==
+  dependencies:
+    "@babel/plugin-check-constants" "^7.0.0-beta.38"
+    "@babel/plugin-proposal-class-properties" "^7.0.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
+    "@babel/plugin-syntax-class-properties" "^7.0.0"
+    "@babel/plugin-syntax-flow" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    "@babel/plugin-transform-arrow-functions" "^7.0.0"
+    "@babel/plugin-transform-block-scoped-functions" "^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-flow-strip-types" "^7.0.0"
+    "@babel/plugin-transform-for-of" "^7.0.0"
+    "@babel/plugin-transform-function-name" "^7.0.0"
+    "@babel/plugin-transform-literals" "^7.0.0"
+    "@babel/plugin-transform-member-expression-literals" "^7.0.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
+    "@babel/plugin-transform-object-super" "^7.0.0"
+    "@babel/plugin-transform-parameters" "^7.0.0"
+    "@babel/plugin-transform-property-literals" "^7.0.0"
+    "@babel/plugin-transform-react-display-name" "^7.0.0"
+    "@babel/plugin-transform-react-jsx" "^7.0.0"
+    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
+    "@babel/plugin-transform-spread" "^7.0.0"
+    "@babel/plugin-transform-template-literals" "^7.0.0"
+    babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
+
+babel-preset-jest@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
+  integrity sha1-jsegOhOPABoaj7HoETZSvxpV2kY=
+  dependencies:
+    babel-plugin-jest-hoist "^23.2.0"
+    babel-plugin-syntax-object-rest-spread "^6.13.0"
+
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
+
+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=
+
+base64-js@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.1.2.tgz#d6400cac1c4c660976d90d07a04351d89395f5e8"
+  integrity sha1-1kAMrBxMZgl22Q0HoENR2JOV9eg=
+
+base64-js@^1.1.2, base64-js@^1.2.3:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
+
+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"
+
+basic-auth@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
+  dependencies:
+    safe-buffer "5.1.2"
+
+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-integer@^1.6.7:
+  version "1.6.36"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.36.tgz#78631076265d4ae3555c04f85e7d9d2f3a071a36"
+  integrity sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg==
+
+bluebird@3.5.x:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
+  integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
+
+bplist-creator@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/bplist-creator/-/bplist-creator-0.0.7.tgz#37df1536092824b87c42f957b01344117372ae45"
+  integrity sha1-N98VNgkoJLh8QvlXsBNEEXNyrkU=
+  dependencies:
+    stream-buffers "~2.2.0"
+
+bplist-parser@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
+  integrity sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=
+  dependencies:
+    big-integer "^1.6.7"
+
+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@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
+braces@^2.3.1:
+  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"
+
+browser-process-hrtime@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e"
+  integrity sha1-Ql1opY00R/AqBKqJQYf86K+Le44=
+
+browser-resolve@^1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
+  dependencies:
+    resolve "1.1.7"
+
+bser@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
+  integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=
+  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==
+
+builtin-modules@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
+
+bunyan-debug-stream@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/bunyan-debug-stream/-/bunyan-debug-stream-1.1.1.tgz#4740a00b7d5c2d9d1b714925ab0802516040813e"
+  integrity sha512-jJbQ1gXUL6vMmZVdbaTFK1v1sGa7axLrSQQwkB6HU9HCPTzsw2HsKcPHm1vgXZlEck/4IvEuRwg/9+083YelCg==
+  dependencies:
+    colors "^1.0.3"
+    exception-formatter "^1.0.4"
+
+bunyan@^1.8.12:
+  version "1.8.12"
+  resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.12.tgz#f150f0f6748abdd72aeae84f04403be2ef113797"
+  integrity sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=
+  optionalDependencies:
+    dtrace-provider "~0.8"
+    moment "^2.10.6"
+    mv "~2"
+    safe-json-stringify "~1"
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+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"
+
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
+  dependencies:
+    callsites "^0.2.0"
+
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+
+camelcase@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+
+capture-exit@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
+  dependencies:
+    rsvp "^3.3.3"
+
+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@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  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.1.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chardet@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+  integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
+
+child-process-promise@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/child-process-promise/-/child-process-promise-2.2.1.tgz#4730a11ef610fad450b8f223c79d31d7bdad8074"
+  integrity sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=
+  dependencies:
+    cross-spawn "^4.0.2"
+    node-version "^1.0.0"
+    promise-polyfill "^6.0.1"
+
+chownr@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
+  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
+
+ci-info@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
+  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
+
+circular-json@^0.3.1:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
+
+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"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.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=
+
+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 sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+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-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-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
+colors@^1.0.3:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
+  integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
+
+combined-stream@1.0.6:
+  version "1.0.6"
+  resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
+  dependencies:
+    delayed-stream "~1.0.0"
+
+combined-stream@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@^2.15.1, commander@^2.9.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
+  integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
+
+commander@~2.13.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
+
+commander@~2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+
+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.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+
+compressible@~2.0.14:
+  version "2.0.15"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
+  integrity sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==
+  dependencies:
+    mime-db ">= 1.36.0 < 2"
+
+compression@^1.7.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
+  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.14"
+    debug "2.6.9"
+    on-headers "~1.0.1"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
+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.6.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"
+
+connect@^3.6.5:
+  version "3.6.6"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
+  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.0"
+    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 sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
+convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+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@^1.0.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+  integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
+
+core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.7:
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
+
+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=
+
+cosmiconfig@^5.0.5:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
+  integrity sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ==
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^4.0.0"
+
+create-react-class@^15.6.3:
+  version "15.6.3"
+  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
+  integrity sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
+cross-spawn@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
+  integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=
+  dependencies:
+    lru-cache "^4.0.1"
+    which "^1.2.9"
+
+cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+cross-spawn@^6.0.5:
+  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"
+
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz#8cd52e8a3acfd68d3aed38ee0a640177d2f9d797"
+  integrity sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==
+
+cssstyle@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz#18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"
+  integrity sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==
+  dependencies:
+    cssom "0.3.x"
+
+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@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.0.1.tgz#d416ac3896918f29ca84d81085bc3705834da579"
+  integrity sha512-0HdcMZzK6ubMUnsMmQmG0AcLQPvbvb47R0+7CCZQCYgcd8OUWG91CG7sM6GoXgjz+WLl4ArFzHtBMy/QqSF4eg==
+  dependencies:
+    abab "^2.0.0"
+    whatwg-mimetype "^2.1.0"
+    whatwg-url "^7.0.0"
+
+debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+  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@^3.1.0:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
+  integrity sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==
+  dependencies:
+    ms "^2.1.1"
+
+decamelize@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+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-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
+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=
+
+default-require-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  integrity sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=
+  dependencies:
+    strip-bom "^2.0.0"
+
+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"
+
+del@^2.0.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+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=
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+denodeify@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631"
+  integrity sha1-OjYof1A05pnnV3kBBSwubJQlFjE=
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
+  dependencies:
+    repeating "^2.0.0"
+
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
+detect-newline@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
+
+detox@9.0.4:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/detox/-/detox-9.0.4.tgz#ff8deeb56464ca0a351b7f9123c86a52dc80d8ef"
+  integrity sha512-2dbMXA2BlJmtx2XWOwMHETsbwKdn9mjto9jrQ2djgmpt3+ulJhWmODmbKCKgtvNuDE5wlfjogvxfoPIv0rzinA==
+  dependencies:
+    bunyan "^1.8.12"
+    bunyan-debug-stream "^1.1.0"
+    child-process-promise "^2.2.0"
+    commander "^2.15.1"
+    fs-extra "^4.0.2"
+    get-port "^2.1.0"
+    ini "^1.3.4"
+    lodash "^4.17.5"
+    minimist "^1.2.0"
+    proper-lockfile "^3.0.2"
+    sanitize-filename "^1.6.1"
+    shell-utils "^1.0.9"
+    tail "^1.2.3"
+    telnet-client "0.15.3"
+    tempfile "^2.0.0"
+    ws "^1.1.1"
+
+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==
+
+doctrine@^2.0.2, 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"
+
+dom-walk@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
+  integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=
+
+domexception@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
+  dependencies:
+    webidl-conversions "^4.0.2"
+
+dtrace-provider@~0.8:
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.7.tgz#dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04"
+  integrity sha1-3JObTT4GIM/gwc2APQ0tftBP/QQ=
+  dependencies:
+    nan "^2.10.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"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+encodeurl@~1.0.1, encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
+  dependencies:
+    iconv-lite "~0.4.13"
+
+envinfo@^5.7.0:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-5.10.0.tgz#503a9774ae15b93ea68bdfae2ccd6306624ea6df"
+  integrity sha512-rXbzXWvnQxy+TcqZlARbWVQwgGVVouVJgFZhLVN5htjLxl1thstrP2ZGi0pXC309AbK7gVOPU+ulz/tmpCI7iw==
+
+error-ex@^1.2.0, 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"
+
+errorhandler@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.0.tgz#eaba64ca5d542a311ac945f582defc336165d9f4"
+  integrity sha1-6rpkyl1UKjEayUX1gt78M2Fl2fQ=
+  dependencies:
+    accepts "~1.3.3"
+    escape-html "~1.0.3"
+
+es-abstract@^1.10.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
+  integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
+  dependencies:
+    es-to-primitive "^1.1.1"
+    function-bind "^1.1.1"
+    has "^1.0.1"
+    is-callable "^1.1.3"
+    is-regex "^1.0.4"
+
+es-to-primitive@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+  integrity sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=
+  dependencies:
+    is-callable "^1.1.1"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.1"
+
+escape-html@~1.0.3:
+  version "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.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=
+
+escodegen@^1.9.1:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
+  integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+eslint-config-fb-strict@22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-fb-strict/-/eslint-config-fb-strict-22.1.0.tgz#6a81785d45748d6c753442772b84da0aca13c45f"
+  integrity sha512-UFJeCwl7Zg7s3d90PjedcNbjpMBzyojTiF9H6lEJMp/XU8oSlSDzk1UFOz41YqdG2BFyg5xsRbQngquJkTxrxg==
+  dependencies:
+    eslint-config-fbjs "^2.0.1"
+
+eslint-config-fbjs@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-config-fbjs/-/eslint-config-fbjs-2.0.1.tgz#395896fd740e0e28dc1c2072e3bc982e88247df5"
+  integrity sha512-nZ/JByixNK/8epeQqmrtNCYYMXCjHoPkJwHaHg4aZyZlS62YLttDSWYE6ISGl070V+o6dkFbDALceWaO3Po+Sw==
+
+eslint-config-fbjs@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-fbjs/-/eslint-config-fbjs-2.1.0.tgz#bfe4f8c2d2282bfe515359553905d830e3a5d12f"
+  integrity sha512-wh7Lveo51V3/SUydWtR2VEU8wNfSHt5V7YzIUKTRkHF3kvkCwFtM6Jgsn+xBNkjxZGpfWgNJN/drk1LLx64Dww==
+
+eslint-plugin-eslint-comments@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.0.1.tgz#baafb713584c0de7ee588710720e580bcc28cfbb"
+  integrity sha512-7zU6gCulKVmfG3AZdnvDxzfHaGdvkA8tsLiKbneeI/TlVaulJsRzOyMCctH9QTobKVJ6LIsiJbrkSKkgcFLHxw==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    ignore "^3.3.8"
+
+eslint-plugin-flowtype@2.43.0:
+  version "2.43.0"
+  resolved "http://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.43.0.tgz#47cdac5f01cda53f1c3e8477f0c83fee66a1606e"
+  integrity sha512-gFlHd3b6L28Mm8nbNoK6YtWgJ6STngf8GY3RA5DfeUYU3mRYJcHZ4c70bsBoERnCZy+nGHyus+aJ4jkimSnu5g==
+  dependencies:
+    lodash "^4.15.0"
+
+eslint-plugin-jest@21.8.0:
+  version "21.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.8.0.tgz#4f3155e2898c1efb0ce548f3e084e07db5e21c07"
+  integrity sha512-u8+tOrVHHAv9SetdzCghLaBrHyaBLx+6surC+A+VfLy7CfXixTvQnJmD/Ym8mDE6e7wPDZWWgsqb3FGAWh7NTw==
+
+eslint-plugin-prettier@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.0.tgz#33e4e228bdb06142d03c560ce04ec23f6c767dd7"
+  integrity sha512-floiaI4F7hRkTrFe8V2ItOK97QYrX75DjmdzmVITZoAP6Cn06oEDPQRsO6MlHEP/u2SxI3xQ52Kpjw6j5WGfeQ==
+  dependencies:
+    fast-diff "^1.1.1"
+    jest-docblock "^21.0.0"
+
+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.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.3.0.tgz#77135f1b9d69058c5612777aac90d9cd6d35af33"
+  integrity sha512-+Td4JX9POuhNDQdIxlzgcD0RDBmA1kB6dTnOCORtN/cDa2vUyIpGLuVkVvgrnUOizsgD7uhniomTpynRcjIvFQ==
+  dependencies:
+    eslint-plugin-react-native-globals "^0.1.1"
+
+eslint-plugin-react@7.8.2:
+  version "7.8.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.8.2.tgz#e95c9c47fece55d2303d1a67c9d01b930b88a51d"
+  integrity sha512-H3ne8ob4Bn6NXSN9N9twsn7t8dyHT5bF/ibQepxIHi6JiPIdC2gXlfYvZYucbdrWio4FxBq7Z4mSauQP+qmMkQ==
+  dependencies:
+    doctrine "^2.0.2"
+    has "^1.0.1"
+    jsx-ast-utils "^2.0.1"
+    prop-types "^15.6.0"
+
+eslint-scope@3.7.1:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
+  integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-scope@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-utils@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
+  integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
+
+eslint-visitor-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
+  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
+
+eslint@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.1.0.tgz#2ed611f1ce163c0fb99e1e0cda5af8f662dff645"
+  integrity sha512-DyH6JsoA1KzA5+OSWFjg56DFJT+sDLO0yokaPZ9qY0UEmYrPA1gEX/G1MnVkmRDsksG4H1foIVz2ZXXM3hHYvw==
+  dependencies:
+    ajv "^6.5.0"
+    babel-code-frame "^6.26.0"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.5"
+    debug "^3.1.0"
+    doctrine "^2.1.0"
+    eslint-scope "^4.0.0"
+    eslint-utils "^1.3.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^4.0.0"
+    esquery "^1.0.1"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.7.0"
+    ignore "^3.3.3"
+    imurmurhash "^0.1.4"
+    inquirer "^5.2.0"
+    is-resolvable "^1.1.0"
+    js-yaml "^3.11.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.5"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    pluralize "^7.0.0"
+    progress "^2.0.0"
+    regexpp "^1.1.0"
+    require-uncached "^1.0.3"
+    semver "^5.5.0"
+    string.prototype.matchall "^2.0.0"
+    strip-ansi "^4.0.0"
+    strip-json-comments "^2.0.1"
+    table "^4.0.3"
+    text-table "^0.2.0"
+
+espree@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-4.0.0.tgz#253998f20a0f82db5d866385799d912a83a36634"
+  integrity sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==
+  dependencies:
+    acorn "^5.6.0"
+    acorn-jsx "^4.1.1"
+
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+
+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.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
+  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+  dependencies:
+    estraverse "^4.0.0"
+
+esrecurse@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+  dependencies:
+    estraverse "^4.1.0"
+
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+
+esutils@^2.0.0, esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
+event-target-shim@^1.0.5:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-1.1.1.tgz#a86e5ee6bdaa16054475da797ccddf0c55698491"
+  integrity sha1-qG5e5r2qFgVEddp5fM3fDFVphJE=
+
+eventemitter3@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
+
+exception-formatter@^1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/exception-formatter/-/exception-formatter-1.0.7.tgz#3291616b86fceabefa97aee6a4708032c6e3b96d"
+  integrity sha512-zV45vEsjytJrwfGq6X9qd1Ll56cW4NC2mhCO6lqwMk4ZpA1fZ6C3UiaQM/X7if+7wZFmCgss3ahp9B/uVFuLRw==
+  dependencies:
+    colors "^1.0.3"
+
+exec-sh@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
+  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
+  dependencies:
+    merge "^1.2.0"
+
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.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"
+
+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@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
+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"
+
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
+  dependencies:
+    fill-range "^2.1.0"
+
+expect@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98"
+  integrity sha512-dgSoOHgmtn/aDGRVFWclQyPDKl2CQRq0hmIEoUAuQs/2rn2NcvCWcSCovm6BLeuB/7EZuLGu2QfnR+qRt5OM4w==
+  dependencies:
+    ansi-styles "^3.2.0"
+    jest-diff "^23.6.0"
+    jest-get-type "^22.1.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+
+extend-shallow@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
+  integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=
+  dependencies:
+    kind-of "^1.1.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:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+external-editor@^2.0.4, external-editor@^2.1.0:
+  version "2.2.0"
+  resolved "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
+  integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
+  dependencies:
+    chardet "^0.4.0"
+    iconv-lite "^0.4.17"
+    tmp "^0.0.33"
+
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
+  dependencies:
+    is-extglob "^1.0.0"
+
+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=
+
+fancy-log@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
+  integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E=
+  dependencies:
+    ansi-gray "^0.1.1"
+    color-support "^1.1.3"
+    time-stamp "^1.0.0"
+
+fast-deep-equal@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
+
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+
+fast-diff@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
+  integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==
+
+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.4:
+  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.0"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+  integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=
+  dependencies:
+    bser "^2.0.0"
+
+fbjs-css-vars@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.1.tgz#836d876e887d702f45610f5ebd2fbeef649527fc"
+  integrity sha512-IM+v/C40MNZWqsLErc32e0TyIk/NhkkQZL0QmjBh6zi1eXv0/GeVKmKmueQX7nn9SXQBQbTUcB8zuexIF3/88w==
+
+fbjs-scripts@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/fbjs-scripts/-/fbjs-scripts-0.8.3.tgz#b854de7a11e62a37f72dab9aaf4d9b53c4a03174"
+  integrity sha512-aUJ/uEzMIiBYuj/blLp4sVNkQQ7ZEB/lyplG1IzzOmZ83meiWecrGg5jBo4wWrxXmO4RExdtsSV1QkTjPt2Gag==
+  dependencies:
+    ansi-colors "^1.0.1"
+    babel-core "^6.7.2"
+    babel-preset-fbjs "^2.1.2"
+    core-js "^2.4.1"
+    cross-spawn "^5.1.0"
+    fancy-log "^1.3.2"
+    object-assign "^4.0.1"
+    plugin-error "^0.1.2"
+    semver "^5.1.0"
+    through2 "^2.0.0"
+
+fbjs@^0.8.9:
+  version "0.8.17"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
+  integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
+  dependencies:
+    core-js "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.18"
+
+fbjs@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-1.0.0.tgz#52c215e0883a3c86af2a7a776ed51525ae8e0a5a"
+  integrity sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==
+  dependencies:
+    core-js "^2.4.1"
+    fbjs-css-vars "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.18"
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
+filename-regex@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
+
+fileset@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
+
+fill-range@^2.1.0:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
+  dependencies:
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^3.0.0"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
+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"
+
+finalhandler@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.3.1"
+    unpipe "~1.0.0"
+
+find-cache-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^2.0.0"
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+find-up@^2.0.0, find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  dependencies:
+    locate-path "^2.0.0"
+
+flat-cache@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+  integrity sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=
+  dependencies:
+    circular-json "^0.3.1"
+    del "^2.0.2"
+    graceful-fs "^4.1.2"
+    write "^0.2.1"
+
+flow-bin@^0.83.0:
+  version "0.83.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.83.0.tgz#fd26f5f95758d7701264b3f9a1e1a3d4cbcab1a9"
+  integrity sha512-1K83EL/U9Gh0BaXPKkZe6TRizSmNSKx9Wuws1c8gh7DJEwiburtCxYT+4o7in1+GnNEm3CZWnbnVV8n9HMpiDA==
+
+for-in@^1.0.1, 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=
+
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
+  dependencies:
+    for-in "^1.0.1"
+
+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.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
+  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"
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
+fs-extra@^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=
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    klaw "^1.0.0"
+
+fs-extra@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
+  dependencies:
+    minipass "^2.2.1"
+
+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.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
+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=
+
+gauge@~1.2.5:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
+  integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM=
+  dependencies:
+    ansi "^0.3.0"
+    has-unicode "^2.0.0"
+    lodash.pad "^4.1.0"
+    lodash.padend "^4.1.0"
+    lodash.padstart "^4.1.0"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  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"
+
+get-caller-file@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
+get-port@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-2.1.0.tgz#8783f9dcebd1eea495a334e1a6a251e78887ab1a"
+  integrity sha1-h4P53OvR7qSVozThpqJR54iHqxo=
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+
+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-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
+  dependencies:
+    is-glob "^2.0.0"
+
+glob@^6.0.1:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  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"
+
+global@^4.3.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
+  integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=
+  dependencies:
+    min-document "^2.19.0"
+    process "~0.5.1"
+
+globals@^11.1.0, globals@^11.7.0:
+  version "11.7.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
+  integrity sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==
+
+globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.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:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
+
+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=
+
+handlebars@^4.0.3:
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
+  dependencies:
+    async "^2.5.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
+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.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
+  dependencies:
+    ajv "^5.3.0"
+    har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
+
+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-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
+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.1:
+  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"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+home-or-tmp@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-3.0.0.tgz#57a8fe24cf33cdd524860a15821ddc25c86671fb"
+  integrity sha1-V6j+JM8zzdUkhgoVgh3cJchmcfs=
+
+hosted-git-info@^2.1.4:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
+
+html-encoding-sniffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+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"
+
+iconv-lite@0.4.23:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+  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"
+
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
+  dependencies:
+    minimatch "^3.0.4"
+
+ignore@^3.3.3, ignore@^3.3.8:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
+
+image-size@^0.6.0:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2"
+  integrity sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA==
+
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  integrity sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.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, inherits@2.0.3, inherits@^2.0.3, inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ini@^1.3.4, ini@~1.3.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+inquirer@^3.0.6:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+  integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.4"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx-lite "^4.0.8"
+    rx-lite-aggregates "^4.0.8"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
+inquirer@^5.2.0:
+  version "5.2.0"
+  resolved "http://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
+  integrity sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.1.0"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^5.5.2"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
+interpret@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
+
+invariant@^2.2.2, 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==
+  dependencies:
+    loose-envify "^1.0.0"
+
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+
+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-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-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-callable@^1.1.1, is-callable@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
+
+is-ci@^1.0.10:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
+  dependencies:
+    ci-info "^1.5.0"
+
+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-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-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-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
+
+is-dotfile@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
+  dependencies:
+    is-primitive "^2.0.0"
+
+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@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
+
+is-finite@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
+  dependencies:
+    number-is-nan "^1.0.0"
+
+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 sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  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"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-generator-fn@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+  integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=
+
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
+  dependencies:
+    is-extglob "^1.0.0"
+
+is-number@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
+  dependencies:
+    kind-of "^3.0.2"
+
+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-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-plain-object@^2.0.1, 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-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
+
+is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
+
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
+  dependencies:
+    has "^1.0.1"
+
+is-resolvable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
+
+is-stream@^1.0.1, 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-symbol@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+  integrity sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=
+
+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-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
+
+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==
+
+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=
+
+isomorphic-fetch@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
+  dependencies:
+    node-fetch "^1.0.1"
+    whatwg-fetch ">=0.10.0"
+
+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-api@^1.3.1:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa"
+  integrity sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==
+  dependencies:
+    async "^2.1.4"
+    fileset "^2.0.2"
+    istanbul-lib-coverage "^1.2.1"
+    istanbul-lib-hook "^1.2.2"
+    istanbul-lib-instrument "^1.10.2"
+    istanbul-lib-report "^1.1.5"
+    istanbul-lib-source-maps "^1.2.6"
+    istanbul-reports "^1.5.1"
+    js-yaml "^3.7.0"
+    mkdirp "^0.5.1"
+    once "^1.4.0"
+
+istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
+  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
+
+istanbul-lib-hook@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86"
+  integrity sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==
+  dependencies:
+    append-transform "^0.4.0"
+
+istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
+  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.2.1"
+    semver "^5.3.0"
+
+istanbul-lib-report@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
+  integrity sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==
+  dependencies:
+    istanbul-lib-coverage "^1.2.1"
+    mkdirp "^0.5.1"
+    path-parse "^1.0.5"
+    supports-color "^3.1.2"
+
+istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f"
+  integrity sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.2.1"
+    mkdirp "^0.5.1"
+    rimraf "^2.6.1"
+    source-map "^0.5.3"
+
+istanbul-reports@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
+  integrity sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==
+  dependencies:
+    handlebars "^4.0.3"
+
+jest-changed-files@^23.4.2:
+  version "23.4.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
+  integrity sha512-EyNhTAUWEfwnK0Is/09LxoqNDOn7mU7S3EHskG52djOFS/z+IT0jT3h3Ql61+dklcG7bJJitIWEMB4Sp1piHmA==
+  dependencies:
+    throat "^4.0.0"
+
+jest-cli@^23.4.1:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4"
+  integrity sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ==
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    import-local "^1.0.0"
+    is-ci "^1.0.10"
+    istanbul-api "^1.3.1"
+    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-instrument "^1.10.1"
+    istanbul-lib-source-maps "^1.2.4"
+    jest-changed-files "^23.4.2"
+    jest-config "^23.6.0"
+    jest-environment-jsdom "^23.4.0"
+    jest-get-type "^22.1.0"
+    jest-haste-map "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve-dependencies "^23.6.0"
+    jest-runner "^23.6.0"
+    jest-runtime "^23.6.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
+    jest-watcher "^23.4.0"
+    jest-worker "^23.2.0"
+    micromatch "^2.3.11"
+    node-notifier "^5.2.1"
+    prompts "^0.1.9"
+    realpath-native "^1.0.0"
+    rimraf "^2.5.4"
+    slash "^1.0.0"
+    string-length "^2.0.0"
+    strip-ansi "^4.0.0"
+    which "^1.2.12"
+    yargs "^11.0.0"
+
+jest-config@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d"
+  integrity sha512-i8V7z9BeDXab1+VNo78WM0AtWpBRXJLnkT+lyT+Slx/cbP5sZJ0+NDuLcmBE5hXAoK0aUp7vI+MOxR+R4d8SRQ==
+  dependencies:
+    babel-core "^6.0.0"
+    babel-jest "^23.6.0"
+    chalk "^2.0.1"
+    glob "^7.1.1"
+    jest-environment-jsdom "^23.4.0"
+    jest-environment-node "^23.4.0"
+    jest-get-type "^22.1.0"
+    jest-jasmine2 "^23.6.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
+    micromatch "^2.3.11"
+    pretty-format "^23.6.0"
+
+jest-diff@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.6.0.tgz#1500f3f16e850bb3d71233408089be099f610c7d"
+  integrity sha512-Gz9l5Ov+X3aL5L37IT+8hoCUsof1CVYBb2QEkOupK64XyRR3h+uRpYIm97K7sY8diFxowR8pIGEdyfMKTixo3g==
+  dependencies:
+    chalk "^2.0.1"
+    diff "^3.2.0"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.6.0"
+
+jest-docblock@23.2.0, jest-docblock@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
+  integrity sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=
+  dependencies:
+    detect-newline "^2.1.0"
+
+jest-docblock@^21.0.0:
+  version "21.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
+  integrity sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==
+
+jest-each@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.6.0.tgz#ba0c3a82a8054387016139c733a05242d3d71575"
+  integrity sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg==
+  dependencies:
+    chalk "^2.0.1"
+    pretty-format "^23.6.0"
+
+jest-environment-jsdom@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
+  integrity sha1-BWp5UrP+pROsYqFAosNox52eYCM=
+  dependencies:
+    jest-mock "^23.2.0"
+    jest-util "^23.4.0"
+    jsdom "^11.5.1"
+
+jest-environment-node@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
+  integrity sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=
+  dependencies:
+    jest-mock "^23.2.0"
+    jest-util "^23.4.0"
+
+jest-get-type@^22.1.0:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
+  integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
+
+jest-haste-map@23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.5.0.tgz#d4ca618188bd38caa6cb20349ce6610e194a8065"
+  integrity sha512-bt9Swigb6KZ6ZQq/fQDUwdUeHenVvZ6G/lKwJjwRGp+Fap8D4B3bND3FaeJg7vXVsLX8hXshRArbVxLop/5wLw==
+  dependencies:
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.11"
+    invariant "^2.2.4"
+    jest-docblock "^23.2.0"
+    jest-serializer "^23.0.1"
+    jest-worker "^23.2.0"
+    micromatch "^2.3.11"
+    sane "^2.0.0"
+
+jest-haste-map@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.6.0.tgz#2e3eb997814ca696d62afdb3f2529f5bbc935e16"
+  integrity sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==
+  dependencies:
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.11"
+    invariant "^2.2.4"
+    jest-docblock "^23.2.0"
+    jest-serializer "^23.0.1"
+    jest-worker "^23.2.0"
+    micromatch "^2.3.11"
+    sane "^2.0.0"
+
+jest-jasmine2@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0"
+  integrity sha512-pe2Ytgs1nyCs8IvsEJRiRTPC0eVYd8L/dXJGU08GFuBwZ4sYH/lmFDdOL3ZmvJR8QKqV9MFuwlsAi/EWkFUbsQ==
+  dependencies:
+    babel-traverse "^6.0.0"
+    chalk "^2.0.1"
+    co "^4.6.0"
+    expect "^23.6.0"
+    is-generator-fn "^1.0.0"
+    jest-diff "^23.6.0"
+    jest-each "^23.6.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    pretty-format "^23.6.0"
+
+jest-junit@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-5.1.0.tgz#e8e497d810a829bf02783125aab74b5df6caa8fe"
+  integrity sha512-3EVf1puv2ox5wybQDfLX3AEn3IKOgDV4E76y4pO2hBu46DEtAFZZAm//X1pzPQpqKji0zqgMIzqzF/K+uGAX9A==
+  dependencies:
+    jest-validate "^23.0.1"
+    mkdirp "^0.5.1"
+    strip-ansi "^4.0.0"
+    xml "^1.0.1"
+
+jest-leak-detector@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de"
+  integrity sha512-f/8zA04rsl1Nzj10HIyEsXvYlMpMPcy0QkQilVZDFOaPbv2ur71X5u2+C4ZQJGyV/xvVXtCCZ3wQ99IgQxftCg==
+  dependencies:
+    pretty-format "^23.6.0"
+
+jest-matcher-utils@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz#726bcea0c5294261a7417afb6da3186b4b8cac80"
+  integrity sha512-rosyCHQfBcol4NsckTn01cdelzWLU9Cq7aaigDf8VwwpIRvWE/9zLgX2bON+FkEW69/0UuYslUe22SOdEf2nog==
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.6.0"
+
+jest-message-util@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
+  integrity sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=
+  dependencies:
+    "@babel/code-frame" "^7.0.0-beta.35"
+    chalk "^2.0.1"
+    micromatch "^2.3.11"
+    slash "^1.0.0"
+    stack-utils "^1.0.1"
+
+jest-mock@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
+  integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=
+
+jest-regex-util@^23.3.0:
+  version "23.3.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
+  integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
+
+jest-resolve-dependencies@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d"
+  integrity sha512-EkQWkFWjGKwRtRyIwRwI6rtPAEyPWlUC2MpzHissYnzJeHcyCn1Hc8j7Nn1xUVrS5C6W5+ZL37XTem4D4pLZdA==
+  dependencies:
+    jest-regex-util "^23.3.0"
+    jest-snapshot "^23.6.0"
+
+jest-resolve@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
+  integrity sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA==
+  dependencies:
+    browser-resolve "^1.11.3"
+    chalk "^2.0.1"
+    realpath-native "^1.0.0"
+
+jest-runner@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38"
+  integrity sha512-kw0+uj710dzSJKU6ygri851CObtCD9cN8aNkg8jWJf4ewFyEa6kwmiH/r/M1Ec5IL/6VFa0wnAk6w+gzUtjJzA==
+  dependencies:
+    exit "^0.1.2"
+    graceful-fs "^4.1.11"
+    jest-config "^23.6.0"
+    jest-docblock "^23.2.0"
+    jest-haste-map "^23.6.0"
+    jest-jasmine2 "^23.6.0"
+    jest-leak-detector "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-runtime "^23.6.0"
+    jest-util "^23.4.0"
+    jest-worker "^23.2.0"
+    source-map-support "^0.5.6"
+    throat "^4.0.0"
+
+jest-runtime@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082"
+  integrity sha512-ycnLTNPT2Gv+TRhnAYAQ0B3SryEXhhRj1kA6hBPSeZaNQkJ7GbZsxOLUkwg6YmvWGdX3BB3PYKFLDQCAE1zNOw==
+  dependencies:
+    babel-core "^6.0.0"
+    babel-plugin-istanbul "^4.1.6"
+    chalk "^2.0.1"
+    convert-source-map "^1.4.0"
+    exit "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.1.11"
+    jest-config "^23.6.0"
+    jest-haste-map "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve "^23.6.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
+    micromatch "^2.3.11"
+    realpath-native "^1.0.0"
+    slash "^1.0.0"
+    strip-bom "3.0.0"
+    write-file-atomic "^2.1.0"
+    yargs "^11.0.0"
+
+jest-serializer@23.0.1, jest-serializer@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
+  integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=
+
+jest-snapshot@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a"
+  integrity sha512-tM7/Bprftun6Cvj2Awh/ikS7zV3pVwjRYU2qNYS51VZHgaAMBs5l4o/69AiDHhQrj5+LA2Lq4VIvK7zYk/bswg==
+  dependencies:
+    babel-types "^6.0.0"
+    chalk "^2.0.1"
+    jest-diff "^23.6.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-resolve "^23.6.0"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    pretty-format "^23.6.0"
+    semver "^5.5.0"
+
+jest-util@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
+  integrity sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=
+  dependencies:
+    callsites "^2.0.0"
+    chalk "^2.0.1"
+    graceful-fs "^4.1.11"
+    is-ci "^1.0.10"
+    jest-message-util "^23.4.0"
+    mkdirp "^0.5.1"
+    slash "^1.0.0"
+    source-map "^0.6.0"
+
+jest-validate@^23.0.1, jest-validate@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
+  integrity sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^22.1.0"
+    leven "^2.1.0"
+    pretty-format "^23.6.0"
+
+jest-watcher@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
+  integrity sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    string-length "^2.0.0"
+
+jest-worker@23.2.0, jest-worker@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
+  integrity sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=
+  dependencies:
+    merge-stream "^1.0.1"
+
+jest@23.4.1:
+  version "23.4.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-23.4.1.tgz#39550c72f3237f63ae1b434d8d122cdf6fa007b6"
+  integrity sha512-HTOuA9epknN7RKdzhmp9qrbP0z3TibAMXI+sluLOcrEoF54ZCG8/urFB2DK/sOINcMeyX6epMUqka8i0+d0xOA==
+  dependencies:
+    import-local "^1.0.0"
+    jest-cli "^23.4.1"
+
+"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-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+
+js-yaml@^3.11.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
+  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@^11.5.1:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
+  integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==
+  dependencies:
+    abab "^2.0.0"
+    acorn "^5.5.3"
+    acorn-globals "^4.1.0"
+    array-equal "^1.0.0"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle "^1.0.0"
+    data-urls "^1.0.0"
+    domexception "^1.0.1"
+    escodegen "^1.9.1"
+    html-encoding-sniffer "^1.0.2"
+    left-pad "^1.3.0"
+    nwsapi "^2.0.7"
+    parse5 "4.0.0"
+    pn "^1.1.0"
+    request "^2.87.0"
+    request-promise-native "^1.0.5"
+    sax "^1.2.4"
+    symbol-tree "^3.2.2"
+    tough-cookie "^2.3.4"
+    w3c-hr-time "^1.0.1"
+    webidl-conversions "^4.0.2"
+    whatwg-encoding "^1.0.3"
+    whatwg-mimetype "^2.1.0"
+    whatwg-url "^6.4.1"
+    ws "^5.2.0"
+    xml-name-validator "^3.0.0"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
+
+jsesc@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
+
+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.1:
+  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-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
+
+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-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=
+
+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 sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
+  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@^0.5.0, json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  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 sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
+
+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"
+
+jsx-ast-utils@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
+  integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=
+  dependencies:
+    array-includes "^3.0.3"
+
+kind-of@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
+  integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=
+
+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.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+
+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@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
+  integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
+
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
+  dependencies:
+    invert-kv "^1.0.0"
+
+left-pad@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
+  integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
+
+leven@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+  integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
+
+levn@^0.3.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"
+
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    strip-bom "^3.0.0"
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+lodash.pad@^4.1.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70"
+  integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA=
+
+lodash.padend@^4.1.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e"
+  integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=
+
+lodash.padstart@^4.1.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"
+  integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs=
+
+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=
+
+lodash.throttle@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+  integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
+
+lodash@4.x.x, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.6.1:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
+  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@^4.0.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+make-dir@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
+  dependencies:
+    pify "^3.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.1"
+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
+
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
+  dependencies:
+    readable-stream "^2.0.1"
+
+merge@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+  integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
+
+metro-babel-register@^0.48.1:
+  version "0.48.1"
+  resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.48.1.tgz#b889aee7fe78423a35c895dc1fb6a8d1a375ff5c"
+  integrity sha512-bSjMAD16vpyHRWeMJ6CXvhWbFbiW58YXhA9zgRbFBdxOcJPbkhj6HEX+FlxTlr2O0MNY27/4U96MFXTcRWcZhQ==
+  dependencies:
+    "@babel/core" "^7.0.0"
+    "@babel/plugin-proposal-class-properties" "^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-transform-async-to-generator" "^7.0.0"
+    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
+    "@babel/register" "^7.0.0"
+    core-js "^2.2.2"
+    escape-string-regexp "^1.0.5"
+
+metro-babel7-plugin-react-transform@0.48.1:
+  version "0.48.1"
+  resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.48.1.tgz#d5c8aeadcf30b75344477017b52edf4683a00e6a"
+  integrity sha512-b39Sowwzp0bqitbS3NkF5fzcuoT6vpLqj6Su7xgfCyW5EmYpvxunK7HwMSoZagAIpbD0H6r+iw+L2Ib1EEWfWw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+
+metro-cache@0.48.1:
+  version "0.48.1"
+  resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.48.1.tgz#befbac2f3a0f259f76d064a0f47e93e00441775d"
+  integrity sha512-Nq1RQ7SkhVKKO/uWKzc6JtvDm0JJD/kDsoIQNR2Db37fNlyGxij0FoYRNOX3BOnyhz0NG8kU1pz0qH43bPQ5rg==
+  dependencies:
+    jest-serializer "23.0.1"
+    metro-core "0.48.1"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+
+metro-config@0.48.1:
+  version "0.48.1"
+  resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.48.1.tgz#b5fac7d3a7e3817d7ff25ff88dcba9578876aae4"
+  integrity sha512-pqdbDHUtoQPfWiL8h3x/cN5Q8w/sPt5/UaXk4oIzalU+ooEh0Hi9w10wJHKVRtWzD27o828O04En51C9eEDY5g==
+  dependencies:
+    cosmiconfig "^5.0.5"
+    metro "0.48.1"
+    metro-cache "0.48.1"
+    metro-core "0.48.1"
+    pretty-format "^23.4.1"
+
+metro-core@0.48.1, metro-core@^0.48.1:
+  version "0.48.1"
+  resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.48.1.tgz#67980160b8d24859308bad9f4394e7e43b54c237"
+  integrity sha512-uctosjP4imHThHlD5hAt0Yg7tiRLmY3GlU4VaIs0YH2i82yI56b93RtTCI1ACWhL7LUuttSVpPXCBN3ERTe+KA==
+  dependencies:
+    jest-haste-map "23.5.0"
+    lodash.throttle "^4.1.1"
+    metro-resolver "0.48.1"
+    wordwrap "^1.0.0"
+
+metro-memory-fs@^0.48.1:
+  version "0.48.1"
+  resolved "https://registry.yarnpkg.com/metro-memory-fs/-/metro-memory-fs-0.48.1.tgz#3590f224ded5c33fb7684d4c0611e74dcafab039"
+  integrity sha512-ASbRBpmfRraFilm5o5gdY9X0DQAmkvCgAHDunCo0J2vlQ730VbuhhR67pVRmRr5oXXmDdEIYUkJSIqzP0Q+UKQ==
+
+metro-minify-uglify@0.48.1:
+  version "0.48.1"
+  resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.48.1.tgz#f8122bb266f7ad799a6b81eef85f0ae3a5623e18"
+  integrity sha512-8htDNs3dil5CopLnMrE6SGjMGg44KB+omE3ZyTNSWXbmZl8aG3spl+xpSJyvkIQrSFNSCzMVZ8V+lDJDwKJ/zg==
+  dependencies:
+    uglify-es "^3.1.9"
+
+metro-react-native-babel-preset@0.48.1:
+  version "0.48.1"
+  resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.48.1.tgz#dddbbe205bdfe75f25cd8dafeb7d1b628a90b755"
+  integrity sha512-euJ0MOyBYTa76kQNbly6An9FNpu9BqxfkXhKtD8hWZxo5dxIAk25AmoWfXU2OHj7PogG/u0Ndo3tmhZZ2NWYvA==
+  dependencies:
+    "@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-transform-arrow-functions" "^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-for-of" "^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-object-assign" "^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-source" "^7.0.0"
+    "@babel/plugin-transform-regenerator" "^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.0.0"
+    "@babel/plugin-transform-unicode-regex" "^7.0.0"
+    "@babel/template" "^7.0.0"
+    metro-babel7-plugin-react-transform "0.48.1"
+    react-transform-hmr "^1.0.4"
+
+metro-resolver@0.48.1:
+  version "0.48.1"
+  resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.48.1.tgz#31078581624f3af828fb5943e916f3f0b97e8cde"
+  integrity sha512-d28ki5RTRUPFNQVJEgiMx3Zr81NlxOm1mKgaBx93Alyy2ZZ1Gvs25olZHwHgKPsRTgCqg5kgImkIHtjP2j8BdQ==
+  dependencies:
+    absolute-path "^0.0.0"
+
+metro-source-map@0.48.1:
+  version "0.48.1"
+  resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.48.1.tgz#800ea0666d5cc0b640dfd9e66f76f8a3c5f6202c"
+  integrity sha512-6+YSKB3zRLGA39I0G/wfPizf1HPlrnmeX70E1vvH0G1HVD/ko5dqjJgH4vlr71Za9xYZLSuaXoQmmgkcf6at4w==
+  dependencies:
+    source-map "^0.5.6"
+
+metro@0.48.1, metro@^0.48.1:
+  version "0.48.1"
+  resolved "https://registry.yarnpkg.com/metro/-/metro-0.48.1.tgz#10cc5cbca1bdf8e4239bf43d3aa74babcf573705"
+  integrity sha512-7V+YOqfmgGhomdWAoD58zRQvPxUgBIo6b1YgcZULvh7yPPMo3tTkTvrzS2Qd2N3LFTysRQWzOlkb7O7jAV5FDw==
+  dependencies:
+    "@babel/core" "^7.0.0"
+    "@babel/generator" "^7.0.0"
+    "@babel/parser" "^7.0.0"
+    "@babel/plugin-external-helpers" "^7.0.0"
+    "@babel/template" "^7.0.0"
+    "@babel/traverse" "^7.0.0"
+    "@babel/types" "^7.0.0"
+    absolute-path "^0.0.0"
+    async "^2.4.0"
+    babel-preset-fbjs "^3.0.1"
+    chalk "^1.1.1"
+    concat-stream "^1.6.0"
+    connect "^3.6.5"
+    debug "^2.2.0"
+    denodeify "^1.2.1"
+    eventemitter3 "^3.0.0"
+    fbjs "^1.0.0"
+    fs-extra "^1.0.0"
+    graceful-fs "^4.1.3"
+    image-size "^0.6.0"
+    jest-docblock "23.2.0"
+    jest-haste-map "23.5.0"
+    jest-worker "23.2.0"
+    json-stable-stringify "^1.0.1"
+    lodash.throttle "^4.1.1"
+    merge-stream "^1.0.1"
+    metro-cache "0.48.1"
+    metro-config "0.48.1"
+    metro-core "0.48.1"
+    metro-minify-uglify "0.48.1"
+    metro-react-native-babel-preset "0.48.1"
+    metro-resolver "0.48.1"
+    metro-source-map "0.48.1"
+    mime-types "2.1.11"
+    mkdirp "^0.5.1"
+    node-fetch "^2.2.0"
+    nullthrows "^1.1.0"
+    react-transform-hmr "^1.0.4"
+    resolve "^1.5.0"
+    rimraf "^2.5.4"
+    serialize-error "^2.1.0"
+    source-map "^0.5.6"
+    temp "0.8.3"
+    throat "^4.1.0"
+    wordwrap "^1.0.0"
+    write-file-atomic "^1.2.0"
+    ws "^1.1.0"
+    xpipe "^1.0.5"
+    yargs "^9.0.0"
+
+micromatch@^2.3.11:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
+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"
+
+"mime-db@>= 1.36.0 < 2", mime-db@~1.36.0:
+  version "1.36.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
+
+mime-db@~1.23.0:
+  version "1.23.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.23.0.tgz#a31b4070adaea27d732ea333740a64d0ec9a6659"
+  integrity sha1-oxtAcK2uon1zLqMzdApk0OyaZlk=
+
+mime-types@2.1.11:
+  version "2.1.11"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c"
+  integrity sha1-wlnEcb2oCKhdbNGTtDCl+uRHOzw=
+  dependencies:
+    mime-db "~1.23.0"
+
+mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19:
+  version "2.1.20"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
+  dependencies:
+    mime-db "~1.36.0"
+
+mime@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
+
+mime@^1.3.4:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
+  dependencies:
+    dom-walk "^0.1.0"
+
+"minimatch@2 || 3", minimatch@^3.0.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"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+
+minimist@^1.1.1, minimist@^1.2.0:
+  version "1.2.0"
+  resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
+  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
+  dependencies:
+    minipass "^2.2.1"
+
+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==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
+  version "0.5.1"
+  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+  dependencies:
+    minimist "0.0.8"
+
+moment@^2.10.6:
+  version "2.22.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
+  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
+
+morgan@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59"
+  integrity sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==
+  dependencies:
+    basic-auth "~2.0.0"
+    debug "2.6.9"
+    depd "~1.1.2"
+    on-finished "~2.3.0"
+    on-headers "~1.0.1"
+
+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.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+mv@~2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
+  integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=
+  dependencies:
+    mkdirp "~0.5.1"
+    ncp "~2.0.0"
+    rimraf "~2.4.0"
+
+nan@^2.10.0, nan@^2.9.2:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
+  integrity sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==
+
+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=
+
+ncp@~2.0.0:
+  version "2.0.0"
+  resolved "http://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
+  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
+
+needle@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.3.tgz#c1b04da378cd634d8befe2de965dc2cfb0fd65ca"
+  integrity sha512-GPL22d/U9cai87FcCPO6e+MT3vyHS2j+zwotakDc7kE2DtUAqFKMXLJCTtRp+5S75vXIwQPvIxkvlctxf9q4gQ==
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
+negotiator@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
+
+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-fetch@^1.0.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
+node-fetch@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
+  integrity sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA==
+
+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@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
+  integrity sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==
+  dependencies:
+    growly "^1.3.0"
+    semver "^5.4.1"
+    shellwords "^0.1.1"
+    which "^1.3.0"
+
+node-pre-gyp@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
+node-version@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.2.0.tgz#34fde3ffa8e1149bd323983479dda620e1b5060d"
+  integrity sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-package-data@^2.3.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.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"
+
+npm-bundled@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
+
+npm-packlist@^1.1.6:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
+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"
+
+npmlog@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692"
+  integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI=
+  dependencies:
+    ansi "~0.3.1"
+    are-we-there-yet "~1.1.2"
+    gauge "~1.2.5"
+
+npmlog@^4.0.2:
+  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.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.0.tgz#832bb19ef7fedab989f81675c846e2858a3917a2"
+  integrity sha512-YoigDq49JRqVCUlb4XlwZirXQiNCoXdwoyfklXJAEYHN+XKHWgDkrcWxNgxEtP7N+XF9Akp7Lr6wLq8HZxLttw==
+
+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 sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+nwsapi@^2.0.7:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016"
+  integrity sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ==
+
+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.0.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=
+
+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.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
+  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
+
+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.getownpropertydescriptors@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.5.1"
+
+object.omit@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
+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"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+on-headers@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+  integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
+
+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"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+opn@^3.0.2:
+  version "3.0.3"
+  resolved "http://registry.npmjs.org/opn/-/opn-3.0.3.tgz#b6d99e7399f78d65c3baaffef1fb288e9b85243a"
+  integrity sha1-ttmec5n3jWXDuq/+8fsojpuFJDo=
+  dependencies:
+    object-assign "^4.0.1"
+
+optimist@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
+optionator@^0.8.1, optionator@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+options@>=0.0.5:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
+  integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-locale@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
+  dependencies:
+    execa "^0.7.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+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@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+  dependencies:
+    p-try "^1.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  dependencies:
+    p-limit "^1.1.0"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+  dependencies:
+    error-ex "^1.2.0"
+
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
+parse5@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
+
+parseurl@~1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
+
+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-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+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-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  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-is-inside@^1.0.1, path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
+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-parse@^1.0.5:
+  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@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
+  dependencies:
+    pify "^2.0.0"
+
+pegjs@^0.10.0:
+  version "0.10.0"
+  resolved "http://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz#cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"
+  integrity sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0=
+
+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=
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pirates@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.0.tgz#850b18781b4ac6ec58a43c9ed9ec5fe6796addbd"
+  integrity sha512-8t5BsXy1LUIjn3WWOlOuFDuKswhQb/tkak641lvBgmPOBUQHXveORtlMCp6OdPV1dtuTaEahKA8VNz6uLfKBtA==
+  dependencies:
+    node-modules-regexp "^1.0.0"
+
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
+  dependencies:
+    find-up "^2.1.0"
+
+plist@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-2.0.1.tgz#0a32ca9481b1c364e92e18dc55c876de9d01da8b"
+  integrity sha1-CjLKlIGxw2TpLhjcVch23p0B2os=
+  dependencies:
+    base64-js "1.1.2"
+    xmlbuilder "8.2.2"
+    xmldom "0.1.x"
+
+plist@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"
+  integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==
+  dependencies:
+    base64-js "^1.2.3"
+    xmlbuilder "^9.0.7"
+    xmldom "0.1.x"
+
+plugin-error@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
+  integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=
+  dependencies:
+    ansi-cyan "^0.1.1"
+    ansi-red "^0.1.1"
+    arr-diff "^1.0.1"
+    arr-union "^2.0.1"
+    extend-shallow "^1.1.2"
+
+pluralize@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
+
+pn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
+
+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=
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
+
+prettier@1.13.6:
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.6.tgz#00ae0b777ad92f81a9e7a1df2f0470b6dab0cb44"
+  integrity sha512-p5eqCNiohWZN++7aJXUVj0JgLqHCPLf9GLIcLBHGNWs4Y9FJOPs6+KNO2WT0udJIQJTbeZFrJkjzjcb8fkAYYQ==
+
+pretty-format@^23.4.1, pretty-format@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
+  integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==
+  dependencies:
+    ansi-regex "^3.0.0"
+    ansi-styles "^3.2.0"
+
+private@^0.1.6, 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==
+
+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==
+
+process@~0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
+  integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=
+
+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-polyfill@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057"
+  integrity sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=
+
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
+prompts@^0.1.9:
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.14.tgz#a8e15c612c5c9ec8f8111847df3337c9cbd443b2"
+  integrity sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w==
+  dependencies:
+    kleur "^2.0.1"
+    sisteransi "^0.1.1"
+
+prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==
+  dependencies:
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
+proper-lockfile@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-3.0.2.tgz#d30b3b83ecb157e08fe0d411f2393bc384b77ad1"
+  integrity sha512-SDrSRyuKE1jM9b2kdpL6SA78wgG+M+fZKe2zbWkURsshOzUmoOornXQcasKQRP9hGhMoEILNpSbWcYoymoB5cA==
+  dependencies:
+    graceful-fs "^4.1.11"
+    retry "^0.10.1"
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+
+psl@^1.1.24:
+  version "1.1.29"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+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==
+
+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==
+
+randomatic@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
+  integrity sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==
+  dependencies:
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    math-random "^1.0.1"
+
+range-parser@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
+
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+react-clone-referenced-element@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/react-clone-referenced-element/-/react-clone-referenced-element-1.1.0.tgz#9cdda7f2aeb54fea791f3ab8c6ab96c7a77d0158"
+  integrity sha512-FKOsfKbBkPxYE8576EM6uAfHC4rnMpLyH6/TJUL4WcHUEB3EUn8AxPjnnV/IiwSSzsClvHYK+sDELKN/EJ0WYg==
+
+react-deep-force-update@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.1.2.tgz#3d2ae45c2c9040cbb1772be52f8ea1ade6ca2ee1"
+  integrity sha512-WUSQJ4P/wWcusaH+zZmbECOk7H5N2pOIl0vzheeornkIMhu+qrNdGFm0bDZLCb0hSF0jf/kH1SgkNGfBdTc4wA==
+
+react-devtools-core@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-3.4.0.tgz#6b61594dce01b129a9e0b44b5bc4952f8f59ceec"
+  integrity sha512-yV3LLhoRwbfcQyVPNwb1EZ9W7CGu+kX2EqyZ3Cl5C+cbXcb6FJ3YSeeBt9BQB+hjyjRMBjQSKqnpPS6OMSEUow==
+  dependencies:
+    shell-quote "^1.6.1"
+    ws "^3.3.1"
+
+react-is@^16.6.0-alpha.8af6728:
+  version "16.6.0-alpha.8af6728"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.0-alpha.8af6728.tgz#3ce01f13f164b90a76ad902735834fc12d06e30e"
+  integrity sha512-F65AeMavskvRglteO7dC0Nvq3Br1ESnpCOG5M6fenQX52Uhpt6eCI0vL3ICM/hnVhIOQY2fwnSWtST33OlgxVA==
+
+react-native-dummy@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/react-native-dummy/-/react-native-dummy-0.1.0.tgz#8ec015b814df45acfac458150b67f8a947b36b93"
+  integrity sha512-IVgM7ZtoQPfbduQIj8DrSaDyCkBDZBoiJMLMIqdDl5FJP3hJsakVybl3TvUOycU6bg+kPQY8znu0akugosh/gw==
+
+react-proxy@^1.1.7:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-1.1.8.tgz#9dbfd9d927528c3aa9f444e4558c37830ab8c26a"
+  integrity sha1-nb/Z2SdSjDqp9ETkVYw3gwq4wmo=
+  dependencies:
+    lodash "^4.6.1"
+    react-deep-force-update "^1.0.0"
+
+react-test-renderer@16.6.0-alpha.8af6728:
+  version "16.6.0-alpha.8af6728"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.6.0-alpha.8af6728.tgz#5b9eaa972f0016c95d1ef5d93f727c5dc4a5a0ee"
+  integrity sha512-42RB1hvEjVuJGrGddGqVj1obs9NhWiuijkz+qsuY0qRzF0ygD5xg4eRdm0H4YNtkp+332g6OWO9O2ussu67cFQ==
+  dependencies:
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    react-is "^16.6.0-alpha.8af6728"
+    scheduler "^0.10.0-alpha.8af6728"
+
+react-timer-mixin@^0.13.2:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.4.tgz#75a00c3c94c13abe29b43d63b4c65a88fc8264d3"
+  integrity sha512-4+ow23tp/Tv7hBM5Az5/Be/eKKF7DIvJ09voz5LyHGQaqqz9WV8YMs31eFvcYQs7d451LSg7kDJV70XYN/Ug/Q==
+
+react-transform-hmr@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz#e1a40bd0aaefc72e8dfd7a7cda09af85066397bb"
+  integrity sha1-4aQL0Krvxy6N/Xp82gmvhQZjl7s=
+  dependencies:
+    global "^4.3.0"
+    react-proxy "^1.1.7"
+
+react@16.6.0-alpha.8af6728:
+  version "16.6.0-alpha.8af6728"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.6.0-alpha.8af6728.tgz#b97b6453c252a1f6ad185acc81aca1485cd3e120"
+  integrity sha512-W5NwSMey/JjF4wdeB7ek/+qG4bJJhgM1O/NaHvhUswgJxBMcFLUroODPELbq6IVolgua+anEirtOCx3fMXHZjw==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    scheduler "^0.10.0-alpha.8af6728"
+
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^2.0.0"
+
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
+  dependencies:
+    load-json-file "^2.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^2.0.0"
+
+readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2:
+  version "2.3.6"
+  resolved "http://registry.npmjs.org/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"
+
+realpath-native@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.2.tgz#cd51ce089b513b45cf9b1516c82989b51ccc6560"
+  integrity sha512-+S3zTvVt9yTntFrBpm7TQmQ3tzpCrnA1a/y+3cUHAc9ZR6aIjG0WNLR+Rj79QpJktY+VeW/TQtFlQ1bzsehI8g==
+  dependencies:
+    util.promisify "^1.0.0"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
+  dependencies:
+    resolve "^1.1.6"
+
+regenerate-unicode-properties@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
+  integrity sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==
+  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-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
+regenerator-runtime@^0.12.0:
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
+  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
+
+regenerator-transform@^0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
+  integrity sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==
+  dependencies:
+    private "^0.1.6"
+
+regex-cache@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
+  dependencies:
+    is-equal-shallow "^0.1.3"
+
+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"
+
+regexp.prototype.flags@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
+  integrity sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==
+  dependencies:
+    define-properties "^1.1.2"
+
+regexpp@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+  integrity sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==
+
+regexpu-core@^4.1.3:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d"
+  integrity sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^7.0.0"
+    regjsgen "^0.4.0"
+    regjsparser "^0.3.0"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.0.2"
+
+regjsgen@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561"
+  integrity sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==
+
+regjsparser@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96"
+  integrity sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==
+  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"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+
+repeat-string@^1.5.2, 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=
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
+  dependencies:
+    is-finite "^1.0.0"
+
+request-promise-core@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
+  integrity sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=
+  dependencies:
+    lodash "^4.13.1"
+
+request-promise-native@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
+  integrity sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=
+  dependencies:
+    request-promise-core "1.1.1"
+    stealthy-require "^1.1.0"
+    tough-cookie ">=2.3.3"
+
+request@^2.87.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  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.0"
+    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.4.3"
+    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@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+
+require-uncached@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
+
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+
+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.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
+
+resolve@^1.1.6, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
+  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
+  dependencies:
+    path-parse "^1.0.5"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+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==
+
+retry@^0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
+
+rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
+  dependencies:
+    glob "^7.0.5"
+
+rimraf@~2.2.6:
+  version "2.2.8"
+  resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
+  integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
+
+rimraf@~2.4.0:
+  version "2.4.5"
+  resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
+  integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=
+  dependencies:
+    glob "^6.0.1"
+
+rsvp@^3.3.3:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
+  dependencies:
+    is-promise "^2.1.0"
+
+rx-lite-aggregates@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+  integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=
+  dependencies:
+    rx-lite "*"
+
+rx-lite@*, rx-lite@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+  integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
+
+rxjs@^5.5.2:
+  version "5.5.12"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc"
+  integrity sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==
+  dependencies:
+    symbol-observable "1.0.1"
+
+safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.2, 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-json-stringify@~1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
+  integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==
+
+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@^2.0.0:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
+  integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
+  dependencies:
+    anymatch "^2.0.0"
+    capture-exit "^1.2.0"
+    exec-sh "^0.2.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+    watch "~0.18.0"
+  optionalDependencies:
+    fsevents "^1.2.3"
+
+sanitize-filename@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a"
+  integrity sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=
+  dependencies:
+    truncate-utf8-bytes "^1.0.0"
+
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+sax@~1.1.1:
+  version "1.1.6"
+  resolved "http://registry.npmjs.org/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240"
+  integrity sha1-XWFr6KXmB9VOEUr65Vt+ry/MMkA=
+
+scheduler@^0.10.0-alpha.8af6728:
+  version "0.10.0-alpha.f47a958"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.10.0-alpha.f47a958.tgz#0063a5c21aad2038111c316e417e9702d1ca7007"
+  integrity sha512-GVz1gvEU4JhqqiLB+DhRwd17sqKCmVsmdrsDoKMOIRCu0z+qYhimF6PvA3q61BgCqHDWJZiAidom6saiE8ZrOQ==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
+
+send@0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.6.2"
+    mime "1.4.1"
+    ms "2.0.0"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.4.0"
+
+serialize-error@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a"
+  integrity sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=
+
+serve-static@^1.13.1:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.2"
+    send "0.16.2"
+
+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==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+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-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=
+
+shell-quote@1.6.1, shell-quote@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
+  integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
+  dependencies:
+    array-filter "~0.0.0"
+    array-map "~0.0.0"
+    array-reduce "~0.0.0"
+    jsonify "~0.0.0"
+
+shell-utils@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/shell-utils/-/shell-utils-1.0.10.tgz#7fe7b8084f5d6d21323d941267013bc38aed063e"
+  integrity sha512-p1xuqhj3jgcXiV8wGoF1eL/NOvapN9tyGDoObqKwvZTUZn7fIzK75swLTEHfGa7sObeN9vxFplHw/zgYUYRTsg==
+  dependencies:
+    lodash "4.x.x"
+
+shelljs@^0.7.8:
+  version "0.7.8"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
+  integrity sha1-3svPh0sNHl+3LhSxZKloMEjprLM=
+  dependencies:
+    glob "^7.0.0"
+    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==
+
+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=
+
+simple-plist@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-0.2.1.tgz#71766db352326928cf3a807242ba762322636723"
+  integrity sha1-cXZts1IyaSjPOoByQrp2IyJjZyM=
+  dependencies:
+    bplist-creator "0.0.7"
+    bplist-parser "0.1.1"
+    plist "2.0.1"
+
+sisteransi@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
+  integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+
+slice-ansi@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+
+slide@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
+
+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-map-resolve@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+  dependencies:
+    atob "^2.1.1"
+    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.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
+  dependencies:
+    source-map "^0.5.6"
+
+source-map-support@^0.5.6, source-map-support@^0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-url@^0.4.0:
+  version "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.3, source-map@^0.5.6, source-map@^0.5.7:
+  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==
+
+spdx-correct@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+  integrity sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+  integrity sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==
+
+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.1"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
+  integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
+
+split-string@^3.0.1, 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.7.0:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+    safer-buffer "^2.0.2"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+stack-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
+  integrity sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=
+
+stacktrace-parser@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.4.tgz#01397922e5f62ecf30845522c95c4fe1d25e7d4e"
+  integrity sha1-ATl5IuX2Ls8whFUiyVxP4dJefU4=
+
+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"
+
+"statuses@>= 1.4.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+statuses@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
+
+statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
+
+stealthy-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
+stream-buffers@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
+  integrity sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=
+
+string-length@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+  integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=
+  dependencies:
+    astral-regex "^1.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  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", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string.prototype.matchall@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz#2af8fe3d2d6dc53ca2a59bd376b089c3c152b3c8"
+  integrity sha512-WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q==
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.10.0"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    regexp.prototype.flags "^1.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@^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 sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-bom@3.0.0, strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
+  dependencies:
+    is-utf8 "^0.2.0"
+
+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-json-comments@^2.0.1, 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 sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^3.1.2:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
+  dependencies:
+    has-flag "^1.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"
+
+symbol-observable@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
+  integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
+
+symbol-tree@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+  integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
+
+table@^4.0.3:
+  version "4.0.3"
+  resolved "http://registry.npmjs.org/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
+  integrity sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==
+  dependencies:
+    ajv "^6.0.1"
+    ajv-keywords "^3.0.0"
+    chalk "^2.1.0"
+    lodash "^4.17.4"
+    slice-ansi "1.0.0"
+    string-width "^2.1.1"
+
+tail@^1.2.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/tail/-/tail-1.4.0.tgz#884b216220b90804bfe87a4c8174c2efed0e2661"
+  integrity sha512-wjwfZw6wcMFTB1Po7NFUf4TdCDwX8duZjdTMhnHBEC677Q6mFRcVZE7f/nZDhG2Fpf/wEEKOJP9L7/b11/vlHQ==
+
+tar@^4:
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
+  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.3"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
+telnet-client@0.15.3:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/telnet-client/-/telnet-client-0.15.3.tgz#99ec754e4acf6fa51dc69898f574df3c2550712e"
+  integrity sha512-GSfdzQV0BKIYsmeXq7bJFJ2wHeJud6icaIxCUf6QCGQUD6R0BBGbT1+yLDhq67JRdgRpwyPwUbV7JxFeRrZomQ==
+  dependencies:
+    bluebird "3.5.x"
+
+temp-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+  integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
+
+temp@0.8.3:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
+  integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=
+  dependencies:
+    os-tmpdir "^1.0.0"
+    rimraf "~2.2.6"
+
+tempfile@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265"
+  integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU=
+  dependencies:
+    temp-dir "^1.0.0"
+    uuid "^3.0.1"
+
+test-exclude@^4.2.1:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
+  integrity sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==
+  dependencies:
+    arrify "^1.0.1"
+    micromatch "^2.3.11"
+    object-assign "^4.1.0"
+    read-pkg-up "^1.0.1"
+    require-main-filename "^1.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=
+
+throat@^4.0.0, throat@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+  integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
+
+through2@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
+  dependencies:
+    readable-stream "^2.1.5"
+    xtend "~4.0.1"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+time-stamp@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
+
+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@^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.3.4, tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+  dependencies:
+    psl "^1.1.24"
+    punycode "^1.4.1"
+
+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"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
+
+truncate-utf8-bytes@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
+  integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys=
+  dependencies:
+    utf8-byte-length "^1.0.1"
+
+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"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+ua-parser-js@^0.7.18:
+  version "0.7.18"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
+  integrity sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA==
+
+uglify-es@^3.1.9:
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
+  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
+  dependencies:
+    commander "~2.13.0"
+    source-map "~0.6.1"
+
+uglify-js@^3.1.4:
+  version "3.4.9"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
+  dependencies:
+    commander "~2.17.1"
+    source-map "~0.6.1"
+
+ultron@1.0.x:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
+  integrity sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=
+
+ultron@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
+
+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.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
+  integrity sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==
+
+unicode-property-aliases-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
+  integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==
+
+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=
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
+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==
+
+unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+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"
+
+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"
+
+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=
+
+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==
+
+utf8-byte-length@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
+  integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
+
+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.promisify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
+  dependencies:
+    define-properties "^1.1.2"
+    object.getownpropertydescriptors "^2.0.3"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+uuid@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
+  integrity sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=
+
+uuid@^3.0.1, uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+
+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"
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+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"
+
+w3c-hr-time@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+  dependencies:
+    browser-process-hrtime "^0.1.2"
+
+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"
+
+watch@~0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
+  integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY=
+  dependencies:
+    exec-sh "^0.2.0"
+    minimist "^1.2.0"
+
+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==
+
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.4.tgz#63fb016b7435b795d9025632c086a5209dbd2621"
+  integrity sha512-vM9KWN6MP2mIHZ86ytcyIv7e8Cj3KTfO2nd2c8PFDqcI4bxFmQp83ibq4wadq7rL9l9sZV6o9B0LTt8ygGAAXg==
+  dependencies:
+    iconv-lite "0.4.23"
+
+whatwg-fetch@>=0.10.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.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.2.0.tgz#a3d58ef10b76009b042d03e25591ece89b88d171"
+  integrity sha512-5YSO1nMd5D1hY3WzAQV3PzZL83W3YeyR1yW9PcH26Weh1t+Vzh9B6XkDh7aXm83HBZ4nSMvkjvN2H2ySWIvBgw==
+
+whatwg-url@^6.4.1:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
+  integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
+whatwg-url@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+  integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
+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.12, which@^1.2.9, which@^1.3.0:
+  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"
+
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
+wordwrap@^1.0.0, wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^1.2.0:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
+  integrity sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    slide "^1.1.5"
+
+write-file-atomic@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
+  dependencies:
+    mkdirp "^0.5.1"
+
+ws@^1.1.0, ws@^1.1.1:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51"
+  integrity sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==
+  dependencies:
+    options ">=0.0.5"
+    ultron "1.0.x"
+
+ws@^3.3.1:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+    ultron "~1.1.0"
+
+ws@^5.2.0:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
+  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
+  dependencies:
+    async-limiter "~1.0.0"
+
+xcode@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/xcode/-/xcode-1.0.0.tgz#e1f5b1443245ded38c180796df1a10fdeda084ec"
+  integrity sha1-4fWxRDJF3tOMGAeW3xoQ/e2ghOw=
+  dependencies:
+    pegjs "^0.10.0"
+    simple-plist "^0.2.1"
+    uuid "3.0.1"
+
+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==
+
+xml@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
+
+xmlbuilder@8.2.2:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"
+  integrity sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=
+
+xmlbuilder@^9.0.7:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
+
+xmldoc@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/xmldoc/-/xmldoc-0.4.0.tgz#d257224be8393eaacbf837ef227fd8ec25b36888"
+  integrity sha1-0lciS+g5PqrL+DfvIn/Y7CWzaIg=
+  dependencies:
+    sax "~1.1.1"
+
+xmldom@0.1.x:
+  version "0.1.27"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
+  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
+
+xpipe@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/xpipe/-/xpipe-1.0.5.tgz#8dd8bf45fc3f7f55f0e054b878f43a62614dafdf"
+  integrity sha1-jdi/Rfw/f1Xw4FS4ePQ6YmFNr98=
+
+xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
+
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
+
+yargs-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs-parser@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+  integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs@^11.0.0:
+  version "11.1.0"
+  resolved "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+  integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.1.1"
+    find-up "^2.1.0"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^9.0.2"
+
+yargs@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
+  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
+  dependencies:
+    camelcase "^4.1.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    read-pkg-up "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^7.0.0"