Skip to content

Commit ca4a6cd

Browse files
committed
Update changelog and versions
1 parent 0e98016 commit ca4a6cd

File tree

4 files changed

+22
-16
lines changed

4 files changed

+22
-16
lines changed

CHANGELOG.md

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

99
#### Bug Fixes
1010

11+
## 2.6.2
12+
13+
#### New Features
14+
15+
- React 16.14
16+
1117
## 2.6.1
1218

1319
#### Breaking Changes
@@ -112,6 +118,7 @@
112118
- Call ReactDOM.render() when react_component :prerender option is falsy, instead of ReactDOM.hydrate() #844, #842
113119

114120
## 2.4.2
121+
115122
#### Bug Fixes
116123

117124
- ReactDOM.hydrate() may not be defined for everyone, it will now use hydrate if it is defined or fallback to render #832
@@ -224,7 +231,6 @@
224231
// = require components
225232
```
226233

227-
228234
#### New Features
229235

230236
- Webpacker support:
@@ -471,14 +477,14 @@
471477

472478
- Changed server rendering configuration names #253
473479

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` |
480+
| Old | New |
481+
| ---------------------------------- | ------------------------------------------------------- |
482+
| `config.react.timeout` | `config.react.server_renderer_timeout` |
483+
| `config.react.max_renderers` | `config.react.server_renderer_pool_size` |
484+
| `config.react.react_js` | `config.react.server_renderer_options[:files]` |
485+
| `config.react.component_filenames` | `config.react.server_renderer_options[:files]` |
486+
| `config.react.replay_console` | `config.react.server_renderer_options[:replay_console]` |
487+
| (none) | `config.react.server_renderer` |
482488

483489
- JSX is transformed by Babel, not JSTransform #295
484490

@@ -504,7 +510,6 @@
504510
- Add `tilt` dependency #248
505511
- Default prerender pool size to 1 #302
506512

507-
508513
## 1.0.0 (April 7, 2015)
509514

510515
#### 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/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)