Merge branch 'master' into iOS_packager_port

Author: DaKaZ

.circleci/config.yml

@@ -69,11 +69,11 @@ aliases:
 
   - &restore-cache-buck
     keys:
-      - v1-buck-{{ arch }}-v2017.09.04.02
+      - v1-buck-{{ arch }}-v2017.11.16.01
   - &save-cache-buck
     paths:
       - ~/buck
-    key: v1-buck-{{ arch }}-v2017.09.04.02
+    key: v1-buck-{{ arch }}-v2017.11.16.01
 
   - &restore-cache-watchman
     keys:
@@ -239,17 +239,22 @@ jobs:
           command: |
             cd website
             npm install --no-package-lock --no-spin --no-progress
+# The CIRCLE_PROJECT_USERNAME and CIRCLE_PR_USERNAME checks below 
+# ensure deploys only happen on projects owned by "facebook", 
+# never on a forked PR build.
       - run:
           name: Build and Deploy Static Website
           command: |
-            if [[ $CIRCLE_PROJECT_USERNAME == "facebook" && -z $CI_PULL_REQUEST && -z $CIRCLE_PR_USERNAME ]]; then
+            if [[ $CIRCLE_PROJECT_USERNAME == "facebook" && -z $CIRCLE_PR_USERNAME ]]; then
               git config --global user.email "[email protected]"
               git config --global user.name "Website Deployment Script"
               echo "machine github.com login reactjs-bot password $GITHUB_TOKEN" > ~/.netrc
               echo "Deploying website..."
               cd website && GIT_USER=reactjs-bot npm run gh-pages
+            elif [[ -n $CIRCLE_PR_USERNAME ]]; then
+              echo "Skipping website deploy, this is a forked PR build."
             else
-              echo "Skipping deploy."
+              echo "Skipping website deploy."
             fi
 
   # Build JavaScript bundle for Android tests
@@ -329,7 +334,7 @@ jobs:
           name: Install Buck
           command: |
             if [[ ! -e ~/buck ]]; then
-              git clone https://github.com/facebook/buck.git ~/buck --branch v2017.09.04.02 --depth=1
+              git clone https://github.com/facebook/buck.git ~/buck --branch v2017.11.16.01 --depth=1
             fi
             cd ~/buck && ant
             buck --version
@@ -438,10 +443,12 @@ jobs:
       - checkout
       - restore-cache: *restore-cache-analysis
       - run: *install-node-dependencies
+# The CIRCLE_PR_NUMBER checks below ensure
+# code analysis only runs on forked PR builds.
       - run:
           name: Install Dependencies
           command: |
-            if [ -n "$CIRCLE_PULL_REQUEST" ]; then
+            if [ -n "$CIRCLE_PR_NUMBER" ]; then
               npm install [email protected]
               cd danger
               npm install --no-package-lock --no-spin --no-progress
@@ -453,17 +460,17 @@ jobs:
       - run:
           name: Analyze Pull Request
           command: |
-            if [ -n "$CIRCLE_PULL_REQUEST" ]; then
+            if [ -n "$CIRCLE_PR_NUMBER" ]; then
               cd danger && DANGER_GITHUB_API_TOKEN="e622517d9f1136ea8900""07c6373666312cdfaa69" npm run danger
             else
               echo "Skipping pull request analysis."            
             fi
           when: always
-# Run eslint          
+# Run eslint
       - run:
           name: Analyze Code
           command: |
-            if [ -n "$CIRCLE_PULL_REQUEST" ]; then
+            if [ -n "$CIRCLE_PR_NUMBER" && -n "$CIRCLE_PROJECT_USERNAME" && -n "$CIRCLE_PROJECT_REPONAME" ]; then
               cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; npm run flow --silent -- check --json) | GITHUB_TOKEN="af6ef0d15709bc91d""06a6217a5a826a226fb57b7" CI_USER=$CIRCLE_PROJECT_USERNAME CI_REPO=$CIRCLE_PROJECT_REPONAME PULL_REQUEST_NUMBER=$CIRCLE_PR_NUMBER node bots/code-analysis-bot.js
             else
               echo "Skipping code analysis."            

