Merge pull request #792 from reactjs/update-to-react-16

Update to react 16

Author: BookOfGreg

Appraisals

@@ -1,86 +1,41 @@
-appraise 'rails-3.2' do
-  gem 'rails', '~> 3.2.21'
-  gem 'rack-cache', '~> 1.6.1'
-  # Modern turbolinks depends on `Rails.application.assets` which no-worky
-  gem 'turbolinks', '~> 2.0'
-end
-
-appraise 'rails-4.0.5' do
-  # Depends on sprockets-rails ~> 2.0.0. Support for
-  # `Rails.application.assets_manifest` which is used by
-  # `ServerRendering::ManifestContainer` has only been added in
-  # sprockets-rails 2.2.2. Ensure that server rendering falls back to
-  # `ServerRendering::EnvironmentContainer`.`
-  gem 'rails', '4.0.5'
-  gem 'turbolinks'
-end
-
-appraise 'rails-4.0-with-mini_racer' do
-  gem 'rails', '~> 4.0.13'
-  gem 'mini_racer', :platforms => :mri
-  gem 'therubyrhino', :platforms => :jruby
-  gem 'turbolinks'
-end
-
-appraise 'rails-4.1' do
-  gem 'rails', '~> 4.1.10'
-  # Just to make sure we support old Turbolinks:
-  gem 'turbolinks', '~> 2.3.0'
-end
-
-appraise 'rails-4.2-sprockets_2' do
-  gem 'rails', '~> 4.2.1'
-  gem 'sprockets', '~> 2.12'
-  gem 'turbolinks'
-end
-
-appraise 'rails-4.2-sprockets_3' do
-  gem 'rails', '~> 4.2.1'
-  gem 'sprockets', '~> 3.5'
-  gem 'turbolinks', '~> 2.5.0'
-end
-
-appraise 'rails-4.2-sprockets_4' do
-  gem 'rails', '~> 4.2.1'
+appraise 'rails-5.1-sprockets_4' do
+  gem 'rails', '~> 5.1'
   gem 'sprockets', '~> 4.0.x'
-  gem 'turbolinks', '~> 2.5.0'
-  # This ExecJS backend provides stateful context
-  # which the default nodejs backend does not
-  gem 'mini_racer', :platforms => :mri
+  gem 'turbolinks', '~> 5.0.0'
 end
 
 # no_sprockets is a magical name from sprockets_helper.rb in test to
 #   load in certain tests or not.
-appraise 'rails-5_no_sprockets_webpacker_1_1' do
+appraise 'rails-5_no_sprockets_webpacker_3' do
   gem 'rails', '~> 5.0.0'
-  gem 'webpacker', '~> 1.1.0'
+  gem 'webpacker', '>= 3.0'
   # This ExecJS backend provides stateful context
   # which the default nodejs backend does not
   gem 'mini_racer', :platforms => :mri
   gem 'therubyrhino', :platforms => :jruby
 end
 
-appraise 'rails-5_no_sprockets_webpacker_1_x' do
+appraise 'rails-5_no_sprockets_webpacker_2' do
   gem 'rails', '~> 5.0.0'
-  gem 'webpacker', '~> 1.2'
+  gem 'webpacker', '~> 2.0'
   # This ExecJS backend provides stateful context
   # which the default nodejs backend does not
   gem 'mini_racer', :platforms => :mri
   gem 'therubyrhino', :platforms => :jruby
 end
 
-appraise 'rails-5_no_sprockets_webpacker_2' do
+appraise 'rails-5_no_sprockets_webpacker_1_x' do
   gem 'rails', '~> 5.0.0'
-  gem 'webpacker', '~> 2.0'
+  gem 'webpacker', '~> 1.2'
   # This ExecJS backend provides stateful context
   # which the default nodejs backend does not
   gem 'mini_racer', :platforms => :mri
   gem 'therubyrhino', :platforms => :jruby
 end
 
-appraise 'rails-5_no_sprockets_webpacker_3' do
+appraise 'rails-5_no_sprockets_webpacker_1_1' do
   gem 'rails', '~> 5.0.0'
-  gem 'webpacker', '>= 3.0'
+  gem 'webpacker', '~> 1.1.0'
   # This ExecJS backend provides stateful context
   # which the default nodejs backend does not
   gem 'mini_racer', :platforms => :mri
@@ -95,8 +50,54 @@ appraise 'rails-5-no_sprockets' do
   gem 'rails', '~> 5.0.0'
 end
 
-appraise 'rails-5.1-sprockets_4' do
-  gem 'rails', '~> 5.1'
+appraise 'rails-4.2-sprockets_4' do
+  gem 'rails', '~> 4.2.1'
   gem 'sprockets', '~> 4.0.x'
-  gem 'turbolinks', '~> 5.0.0'
+  gem 'turbolinks', '~> 2.5.0'
+  # This ExecJS backend provides stateful context
+  # which the default nodejs backend does not
+  gem 'mini_racer', :platforms => :mri
+end
+
+appraise 'rails-4.2-sprockets_3' do
+  gem 'rails', '~> 4.2.1'
+  gem 'sprockets', '~> 3.5'
+  gem 'turbolinks', '~> 2.5.0'
 end
+
+appraise 'rails-4.2-sprockets_2' do
+  gem 'rails', '~> 4.2.1'
+  gem 'sprockets', '~> 2.12'
+  gem 'turbolinks'
+end
+
+appraise 'rails-4.1' do
+  gem 'rails', '~> 4.1.10'
+  # Just to make sure we support old Turbolinks:
+  gem 'turbolinks', '~> 2.3.0'
+end
+
+appraise 'rails-4.0-with-mini_racer' do
+  gem 'rails', '~> 4.0.13'
+  gem 'mini_racer', :platforms => :mri
+  gem 'therubyrhino', :platforms => :jruby
+  gem 'turbolinks'
+end
+
+appraise 'rails-4.0.5' do
+  # Depends on sprockets-rails ~> 2.0.0. Support for
+  # `Rails.application.assets_manifest` which is used by
+  # `ServerRendering::ManifestContainer` has only been added in
+  # sprockets-rails 2.2.2. Ensure that server rendering falls back to
+  # `ServerRendering::EnvironmentContainer`.`
+  gem 'rails', '4.0.5'
+  gem 'turbolinks'
+end
+
+appraise 'rails-3.2' do
+  gem 'rails', '~> 3.2.21'
+  gem 'rack-cache', '~> 1.6.1'
+  # Modern turbolinks depends on `Rails.application.assets` which no-worky
+  gem 'turbolinks', '~> 2.0'
+end
+

Rakefile

@@ -32,13 +32,8 @@ namespace :react do
   task :copy do
     environments = ['development', 'production']
     environments.each do |environment|
-      # Without addons:
       copy_react_asset("#{environment}/react-browser.js", "#{environment}/react.js")
       copy_react_asset("#{environment}/react-server.js", "#{environment}/react-server.js")
-
-      # With addons:
-      copy_react_asset("#{environment}/react-browser-with-addons.js", "#{environment}-with-addons/react.js")
-      copy_react_asset("#{environment}/react-server-with-addons.js", "#{environment}-with-addons/react-server.js")
     end
   end