[0.56.1] Bump version numbers

Fix currentlyFocusedField by Removing this usage in TextInputState (#19834 )
Summary: I broke `currentlyFocusedField` when adding it back in ce3b7b8204 because `this` no longer refers to the proper object because it is assigned here https://github.com/facebook/react-native/commit/ce3b7b8204dad0fd62a76a0ce66472eca4b25bc8#diff-b48972356bc8dca4a00747d002fc3dd5R330. This code was pretty prone to breaking so I simply removed the `this` usage and rely on a top level variable instead. Also moved everything to named functions. Pull Request resolved: https://github.com/facebook/react-native/pull/19834 Differential Revision: D8943088 Pulled By: hramos fbshipit-source-id: 24d1470f6117138a5978fb7e467147847a9f3658
2025-11-01 09:14:26 +00:00 · 2018-09-10 11:49:48 +02:00 · 2018-09-10 11:49:40 +02:00 · 2018-07-04 16:51:44 +02:00 · 2018-07-03 17:26:24 -07:00 · 2018-07-03 17:26:08 -07:00
3395 changed files with 63476 additions and 86223 deletions
@@ -1,48 +0,0 @@
-environment:
-    ANDROID_HOME: "C:\\android-sdk-windows"
-    ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17c"
-    ANDROID_BUILD_VERSION: 28
-    ANDROID_TOOLS_VERSION: 28.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"
@@ -1,13 +1,13 @@

 [android]
-  target = android-28
+  target = android-26

 [download]
  max_number_of_retries = 3

 [maven_repositories]
  central = https://repo1.maven.org/maven2
-  google = https://dl.google.com/dl/android/maven2/
+  google = https://maven.google.com

 [alias]
  rntester = //RNTester/android/app:app
@@ -3,7 +3,7 @@ aliases:
  - &restore-yarn-cache
    keys:
      - v1-yarn-cache-{{ arch }}-{{ checksum "package.json" }}
-      - v1-yarn-cache-{{ arch }}-fixed
+      - v1-yarn-cache-{{ arch }}
  - &save-yarn-cache
    paths:
      - ~/.cache/yarn
@@ -28,40 +28,51 @@ aliases:

  - &restore-cache-android-packages
    keys:
-      - v1-android-sdkmanager-packages-api-28-alpha-{{ checksum "scripts/.tests.env" }}
+      - v1-android-sdkmanager-packages-api-26-alpha-{{ checksum "scripts/.tests.env" }}
  - &save-cache-android-packages
    paths:
      - /opt/android/sdk
-    key: v1-android-sdkmanager-packages-api-28-alpha-{{ checksum "scripts/.tests.env" }}
+    key: v1-android-sdkmanager-packages-api-26-alpha-{{ checksum "scripts/.tests.env" }}

  - &restore-cache-gradle
    keys:
-      - v2-gradle-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum "ReactAndroid/build.gradle" }}
+      - v1-gradle-{{ arch }}-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum "ReactAndroid/build.gradle" }}
      # Fallback in case checksum fails
-      - v2-gradle-{{ .Branch }}-{{ checksum "build.gradle" }}-
-      - v2-gradle-{{ .Branch }}-fixed
+      - v1-gradle-{{ arch }}-{{ .Branch }}-{{ checksum "build.gradle" }}-
+      - v1-gradle-{{ arch }}-{{ .Branch }}-
+      # Fallback in case this is a first-time run on a fork
+      - v1-gradle-{{ arch }}-master-
  - &save-cache-gradle
    paths:
      - ~/.gradle
-    key: v2-gradle-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum "ReactAndroid/build.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" }}

  - &restore-cache-ndk
    keys:
-      - v3-android-ndk-r17c-{{ checksum "scripts/android-setup.sh" }}
+      - v3-android-ndk-{{ arch }}-r10e-{{ checksum "scripts/android-setup.sh" }}
  - &save-cache-ndk
    paths:
      - /opt/ndk
-    key: v3-android-ndk-r17c-{{ checksum "scripts/android-setup.sh" }}
+    key: v3-android-ndk-{{ arch }}-r10e-{{ checksum "scripts/android-setup.sh" }}

-  - &restore-cache-downloads-buck
+  - &restore-cache-buck
    keys:
-      - v3-buck-v2018.10.29.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}}
-      - v3-buck-v2018.10.29.01-fixed
-  - &save-cache-downloads-buck
+      - v3-buck-{{ arch }}-v2018.03.26.01
+  - &save-cache-buck
    paths:
      - ~/buck
      - ~/okbuck
-    key: v3-buck-v2018.10.29.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}
+    key: v3-buck-{{ arch }}-v2018.03.26.01

  - &restore-cache-watchman
    keys:
@@ -71,24 +82,16 @@ aliases:
      - ~/watchman
    key: v1-watchman-{{ arch }}-v4.9.0

-  - &restore-cache-downloads-gradle
+  - &restore-cache-gradle-downloads
    keys:
-      - v2-gradle-{{ checksum "ReactAndroid/build.gradle" }}-{{ checksum "scripts/circleci/gradle_download_deps.sh" }}
-      - v2-gradle-fixed
-  - &save-cache-downloads-gradle
+      - v1-gradle-{{ arch }}-{{ checksum "ReactAndroid/build.gradle" }}-{{ checksum "scripts/circleci/gradle_download_deps.sh" }}
+      - v1-gradle-{{ arch }}-
+  - &save-cache-gradle-downloads
    paths:
      - ~/.gradle
      - ReactAndroid/build/downloads
      - ReactAndroid/build/third-party-ndk
-    key: v2-gradle-{{ checksum "ReactAndroid/build.gradle" }}-{{ checksum "scripts/circleci/gradle_download_deps.sh" }}
-
-  - &restore-cache-homebrew
-    keys:
-      - v1-homebrew-fixed
-  - &save-cache-homebrew
-    paths:
-      - /usr/local/Homebrew
-    key: v1-homebrew
+    key: v1-gradle-{{ arch }}-{{ checksum "ReactAndroid/build.gradle" }}-{{ checksum "scripts/circleci/gradle_download_deps.sh" }}

  # Branch Filtering
  - &filter-only-master-stable
@@ -119,13 +122,8 @@ aliases:
    command: source scripts/android-setup.sh && getAndroidNDK

  - &yarn
-    name: Run Yarn
-    command: |
-      # Skip yarn install on metro bump commits as the package is not yet
-      # available on npm
-      if [[ $(echo "$GIT_COMMIT_DESC" | grep -c "Bump metro@") -eq 0 ]]; then
-        yarn install --non-interactive --cache-folder ~/.cache/yarn
-      fi
+    |
+      yarn install --non-interactive --cache-folder ~/.cache/yarn

  - &install-yarn
    name: Install Yarn
