Sync Local

.circleci/config.yml

@@ -585,31 +585,44 @@ jobs:
       - checkout
       - run: *setup-artifacts
 
-      - restore-cache: *restore-yarn-cache
+      - restore-cache: *restore-cache-analysis
       - run: *yarn
 
+      - run:
+          name: Analyze Shell Scripts
+          command: |
+            echo -e "\\x1B[36mInstalling additional dependencies\\x1B[0m"
+            sudo apt-get install -y shellcheck
+            yarn add @octokit/[email protected]
+            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: |
-            if [ -n "$CIRCLE_PR_NUMBER" ]; then
-              echo -e "\\x1B[36mInstalling additional dependencies\\x1B[0m"; yarn add @octokit/[email protected]
-              echo -e "\\x1B[36mAnalyzing code\\x1B[0m"; GITHUB_TOKEN="$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A""$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B" ./scripts/circleci/analyze_code.sh
-            else
-              echo "Skipping code analysis."
-            fi
+            echo -e "\\x1B[36mInstalling additional dependencies\\x1B[0m"; yarn add @octokit/[email protected]
+            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
 
-      - restore-cache: *restore-cache-analysis
       - run:
           name: Analyze Pull Request
           command: |
-            if [ -n "$CIRCLE_PR_NUMBER" ]; then
-              cd bots
-              yarn install --non-interactive --cache-folder ~/.cache/yarn
-              DANGER_GITHUB_API_TOKEN="$PUBLIC_PULLBOT_GITHUB_TOKEN_A""$PUBLIC_PULLBOT_GITHUB_TOKEN_B" yarn danger
-            else
-              echo "Skipping pull request analysis."
-            fi
+            echo -e "\\x1B[36mInstalling additional dependencies\\x1B[0m"
+            cd bots
+            yarn install --non-interactive --cache-folder ~/.cache/yarn
+            echo -e "\\x1B[36mAnalyzing pull request\\x1B[0m"; \
+            DANGER_GITHUB_API_TOKEN="$PUBLIC_PULLBOT_GITHUB_TOKEN_A""$PUBLIC_PULLBOT_GITHUB_TOKEN_B" \
+            yarn danger
           when: always
       - save-cache: *save-cache-analysis
 
@@ -716,13 +729,9 @@ workflows:
             # only act on version tags
             tags:
               only: /v[0-9]+(\.[0-9]+)*(\-rc(\.[0-9]+)?)?/
-          requires:
-            - analyze
-            - test_detox_end_to_end
-            - test_javascript
-            - test_objc
-            - test_android
 
-      # Run code checks
+      # Run code checks on PRs from forks
       - analyze_pr:
-          filters: *filter-ignore-master-stable
+          filters:
+            branches:
+              only: /^pull\/.*$/

.editorconfig

@@ -12,3 +12,6 @@ indent_size = 2
 
 [*.gradle]
 indent_size = 4
+
+[BUCK]
+indent_size = 4

.flowconfig

@@ -100,4 +100,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.81.0
+^0.82.0

.flowconfig.android

@@ -100,4 +100,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.81.0
+^0.82.0

ContainerShip/scripts/run-android-docker-instrumentation-tests.sh

@@ -6,7 +6,7 @@ mount -o remount,exec /dev/shm
 AVD_UUID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
 
 # create virtual device
-echo no | android create avd -n $AVD_UUID -f -t android-19 --abi default/armeabi-v7a
+echo no | android create avd -n "$AVD_UUID" -f -t android-19 --abi default/armeabi-v7a
 
 # emulator setup
 emulator64-arm -avd $AVD_UUID -no-skin -no-audio -no-window -no-boot-anim &
@@ -28,8 +28,9 @@ watchman shutdown-server
 node local-cli/cli.js bundle --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
 
 # build test APK
+# shellcheck disable=SC1091
 source ./scripts/android-setup.sh && NO_BUCKD=1 retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
 
 # run installed apk with tests
-node ./ContainerShip/scripts/run-android-ci-instrumentation-tests.js $*
+node ./ContainerShip/scripts/run-android-ci-instrumentation-tests.js "$*"
 exit $?

ContainerShip/scripts/run-android-docker-unit-tests.sh

@@ -9,4 +9,4 @@ mount -o remount,exec /dev/shm
 set -x
 
 # run unit tests
-buck test ReactAndroid/src/test/... --config build.threads=$UNIT_TESTS_BUILD_THREADS
+buck test ReactAndroid/src/test/... --config build.threads="$UNIT_TESTS_BUILD_THREADS"

ContainerShip/scripts/run-ci-e2e-tests.sh

@@ -128,6 +128,7 @@ function e2e_suite() {
         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)