.flowconfig

@@ -46,12 +46,12 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-8]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*[react_native_oss|react_native_fb][a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-8]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*[react_native_oss|react_native_fb][a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-9]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*[react_native_oss|react_native_fb][a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-9]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*[react_native_oss|react_native_fb][a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.58.0
+^0.59.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -27,7 +27,7 @@ Help reviewers and the release process by writing your own release notes
 [----------]        TYPE
 [ CLI      ]   [-------------]      LOCATION
 [ DOCS     ]   [ BREAKING    ]   [-------------]
-[ GENERAl  ]   [ BUGFIX      ]   [-{Component}-]
+[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
 [ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
 [ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
 [ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |

CONTRIBUTING.md

@@ -96,11 +96,11 @@ Please make sure the following is done when submitting a pull request:
 
 1. Fork [the repository](https://github.com/facebook/react-native) and create your branch from `master`.
 2. Add the copyright notice to the top of any new files you've added.
-3. Describe your [**test plan**](/react-native/docs/contributing.html#test-plan) in your pull request description. Make sure to [test your changes](/react-native/docs/testing.html)!
+3. Describe your [**test plan**](https://facebook.github.io/react-native/docs/contributing.html#test-plan) in your pull request description. Make sure to [test your changes](https://facebook.github.io/react-native/docs/testing.html)!
 4. Make sure your code lints (`npm run lint`).
 5. If you haven't already, [sign the CLA](https://code.facebook.com/cla).
 
-All pull requests should be opened against the `master` branch. After opening your pull request, ensure [**all tests pass**](/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.
+All pull requests should be opened against the `master` branch. After opening your pull request, ensure [**all tests pass**](https://facebook.github.io/react-native/docs/contributing.html#contrinuous-integration-tests) on Circle CI. If a test fails and you believe it is unrelated to your change, leave a comment on the pull request explaining why.
 
 > **Note:** It is not necessary to keep clicking `Merge master to your branch` on the PR page. You would want to merge master if there are conflicts or tests are failing. The Facebook-GitHub-Bot ultimately squashes all commits to a single one before merging your PR.
 
@@ -116,7 +116,7 @@ See [What is a Test Plan?](https://medium.com/@martinkonicek/what-is-a-test-plan
 
 #### Continuous integration tests
 
-Make sure all **tests pass** on [Circle CI][circle]. PRs that break tests are unlikely to be merged. Learn more about [testing your changes here](/react-native/docs/testing.html).
+Make sure all **tests pass** on [Circle CI][circle]. PRs that break tests are unlikely to be merged. Learn more about [testing your changes here](https://facebook.github.io/react-native/docs/testing.html).
 
 [circle]: http://circleci.com/gh/facebook/react-native
 

Libraries/ActionSheetIOS/ActionSheetIOS.js

@@ -16,33 +16,27 @@ var RCTActionSheetManager = require('NativeModules').ActionSheetManager;
 var invariant = require('fbjs/lib/invariant');
 var processColor = require('processColor');
 
+/**
+ * Display action sheets and share sheets on iOS.
+ * 
+ * See http://facebook.github.io/react-native/docs/actionsheetios.html
+ */
 var ActionSheetIOS = {
   /**
-   * Display an iOS action sheet. The `options` object must contain one or more
-   * of:
-   *
+   * Display an iOS action sheet.
+   * 
+   * The `options` object must contain one or more of:
+   * 
    * - `options` (array of strings) - a list of button titles (required)
    * - `cancelButtonIndex` (int) - index of cancel button in `options`
    * - `destructiveButtonIndex` (int) - index of destructive button in `options`
    * - `title` (string) - a title to show above the action sheet
    * - `message` (string) - a message to show below the title
-   *
+   * 
    * The 'callback' function takes one parameter, the zero-based index
    * of the selected item.
-   *
-   * Minimal example:
    * 
-   * ```
-   * ActionSheetIOS.showActionSheetWithOptions({
-   *   options: ['Remove', 'Cancel'],
-   *   destructiveButtonIndex: 1,
-   *   cancelButtonIndex: 0,
-   * },
-   * (buttonIndex) => {
-   *   if (buttonIndex === 1) { // destructive action }
-   * });
-   * ```
-   *
+   * See http://facebook.github.io/react-native/docs/actionsheetios.html#showactionsheetwithoptions
    */
   showActionSheetWithOptions(options: Object, callback: Function) {
     invariant(
@@ -67,11 +61,9 @@ var ActionSheetIOS = {
    * - `url` (string) - a URL to share
    * - `message` (string) - a message to share
    * - `subject` (string) - a subject for the message
-   * - `excludedActivityTypes` (array) - the activities to exclude from the ActionSheet
-   *
-   * NOTE: if `url` points to a local file, or is a base64-encoded
-   * uri, the file it points to will be loaded and shared directly.
-   * In this way, you can share images, videos, PDF files, etc.
+   * - `excludedActivityTypes` (array) - the activities to exclude from 
+   *   the ActionSheet
+   * - `tintColor` (color) - tint color of the buttons
    *
    * The 'failureCallback' function takes one parameter, an error object.
    * The only property defined on this object is an optional `stack` property
@@ -81,6 +73,8 @@ var ActionSheetIOS = {
    *
    * - a boolean value signifying success or failure
    * - a string that, in the case of success, indicates the method of sharing
+   * 
+   * See http://facebook.github.io/react-native/docs/actionsheetios.html#showshareactionsheetwithoptions
    */
   showShareActionSheetWithOptions(
     options: Object,

Libraries/Alert/Alert.js

@@ -30,54 +30,16 @@ type Options = {
 
 /**
  * Launches an alert dialog with the specified title and message.
- *
- * Optionally provide a list of buttons. Tapping any button will fire the
- * respective onPress callback and dismiss the alert. By default, the only
- * button will be an 'OK' button.
- *
- * This is an API that works both on iOS and Android and can show static
- * alerts. To show an alert that prompts the user to enter some information,
- * see `AlertIOS`; entering text in an alert is common on iOS only.
- *
- * ## iOS
- *
- * On iOS you can specify any number of buttons. Each button can optionally
- * specify a style, which is one of 'default', 'cancel' or 'destructive'.
- *
- * ## Android
- *
- * On Android at most three buttons can be specified. Android has a concept
- * of a neutral, negative and a positive button:
- *
- *   - If you specify one button, it will be the 'positive' one (such as 'OK')
- *   - Two buttons mean 'negative', 'positive' (such as 'Cancel', 'OK')
- *   - Three buttons mean 'neutral', 'negative', 'positive' (such as 'Later', 'Cancel', 'OK')
- *
- * By default alerts on Android can be dismissed by tapping outside of the alert
- * box. This event can be handled by providing an optional `options` parameter,
- * with an `onDismiss` callback property `{ onDismiss: () => {} }`.
- *
- * Alternatively, the dismissing behavior can be disabled altogether by providing
- * an optional `options` parameter with the `cancelable` property set to `false`
- * i.e. `{ cancelable: false }`
- *
- * Example usage:
- * ```
- * // Works on both iOS and Android
- * Alert.alert(
- *   'Alert Title',
- *   'My Alert Msg',
- *   [
- *     {text: 'Ask me later', onPress: () => console.log('Ask me later pressed')},
- *     {text: 'Cancel', onPress: () => console.log('Cancel Pressed'), style: 'cancel'},
- *     {text: 'OK', onPress: () => console.log('OK Pressed')},
- *   ],
- *   { cancelable: false }
- * )
- * ```
+ * 
+ * See http://facebook.github.io/react-native/docs/alert.html
  */
 class Alert {
 
+  /**
+   * Launches an alert dialog with the specified title and message.
+   * 
+   * See http://facebook.github.io/react-native/docs/alert.html#alert
+   */
   static alert(
     title: ?string,
     message?: ?string,

Libraries/Alert/AlertIOS.js

@@ -77,60 +77,15 @@ export type ButtonsArray = Array<{
 }>;
 
 /**
- * @description
- * `AlertIOS` provides functionality to create an iOS alert dialog with a
- * message or create a prompt for user input.
- *
- * Creating an iOS alert:
- *
- * ```
- * AlertIOS.alert(
- *  'Sync Complete',
- *  'All your data are belong to us.'
- * );
- * ```
- *
- * Creating an iOS prompt:
- *
- * ```
- * AlertIOS.prompt(
- *   'Enter a value',
- *   null,
- *   text => console.log("You entered "+text)
- * );
- * ```
- *
- * We recommend using the [`Alert.alert`](docs/alert.html) method for
- * cross-platform support if you don't need to create iOS-only prompts.
+ * Use `AlertIOS` to display an alert dialog with a message or to create a prompt for user input on iOS. If you don't need to prompt for user input, we recommend using `Alert.alert() for cross-platform support.
  *
+ * See http://facebook.github.io/react-native/docs/alertios.html
  */
 class AlertIOS {
   /**
    * Create and display a popup alert.
-   * @static
-   * @method alert
-   * @param title The dialog's title. Passing null or '' will hide the title.
-   * @param message An optional message that appears below
-   *     the dialog's title.
-   * @param callbackOrButtons This optional argument should
-   *    be either a single-argument function or an array of buttons. If passed
-   *    a function, it will be called when the user taps 'OK'.
-   *
-   *    If passed an array of button configurations, each button should include
-   *    a `text` key, as well as optional `onPress` and `style` keys. `style`
-   *    should be one of 'default', 'cancel' or 'destructive'.
-   * @param type Deprecated, do not use.
    *
-   * @example <caption>Example with custom buttons</caption>
-   *
-   * AlertIOS.alert(
-   *  'Update available',
-   *  'Keep your app up to date to enjoy the latest features',
-   *  [
-   *    {text: 'Cancel', onPress: () => console.log('Cancel Pressed'), style: 'cancel'},
-   *    {text: 'Install', onPress: () => console.log('Install Pressed')},
-   *  ],
-   * );
+   * See http://facebook.github.io/react-native/docs/alertios.html#alert
    */
   static alert(
     title: ?string,
@@ -148,48 +103,8 @@ class AlertIOS {
 
   /**
    * Create and display a prompt to enter some text.
-   * @static
-   * @method prompt
-   * @param title The dialog's title.
-   * @param message An optional message that appears above the text
-   *    input.
-   * @param callbackOrButtons This optional argument should
-   *    be either a single-argument function or an array of buttons. If passed
-   *    a function, it will be called with the prompt's value when the user
-   *    taps 'OK'.
-   *
-   *    If passed an array of button configurations, each button should include
-   *    a `text` key, as well as optional `onPress` and `style` keys (see
-   *    example). `style` should be one of 'default', 'cancel' or 'destructive'.
-   * @param type This configures the text input. One of 'plain-text',
-   *    'secure-text' or 'login-password'.
-   * @param defaultValue The default text in text input.
-   * @param keyboardType The keyboard type of first text field(if exists).
-   *    One of 'default', 'email-address', 'numeric', 'phone-pad',
-   *    'ascii-capable', 'numbers-and-punctuation', 'url', 'number-pad',
-   *    'name-phone-pad', 'decimal-pad', 'twitter' or 'web-search'.
-   *
-   * @example <caption>Example with custom buttons</caption>
-   *
-   * AlertIOS.prompt(
-   *   'Enter password',
-   *   'Enter your password to claim your $1.5B in lottery winnings',
-   *   [
-   *     {text: 'Cancel', onPress: () => console.log('Cancel Pressed'), style: 'cancel'},
-   *     {text: 'OK', onPress: password => console.log('OK Pressed, password: ' + password)},
-   *   ],
-   *   'secure-text'
-   * );
-   *
-   * @example <caption>Example with the default button and a custom callback</caption>
-   *
-   * AlertIOS.prompt(
-   *   'Update username',
-   *   null,
-   *   text => console.log("Your username is "+text),
-   *   null,
-   *   'default'
-   * );
+   * 
+   * See http://facebook.github.io/react-native/docs/alertios.html#prompt
    */
   static prompt(
     title: ?string,