taking latest

.circleci/config.yml

@@ -57,13 +57,13 @@ aliases:
 
   - &restore-cache-downloads-buck
     keys:
-      - v3-buck-v2018.07.23.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}}
-      - v3-buck-v2018.07.23.01-
+      - v3-buck-v2018.10.29.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}}
+      - v3-buck-v2018.10.29.01-
   - &save-cache-downloads-buck
     paths:
       - ~/buck
       - ~/okbuck
-    key: v3-buck-v2018.07.23.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}
+    key: v3-buck-v2018.10.29.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}
 
   - &restore-cache-watchman
     keys:
@@ -132,7 +132,7 @@ aliases:
     name: Install BUCK
     command: |
       if [[ ! -e ~/buck ]]; then
-        git clone https://github.com/facebook/buck.git ~/buck --branch v2018.07.23.01 --depth=1
+        git clone https://github.com/facebook/buck.git ~/buck --branch v2018.10.29.01 --depth=1
       fi
       cd ~/buck && ant
       buck --version

.eslintrc

@@ -5,7 +5,6 @@
 
   "env": {
     "es6": true,
-    "jest": true,
   },
 
   "plugins": [
@@ -14,7 +13,7 @@
     "prettier",
     "react",
     "react-native",
-    "jest"
+    "jest",
   ],
 
   // Map from global var to bool specifying if it can be redefined
@@ -37,7 +36,6 @@
     "fetch": false,
     "FormData": false,
     "global": false,
-    "jest": false,
     "Map": true,
     "module": false,
     "navigator": false,
@@ -52,8 +50,6 @@
     "setTimeout": false,
     "window": false,
     "XMLHttpRequest": false,
-    "pit": false,
-    "jasmine": true
   },
 
   "rules": {
@@ -271,5 +267,32 @@
         "node": true,
       },
     },
+    {
+      "files": [
+        "**/__fixtures__/**/*.js",
+        "**/__mocks__/**/*.js",
+        "**/__tests__/**/*.js",
+        "jest/**/*.js",
+        "RNTester/**/*.js",
+      ],
+      "globals": {
+        // Expose some Jest globals for test helpers
+        "afterAll": true,
+        "afterEach": true,
+        "beforeAll": true,
+        "beforeEach": true,
+        "expect": true,
+        "jest": true,
+      },
+    },
+    {
+      "files": [
+        "**/__tests__/**/*-test.js",
+      ],
+      "env": {
+        "jasmine": true,
+        "jest": true,
+      },
+    },
   ],
 }

.flowconfig

@@ -22,9 +22,6 @@
 ; 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/.*
@@ -101,4 +98,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.84.0
+^0.87.0

.flowconfig.android

@@ -22,9 +22,6 @@
 ; 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/.*
@@ -101,4 +98,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.84.0
+^0.87.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,31 +9,37 @@ 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!
 
-Release Notes:
---------------
-Help reviewers and the release process by writing your own release notes. See below for an example.
+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.
 
-[CATEGORY] [TYPE] [LOCATION] - Message
+[CATEGORY] [TYPE] - Message
 
 <!--
