Skip to content

Commit

Permalink
Merge pull request #908 from reactjs/update-react
Browse files Browse the repository at this point in the history
⬆️ Upgrade pre-bundled react to 16.3.2
  • Loading branch information
BookOfGreg authored Jul 15, 2018
2 parents 83b6175 + 432b9a5 commit fd70bcf
Show file tree
Hide file tree
Showing 8 changed files with 9,189 additions and 7,855 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@

#### New Features

- React 16.3.2 prebundled #908
- Supports Webpacker 4.x #895
- Enhanced generator to create components in subdirectories #890
- Explicitly support Rails 5.2 #893
- Enhanced documentation for Turbolinks usage #900

## 2.4.4

#### New Features

- React 16.2 prebundled #856, #874
- Use Fragments instead of Divs by default #856
- Explicitly support Ruby 2.5 #857
Expand Down
1 change: 1 addition & 0 deletions VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
| Gem | React.js |
|----------|----------|
| master | 16.2.0 |
| 2.4.5 | 16.3.2 |
| 2.4.4 | 16.2.0 |
| 2.4.3 | 16.1.1 |
| 2.4.2 | 16.1.1 |
Expand Down
1,677 changes: 978 additions & 699 deletions lib/assets/react-source/development/react-server.js

Large diffs are not rendered by default.

14,698 changes: 7,985 additions & 6,713 deletions lib/assets/react-source/development/react.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions lib/assets/react-source/production/react-server.js

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions lib/assets/react-source/production/react.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions react-builds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"create-react-class": "^15.6.2",
"immutability-helper": "^2.4.0",
"prop-types": "^15.6.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react": "16.3.2",
"react-dom": "16.3.2",
"react-transition-group": "1.1.1",
"webpack": "^1.12.2"
},
Expand Down
Loading

0 comments on commit fd70bcf

Please sign in to comment.