Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 68f3a4b

Browse files
Merge pull request #1172 from reactjs/update-react-16
rake react:update ujs:update
2 parents 58b1a20 + e6eb502 commit 68f3a4b

File tree

10 files changed

+23232
-24790
lines changed

10 files changed

+23232
-24790
lines changed

‎CHANGELOG.md

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,19 @@
88

99
#### Bug Fixes
1010

11+
## 2.6.2
12+
13+
#### New Features
14+
15+
- React 16.14
16+
- Support for ShakaPacker
17+
- Preparation for React 18 #1151
18+
19+
#### Bug Fixes
20+
21+
- URI.open instead of open #1099
22+
- No longer unmount components on Turbolinks navigation #1135
23+
1124
## 2.6.1
1225

1326
#### Breaking Changes
@@ -112,6 +125,7 @@
112125
- Call ReactDOM.render() when react_component :prerender option is falsy, instead of ReactDOM.hydrate() #844, #842
113126

114127
## 2.4.2
128+
115129
#### Bug Fixes
116130

117131
- ReactDOM.hydrate() may not be defined for everyone, it will now use hydrate if it is defined or fallback to render #832
@@ -224,7 +238,6 @@
224238
// = require components
225239
```
226240

227-
228241
#### New Features
229242

230243
- Webpacker support:
@@ -471,14 +484,14 @@
471484

472485
- Changed server rendering configuration names #253
473486

474-
| Old | New |
475-
| ---- | ---- |
476-
| `config.react.timeout` | `config.react.server_renderer_timeout` |
477-
| `config.react.max_renderers` | `config.react.server_renderer_pool_size` |
478-
| `config.react.react_js` | `config.react.server_renderer_options[:files]` |
479-
| `config.react.component_filenames` | `config.react.server_renderer_options[:files]` |
480-
| `config.react.replay_console` | `config.react.server_renderer_options[:replay_console]` |
481-
| (none) | `config.react.server_renderer` |
487+
| Old | New |
488+
| ---------------------------------- | ------------------------------------------------------- |
489+
| `config.react.timeout` | `config.react.server_renderer_timeout` |
490+
| `config.react.max_renderers` | `config.react.server_renderer_pool_size` |
491+
| `config.react.react_js` | `config.react.server_renderer_options[:files]` |
492+
| `config.react.component_filenames` | `config.react.server_renderer_options[:files]` |
493+
| `config.react.replay_console` | `config.react.server_renderer_options[:replay_console]` |
494+
| (none) | `config.react.server_renderer` |
482495

483496
- JSX is transformed by Babel, not JSTransform #295
484497

@@ -504,7 +517,6 @@
504517
- Add `tilt` dependency #248
505518
- Default prerender pool size to 1 #302
506519

507-
508520
## 1.0.0 (April 7, 2015)
509521

510522
#### New Features

‎VERSIONS.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
88
## Bundled Versions
99

1010
| Gem | React.js |
11-
|----------|----------|
12-
| master | 16.9.0 |
11+
| -------- | -------- | -------------- |
12+
| master | 16.14.0 |
13+
| 2.6.2 | 16.14.0 |
1314
| 2.6.1 | 16.9.0 |
1415
| 2.6.0 | 16.8.6 |
1516
| 2.5.0 | 16.8.6 |
@@ -21,7 +22,7 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
2122
| 2.4.2 | 16.1.1 |
2223
| 2.4.1 | 16.0.0 |
2324
| 2.4.0 | 16.0.0 |
24-
| 2.3.1 | 15.6.2 | Updated Addons
25+
| 2.3.1 | 15.6.2 | Updated Addons|
2526
| 2.3.0 | 15.6.2 |
2627
| 2.2.1 | 15.4.2 |
2728
| 2.2.0 | 15.4.2 |
@@ -58,4 +59,4 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
5859

5960
## Drop-in Version
6061

61-
You can also provide your own copies of React.js and JSXTransformer. Just add a different version of `react.js` and `react-server.js` from this project or `JSXTransformer.js` (case-sensitive) files to the asset pipeline (eg, `app/assets/vendor/`).
62+
You can also provide your own copies of React.js and JSXTransformer. Just add a different version of `react.js` and `react-server.js` from this project or `JSXTransformer.js` (case-sensitive) files to the asset pipeline (eg, `app/assets/vendor/`).

‎lib/assets/react-source/development/react-server.js

Lines changed: 1911 additions & 2345 deletions
Large diffs are not rendered by default.

‎lib/assets/react-source/development/react.js

Lines changed: 20900 additions & 21712 deletions
Large diffs are not rendered by default.

‎lib/assets/react-source/production/react-server.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/assets/react-source/production/react.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/react/rails/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ module React
22
module Rails
33
# If you change this, make sure to update VERSIONS.md
44
# and republish the UJS by updating package.json and `bundle exec rake ujs:publish`
5-
VERSION = '2.6.1'
5+
VERSION = '2.6.2'
66
end
77
end

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react_ujs",
3-
"version": "2.6.1",
3+
"version": "2.6.2",
44
"description": "Rails UJS for the react-rails gem",
55
"main": "react_ujs/index.js",
66
"files": [

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /