Merge remote-tracking branch 'upstream/master' into iframes-16

Author: acusti

.flowconfig

@@ -17,8 +17,6 @@
 ./scripts/flow
 
 [options]
-module.system=haste
-
 esproposal.class_static_fields=enable
 esproposal.class_instance_fields=enable
 unsafe.enable_getters_and_setters=true

.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,8 @@
+<!--
+  Note: if the issue is about documentation or the website, please file it at:
+  https://github.com/reactjs/reactjs.org/issues/new
+-->
+
 **Do you want to request a *feature* or report a *bug*?**
 
 **What is the current behavior?**

README.md

@@ -1,4 +1,4 @@
-# [React](https://reactjs.org/) · [![CircleCI Status](https://circleci.com/gh/facebook/react.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/facebook/react) [![Coverage Status](https://img.shields.io/coveralls/facebook/react/master.svg?style=flat)](https://coveralls.io/github/facebook/react?branch=master) [![npm version](https://img.shields.io/npm/v/react.svg?style=flat)](https://www.npmjs.com/package/react) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md#pull-requests)
+# [React](https://reactjs.org/) · [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/facebook/react/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/react.svg?style=flat)](https://www.npmjs.com/package/react) [![Coverage Status](https://img.shields.io/coveralls/facebook/react/master.svg?style=flat)](https://coveralls.io/github/facebook/react?branch=master) [![CircleCI Status](https://circleci.com/gh/facebook/react.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/facebook/react) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md#pull-requests)
 
 React is a JavaScript library for building user interfaces.
 
