Merge pull request #1172 from reactjs/update-react-16

rake react:update ujs:update

CHANGELOG.md

@@ -8,6 +8,19 @@
 
 #### Bug Fixes
 
+## 2.6.2
+
+#### New Features
+
+- React 16.14
+- Support for ShakaPacker
+- Preparation for React 18 #1151
+
+#### Bug Fixes
+
+- URI.open instead of open #1099
+- No longer unmount components on Turbolinks navigation #1135
+
 ## 2.6.1
 
 #### Breaking Changes
@@ -112,6 +125,7 @@
 - Call ReactDOM.render() when react_component :prerender option is falsy, instead of ReactDOM.hydrate() #844, #842
 
 ## 2.4.2
+
 #### Bug Fixes
 
 - 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 @@
   // = require components
   ```
 
-
 #### New Features
 
 - Webpacker support:
@@ -471,14 +484,14 @@
 
 - Changed server rendering configuration names #253
 
-  |  Old | New  |
-  | ---- | ---- |
-  | `config.react.timeout` | `config.react.server_renderer_timeout` |
-  | `config.react.max_renderers` | `config.react.server_renderer_pool_size` |
-  | `config.react.react_js` | `config.react.server_renderer_options[:files]` |
-  | `config.react.component_filenames` | `config.react.server_renderer_options[:files]` |
-  | `config.react.replay_console` | `config.react.server_renderer_options[:replay_console]` |
-  | (none) | `config.react.server_renderer` |
+  | Old                                | New                                                     |
+  | ---------------------------------- | ------------------------------------------------------- |
+  | `config.react.timeout`             | `config.react.server_renderer_timeout`                  |
+  | `config.react.max_renderers`       | `config.react.server_renderer_pool_size`                |
+  | `config.react.react_js`            | `config.react.server_renderer_options[:files]`          |
+  | `config.react.component_filenames` | `config.react.server_renderer_options[:files]`          |
+  | `config.react.replay_console`      | `config.react.server_renderer_options[:replay_console]` |
+  | (none)                             | `config.react.server_renderer`                          |
 
 - JSX is transformed by Babel, not JSTransform #295
 
@@ -504,7 +517,6 @@
 - Add `tilt` dependency #248
 - Default prerender pool size to 1 #302
 
-
 ## 1.0.0 (April 7, 2015)
 
 #### New Features

VERSIONS.md

@@ -8,8 +8,9 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
 ## Bundled Versions
 
 | Gem      | React.js |
-|----------|----------|
-| master   | 16.9.0   |
+| -------- | -------- | -------------- |
+| master   | 16.14.0  |
+| 2.6.2    | 16.14.0  |
 | 2.6.1    | 16.9.0   |
 | 2.6.0    | 16.8.6   |
 | 2.5.0    | 16.8.6   |
@@ -21,7 +22,7 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
 | 2.4.2    | 16.1.1   |
 | 2.4.1    | 16.0.0   |
 | 2.4.0    | 16.0.0   |
-| 2.3.1    | 15.6.2   | Updated Addons
+| 2.3.1    | 15.6.2   | Updated Addons |
 | 2.3.0    | 15.6.2   |
 | 2.2.1    | 15.4.2   |
 | 2.2.0    | 15.4.2   |
@@ -58,4 +59,4 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
 
 ## Drop-in Version
 
-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/`).
+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

@@ -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.6.1'
+    VERSION = '2.6.2'
   end
 end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_ujs",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Rails UJS for the react-rails gem",
   "main": "react_ujs/index.js",
   "files": [