@@ -134,11 +132,15 @@ 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.10.29.01 --depth=1
+        git clone https://github.com/facebook/buck.git ~/buck --branch v2018.03.26.01 --depth=1
      fi
      cd ~/buck && ant
      buck --version
@@ -149,6 +151,13 @@ 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: |
@@ -162,7 +171,7 @@ aliases:
  - &configure-android-path
    name: Configure Environment Variables
    command: |
-      echo 'export PATH=${ANDROID_NDK}:~/buck/bin:$PATH' >> $BASH_ENV
+      echo 'export PATH=${ANDROID_NDK}:~/react-native/gradle-2.9/bin:~/buck/bin:$PATH' >> $BASH_ENV
      source $BASH_ENV

  - &install-android-packages
@@ -190,30 +199,24 @@ aliases:
  - &run-lint-checks
    name: Lint code
    command: scripts/circleci/exec_swallow_error.sh yarn lint --format junit -o ~/react-native/reports/junit/eslint/results.xml
+    when: always

-  - &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-flow-checks
+    name: Check for errors in code using Flow
+    command: yarn flow check
+    when: always

  - &run-sanity-checks
    name: Sanity checks
    command: |
      ./scripts/circleci/check_license.sh
-      ./scripts/circleci/validate_yarn_lockfile.sh
+      ./scripts/circleci/check_cache.sh
    when: always

-  - &download-dependencies-gradle
-    name: Download Dependencies Using Gradle
+  - &gradle-download-deps
+    name: Download C++ Dependencies
    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: |
@@ -239,7 +242,7 @@ aliases:

  - &compile-native-libs
    name: Compile Native Libs for Unit and Integration Tests
-    command: ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=$BUILD_THREADS
+    command: ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=$BUILD_THREADS -Pcom.android.build.threadPoolSize=1
    no_output_timeout: 6m

  - &run-android-unit-tests
@@ -254,10 +257,6 @@ 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: |
@@ -275,51 +274,36 @@ 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: source scripts/.tests.env && xcrun simctl boot "$IOS_DEVICE" || true
+    command: xcrun simctl boot "iPhone 5s" || true
+
+  - &boot-simulator-appletv
+    name: Boot Apple TV Simulator
+    command: xcrun simctl boot "Apple TV" || true

  - &run-objc-ios-tests
    name: iOS Test Suite
    command: ./scripts/objc-test-ios.sh test

-  - &display-broken-tests-warning
-    name: Running broken tests (Ignore any failures past this point)
-    command: |
-      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 (Disabled)
-    command: ./scripts/circleci/exec_author_check.sh ./scripts/process-podspecs.sh
+  - &run-objc-tvos-tests
+    name: tvOS Test Suite
+    command: ./scripts/objc-test-tvos.sh test

  - &run-e2e-tests
-    name: End-to-End Test Suite (Disabled)
-    command: ./scripts/circleci/exec_author_check.sh node ./scripts/run-ci-e2e-tests.js --android --ios --js --retries 3;
+    name: End-to-End Test Suite
+    command: node ./scripts/run-ci-e2e-tests.js --ios --tvos --js --retries 3;

  - &run-objc-ios-e2e-tests
-    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;
+    name: iOS End-to-End Test Suite
+    command: node ./scripts/run-ci-e2e-tests.js --ios --retries 3;

-  - &run-android-e2e-tests
-    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
-    command: node ./scripts/run-ci-e2e-tests.js --js --retries 3;
+  - &run-objc-tvos-e2e-tests
+    name: tvOS End-to-End Test Suite
+    command: node ./scripts/run-ci-e2e-tests.js --tvos --js --retries 3;

 defaults: &defaults
  working_directory: ~/react-native
-  environment:
-    - GIT_COMMIT_DESC: git log --format=oneline -n 1 $CIRCLE_SHA1

 js_defaults: &js_defaults
  <<: *defaults
@@ -331,23 +315,24 @@ js_defaults: &js_defaults
 android_defaults: &android_defaults
  <<: *defaults
  docker:
-    - image: circleci/android:api-28-node8-alpha
+    - image: circleci/android:api-26-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-r17c'
+    - ANDROID_NDK: '/opt/ndk/android-ndk-r10e'
    - BUILD_THREADS: 2

 macos_defaults: &macos_defaults
  <<: *defaults
  macos:
-    xcode: "10.1.0"
+    xcode: "9.4.0"

 version: 2
 jobs:
+
  # Set up a Node environment for downstream jobs
  checkout_code:
    <<: *js_defaults
@@ -375,8 +360,7 @@ jobs:
          at: ~/react-native

      - run: *run-lint-checks
-      - run: *run-flow-checks-ios
-      - run: *run-flow-checks-android
+      - run: *run-flow-checks

      - store_test_results:
          path: ~/react-native/reports/junit
@@ -395,21 +379,6 @@ 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 devices
  test_ios:
    <<: *macos_defaults
@@ -418,43 +387,105 @@ jobs:
          at: ~/react-native

      - run: *boot-simulator-iphone
-
-      - restore-cache: *restore-cache-homebrew
-      - run: *brew-install-watchman
-      - save-cache: *save-cache-homebrew
+      - run: brew install watchman
      - run: *run-objc-ios-tests

      - store_test_results:
          path: ~/react-native/reports/junit

-  # Runs end to end tests (Detox)
-  test_detox_end_to_end:
+  # Runs unit tests on tvOS devices
+  test_tvos:
    <<: *macos_defaults
    steps:
      - attach_workspace:
          at: ~/react-native
-      - run: xcrun simctl boot "iPhone 5s" || true
+
+      - run: *boot-simulator-appletv
+      - run: brew install watchman
+      - run: *run-objc-tvos-tests
+
+      - store_test_results:
+          path: ~/react-native/reports/junit
+
+  # Runs end to end tests
+  test_end_to_end:
+    <<: *macos_defaults
+    steps:
+      - attach_workspace:
+          at: ~/react-native
+
+      - run: *boot-simulator-iphone
+
      - 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
+
+      - store_test_results:
+          path: ~/react-native/reports/junit
+
+  # Checks podspec
+  test_podspec:
+    <<: *macos_defaults
+    steps:
+      - attach_workspace:
+          at: ~/react-native
+
+      - run: ./scripts/process-podspecs.sh
+
+  # 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
+
+      # Install Android NDK
+      - run: *create-ndk-directory
+      - restore-cache: *restore-cache-ndk
+      - run: *install-ndk
+
+      # Fetch dependencies using BUCK
+      - restore-cache: *restore-cache-buck
+      - run: *install-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
+
+      - restore-cache: *restore-yarn-cache
      - run: *yarn

      - run:
-          name: Build iOS app for simulator
-          command: yarn run build-ios-e2e
-      - run:
-          name: Run Detox Tests
-          command: yarn run test-ios-e2e
+          name: Publish React Native Package
+          command: |
+            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

  # Set up an Android environment for downstream jobs
  test_android:
