Skip to content

Commit c71601b

Browse files
committed
Merge branch 'master' into iframes
2 parents 0744710 + 48833f6 commit c71601b

File tree

139 files changed

+4323
-5509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+4323
-5509
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
**What is the current behavior?**
99

10-
**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem via https://jsfiddle.net or similar (template for React 16: https://jsfiddle.net/Luktwrdm/, template for React 15: https://jsfiddle.net/hmbg7e9w/).**
10+
**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem. Your bug will get fixed much faster if we can run your code and it doesn't have dependencies other than React. Paste the link to your JSFiddle (https://jsfiddle.net/Luktwrdm/) or CodeSandbox (https://codesandbox.io/s/new) example below:**
1111

1212
**What is the expected behavior?**
1313

CHANGELOG.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ Starting with 16.1.0, we will no longer be publishing new releases on Bower. You
8989
* Fix `onMouseEnter` and `onMouseLeave` firing on wrong elements. ([@gaearon](https://github.com/gaearon) in [#11164](https://github.com/facebook/react/pull/11164))
9090
* Fix `null` showing up in a warning instead of the component stack. ([@gaearon](https://github.com/gaearon) in [#10915](https://github.com/facebook/react/pull/10915))
9191
* Fix IE11 crash in development mode. ([@leidegre](https://github.com/leidegre) in [#10921](https://github.com/facebook/react/pull/10921))
92-
* Fix `tabIndex` not getting applied to SVG elements. ([@gaearon](http://github.com/gaearon) in [#11034](https://github.com/facebook/react/pull/11034))
92+
* Fix `tabIndex` not getting applied to SVG elements. ([@gaearon](https://github.com/gaearon) in [#11034](https://github.com/facebook/react/pull/11034))
9393
* Fix SVG children not getting cleaned up on `dangerouslySetInnerHTML` in IE. ([@OriR](https://github.com/OriR) in [#11108](https://github.com/facebook/react/pull/11108))
94-
* Fix false positive text mismatch warning caused by newline normalization. ([@gaearon](http://github.com/gaearon) in [#11119](https://github.com/facebook/react/pull/11119))
94+
* Fix false positive text mismatch warning caused by newline normalization. ([@gaearon](https://github.com/gaearon) in [#11119](https://github.com/facebook/react/pull/11119))
9595
* Fix `form.reset()` to respect `defaultValue` on uncontrolled `<select>`. ([@aweary](https://github.com/aweary) in [#11057](https://github.com/facebook/react/pull/11057))
9696
* Fix `<textarea>` placeholder not rendering on IE11. ([@gaearon](https://github.com/gaearon) in [#11177](https://github.com/facebook/react/pull/11177))
9797
* Fix a crash rendering into shadow root. ([@gaearon](https://github.com/gaearon) in [#11037](https://github.com/facebook/react/pull/11037))
98-
* Fix false positive warning about hydrating mixed case SVG tags. ([@gaearon](http://github.com/gaearon) in [#11174](https://github.com/facebook/react/pull/11174))
99-
* Suppress the new unknown tag warning for `<dialog>` element. ([@gaearon](http://github.com/gaearon) in [#11035](https://github.com/facebook/react/pull/11035))
98+
* Fix false positive warning about hydrating mixed case SVG tags. ([@gaearon](https://github.com/gaearon) in [#11174](https://github.com/facebook/react/pull/11174))
99+
* Suppress the new unknown tag warning for `<dialog>` element. ([@gaearon](https://github.com/gaearon) in [#11035](https://github.com/facebook/react/pull/11035))
100100
* Warn when defining a non-existent `componentDidReceiveProps` method. ([@iamtommcc](https://github.com/iamtommcc) in [#11479](https://github.com/facebook/react/pull/11479))
101101
* Warn about function child no more than once. ([@andreysaleba](https://github.com/andreysaleba) in [#11120](https://github.com/facebook/react/pull/11120))
102102
* Warn about nested updates no more than once. ([@anushreesubramani](https://github.com/anushreesubramani) in [#11113](https://github.com/facebook/react/pull/11113))
@@ -105,16 +105,16 @@ Starting with 16.1.0, we will no longer be publishing new releases on Bower. You
105105
* Improve the warning about booleans passed to event handlers. ([@NicBonetto](https://github.com/NicBonetto) in [#11308](https://github.com/facebook/react/pull/11308))
106106
* Improve the warning when a multiple `select` gets null `value`. ([@Hendeca](https://github.com/Hendeca) in [#11141](https://github.com/facebook/react/pull/11141))
107107
* Move link in the warning message to avoid redirect. ([@marciovicente](https://github.com/marciovicente) in [#11400](https://github.com/facebook/react/pull/11400))
108-
* Add a way to suppress the React DevTools installation prompt. ([@gaearon](http://github.com/gaearon) in [#11448](https://github.com/facebook/react/pull/11448))
108+
* Add a way to suppress the React DevTools installation prompt. ([@gaearon](https://github.com/gaearon) in [#11448](https://github.com/facebook/react/pull/11448))
109109
* Remove unused code. ([@gaearon](https://github.com/gaearon) in [#10802](https://github.com/facebook/react/pull/10802), [#10803](https://github.com/facebook/react/pull/10803))
110110

111111
### React DOM Server
112112

113-
* Add a new `suppressHydrationWarning` attribute for intentional client/server text mismatches. ([@sebmarkbage](http://github.com/sebmarkbage) in [#11126](https://github.com/facebook/react/pull/11126))
114-
* Fix markup generation when components return strings. ([@gaearon](http://github.com/gaearon) in [#11109](https://github.com/facebook/react/pull/11109))
113+
* Add a new `suppressHydrationWarning` attribute for intentional client/server text mismatches. ([@sebmarkbage](https://github.com/sebmarkbage) in [#11126](https://github.com/facebook/react/pull/11126))
114+
* Fix markup generation when components return strings. ([@gaearon](https://github.com/gaearon) in [#11109](https://github.com/facebook/react/pull/11109))
115115
* Fix obscure error message when passing an invalid style value. ([@iamdustan](https://github.com/iamdustan) in [#11173](https://github.com/facebook/react/pull/11173))
116-
* Include the `autoFocus` attribute into SSR markup. ([@gaearon](http://github.com/gaearon) in [#11192](https://github.com/facebook/react/pull/11192))
117-
* Include the component stack into more warnings. ([@gaearon](http://github.com/gaearon) in [#11284](https://github.com/facebook/react/pull/11284))
116+
* Include the `autoFocus` attribute into SSR markup. ([@gaearon](https://github.com/gaearon) in [#11192](https://github.com/facebook/react/pull/11192))
117+
* Include the component stack into more warnings. ([@gaearon](https://github.com/gaearon) in [#11284](https://github.com/facebook/react/pull/11284))
118118

119119
### React Test Renderer and Test Utils
120120

@@ -752,7 +752,7 @@ Each of these changes will continue to work as before with a new warning until t
752752

753753
- Added `React.Children.toArray` which takes a nested children object and returns a flat array with keys assigned to each child. This helper makes it easier to manipulate collections of children in your `render` methods, especially if you want to reorder or slice `this.props.children` before passing it down. In addition, `React.Children.map` now returns plain arrays too.
754754
- React uses `console.error` instead of `console.warn` for warnings so that browsers show a full stack trace in the console. (Our warnings appear when you use patterns that will break in future releases and for code that is likely to behave unexpectedly, so we do consider our warnings to be “must-fix” errors.)
755-
- Previously, including untrusted objects as React children [could result in an XSS security vulnerability](http://danlec.com/blog/xss-via-a-spoofed-react-element). This problem should be avoided by properly validating input at the application layer and by never passing untrusted objects around your application code. As an additional layer of protection, [React now tags elements](https://github.com/facebook/react/pull/4832) with a specific [ES2015 (ES6) `Symbol`](http://www.2ality.com/2014/12/es6-symbols.html) in browsers that support it, in order to ensure that React never considers untrusted JSON to be a valid element. If this extra security protection is important to you, you should add a `Symbol` polyfill for older browsers, such as the one included by [Babel’s polyfill](http://babeljs.io/docs/usage/polyfill/).
755+
- Previously, including untrusted objects as React children [could result in an XSS security vulnerability](http://danlec.com/blog/xss-via-a-spoofed-react-element). This problem should be avoided by properly validating input at the application layer and by never passing untrusted objects around your application code. As an additional layer of protection, [React now tags elements](https://github.com/facebook/react/pull/4832) with a specific [ES2015 (ES6) `Symbol`](http://www.2ality.com/2014/12/es6-symbols.html) in browsers that support it, in order to ensure that React never considers untrusted JSON to be a valid element. If this extra security protection is important to you, you should add a `Symbol` polyfill for older browsers, such as the one included by [Babel’s polyfill](https://babeljs.io/docs/usage/polyfill/).
756756
- When possible, React DOM now generates XHTML-compatible markup.
757757
- React DOM now supports these standard HTML attributes: `capture`, `challenge`, `inputMode`, `is`, `keyParams`, `keyType`, `minLength`, `summary`, `wrap`. It also now supports these non-standard attributes: `autoSave`, `results`, `security`.
758758
- React DOM now supports these SVG attributes, which render into namespaced attributes: `xlinkActuate`, `xlinkArcrole`, `xlinkHref`, `xlinkRole`, `xlinkShow`, `xlinkTitle`, `xlinkType`, `xmlBase`, `xmlLang`, `xmlSpace`.
@@ -786,7 +786,7 @@ Each of these changes will continue to work as before with a new warning until t
786786

787787
#### Breaking Changes
788788

789-
- The `react-tools` package and `JSXTransformer.js` browser file [have been deprecated](https://reactjs.org/blog/2015/06/12/deprecating-jstransform-and-react-tools.html). You can continue using version `0.13.3` of both, but we no longer support them and recommend migrating to [Babel](http://babeljs.io/), which has built-in support for React and JSX.
789+
- The `react-tools` package and `JSXTransformer.js` browser file [have been deprecated](https://reactjs.org/blog/2015/06/12/deprecating-jstransform-and-react-tools.html). You can continue using version `0.13.3` of both, but we no longer support them and recommend migrating to [Babel](https://babeljs.io), which has built-in support for React and JSX.
790790

791791
#### New Features
792792

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ You'll notice that we used an HTML-like syntax; [we call it JSX](https://reactjs
4545

4646
## Installation
4747

48-
React is available as the `react` package on [npm](https://www.npmjs.com/). It is also available on a [CDN](https://reactjs.org/docs/installation.html#using-a-cdn).
48+
React is available as the `react` package on [npm](https://www.npmjs.com/). It is also available on a [CDN](https://reactjs.org/docs/cdn-links.html).
4949

5050
React is flexible and can be used in a variety of projects. You can create new apps with it, but you can also gradually introduce it into an existing codebase without doing a rewrite.
5151

5252
The recommended way to install React depends on your project. Here you can find short guides for the most common scenarios:
5353

54-
* [Trying Out React](https://reactjs.org/docs/installation.html#trying-out-react)
55-
* [Creating a New Application](https://reactjs.org/docs/installation.html#creating-a-new-application)
56-
* [Adding React to an Existing Application](https://reactjs.org/docs/installation.html#adding-react-to-an-existing-application)
54+
* [Trying Out React](https://reactjs.org/docs/try-react.html)
55+
* [Creating a New Application](https://reactjs.org/docs/add-react-to-a-new-app.html)
56+
* [Adding React to an Existing Application](https://reactjs.org/docs/add-react-to-an-existing-app.html)
5757

5858
## Contributing
5959

fixtures/art/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"babel-plugin-transform-class-properties": "^6.24.1",
66
"babel-preset-es2015": "^6.6.0",
77
"babel-preset-react": "^6.5.0",
8-
"react": "file:../../build/packages/react",
9-
"react-art": "file:../../build/packages/react-art",
10-
"react-dom": "file:../../build/packages/react-dom",
8+
"react": "link:../../build/node_modules/react",
9+
"react-art": "link:../../build/node_modules/react-art/",
10+
"react-dom": "link:../../build/node_modules/react-dom",
1111
"webpack": "^1.14.0"
1212
},
1313
"scripts": {

fixtures/art/yarn.lock

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,31 +1742,17 @@ rc@^1.1.7:
17421742
minimist "^1.2.0"
17431743
strip-json-comments "~2.0.1"
17441744

1745-
"react-art@file:../../build/packages/react-art":
1746-
version "16.0.0"
1747-
dependencies:
1748-
art "^0.10.1"
1749-
create-react-class "^15.6.2"
1750-
fbjs "^0.8.16"
1751-
loose-envify "^1.1.0"
1752-
object-assign "^4.1.1"
1753-
prop-types "^15.6.0"
1745+
"react-art@link:../../build/node_modules/react-art":
1746+
version "0.0.0"
1747+
uid ""
17541748

1755-
"react-dom@file:../../build/packages/react-dom":
1756-
version "16.0.0"
1757-
dependencies:
1758-
fbjs "^0.8.16"
1759-
loose-envify "^1.1.0"
1760-
object-assign "^4.1.1"
1761-
prop-types "^15.6.0"
1749+
"react-dom@link:../../build/node_modules/react-dom":
1750+
version "0.0.0"
1751+
uid ""
17621752

1763-
"react@file:../../build/packages/react":
1764-
version "16.0.0"
1765-
dependencies:
1766-
fbjs "^0.8.16"
1767-
loose-envify "^1.1.0"
1768-
object-assign "^4.1.1"
1769-
prop-types "^15.6.0"
1753+
"react@link:../../build/node_modules/react":
1754+
version "0.0.0"
1755+
uid ""
17701756

17711757
"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.2.6:
17721758
version "2.2.6"

fixtures/packaging/browserify/dev/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"name": "browserify-dev-fixture",
44
"dependencies": {
55
"browserify": "^13.3.0",
6-
"react": "file:../../../../build/packages/react",
7-
"react-dom": "file:../../../../build/packages/react-dom"
6+
"react": "link:../../../../build/node_modules/react",
7+
"react-dom": "link:../../../../build/node_modules/react-dom"
88
},
99
"scripts": {
1010
"build": "rm -f output.js && browserify ./input.js -o output.js"

fixtures/packaging/browserify/dev/yarn.lock

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -739,21 +739,13 @@ randombytes@^2.0.0, randombytes@^2.0.1:
739739
dependencies:
740740
safe-buffer "^5.1.0"
741741

742-
"react-dom@file:../../../../build/packages/react-dom":
743-
version "16.0.0"
744-
dependencies:
745-
fbjs "^0.8.16"
746-
loose-envify "^1.1.0"
747-
object-assign "^4.1.1"
748-
prop-types "^15.6.0"
742+
"react-dom@link:../../../../build/node_modules/react-dom":
743+
version "0.0.0"
744+
uid ""
749745

750-
"react@file:../../../../build/packages/react":
751-
version "16.0.0"
752-
dependencies:
753-
fbjs "^0.8.16"
754-
loose-envify "^1.1.0"
755-
object-assign "^4.1.1"
756-
prop-types "^15.6.0"
746+
"react@link:../../../../build/node_modules/react":
747+
version "0.0.0"
748+
uid ""
757749

758750
read-only-stream@^2.0.0:
759751
version "2.0.0"

fixtures/packaging/browserify/prod/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"name": "browserify-prod-fixture",
44
"dependencies": {
55
"browserify": "^13.3.0",
6-
"react": "file:../../../../build/packages/react",
7-
"react-dom": "file:../../../../build/packages/react-dom"
6+
"react": "link:../../../../build/node_modules/react",
7+
"react-dom": "link:../../../../build/node_modules/react-dom"
88
},
99
"scripts": {
1010
"build": "rm -f output.js && browserify ./input.js -g [envify --NODE_ENV 'production'] -o output.js"

fixtures/packaging/browserify/prod/yarn.lock

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -750,21 +750,13 @@ randombytes@^2.0.0, randombytes@^2.0.1:
750750
dependencies:
751751
safe-buffer "^5.1.0"
752752

753-
"react-dom@file:../../../../build/packages/react-dom":
754-
version "16.0.0"
755-
dependencies:
756-
fbjs "^0.8.16"
757-
loose-envify "^1.1.0"
758-
object-assign "^4.1.1"
759-
prop-types "^15.6.0"
753+
"react-dom@link:../../../../build/node_modules/react-dom":
754+
version "0.0.0"
755+
uid ""
760756

761-
"react@file:../../../../build/packages/react":
762-
version "16.0.0"
763-
dependencies:
764-
fbjs "^0.8.16"
765-
loose-envify "^1.1.0"
766-
object-assign "^4.1.1"
767-
prop-types "^15.6.0"
757+
"react@link:../../../../build/node_modules/react":
758+
version "0.0.0"
759+
uid ""
768760

769761
read-only-stream@^2.0.0:
770762
version "2.0.0"

fixtures/packaging/brunch/dev/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"devDependencies": {
55
"brunch": "^2.9.1",
66
"javascript-brunch": "^2.0.0",
7-
"react": "file:../../../../build/packages/react",
8-
"react-dom": "file:../../../../build/packages/react-dom"
7+
"react": "link:../../../../build/node_modules/react",
8+
"react-dom": "link:../../../../build/node_modules/react-dom"
99
},
1010
"scripts": {
1111
"build": "rm -rf public && brunch build"
1212
}
13-
}
13+
}

0 commit comments

Comments
 (0)