Skip to content

Commit 76e6790

Browse files
committed
Merge remote-tracking branch 'upstream/15-stable' into 15-dev
2 parents 7df71a2 + 91676a6 commit 76e6790

File tree

384 files changed

+35595
-62060
lines changed

Some content is hidden

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

384 files changed

+35595
-62060
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ docs/code
1515
docs/_site
1616
docs/.sass-cache
1717
docs/js/*
18-
docs/downloads
18+
docs/downloads/*.zip
1919
docs/vendor/bundle
2020
examples/shared/*.js
2121
examples/**/bundle.js

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ script:
3939
bundle exec rake release
4040
cd $GH_PAGES_DIR
4141
git status
42-
if ! git diff-index --quiet HEAD --; then
42+
if test -n "$(git status --porcelain)"; then
4343
git add -A .
4444
git commit -m "Rebuild website"
4545
git push origin gh-pages

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
## 15.4.0 (November 16, 2016)
2+
3+
### React
4+
* React package and browser build no longer "secretly" includes React DOM. ([@sebmarkbage](https://github.com/sebmarkbage) in [#7164](https://github.com/facebook/react/pull/7164) and [#7168](https://github.com/facebook/react/pull/7168))
5+
* Required PropTypes now fail with specific messages for null and undefined. ([@chenglou](https://github.com/chenglou) in [#7291](https://github.com/facebook/react/pull/7291))
6+
* Improved development performance by freezing children instead of copying. ([@keyanzhang](https://github.com/keyanzhang) in [#7455](https://github.com/facebook/react/pull/7455))
7+
8+
### React DOM
9+
* Fixed occasional test failures when React DOM is used together with shallow renderer. ([@goatslacker](https://github.com/goatslacker) in [#8097](https://github.com/facebook/react/pull/8097))
10+
* Added a warning for invalid `aria-` attributes. ([@jessebeach](https://github.com/jessebeach) in [#7744](https://github.com/facebook/react/pull/7744))
11+
* Added a warning for using `autofocus` rather than `autoFocus`. ([@hkal](https://github.com/hkal) in [#7694](https://github.com/facebook/react/pull/7694))
12+
* Removed an unnecessary warning about polyfilling `String.prototype.split`. ([@nhunzaker](https://github.com/nhunzaker) in [#7629](https://github.com/facebook/react/pull/7629))
13+
* Clarified the warning about not calling PropTypes manually. ([@jedwards1211](https://github.com/jedwards1211) in [#7777](https://github.com/facebook/react/pull/7777))
14+
* The unstable `batchedUpdates` API now passes the wrapped function's return value through. ([@bgnorlov](https://github.com/bgnorlov) in [#7444](https://github.com/facebook/react/pull/7444))
15+
* Fixed a bug with updating text in IE 8. ([@mnpenner](https://github.com/mnpenner) in [#7832](https://github.com/facebook/react/pull/7832))
16+
17+
### React Perf
18+
* When ReactPerf is started, you can now view the relative time spent in components as a chart in Chrome Timeline. ([@gaearon](https://github.com/gaearon) in [#7549](https://github.com/facebook/react/pull/7549))
19+
20+
### React Test Utils
21+
* If you call `Simulate.click()` on a `<input disabled onClick={foo} />` then `foo` will get called whereas it didn't before. ([@nhunzaker](https://github.com/nhunzaker) in [#7642](https://github.com/facebook/react/pull/7642))
22+
23+
### React Test Renderer
24+
* Due to packaging changes, it no longer crashes when imported together with React DOM in the same file. ([@sebmarkbage](https://github.com/sebmarkbage) in [#7164](https://github.com/facebook/react/pull/7164) and [#7168](https://github.com/facebook/react/pull/7168))
25+
* `ReactTestRenderer.create()` now accepts `{createNodeMock: element => mock}` as an optional argument so you can mock refs with snapshot testing. ([@Aweary](https://github.com/Aweary) in [#7649](https://github.com/facebook/react/pull/7649), [#8261](https://github.com/facebook/react/pull/8261))
26+
27+
128
## 15.3.2 (September 19, 2016)
229

330
### React

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ React is a JavaScript library for building user interfaces.
1313
We have several examples [on the website](https://facebook.github.io/react/). Here is the first one to get you started:
1414

1515
```js
16-
var HelloMessage = React.createClass({
17-
render: function() {
16+
class HelloMessage extends React.Component {
17+
render() {
1818
return <div>Hello {this.props.name}</div>;
1919
}
20-
});
20+
}
2121

2222
ReactDOM.render(
2323
<HelloMessage name="John" />,
@@ -35,12 +35,12 @@ The fastest way to get started is to serve JavaScript from a CDN. We're using [u
3535

3636
```html
3737
<!-- The core React library -->
38-
<script src="https://unpkg.com/react@15.3.2/dist/react.js"></script>
38+
<script src="https://unpkg.com/react@15.4.0/dist/react.js"></script>
3939
<!-- The ReactDOM Library -->
40-
<script src="https://unpkg.com/react-dom@15.3.2/dist/react-dom.js"></script>
40+
<script src="https://unpkg.com/react-dom@15.4.0/dist/react-dom.js"></script>
4141
```
4242

43-
We've also built a [starter kit](https://facebook.github.io/react/downloads/react-15.3.2.zip) which might be useful if this is your first time using React. It includes a webpage with an example of using React with live code.
43+
We've also built a [starter kit](https://facebook.github.io/react/downloads/react-15.4.0.zip) which might be useful if this is your first time using React. It includes a webpage with an example of using React with live code.
4444

4545
If you'd like to use [bower](http://bower.io), it's as easy as:
4646

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Use Jekyll to serve the website locally (by default, at `http://localhost:4000`)
3434
$ cd react/docs
3535
$ bundle exec rake
3636
$ bundle exec jekyll serve -w
37-
$ open http://localhost:4000/react/
37+
$ open http://localhost:4000/react/index.html
3838
```
3939

4040
We use [SASS](http://sass-lang.com/) (with [Bourbon](http://bourbon.io/)) for our CSS, and we use JSX to transform some of our JS.

docs/Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require('open-uri')
66
desc "download babel-browser"
77
task :fetch_remotes do
88
IO.copy_stream(
9-
open('https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.8.34/browser.min.js'),
10-
'js/babel-browser.min.js'
9+
open('https://unpkg.com/babel-standalone@6.15.0/babel.min.js'),
10+
'js/babel.min.js'
1111
)
1212
end
1313

docs/_config.yml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
name: React
33
description: A JavaScript library for building user interfaces
44
url: https://facebook.github.io
5-
baseurl: "/react"
6-
permalink: "/blog/:year/:month/:day/:title.html"
7-
paginate_path: "/blog/page:num/"
5+
baseurl: /react
6+
permalink: /blog/:year/:month/:day/:title.html
7+
paginate_path: /blog/page:num/
88
paginate: 5
99
timezone: America/Los_Angeles
1010
highlighter: pygments
@@ -20,22 +20,29 @@ defaults:
2020
type: pages
2121
values:
2222
sectionid: blog
23+
- scope:
24+
path: tutorial
25+
type: pages
26+
values:
27+
layout: tutorial
28+
sectionid: tutorial
2329
- scope:
2430
path: docs
2531
type: pages
2632
values:
2733
layout: docs
2834
sectionid: docs
2935
- scope:
30-
path: tips
36+
path: contributing
3137
type: pages
3238
values:
3339
sectionid: docs
3440
- scope:
35-
path: contributing
41+
path: community
3642
type: pages
3743
values:
38-
sectionid: docs
44+
layout: community
45+
sectionid: community
3946
exclude:
4047
- Gemfile
4148
- Gemfile.lock
@@ -53,13 +60,13 @@ sass:
5360
gems:
5461
- jekyll-redirect-from
5562
- jekyll-paginate
56-
react_version: 15.3.2
63+
react_version: 15.4.0
5764
react_hashes:
58-
dev: bQIyvl+8Ufi5KiKZPG9VItNWmhcAXA1pa5nHIEoBGob+rdbjJnpNV3s288Mz2yZu
59-
prod: drG4TSBgFQ0Hb/A3ynRyFDT22irpJDL+duuxvYD5mkC9adCYDqEwnX13371waqiH
60-
addons_dev: gCLxBq3yes/qREmjcw3Tdk5dUh3iB54huWqgxq1lAJZTYzLahJqEik5ZiVnq9Zt4
61-
addons_prod: pmUKSclxJREtkrfcUJvBYTEoJCvO6Vj5ob8IgPSiIX0G3c4w2dKBJMoGEhlv9Gev
62-
dom_dev: ZzFfcTbsRst34N23lWs6TtlfonXwDgpeALh+ObwYXav5BSo0j7KsaAtcdn+xrnS1
63-
dom_prod: MTxlP+/p3lyvc2+LZc2B5xy5reGwrA80whnflxNc6zPgLUmMvbwUoKy7qorBH+P4
64-
dom_server_dev: jHjmbawtj2AhVuJlmE/O1HXAIbQMzHvoXRZEVdhTSrfJXACRVpZm/BpuAi4K89xn
65-
dom_server_prod: LCYUMPll/9t/UsNa/Q1zfti2awxxiiczBUZcQBdeGACH0sU6BEAllZuGxo5b6/kf
65+
dev: buVLzxzBI8Ps3svVMSUurNdb5dozNidH5Ow4H0YgZeia3t6Oeui2VLpvtAq1fwtK
66+
prod: nCjsa0kjNQPQdxWm12/ReVJzfBJaVubEwwDswyQDGMKYJmeWv3qShMuETfU5fisu
67+
addons_dev: /u97pKzBwasbC1yj8gSIq1z30o4ZTUX9j1Mv/hyAjmG41ydTNHw9JFOhwFbDgxmR
68+
addons_prod: /p86n4b5VTlWoA/INEHQZ+zjx9g1pJduoFmTEJ6fSzFTq1mBaXaBcWVGtZJXD68L
69+
dom_dev: lUxkeWjg3I3lXmxcM1gvgo0yvm2w9alc1osa4L8yWZFO6l/vg9h5hSlHPFioltrm
70+
dom_prod: u8x1yIGN9IjGNYbBaDMsp1D4MK3sCmMU13mcBX+bm+aMo5+gaT8HIwIj39GlXaRS
71+
dom_server_dev: Okj1hVX1VF+oZSkPcJQ/YcnW6bsIpeni222ylwUaMnSmdCe0zWKmMwpFMVqzy4Ws
72+
dom_server_prod: wiA4u+G5fEfF4xzhhVnNWeSifVyttoEIpgc3APaMKQgw5A4wHbEMihf63tk1qoyt

docs/_data/nav_community.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
- title: Community Resources
2+
items:
3+
- id: support
4+
title: Where To Get Support
5+
- id: conferences
6+
title: Conferences
7+
- id: videos
8+
title: Videos
9+
- id: complementary-tools
10+
title: Complementary Tools
11+
href: https://github.com/facebook/react/wiki/Complementary-Tools
12+
- id: examples
13+
title: Examples
14+
href: https://github.com/facebook/react/wiki/Examples

docs/_data/nav_contributing.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
title: How to Contribute
55
- id: codebase-overview
66
title: Codebase Overview
7+
- id: implementation-notes
8+
title: Implementation Notes
79
- id: design-principles
810
title: Design Principles

docs/_data/nav_docs.yml

Lines changed: 78 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,84 @@
11
- title: Quick Start
22
items:
3-
- id: getting-started
4-
title: Getting Started
5-
- id: tutorial
6-
title: Tutorial
7-
- id: thinking-in-react
8-
title: Thinking in React
9-
- title: Community Resources
3+
- id: installation
4+
title: Installation
5+
- id: hello-world
6+
title: Hello World
7+
- id: introducing-jsx
8+
title: Introducing JSX
9+
- id: rendering-elements
10+
title: Rendering Elements
11+
- id: components-and-props
12+
title: Components and Props
13+
- id: state-and-lifecycle
14+
title: State and Lifecycle
15+
- id: handling-events
16+
title: Handling Events
17+
- id: conditional-rendering
18+
title: Conditional Rendering
19+
- id: lists-and-keys
20+
title: Lists and Keys
21+
- id: forms
22+
title: Forms
23+
- id: lifting-state-up
24+
title: Lifting State Up
25+
- id: composition-vs-inheritance
26+
title: Composition vs Inheritance
27+
- id: thinking-in-react
28+
title: Thinking In React
29+
- title: Advanced Guides
1030
items:
11-
- id: conferences
12-
title: Conferences
13-
- id: videos
14-
title: Videos
15-
- id: complementary-tools
16-
title: Complementary Tools
17-
href: https://github.com/facebook/react/wiki/Complementary-Tools
18-
- id: examples
19-
title: Examples
20-
href: https://github.com/facebook/react/wiki/Examples
21-
- title: Guides
22-
items:
23-
- id: why-react
24-
title: Why React?
25-
- id: displaying-data
26-
title: Displaying Data
27-
subitems:
2831
- id: jsx-in-depth
29-
title: JSX in Depth
30-
- id: jsx-spread
31-
title: JSX Spread Attributes
32-
- id: jsx-gotchas
33-
title: JSX Gotchas
34-
- id: interactivity-and-dynamic-uis
35-
title: Interactivity and Dynamic UIs
36-
- id: multiple-components
37-
title: Multiple Components
38-
- id: reusable-components
39-
title: Reusable Components
40-
- id: transferring-props
41-
title: Transferring Props
42-
- id: forms
43-
title: Forms
44-
- id: working-with-the-browser
45-
title: Working With the Browser
46-
subitems:
47-
- id: more-about-refs
48-
title: Refs to Components
49-
- id: tooling-integration
50-
title: Tooling Integration
51-
subitems:
52-
- id: language-tooling
53-
title: Language Tooling
54-
- id: package-management
55-
title: Package Management
56-
- id: environments
57-
title: Server-side Environments
58-
- id: addons
59-
title: Add-Ons
60-
subitems:
61-
- id: animation
62-
title: Animation
63-
- id: two-way-binding-helpers
64-
title: Two-Way Binding Helpers
65-
- id: test-utils
66-
title: Test Utilities
67-
- id: clone-with-props
68-
title: Cloning Elements
69-
- id: create-fragment
70-
title: Keyed Fragments
71-
- id: update
72-
title: Immutability Helpers
73-
- id: pure-render-mixin
74-
title: PureRenderMixin
75-
- id: perf
76-
title: Performance Tools
77-
- id: shallow-compare
78-
title: Shallow Compare
79-
- id: advanced-performance
80-
title: Advanced Performance
81-
- id: context
82-
title: Context
32+
title: JSX In Depth
33+
- id: typechecking-with-proptypes
34+
title: Typechecking With PropTypes
35+
- id: refs-and-the-dom
36+
title: Refs and the DOM
37+
- id: uncontrolled-components
38+
title: Uncontrolled Components
39+
- id: optimizing-performance
40+
title: Optimizing Performance
41+
- id: react-without-es6
42+
title: React Without ES6
43+
- id: react-without-jsx
44+
title: React Without JSX
45+
- id: reconciliation
46+
title: Reconciliation
47+
- id: context
48+
title: Context
49+
- id: web-components
50+
title: Web Components
8351
- title: Reference
8452
items:
85-
- id: top-level-api
86-
title: Top-Level API
87-
- id: component-api
88-
title: Component API
89-
- id: component-specs
90-
title: Component Specs and Lifecycle
91-
- id: tags-and-attributes
92-
title: Supported Tags and Attributes
93-
- id: events
94-
title: Event System
95-
- id: dom-differences
96-
title: DOM Differences
97-
- id: special-non-dom-attributes
98-
title: Special Non-DOM Attributes
99-
- id: reconciliation
100-
title: Reconciliation
101-
- id: webcomponents
102-
title: Web Components
103-
- id: glossary
104-
title: React (Virtual) DOM Terminology
53+
- id: react-api
54+
title: React
55+
subitems:
56+
- id: react-component
57+
title: React.Component
58+
- id: react-dom
59+
title: ReactDOM
60+
- id: react-dom-server
61+
title: ReactDOMServer
62+
- id: dom-elements
63+
title: DOM Elements
64+
- id: events
65+
title: SyntheticEvent
66+
- id: addons
67+
title: Add-Ons
68+
subitems:
69+
- id: perf
70+
title: Performance Tools
71+
- id: test-utils
72+
title: Test Utilities
73+
- id: animation
74+
title: Animation
75+
- id: create-fragment
76+
title: Keyed Fragments
77+
- id: update
78+
title: Immutability Helpers
79+
- id: pure-render-mixin
80+
title: PureRenderMixin
81+
- id: shallow-compare
82+
title: Shallow Compare
83+
- id: two-way-binding-helpers
84+
title: Two-way Binding Helpers

0 commit comments

Comments
 (0)