Skip to content

Update react pt2 #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BookOfGreg merged 4 commits into from
Jul 15, 2018
Merged

Update react pt2 #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b4bf58
:arrow_up: Upgrade pre-bundled react to 16.4.1
BookOfGreg Jul 15, 2018
f27df61
Bump version number
BookOfGreg Jul 15, 2018
dd7a70d
Update version
BookOfGreg Jul 15, 2018
6b9c828
Merge versions
BookOfGreg Jul 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion VERSIONS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ You can control what version of React.js (and JSXTransformer) is used by `react-

| Gem | React.js |
|----------|----------|
| master | 16.2.0 |
| master | 16.4.1 |
| 2.4.6 | 16.4.1 |
| 2.4.5 | 16.3.2 |
| 2.4.4 | 16.2.0 |
| 2.4.3 | 16.1.1 |
Expand Down
373 changes: 246 additions & 127 deletions lib/assets/react-source/development/react-server.js
View file
Open in desktop

Large diffs are not rendered by default.

22,858 changes: 11,850 additions & 11,008 deletions lib/assets/react-source/development/react.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lib/assets/react-source/production/react-server.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions lib/assets/react-source/production/react.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/react/rails/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ module React
module Rails
# If you change this, make sure to update VERSIONS.md
# and republish the UJS by updating package.json and `bundle exec rake ujs:publish`
VERSION = '2.4.4'
VERSION = '2.4.6'
end
end
4 changes: 2 additions & 2 deletions react-builds/package.json
View file
Open in desktop
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.3.2",
"react-dom": "16.3.2",
"react": "^16.4.1",
"react-dom": "^16.4.1",
"react-transition-group": "1.1.1",
"webpack": "^1.12.2"
},
Expand Down
12 changes: 6 additions & 6 deletions react-builds/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,9 +904,9 @@ rc@^1.2.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

react-dom@16.3.2:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
react-dom@^16.4.1:
version "16.4.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.1.tgz#7f8b0223b3a5fbe205116c56deb85de32685dad6"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
Expand All @@ -921,9 +921,9 @@ react-transition-group@1.1.1:
dom-helpers "^3.2.0"
warning "^3.0.0"

react@16.3.2:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
react@^16.4.1:
version "16.4.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.4.1.tgz#de51ba5764b5dbcd1f9079037b862bd26b82fe32"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
Expand Down