Merge pull request #812 from BookOfGreg/prebundle-the-correct-react

Prepare for 2.4.0

Author: BookOfGreg

Diff for: CHANGELOG.md

@@ -2,7 +2,33 @@
 
 #### Breaking Changes
 
-- React Deprecations for 15.4, 15.5, 15.6 in preparation for 16 handled in prebundled version
+#### New Features
+
+#### Deprecation
+
+#### Bug Fixes
+
+## 2.4.0
+
+#### Breaking Changes
+
+- (Sprockets) Prebundled React upgraded to 16 #792
+- (Sprockets) Addons removed # 792
+
+#### New Features
+
+#### Deprecation
+
+#### Bug Fixes
+
+- Coffeescript generator exports correctly #799, #800
+- Running detector manually no longer breaks if Turbolinks is not preset #802
+
+## 2.3.1
+
+#### Breaking Changes
+
+- React Deprecations for 15.4, 15.5, 15.6 in preparation for 16 handled in prebundled version #789, #798
 
 #### New Features
 

Diff for: README.md

@@ -6,6 +6,13 @@
 [![Code Climate](https://img.shields.io/codeclimate/github/reactjs/react-rails.svg?style=flat-square)](https://codeclimate.com/github/reactjs/react-rails)
 [![Test Coverage](https://img.shields.io/codeclimate/coverage/github/reactjs/react-rails.svg?style=flat-square)](https://codeclimate.com/github/reactjs/react-rails/coverage)
 
+Gem version 2.4.x onwards and master will no longer have React Addons.
+
+If you need to make changes for the prebundled react, see the migration docs here:
+https://reactjs.org/blog/2016/11/16/react-v15.4.0.html
+https://reactjs.org/blog/2017/04/07/react-v15.5.0.html
+https://reactjs.org/blog/2017/06/13/react-v15.6.0.html
+
 `react-rails` makes it easy to use [React](http://facebook.github.io/react/) and [JSX](http://facebook.github.io/react/docs/jsx-in-depth.html) in your Ruby on Rails (3.2+) application. Learn more:
 
 - React's [Getting Started guide](https://facebook.github.io/react/docs/getting-started.html)

Diff for: Rakefile

@@ -12,10 +12,22 @@ def copy_react_asset(webpack_file, destination_file)
   FileUtils.cp(full_webpack_path, full_destination_path)
 end
 
+# Move to `dirname` and execute `yarn {cmd}`
+def yarn_run_in(dirname, cmd)
+  Dir.chdir(dirname) do
+    `yarn #{cmd}`
+  end
+end
+
 namespace :react do
   desc 'Run the JS build process to put files in the gem source'
   task update: [:install, :build, :copy]
 
+  desc 'Install the JavaScript dependencies'
+  task :install do
+    yarn_run_in('react-builds', 'upgrade')
+  end
+
   desc 'Build the JS bundles with Webpack'
   task :build do
     yarn_run_in('react-builds', 'build')
@@ -29,11 +41,6 @@ namespace :react do
       copy_react_asset("#{environment}/react-server.js", "#{environment}/react-server.js")
     end
   end
-
-  desc 'Install the JavaScript dependencies'
-  task :install do
-    yarn_run_in('react-builds', 'upgrade')
-  end
 end
 
 namespace :ujs do

Diff for: VERSIONS.md

@@ -9,7 +9,9 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
 
 | Gem      | React.js |
 |----------|----------|
-| master   | 15.6.2   |
+| master   | 16.0.0   |
+| 2.4.0    | 16.0.0   |
+| 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   |

Diff for: lib/assets/react-source/development/react-server.js

@@ -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.3.0'
+    VERSION = '2.4.0'
   end
 end

Diff for: lib/assets/react-source/development/react.js

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