@@ -210,15 +211,15 @@ function e2e_suite() {
       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

ContainerShip/scripts/run-instrumentation-tests-via-adb-shell.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+# shellcheck disable=SC1117
 # Python script to run instrumentation tests, copied from https://github.com/circleci/circle-dummy-android
 # Example: ./scripts/run-android-instrumentation-tests.sh com.facebook.react.tests com.facebook.react.tests.ReactPickerTestCase
 #
@@ -9,7 +9,7 @@ export PATH="$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$PATH"
 adb logcat -c
 
 # run tests and check output
-python - $1 $2 << END
+python - "$1" "$2" << END
 
 import re
 import subprocess as sp
@@ -24,7 +24,7 @@ test_class = None
 
 if len(sys.argv) > 2:
   test_class = sys.argv[2]
-  
+
 def update():
   # prevent CircleCI from killing the process for inactivity
   while not done:
@@ -38,10 +38,10 @@ t.start()
 def run():
   sp.Popen(['adb', 'wait-for-device']).communicate()
   if (test_class != None):
-    p = sp.Popen('adb shell am instrument -w -e class %s %s/android.support.test.runner.AndroidJUnitRunner' 
+    p = sp.Popen('adb shell am instrument -w -e class %s %s/android.support.test.runner.AndroidJUnitRunner'
       % (test_class, test_app), shell=True, stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE)
   else :
-    p = sp.Popen('adb shell am instrument -w %s/android.support.test.runner.AndroidJUnitRunner' 
+    p = sp.Popen('adb shell am instrument -w %s/android.support.test.runner.AndroidJUnitRunner'
       % (test_app), shell=True, stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE)
   return p.communicate()
 

IntegrationTests/IntegrationTestHarnessTest.js

@@ -10,28 +10,22 @@
 
 'use strict';
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const requestAnimationFrame = require('fbjs/lib/requestAnimationFrame');
 const React = require('react');
-const PropTypes = require('prop-types');
 const ReactNative = require('react-native');
 const {Text, View} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 
-class IntegrationTestHarnessTest extends React.Component<
-  {
-    shouldThrow?: boolean,
-    waitOneFrame?: boolean,
-  },
-  $FlowFixMeState,
-> {
-  static propTypes = {
-    shouldThrow: PropTypes.bool,
-    waitOneFrame: PropTypes.bool,
-  };
+type Props = $ReadOnly<{|
+  shouldThrow?: boolean,
+  waitOneFrame?: boolean,
+|}>;
+
+type State = {|
+  done: boolean,
+|};
 
+class IntegrationTestHarnessTest extends React.Component<Props, State> {
   state = {
     done: false,
   };

IntegrationTests/ReactContentSizeUpdateTest.js

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
+ * @flow
  */
 
 'use strict';
@@ -13,12 +14,11 @@ 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;
@@ -27,11 +27,11 @@ const newReactViewHeight = 202;
 
 const ReactContentSizeUpdateTest = createReactClass({
   displayName: 'ReactContentSizeUpdateTest',
-  mixins: [Subscribable.Mixin, TimerMixin],
+  _timeoutID: (null: ?TimeoutID),
+  _subscription: (null: ?EmitterSubscription),
 
   UNSAFE_componentWillMount: function() {
-    this.addListenerOn(
-      RCTNativeAppEventEmitter,
+    this._subscription = RCTNativeAppEventEmitter.addListener(
       'rootViewDidChangeIntrinsicSize',
       this.rootViewDidChangeIntrinsicSize,
     );
@@ -52,11 +52,21 @@ const ReactContentSizeUpdateTest = createReactClass({
   },
 
   componentDidMount: function() {
-    this.setTimeout(() => {
+    this._timeoutID = setTimeout(() => {
       this.updateViewSize();
     }, 1000);
   },
 
+  componentWillUnmount: function() {
+    if (this._timeoutID != null) {
+      clearTimeout(this._timeoutID);
+    }
+
+    if (this._subscription != null) {
+      this._subscription.remove();
+    }
+  },
+
   rootViewDidChangeIntrinsicSize: function(intrinsicSize) {
     if (
       intrinsicSize.height === newReactViewHeight &&

IntegrationTests/SizeFlexibilityUpdateTest.js

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
+ * @flow
  */
 
 'use strict';
@@ -13,10 +14,10 @@ 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;
@@ -25,16 +26,21 @@ let finalState = false;
 
 const SizeFlexibilityUpdateTest = createReactClass({
   displayName: 'SizeFlexibilityUpdateTest',
-  mixins: [Subscribable.Mixin],
+  _subscription: (null: ?EmitterSubscription),
 
   UNSAFE_componentWillMount: function() {
-    this.addListenerOn(
-      RCTNativeAppEventEmitter,
+    this._subscription = RCTNativeAppEventEmitter.addListener(
       'rootViewDidChangeIntrinsicSize',
       this.rootViewDidChangeIntrinsicSize,
     );
   },
 
+  componentWillUnmount: function() {
+    if (this._subscription != null) {
+      this._subscription.remove();
+    }
+  },
+
   markPassed: function() {
     TestModule.markTestPassed(true);
     finalState = true;

Libraries/Animated/release/package.json

@@ -10,7 +10,7 @@
   "license": "MIT",
   "main": "Animated.js",
   "dependencies": {
-    "fbjs": "0.8.17"
+    "fbjs": "^1.0.0"
   },
   "scripts": {
     "build": "gulp"

Libraries/Animated/src/__tests__/Animated-test.js

@@ -134,7 +134,9 @@ describe('Animated tests', () => {
       expect(callback).toBeCalled();
     });
 
-    it('send toValue when an underdamped spring stops', () => {
+    // This test is flaky and we are asking open source to fix it
+    // https://github.com/facebook/react-native/issues/21517
+    it.skip('send toValue when an underdamped spring stops', () => {
       const anim = new Animated.Value(0);
       const listener = jest.fn();
       anim.addListener(listener);

Libraries/Animated/src/createAnimatedComponent.js

@@ -12,7 +12,7 @@
 const {AnimatedEvent} = require('./AnimatedEvent');
 const AnimatedProps = require('./nodes/AnimatedProps');
 const React = require('React');
-const ViewStylePropTypes = require('ViewStylePropTypes');
+const DeprecatedViewStylePropTypes = require('DeprecatedViewStylePropTypes');
 
 const invariant = require('fbjs/lib/invariant');
 
@@ -184,7 +184,7 @@ function createAnimatedComponent(Component: any): any {
         return;
       }
 
-      for (const key in ViewStylePropTypes) {
+      for (const key in DeprecatedViewStylePropTypes) {
         if (!propTypes[key] && props[key] !== undefined) {
           console.warn(
             'You are setting the style `{ ' +