@@ -465,14 +496,14 @@ jobs:

      # Configure Android SDK and related dependencies
      - run: *configure-android-path
-      # Android build deps install from the network faster than cache
+      - restore-cache: *restore-cache-apt
      - 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.
@@ -487,21 +518,22 @@ jobs:
      - run: *install-ndk
      - save-cache: *save-cache-ndk

-      # Install Buck
-      - restore-cache: *restore-cache-downloads-buck
+      # Fetch dependencies using BUCK
+      - restore-cache: *restore-cache-buck
      - run: *install-buck
-      - save-cache: *save-cache-downloads-buck
+      - save-cache: *save-cache-buck

-      # Validate Android test environment (including Buck)
      - run: *validate-android-test-env

-      # Download dependencies using Buck
-      - run: *download-dependencies-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/...

-      # Download dependencies using Gradle
-      - restore-cache: *restore-cache-downloads-gradle
-      - run: *download-dependencies-gradle
-      - save-cache: *save-cache-downloads-gradle
+      - restore-cache: *restore-cache-gradle-downloads
+      - run: *gradle-download-deps
+      - save-cache: *save-cache-gradle-downloads

      # Build and compile
      - run: *build-android-app
@@ -516,12 +548,6 @@ jobs:
      # Test Suite
      - run: *run-android-unit-tests
      - run: *run-android-instrumentation-tests
-      - run: *build-android-rntester-app
-
-      # Run Android end-to-end tests
-      # TODO: Fix these failing tests.
-      - run: *display-broken-tests-warning
-      - run: *run-android-e2e-tests

      # Collect Results
      - run: *collect-android-test-results
@@ -531,111 +557,46 @@ 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:
-    <<: *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"
-
+    <<: *js_defaults
    steps:
-      - checkout
-      - run: *setup-artifacts
+      - attach_workspace:
+          at: ~/react-native

      - restore-cache: *restore-cache-analysis
      - run: *yarn
-
      - run:
-          name: Analyze Shell Scripts
+          name: Install Additional Dependencies
          command: |
-            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 Code
-          command: |
-            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
+            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

      - run:
          name: Analyze Pull Request
          command: |
-            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
+            # 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
          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
+          name: Analyze Code
          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
+            # 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
+          when: always

 # Workflows enables us to run multiple jobs in parallel
 workflows:
@@ -643,6 +604,7 @@ workflows:

  tests:
    jobs:
+
      # Checkout repo and run Yarn
      - checkout_code:
          filters: *filter-ignore-gh-pages
@@ -665,33 +627,65 @@ workflows:
          requires:
            - checkout_code

-      # Test iOS
+      # Test iOS & tvOS
      - test_ios:
          filters: *filter-ignore-gh-pages
          requires:
            - checkout_code
-
-      - test_detox_end_to_end:
+      - test_tvos:
          filters: *filter-ignore-gh-pages
          requires:
            - checkout_code

-      # Tooling Compatibility Checks
-      - test_node10:
+      # End-to-end tests
+      - test_end_to_end:
          filters: *filter-ignore-gh-pages
+          requires:
+            - checkout_code

      # 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
+              only:
+                - /.*-stable/
            tags:
              only: /v[0-9]+(\.[0-9]+)*(\-rc(\.[0-9]+)?)?/
+          requires:
+            - test_javascript
+            - test_ios
+            - test_tvos
+            - test_end_to_end
+            - analyze

-      # Run code checks on PRs from forks
+  # Only runs on PRs
+  analyze:
+    jobs:
+      # Checkout repo and run Yarn
+      - checkout_code:
+          filters: *filter-ignore-master-stable
+
+      # Run code checks
      - analyze_pr:
-          filters:
-            branches:
-              only: /^pull\/.*$/
+          filters: *filter-ignore-master-stable
+          requires:
+            - checkout_code
+
+
+  # These tests are flaky or are yet to be fixed. They are placed on their own
+  # workflow to avoid marking benign PRs as broken.
+  # To run them, uncomment the entire block and open a PR (do not merge).
+  # Once a test is fixed, move the test definition to the 'tests' workflow.
+  # disabled_tests:
+  #   jobs:
+  #     # Checkout repo and run Yarn (pre-req, should succeed)
+  #     - checkout_code:
+  #         filters: *filter-ignore-gh-pages
+
+  #     # The following were DISABLED because they have not run since
+  #     # the migration from Travis, and they have broken since then,
+  #     # CocoaPods
+  #     - test_podspec:
+  #         filters: *filter-ignore-gh-pages
+  #         requires:
+  #           - checkout_code
@@ -12,6 +12,3 @@ indent_size = 2

 [*.gradle]
 indent_size = 4
-
-[BUCK]
-indent_size = 4
@@ -52,8 +52,7 @@
    "setTimeout": false,
    "window": false,
    "XMLHttpRequest": false,