-  **INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**
-
-    CATEGORY
-  [----------]      TYPE
-  [ CLI      ] [-------------]    LOCATION
-  [ DOCS     ] [ BREAKING    ] [-------------]
-  [ GENERAL  ] [ BUGFIX      ] [ {Component} ]
-  [ INTERNAL ] [ ENHANCEMENT ] [ {Filename}  ]
-  [ IOS      ] [ FEATURE     ] [ {Directory} ]   |-----------|
-  [ ANDROID  ] [ MINOR       ] [ {Framework} ] - | {Message} |
-  [----------] [-------------] [-------------]   |-----------|
-
- EXAMPLES:
-
- [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
--->
+
+  CATEGORY may be:
+
+  - [General]
+  - [iOS]
+  - [Android]
+
+  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
+
+-->

ContainerShip/Dockerfile.android

@@ -1,3 +1,8 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
 # React Native Android Unit Tests
 #
 # This image builds upon the React Native Base Android Development Environment

ContainerShip/Dockerfile.android-base

@@ -1,3 +1,8 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
 # React Native Base Android Development Environment
 #
 # This image provides a base Android development environment for React Native,
@@ -20,7 +25,7 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
 ARG SDK_VERSION=sdk-tools-linux-3859397.zip
 ARG ANDROID_BUILD_VERSION=27
 ARG ANDROID_TOOLS_VERSION=27.0.3
-ARG BUCK_VERSION=v2018.07.23.01
+ARG BUCK_VERSION=v2018.10.29.01
 ARG NDK_VERSION=17c
 ARG NODE_VERSION=8.10.0
 ARG WATCHMAN_VERSION=4.9.0

ContainerShip/Dockerfile.javascript

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

ContainerShip/scripts/run-android-ci-instrumentation-tests.js

@@ -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),
+    TEST_TIMEOUT: parseInt(argv['test-timeout'] || 1000 * 60 * 10, 10),
 
     OFFSET: argv.offset,
     COUNT: argv.count,
@@ -68,7 +68,6 @@ 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;
 

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

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

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

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

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

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

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

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

IntegrationTests/AsyncStorageTest.js

@@ -12,7 +12,7 @@
 
 const React = require('react');
 const ReactNative = require('react-native');
-const {AsyncStorage, Text, View} = ReactNative;
+const {AsyncStorage, Text, View, StyleSheet} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 
 const deepDiffer = require('deepDiffer');
@@ -191,7 +191,7 @@ class AsyncStorageTest extends React.Component<{}, $FlowFixMeState> {
 
   render() {
     return (
-      <View style={{backgroundColor: 'white', padding: 40}}>
+      <View style={styles.container}>
         <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,6 +205,13 @@ class AsyncStorageTest extends React.Component<{}, $FlowFixMeState> {
   }
 }
 
+const styles = StyleSheet.create({
+  container: {
+    backgroundColor: 'white',
+    padding: 40,
+  },
+});
+
 AsyncStorageTest.displayName = 'AsyncStorageTest';
 
 module.exports = AsyncStorageTest;

IntegrationTests/ImageCachePolicyTest.js

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

IntegrationTests/ImageSnapshotTest.js

@@ -12,7 +12,7 @@
 
 const React = require('react');
 const ReactNative = require('react-native');
-const {Image, View} = ReactNative;
+const {Image} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 
 class ImageSnapshotTest extends React.Component<{}> {

IntegrationTests/IntegrationTestHarnessTest.js

@@ -13,7 +13,7 @@
 const requestAnimationFrame = require('fbjs/lib/requestAnimationFrame');
 const React = require('react');
 const ReactNative = require('react-native');
-const {Text, View} = ReactNative;
+const {Text, View, StyleSheet} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 
 type Props = $ReadOnly<{|
@@ -54,7 +54,7 @@ class IntegrationTestHarnessTest extends React.Component<Props, State> {
 
   render() {
     return (
-      <View style={{backgroundColor: 'white', padding: 40}}>
+      <View style={styles.container}>
         <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,6 +67,13 @@ class IntegrationTestHarnessTest extends React.Component<Props, State> {
   }
 }
 
+const styles = StyleSheet.create({
+  container: {
+    backgroundColor: 'white',
+    padding: 40,
+  },
+});
+
 IntegrationTestHarnessTest.displayName = 'IntegrationTestHarnessTest';
 
 module.exports = IntegrationTestHarnessTest;

IntegrationTests/SimpleSnapshotTest.js

@@ -34,7 +34,7 @@ class SimpleSnapshotTest extends React.Component<{}> {
 
   render() {
     return (
-      <View style={{backgroundColor: 'white', padding: 100}}>
+      <View style={styles.container}>
         <View style={styles.box1} />
         <View style={styles.box2} />
       </View>
@@ -43,6 +43,10 @@ class SimpleSnapshotTest extends React.Component<{}> {
 }
 
 const styles = StyleSheet.create({
+  container: {
+    backgroundColor: 'white',
+    padding: 100,
+  },
   box1: {
     width: 80,
     height: 50,