@@ -8,6 +8,20 @@ React is a JavaScript library for building user interfaces.
 
 [Learn how to use React in your own project](https://reactjs.org/docs/getting-started.html).
 
+## Documentation
+
+You can find the React documentation [on the website](https://reactjs.org/docs).  
+It is divided into several sections:
+
+* [Quick Start](https://reactjs.org/docs/hello-world.html)
+* [Advanced Guides](https://reactjs.org/docs/jsx-in-depth.html)
+* [API Reference](https://reactjs.org/docs/react-api.html)
+* [Tutorial](https://reactjs.org/tutorial/tutorial.html)
+* [Where to Get Support](https://reactjs.org/community/support.html)
+* [Contributing Guide](https://reactjs.org/docs/how-to-contribute.html)
+
+You can improve it by sending pull requests to [this repository](https://github.com/reactjs/reactjs.org).
+
 ## Examples
 
 We have several examples [on the website](https://reactjs.org/). Here is the first one to get you started:
@@ -49,7 +63,7 @@ The main purpose of this repository is to continue to evolve React core, making
 
 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.
 
-### Contributing Guide
+### [Contributing Guide](https://reactjs.org/contributing/how-to-contribute.html)
 
 Read our [contributing guide](https://reactjs.org/contributing/how-to-contribute.html) to learn about our development process, how to propose bugfixes and improvements, and how to build and test your changes to React.
 

circle.yml

@@ -2,12 +2,12 @@
 machine:
   timezone: America/Los_Angeles
   node:
-    version: 6
+    version: 8
   ruby:
     version: 2.2.3
   environment:
     TRAVIS_REPO_SLUG: facebook/react
-    YARN_VERSION: 0.17.8
+    YARN_VERSION: 1.2.1
     PATH: "${PATH}:${HOME}/.yarn/bin"
 
 dependencies:

fixtures/art/yarn.lock

@@ -73,6 +73,10 @@ arrify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
+art@^0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/art/-/art-0.10.1.tgz#38541883e399225c5e193ff246e8f157cf7b2146"
+
 asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
@@ -1741,6 +1745,7 @@ rc@^1.1.7:
 "react-art@file:../../build/packages/react-art":
   version "16.0.0"
   dependencies:
+    art "^0.10.1"
     create-react-class "^15.6.2"
     fbjs "^0.8.16"
     loose-envify "^1.1.0"

fixtures/dom/README.md

@@ -4,13 +4,13 @@ A set of DOM test cases for quickly identifying browser issues.
 
 ## Setup
 
-To reference a local build of React, first run `npm run build` at the root
+To reference a local build of React, first run `yarn build` at the root
 of the React project. Then:
 
 ```
 cd fixtures/dom
-npm install
-npm start
+yarn
+yarn start
 ```
 
 The `start` command runs a script that copies over the local build of react into

fixtures/dom/yarn.lock

@@ -2672,9 +2672,9 @@ fbjs@^0.8.1, fbjs@^0.8.4:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.9"
 
-fbjs@^0.8.9:
-  version "0.8.12"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
+fbjs@^0.8.16:
+  version "0.8.16"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
   dependencies:
     core-js "^1.0.0"
     isomorphic-fetch "^2.1.1"
@@ -4203,6 +4203,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0:
   dependencies:
     js-tokens "^2.0.0"
 
+loose-envify@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@ -4605,7 +4611,7 @@ oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@4.1.1:
+object-assign@4.1.1, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
@@ -5257,11 +5263,13 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.6:
-  version "15.5.6"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.6.tgz#797a915b1714b645ebb7c5d6cc690346205bd2aa"
+prop-types@^15.6.0:
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
   dependencies:
-    fbjs "^0.8.9"
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
 
 proxy-addr@~1.1.2:
   version "1.1.2"

package.json

@@ -10,7 +10,7 @@
     "babel-cli": "^6.6.5",
     "babel-core": "^6.0.0",
     "babel-eslint": "^7.1.0",
-    "babel-jest": "21.2.0",
+    "babel-jest": "^21.3.0-beta.4",
     "babel-plugin-check-es2015-constants": "^6.5.0",
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.5.0",
@@ -53,6 +53,7 @@
     "eslint-plugin-flowtype": "^2.25.0",
     "eslint-plugin-react": "^6.7.1",
     "eslint-plugin-react-internal": "file:./scripts/eslint-rules",
+    "expect": "^21.3.0-beta.4",
     "fbjs": "^0.8.16",
     "fbjs-scripts": "^0.6.0",
     "filesize": "^3.5.6",
@@ -63,11 +64,10 @@
     "gzip-js": "~0.3.2",
     "gzip-size": "^3.0.0",
     "jasmine-check": "^1.0.0-rc.0",
-    "jest": "21.2.1",
-    "jest-config": "21.2.1",
-    "jest-jasmine2": "21.2.1",
-    "jest-matchers": "20.1.0-delta.1",
-    "jest-runtime": "21.2.1",
+    "jest": "^21.3.0-beta.4",
+    "jest-config": "^21.3.0-beta.4",
+    "jest-jasmine2": "^21.3.0-beta.4",
+    "jest-runtime": "^21.3.0-beta.4",
     "merge-stream": "^1.0.0",
     "minimist": "^1.2.0",
     "ncp": "^2.0.0",
@@ -115,9 +115,6 @@
     "transform": {
       ".*": "./scripts/jest/preprocessor.js"
     },
-    "transformIgnorePatterns": [
-      "/node_modules/(?!react)"
-    ],
     "setupFiles": [
       "./scripts/jest/setup.js",
       "./scripts/jest/environment.js"

packages/events/EventPluginHub.js

@@ -3,20 +3,18 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- *
- * @providesModule EventPluginHub
  */
 
 'use strict';
 
-var EventPluginRegistry = require('EventPluginRegistry');
-var EventPluginUtils = require('EventPluginUtils');
-var ReactErrorUtils = require('ReactErrorUtils');
-
-var accumulateInto = require('accumulateInto');
-var forEachAccumulated = require('forEachAccumulated');
+var ReactErrorUtils = require('shared/ReactErrorUtils');
 var invariant = require('fbjs/lib/invariant');
 
+var EventPluginRegistry = require('./EventPluginRegistry');
+var EventPluginUtils = require('./EventPluginUtils');
+var accumulateInto = require('./accumulateInto');
+var forEachAccumulated = require('./forEachAccumulated');
+
 /**
  * Internal queue of events that have accumulated their dispatches and are
  * waiting to have their dispatches executed.

packages/events/EventPluginRegistry.js

@@ -4,22 +4,23 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @providesModule EventPluginRegistry
  * @flow
  */
 
 'use strict';
 
-import type {DispatchConfig} from 'ReactSyntheticEventType';
+import type {DispatchConfig} from './ReactSyntheticEventType';
+import type {
+  AnyNativeEvent,
+  PluginName,
+  PluginModule,
+} from './PluginModuleType';
 
-import type {AnyNativeEvent, PluginName, PluginModule} from 'PluginModuleType';
+var invariant = require('fbjs/lib/invariant');
 
 type NamesToPlugins = {[key: PluginName]: PluginModule<AnyNativeEvent>};
-
 type EventPluginOrder = null | Array<PluginName>;
 
-var invariant = require('fbjs/lib/invariant');
-
 /**
  * Injectable ordering of event plugins.
  */