-    "pit": false,
-    "jasmine": true
+    "pit": false
  },

  "rules": {
@@ -65,7 +64,6 @@
    "no-constant-condition": 0,      // disallow use of constant expressions in conditions
    "no-control-regex": 1,           // disallow control characters in regular expressions
    "no-debugger": 1,                // disallow use of debugger
-    "no-dupe-class-members": 2,      // Disallow duplicate name in class members
    "no-dupe-keys": 2,               // disallow duplicate keys when creating object literals
    "no-empty": 0,                   // disallow empty statements
    "no-ex-assign": 1,               // disallow assigning to the exception in a catch block
@@ -145,7 +143,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", ignoreRestSiblings: true}], // disallow declaration of variables that are not used in the code
+    "no-unused-vars": [1, {"vars": "all", "args": "none"}], // 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
@@ -22,6 +22,9 @@
 ; 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/.*
@@ -37,9 +40,6 @@ 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 +53,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,37 +68,10 @@ suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState

-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\\)*\\$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\\)*\\$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.86.0
-
-[untyped]
-.*/node_modules/metro/.*
+^0.75.0
@@ -1,104 +0,0 @@
-[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/.*
-
-; 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.86.0
-
-[untyped]
-.*/node_modules/metro/.*
@@ -6,13 +6,22 @@ about: Report a reproducible bug or regression in the core React Native library.
 <!-- Requirements: please go through this checklist before opening a new issue -->
  - [ ] Review the documentation: https://facebook.github.io/react-native
  - [ ] Search for existing issues: https://github.com/facebook/react-native/issues
-  - [ ] Use the latest React Native release: https://github.com/facebook/react-native/releases
+  - [ ] Use the latest React Native version: https://github.com/facebook/react-native/releases
+  - [ ] Run `react-native info` in your terminal and paste its contents under "Environment"
+  - [ ] Let us know how to reproduce the issue. Include a code sample, share a project, or
+    share an app that reproduces the issue using https://snack.expo.io/

 ## Environment
-Run `react-native info` in your terminal and paste its contents here.
+<!-- Required. -->

 ## Description
-Describe your issue in detail. Include screenshots if needed. If this is a regression, let us know.
+<!-- Describe your issue in detail. -->

-## Reproducible Demo
-Let us know how to reproduce the issue. Include a code sample, share a project, or     share an app that reproduces the issue using https://snack.expo.io/. Please follow the guidelines for providing a MCVE: https://stackoverflow.com/help/mcve
+## Steps to Reproduce
+<!-- Required. -->
+
+## Expected Behavior
+<!-- Write what you thought would happen. -->
+
+## Actual Behavior
+<!-- Write what happened. Include screenshots if needed. If this is a regression, let us know. -->
@@ -1,18 +1,15 @@
 ---
 name: 🗣 Start a Discussion
-about: Use https://github.com/react-native-community/discussions-and-proposals to propose changes or discuss feature requests.
---
+about: 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.
-
-You may also use https://discuss.reactjs.org/ for discussions on topics that are not necessarily served by the Bug Report template.
+guidelines: |
+  If you feel strongly about starting a discussion as a GitHub Issue instead of using the discussion forum, please 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.

 ---

-# For Discussion
+## For Discussion

-<!--
-  If you feel strongly about having your discussion in the main React Native repository, you may write your proposal here.
+<!-- Describe your issue in detail. -->

-  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.
-->
@@ -1,45 +1,53 @@
-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.
+<!-- 
+  Required: Write your motivation here.
+  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

-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!
+<!-- 
+  Required: 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! 
+-->

-Changelog:
----------
-Help reviewers and the release process by writing your own changelog entry. When the change doesn't impact React Native developers, it may be ommitted from the changelog for brevity. See below for an example.
+## Related PRs

-[CATEGORY] [TYPE] - Message
+<!-- 
+  Does this PR require a documentation change? 
+  Create a PR at https://github.com/facebook/react-native-website and add a link to it here.
+-->
+
+## Release Notes
+
+<!-- 
+  Required. 
+  Help reviewers and the release process by writing your own release notes. See below for an example.
+-->
+
+[CATEGORY] [TYPE] [LOCATION] - Message

 <!--
+  **INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

-  CATEGORY may be:
+    CATEGORY
+  [----------]      TYPE
+  [ CLI      ] [-------------]    LOCATION
+  [ DOCS     ] [ BREAKING    ] [-------------]
+  [ GENERAL  ] [ BUGFIX      ] [ {Component} ]
+  [ INTERNAL ] [ ENHANCEMENT ] [ {Filename}  ]
+  [ IOS      ] [ FEATURE     ] [ {Directory} ]   |-----------|
+  [ ANDROID  ] [ MINOR       ] [ {Framework} ] - | {Message} |
+  [----------] [-------------] [-------------]   |-----------|

-  - [General]
-  - [iOS]
-  - [Android]
+ EXAMPLES:

-  TYPE may be:
-
-  - [Added] for new features.
-  - [Changed] for changes in existing functionality.
-  - [Deprecated] for soon-to-be removed features.
-  - [Removed] for now removed features.
-  - [Fixed] for any bug fixes.
-  - [Security] in case of vulnerabilities.
-
-  For more detail, see https://keepachangelog.com/en/1.0.0/#how
-
-  MESSAGE may answer "what and why" on a feature level. Use this to briefly tell React Native users about notable changes.
-
-  EXAMPLES:
-
-  [General] [Added] - Add snapToOffsets prop to ScrollView component
-  [General] [Fixed] - Fix various issues in snapToInterval on ScrollView component
-  [iOS] [Fixed] - Fix crash in RCTImagePicker
-
-->
+ [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
+ [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
+ [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
+ [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
+ [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
+ [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
+-->
@@ -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: 7
+daysUntilClose: 30
 # Issues with these labels will never be considered stale
 exemptLabels:
  - Good first issue
@@ -10,7 +10,6 @@ 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
@@ -51,6 +51,10 @@ 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
@@ -68,4 +72,3 @@ package-lock.json

 # ReactCommon subdir shouldn't have Xcode project
 /ReactCommon/**/*.xcodeproj
-RNTester/build
@@ -1 +0,0 @@
-8.11.3
@@ -1,5 +1,43 @@
-# Code of Conduct
+# [Open Source Code of Conduct](https://code.facebook.com/codeofconduct)

-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.
+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/)._
@@ -1,41 +1,192 @@
 # Contributing to React Native

-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.
+<!-- 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.

-## Our Development Process
+## [Code of Conduct](https://code.facebook.com/codeofconduct)

-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.
+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.

-## Pull Requests
+## 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.

 Please make sure the following is done when submitting a pull request:

-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").
+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).

-## Contributor License Agreement ("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.

-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.
+> **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.

-Complete your CLA here: <https://code.facebook.com/cla>
+#### Test plan

-## Issues
+A good test plan has the exact commands you ran and their output, provides screenshots or videos if the pull request changes UI.

-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.
+* If you've added code that should be tested, add tests!
+* If you've changed APIs, update the documentation.

-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.
+See [What is a Test Plan?](https://medium.com/@martinkonicek/what-is-a-test-plan-8bfc840ec171#.y9lcuqqi9) to learn more.

-## Coding Style
+#### Continuous integration tests

-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`.
+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).

-However, there are still some styles that the linter cannot pick up, notably in Java or Objective-C code.
+[circle]: https://circleci.com/gh/facebook/react-native

-**Objective-C:**
+#### Breaking changes
+
+When adding a new breaking change, follow this template in your pull request:
+
+```
+### New breaking change here
+
+* **Who does this affect**:
+* **How to migrate**:
+* **Why make this breaking change**:
+* **Severity (number of people affected x effort)**:
+```
+
+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.
+
+#### Copyright Notice for files
+
+Copy and paste this to the top of your new file(s):
+
+```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.
+ */
+```
+
+#### Contributor License Agreement (CLA)
+
+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

 * Space after `@property` declarations
 * Brackets on *every* `if`, on the *same* line
@@ -43,13 +194,17 @@ However, there are still some styles that the linter cannot pick up, notably in
 * *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 the LICENSE file in the root directory of this source tree.
+By contributing to React Native, you agree that your contributions will be licensed under its MIT license.
+<!-- generated_contributing_end -->
@@ -1,8 +1,3 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
 # React Native Android Unit Tests
 #
 # This image builds upon the React Native Base Android Development Environment
@@ -50,7 +45,7 @@ ADD react.gradle /app/react.gradle
 RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog :ReactAndroid:downloadJSCHeaders

 # compile native libs with Gradle script, we need bridge for unit and integration tests
-RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1
+RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1 -Pcom.android.build.threadPoolSize=1

 # add all react-native code
 ADD . /app
@@ -1,8 +1,3 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
 # React Native Base Android Development Environment
 #
 # This image provides a base Android development environment for React Native,
@@ -23,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=28
-ARG ANDROID_TOOLS_VERSION=28.0.3
-ARG BUCK_VERSION=v2018.10.29.01
-ARG NDK_VERSION=17c
+ARG ANDROID_BUILD_VERSION=26
+ARG ANDROID_TOOLS_VERSION=26.0.3
+ARG BUCK_VERSION=v2018.03.26.01
+ARG NDK_VERSION=10e
 ARG NODE_VERSION=8.10.0
 ARG WATCHMAN_VERSION=4.9.0

@@ -1,8 +1,3 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
 FROM library/node:6.9.2

 ENV YARN_VERSION=0.27.5
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -38,7 +38,7 @@ const test_opts = {
    PATH: argv.path || './ReactAndroid/src/androidTest/java/com/facebook/react/tests',
    RETRIES: parseInt(argv.retries || 2, 10),

-    TEST_TIMEOUT: parseInt(argv['test-timeout'] || 1000 * 60 * 10, 10),
+    TEST_TIMEOUT: parseInt(argv['test-timeout'] || 1000 * 60 * 10),

    OFFSET: argv.offset,
    COUNT: argv.count,
@@ -68,6 +68,7 @@ testClasses = testClasses.map((clazz) => {

 // only process subset of the tests at corresponding offset and count if args provided
 if (test_opts.COUNT != null && test_opts.OFFSET != null) {
+    const testCount = testClasses.length;
    const start = test_opts.COUNT * test_opts.OFFSET;
    const end = start + test_opts.COUNT;

@@ -1,10 +1,4 @@
 #!/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.
-#

 # for buck gen
 mount -o remount,exec /dev/shm
@@ -12,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 &
@@ -34,9 +28,8 @@ 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 $?
@@ -1,10 +1,4 @@
 #!/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 default environment variables
 UNIT_TESTS_BUILD_THREADS="${UNIT_TESTS_BUILD_THREADS:-1}"
@@ -15,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
@@ -1,10 +1,4 @@
 #!/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

@@ -18,12 +12,11 @@ RUN_IOS=0
 RUN_JS=0

 RETRY_COUNT=${RETRY_COUNT:-2}
-AVD_UUID=$(< /dev/urandom tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
+AVD_UUID=$(cat /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"
-# Version of react-native-dummy to test against
-REACT_DUMMY_PLATFORM=react-native-dummy@0.1.0
+CLI_PACKAGE=$ROOT/react-native-cli/react-native-cli-*.tgz
+PACKAGE=$ROOT/react-native-*.tgz

 # solve issue with max user watches limit
 echo 65536 | tee -a /proc/sys/fs/inotify/max_user_watches
@@ -34,7 +27,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
@@ -82,7 +75,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!"
@@ -95,8 +88,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
@@ -105,8 +98,8 @@ function e2e_suite() {

    # can skip cli install for non sudo mode
    if [ $RUN_CLI_INSTALL -ne 0 ]; then
-      if ! npm install -g "$CLI_PACKAGE"
-      then
+      npm install -g $CLI_PACKAGE
+      if [ $? -ne 0 ]; 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
@@ -118,7 +111,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
@@ -131,10 +124,9 @@ 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)
@@ -143,23 +135,23 @@ function e2e_suite() {

        set -ex

-      if ! ./gradlew :ReactAndroid:installArchives -Pjobs=1 -Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError"
-      then
+      ./gradlew :ReactAndroid:installArchives -Pjobs=1 -Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError"
+      if [ $? -ne 0 ]; then
        echo "Failed to compile Android binaries"
        return 1
      fi
    fi

-    if ! npm pack
-    then
+    npm pack
+    if [ $? -ne 0 ]; then
      echo "Failed to pack react-native"
      return 1
    fi

-    cd "$TEMP_DIR"
+    cd $TEMP_DIR

-    if ! retry "$RETRY_COUNT" react-native init EndToEndTest --version "$PACKAGE" --npm
-    then
+    retry $RETRY_COUNT react-native init EndToEndTest --version $PACKAGE --npm
+    if [ $? -ne 0 ]; then
      echo "Failed to execute react-native init"
      echo "Most common reason is npm registry connectivity, try again"
      return 1
@@ -172,21 +164,20 @@ function e2e_suite() {
      echo "Running an Android e2e test"
      echo "Installing e2e framework"

-      if ! retry "$RETRY_COUNT" npm install --save-dev "$ANDROID_NPM_DEPS" --silent >> /dev/null
-      then
+      retry $RETRY_COUNT npm install --save-dev $ANDROID_NPM_DEPS --silent >> /dev/null
+      if [ $? -ne 0 ]; 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 || exit
+      cd android
      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 &
@@ -197,8 +188,9 @@ function e2e_suite() {
      buck build android/app

      # hack to get node unhung (kill buckd)
-      if ! kill -9 "$(pgrep java)"
-      then
+      kill -9 $(pgrep java)
+
+      if [ $? -ne 0 ]; then
        echo "could not execute Buck build, is it installed and in PATH?"
        return 1
      fi
@@ -209,23 +201,23 @@ function e2e_suite() {
      sleep 15

      echo "Executing android e2e test"
-      if ! retry "$RETRY_COUNT" node node_modules/.bin/_mocha android-e2e-test.js
-      then
+      retry $RETRY_COUNT node node_modules/.bin/_mocha android-e2e-test.js
+      if [ $? -ne 0 ]; 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
@@ -238,37 +230,24 @@ function e2e_suite() {
    # js tests
    if [ $RUN_JS -ne 0 ]; then
      # Check the packager produces a bundle (doesn't throw an error)
-      if ! react-native bundle --max-workers 1 --platform android --dev true --entry-file index.js --bundle-output android-bundle.js
-      then
+      react-native bundle --max-workers 1 --platform android --dev true --entry-file index.js --bundle-output android-bundle.js
+      if [ $? -ne 0 ]; then
        echo "Could not build android bundle"
        return 1
      fi

-      if ! react-native bundle --max-workers 1 --platform ios --dev true --entry-file index.js --bundle-output ios-bundle.js
-      then
+      react-native bundle --max-workers 1 --platform ios --dev true --entry-file index.js --bundle-output ios-bundle.js
+      if [ $? -ne 0 ]; 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
@@ -1,12 +1,5 @@
 #!/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.
-#

-# 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
 #
@@ -16,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
@@ -31,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:
@@ -45,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()

@@ -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 docker-setup-android` - Pulls down the base android docker image used for running the tests
+`npm run test-android-setup` - Pulls down the base android docker image used for running the tests

-`npm run docker-build-android` - Builds the docker image used to run the tests
+`npm run test-android-build` - 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)

@@ -35,7 +35,7 @@ There are two Dockerfiles for use with the Android codebase.

 The `Dockerfile.android-base` contains all the necessary prerequisites required to run the React Android tests. It is
 separated out into a separate Dockerfile because these are dependencies that rarely change and also because it is quite
-a beastly image since it contains all the Android dependencies for running android and the emulators (~9GB).
+a beastly image since it contains all the Android depedencies for running android and the emulators (~9GB).

 The good news is you should rarely have to build or pull down the base image! All iterative code updates happen as
 part of the `Dockerfile.android` image build.
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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-local
+ * @flow
 */

 'use strict';
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -12,7 +12,7 @@

 const React = require('react');
 const ReactNative = require('react-native');
-const {AsyncStorage, Text, View, StyleSheet} = ReactNative;
+const {AsyncStorage, Text, View} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;

 const deepDiffer = require('deepDiffer');
@@ -191,7 +191,7 @@ class AsyncStorageTest extends React.Component<{}, $FlowFixMeState> {

  render() {
    return (
-      <View style={styles.container}>
+      <View style={{backgroundColor: 'white', padding: 40}}>
        <Text>
          {/* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This
             * comment suppresses an error found when Flow v0.54 was deployed.
@@ -205,13 +205,6 @@ class AsyncStorageTest extends React.Component<{}, $FlowFixMeState> {
  }
 }

-const styles = StyleSheet.create({
-  container: {
-    backgroundColor: 'white',
-    padding: 40,
-  },
-});
-
 AsyncStorageTest.displayName = 'AsyncStorageTest';

 module.exports = AsyncStorageTest;
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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-local
+ * @flow
 */

 'use strict';
@@ -58,7 +58,7 @@ class ImageCachePolicyTest extends React.Component<Props, $FlowFixMeState> {

  render() {
    return (
-      <View style={styles.container}>
+      <View style={{flex: 1}}>
        <Text>Hello</Text>
        <Image
          source={{
@@ -110,9 +110,6 @@ class ImageCachePolicyTest extends React.Component<Props, $FlowFixMeState> {
 }

 const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-  },
  base: {
    width: 100,
    height: 100,
@@ -1,18 +1,18 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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-local
+ * @flow
 */

 'use strict';

 const React = require('react');
 const ReactNative = require('react-native');
-const {Image} = ReactNative;
+const {Image, View} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;

 class ImageSnapshotTest extends React.Component<{}> {
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,22 +10,28 @@

 '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, StyleSheet} = ReactNative;
+const {Text, View} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;

-type Props = $ReadOnly<{|
-  shouldThrow?: boolean,
-  waitOneFrame?: boolean,
-|}>;
+class IntegrationTestHarnessTest extends React.Component<
+  {
+    shouldThrow?: boolean,
+    waitOneFrame?: boolean,
+  },
+  $FlowFixMeState,
+> {
+  static propTypes = {
+    shouldThrow: PropTypes.bool,
+    waitOneFrame: PropTypes.bool,
+  };

-type State = {|
-  done: boolean,
-|};
-
-class IntegrationTestHarnessTest extends React.Component<Props, State> {
  state = {
    done: false,
  };
@@ -54,7 +60,7 @@ class IntegrationTestHarnessTest extends React.Component<Props, State> {

  render() {
    return (
-      <View style={styles.container}>
+      <View style={{backgroundColor: 'white', padding: 40}}>
        <Text>
          {/* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This
             * comment suppresses an error found when Flow v0.54 was deployed.
@@ -67,13 +73,6 @@ class IntegrationTestHarnessTest extends React.Component<Props, State> {
  }
 }

-const styles = StyleSheet.create({
-  container: {
-    backgroundColor: 'white',
-    padding: 40,
-  },
-});
-
 IntegrationTestHarnessTest.displayName = 'IntegrationTestHarnessTest';

 module.exports = IntegrationTestHarnessTest;
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -11,12 +11,11 @@
 '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) {
@@ -24,8 +23,14 @@ function debug(...args) {
 }

 import type {Layout, LayoutEvent} from 'CoreEventTypes';
-
-type Props = $ReadOnly<{||}>;
+type Style = {
+  margin?: number,
+  padding?: number,
+  borderColor?: string,
+  borderWidth?: number,
+  backgroundColor?: string,
+  width?: number,
+};

 type State = {
  didAnimation: boolean,
@@ -33,58 +38,44 @@ type State = {
  imageLayout?: Layout,
  textLayout?: Layout,
  viewLayout?: Layout,
-  viewStyle?: ViewStyleProp,
-  containerStyle?: ViewStyleProp,
+  viewStyle?: Style,
+  containerStyle?: Style,
 };

-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() {
+const LayoutEventsTest = createReactClass({
+  displayName: 'LayoutEventsTest',
+  getInitialState(): State {
+    return {
+      didAnimation: false,
+    };
+  },
+  animateViewLayout: function() {
    debug('animateViewLayout invoked');
    LayoutAnimation.configureNext(LayoutAnimation.Presets.spring, () => {
      debug('animateViewLayout done');
      this.checkLayout(this.addWrapText);
    });
    this.setState({viewStyle: {margin: 60}});
-  }
-
-  addWrapText = () => {
+  },
+  addWrapText: function() {
    debug('addWrapText invoked');
    this.setState(
      {extraText: '  And a bunch more text to wrap around a few lines.'},
      () => this.checkLayout(this.changeContainer),
    );
-  };
-
-  changeContainer = () => {
+  },
+  changeContainer: function() {
    debug('changeContainer invoked');
    this.setState({containerStyle: {width: 280}}, () =>
      this.checkLayout(TestModule.markTestCompleted),
    );
-  };
-
-  checkLayout = (next?: ?() => void) => {
-    const view = this._view;
-    const txt = this._txt;
-    const img = this._img;
-
-    if (view == null || txt == null || img == null) {
+  },
+  checkLayout: function(next?: ?Function) {
+    if (!this.isMounted()) {
      return;
    }
-
-    view.measure((x, y, width, height) => {
-      this.compare(
-        'view',
-        {x, y, width, height},
-        this.state.viewLayout || null,
-      );
+    this.refs.view.measure((x, y, width, height) => {
+      this.compare('view', {x, y, width, height}, this.state.viewLayout);
      if (typeof next === 'function') {
        next();
      } else if (!this.state.didAnimation) {
@@ -93,17 +84,14 @@ class LayoutEventsTest extends React.Component<Props, State> {
        this.state.didAnimation = true;
      }
    });
-
-    txt.measure((x, y, width, height) => {
+    this.refs.txt.measure((x, y, width, height) => {
      this.compare('txt', {x, y, width, height}, this.state.textLayout);
    });
-
-    img.measure((x, y, width, height) => {
+    this.refs.img.measure((x, y, width, height) => {
      this.compare('img', {x, y, width, height}, this.state.imageLayout);
    });
-  };
-
-  compare(node: string, measured: Layout, onLayout?: ?Layout): void {
+  },
+  compare: function(node: string, measured: any, onLayout: any): void {
    if (deepDiffer(measured, onLayout)) {
      const data = {measured, onLayout};
      throw new Error(
@@ -112,50 +100,34 @@ class LayoutEventsTest extends React.Component<Props, State> {
          JSON.stringify(data, null, '  '),
      );
    }
-  }
-
-  onViewLayout = (e: LayoutEvent) => {
+  },
+  onViewLayout: function(e: LayoutEvent) {
    debug('received view layout event\n', e.nativeEvent);
    this.setState({viewLayout: e.nativeEvent.layout}, this.checkLayout);
-  };
-
-  onTextLayout = (e: LayoutEvent) => {
+  },
+  onTextLayout: function(e: LayoutEvent) {
    debug('received text layout event\n', e.nativeEvent);
    this.setState({textLayout: e.nativeEvent.layout}, this.checkLayout);
-  };
-
-  onImageLayout = (e: LayoutEvent) => {
+  },
+  onImageLayout: function(e: LayoutEvent) {
    debug('received image layout event\n', e.nativeEvent);
    this.setState({imageLayout: e.nativeEvent.layout}, this.checkLayout);
-  };
-
-  render() {
+  },
+  render: function() {
    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={ref => {
-            this._view = ref;
-          }}
-          onLayout={this.onViewLayout}
-          style={viewStyle}>
+        <View ref="view" onLayout={this.onViewLayout} style={viewStyle}>
          <Image
-            ref={ref => {
-              this._img = ref;
-            }}
+            ref="img"
            onLayout={this.onImageLayout}
            style={styles.image}
            source={{uri: 'uie_thumb_big.png'}}
          />
-          <Text
-            ref={ref => {
-              this._txt = ref;
-            }}
-            onLayout={this.onTextLayout}
-            style={styles.text}>
+          <Text ref="txt" onLayout={this.onTextLayout} style={styles.text}>
            A simple piece of text.{this.state.extraText}
          </Text>
          <Text>
@@ -166,8 +138,8 @@ class LayoutEventsTest extends React.Component<Props, State> {
        </View>
      </View>
    );
-  }
-}
+  },
+});

 const styles = StyleSheet.create({
  container: {
@@ -193,4 +165,6 @@ const styles = StyleSheet.create({
  },
 });

+LayoutEventsTest.displayName = 'LayoutEventsTest';
+
 module.exports = LayoutEventsTest;
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,6 +9,8 @@

 'use strict';

+require('regenerator-runtime/runtime');
+
 const React = require('react');
 const ReactNative = require('react-native');

@@ -1,89 +1,78 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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 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;

-type Props = {||};
+const ReactContentSizeUpdateTest = createReactClass({
+  displayName: 'ReactContentSizeUpdateTest',
+  mixins: [Subscribable.Mixin, TimerMixin],

-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(
+  UNSAFE_componentWillMount: function() {
+    this.addListenerOn(
+      RCTNativeAppEventEmitter,
      'rootViewDidChangeIntrinsicSize',
      this.rootViewDidChangeIntrinsicSize,
    );
-  }
+  },

-  componentDidMount() {
-    this._timeoutID = setTimeout(() => {
-      this.updateViewSize();
-    }, 1000);
-  }
+  getInitialState: function() {
+    return {
+      height: reactViewHeight,
+      width: reactViewWidth,
+    };
+  },

-  componentWillUnmount() {
-    if (this._timeoutID != null) {
-      clearTimeout(this._timeoutID);
-    }
-
-    if (this._subscription != null) {
-      this._subscription.remove();
-    }
-  }
-
-  updateViewSize() {
+  updateViewSize: function() {
    this.setState({
      height: newReactViewHeight,
      width: newReactViewWidth,
    });
-  }
+  },

-  rootViewDidChangeIntrinsicSize = (intrinsicSize: State) => {
+  componentDidMount: function() {
+    this.setTimeout(() => {
+      this.updateViewSize();
+    }, 1000);
+  },
+
+  rootViewDidChangeIntrinsicSize: function(intrinsicSize) {
    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;
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -34,7 +34,7 @@ class SimpleSnapshotTest extends React.Component<{}> {

  render() {
    return (
-      <View style={styles.container}>
+      <View style={{backgroundColor: 'white', padding: 100}}>
        <View style={styles.box1} />
        <View style={styles.box2} />
      </View>
@@ -43,10 +43,6 @@ class SimpleSnapshotTest extends React.Component<{}> {
 }

 const styles = StyleSheet.create({
-  container: {
-    backgroundColor: 'white',
-    padding: 100,
-  },
  box1: {
    width: 80,
    height: 50,
@@ -1,60 +1,46 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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 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;

-type Props = $ReadOnly<{|
-  width: boolean,
-  height: boolean,
-  both: boolean,
-  none: boolean,
-|}>;
+const SizeFlexibilityUpdateTest = createReactClass({
+  displayName: 'SizeFlexibilityUpdateTest',
+  mixins: [Subscribable.Mixin],

-class SizeFlexibilityUpdateTest extends React.Component<Props> {
-  _subscription: ?EmitterSubscription = null;
-
-  UNSAFE_componentWillMount() {
-    this._subscription = RCTNativeAppEventEmitter.addListener(
+  UNSAFE_componentWillMount: function() {
+    this.addListenerOn(
+      RCTNativeAppEventEmitter,
      'rootViewDidChangeIntrinsicSize',
      this.rootViewDidChangeIntrinsicSize,
    );
-  }
+  },

-  componentWillUnmount() {
-    if (this._subscription != null) {
-      this._subscription.remove();
-    }
-  }
-
-  markPassed = () => {
+  markPassed: function() {
    TestModule.markTestPassed(true);
    finalState = true;
-  };
+  },

-  rootViewDidChangeIntrinsicSize = (intrinsicSize: {
-    width: number,
-    height: number,
-  }) => {
+  rootViewDidChangeIntrinsicSize: function(intrinsicSize) {
    if (finalState) {
      // If a test reaches its final state, it is not expected to do anything more
      TestModule.markTestPassed(false);
@@ -97,11 +83,13 @@ class SizeFlexibilityUpdateTest extends React.Component<Props> {
        return;
      }
    }
-  };
+  },

  render() {
    return <View style={{height: reactViewHeight, width: reactViewWidth}} />;
-  }
-}
+  },
+});
+
+SizeFlexibilityUpdateTest.displayName = 'SizeFlexibilityUpdateTest';

 module.exports = SizeFlexibilityUpdateTest;
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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-local
+ * @flow
 */

 'use strict';
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -11,136 +11,75 @@
 '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;

-type Props = $ReadOnly<{||}>;
+const TimersTest = createReactClass({
+  displayName: 'TimersTest',
+  mixins: [TimerMixin],

-type State = {|
-  count: number,
-  done: boolean,
-|};
+  _nextTest: () => {},
+  _interval: -1,

-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);
-  }
+  getInitialState() {
+    return {
+      count: 0,
+      done: false,
+    };
+  },

  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 = [];
@@ -157,7 +96,7 @@ class TimersTest extends React.Component<Props, State> {
    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.
@@ -192,73 +131,42 @@ class TimersTest extends React.Component<Props, State> {
      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.name + ': \n'}
+          {this.constructor.displayName + ': \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) {
-      if (this._interval != null) {
-        this.clearInterval(this._interval);
-        this._interval = null;
-      }
+      this.clearInterval(this._interval);
      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: {
@@ -267,4 +175,6 @@ const styles = StyleSheet.create({
  },
 });

+TimersTest.displayName = 'TimersTest';
+
 module.exports = TimersTest;
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -18,6 +18,12 @@ const {TestModule} = ReactNative.NativeModules;
 const DEFAULT_WS_URL = 'ws://localhost:5555/';

 const WS_EVENTS = ['close', 'error', 'message', 'open'];
+const WS_STATES = [
+  /* 0 */ 'CONNECTING',
+  /* 1 */ 'OPEN',
+  /* 2 */ 'CLOSING',
+  /* 3 */ 'CLOSED',
+];

 type State = {
  url: string,
@@ -44,6 +50,7 @@ class WebSocketTest extends React.Component<{}, State> {

  _waitFor = (condition: any, timeout: any, callback: any) => {
    let remaining = timeout;
+    let t;
    const timeoutFunction = function() {
      if (condition()) {
        callback(true);
@@ -53,10 +60,10 @@ class WebSocketTest extends React.Component<{}, State> {
      if (remaining === 0) {
        callback(false);
      } else {
-        setTimeout(timeoutFunction, 1000);
+        t = setTimeout(timeoutFunction, 1000);
      }
    };
-    setTimeout(timeoutFunction, 1000);
+    t = setTimeout(timeoutFunction, 1000);
  };

  _connect = () => {
@@ -114,30 +121,39 @@ class WebSocketTest extends React.Component<{}, State> {
  }

  testConnect = () => {
-    this._connect();
-    this._waitFor(this._socketIsConnected, 5, connectSucceeded => {
+    const component = this;
+    component._connect();
+    component._waitFor(component._socketIsConnected, 5, function(
+      connectSucceeded,
+    ) {
      if (!connectSucceeded) {
        TestModule.markTestPassed(false);
        return;
      }
-      this.testSendAndReceive();
+      component.testSendAndReceive();
    });
  };

  testSendAndReceive = () => {
-    this._sendTestMessage();
-    this._waitFor(this._receivedTestExpectedResponse, 5, messageReceived => {
+    const component = this;
+    component._sendTestMessage();
+    component._waitFor(component._receivedTestExpectedResponse, 5, function(
+      messageReceived,
+    ) {
      if (!messageReceived) {
        TestModule.markTestPassed(false);
        return;
      }
-      this.testDisconnect();
+      component.testDisconnect();
    });
  };

  testDisconnect = () => {
-    this._disconnect();
-    this._waitFor(this._socketIsDisconnected, 5, disconnectSucceeded => {
+    const component = this;
+    component._disconnect();
+    component._waitFor(component._socketIsDisconnected, 5, function(
+      disconnectSucceeded,
+    ) {
      TestModule.markTestPassed(disconnectSucceeded);
    });
  };
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash

-# Copyright (c) Facebook, Inc. and its affiliates.
+# 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.
@@ -9,7 +9,7 @@
 echo -en "\033]0;Web Socket Test Server\a"
 clear

-THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+THIS_DIR=$(dirname "$0")
 pushd "$THIS_DIR"
 ./websocket_integration_test_server.js
 popd
@@ -1,7 +1,7 @@
 #!/usr/bin/env node

 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) Facebook, Inc. and its affiliates.
+Copyright (c) 2015-present, Facebook, Inc.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -245,7 +245,7 @@
 		0CF68AB91AF0540F00FF9E5C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 0620;
 				TargetAttributes = {
 					0CF68AC01AF0540F00FF9E5C = {
 						CreatedOnToolsVersion = 6.2;
@@ -336,31 +336,19 @@
 				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",
@@ -389,30 +377,19 @@
 				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_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;
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -150,11 +150,11 @@ class Surface extends React.Component {
  }

  render() {
-    const height = extractNumber(this.props.height, 0);
-    const width = extractNumber(this.props.width, 0);
-
+    const props = this.props;
+    const w = extractNumber(props.width, 0);
+    const h = extractNumber(props.height, 0);
    return (
-      <NativeSurfaceView style={[this.props.style, {height, width}]}>
+      <NativeSurfaceView style={[props.style, {width: w, height: h}]}>
        {this.props.children}
      </NativeSurfaceView>
    );
@@ -399,19 +399,7 @@ function extractStrokeJoin(strokeJoin) {
 // Note: ART has a notion of width and height on Shape but AFAIK it's a noop in
 // ReactART.

-export type ShapeProps = {|
-  fill?: mixed,
-  stroke?: mixed,
-  strokeCap?: mixed,
-  strokeDash?: mixed,
-  strokeJoin?: mixed,
-  strokeWidth?: mixed,
-  x?: number,
-  y?: number,
-  opacity?: mixed,
-|};
-
-class Shape extends React.Component<ShapeProps> {
+class Shape extends React.Component {
  render() {
    const props = this.props;
    const path = props.d || childrenAsString(props.children);
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -61,7 +61,7 @@
 		58B511D31A9E6C8500147676 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					58B511DA1A9E6C8500147676 = {
@@ -106,31 +106,19 @@
 				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",
@@ -165,30 +153,19 @@
 				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_INITIALIZER_NOT_FULLY_BRACKETED = YES;
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -1,11 +1,11 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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-local
+ * @flow
 */

 'use strict';
@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 html, h1, h2 {
 font-family: 'Roboto', sans-serif;
 font-weight: 300;
@@ -1,3 +0,0 @@
-/lib/
-/dist/
-/node_modules/
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,7 +10,7 @@
  "license": "MIT",
  "main": "Animated.js",
  "dependencies": {
-    "fbjs": "^1.0.0"
+    "fbjs": "^0.2.1"
  },
  "scripts": {
    "build": "gulp"
@@ -19,7 +19,7 @@
    "babel-core": "^5.8.25",
    "babel-loader": "^5.3.2",
    "del": "^1.2.0",
-    "fbjs-scripts": "^1.0.0",
+    "fbjs-scripts": "^0.2.0",
    "gulp": "^3.9.0",
    "gulp-babel": "^5.1.0",
    "gulp-derequire": "^2.1.0",
--- a/Show More
+++ b/Show More