Merge pull request #689 from reactjs/2.0-dev

react-rails 2.0

Author: rmosolgo

.gitignore

@@ -2,9 +2,10 @@
 Gemfile.lock
 *.log
 test/dummy/tmp
+test/dummy/public/packs
 gemfiles/*.lock
 *.swp
 /vendor/react
-react-builds/node_modules
+**/node_modules
 react-builds/build
 coverage/

.travis.yml

@@ -1,21 +1,25 @@
 language: ruby
 sudo: required
 dist: trusty
-cache: bundler
+cache:
+  bundler: true
+  yarn: true
 rvm:
   - 2.3.0
   - 2.1
   - jruby-9.0.1.0
 
 gemfile:
+  # These have webpacker:
+  - gemfiles/rails_4.2_sprockets_4.gemfile
+  - gemfiles/rails_5_no_sprockets_webpacker.gemfile
+  # These don't have webpacker:
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.5.gemfile
   - gemfiles/rails_4.0_with_therubyracer.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2_sprockets_2.gemfile
   - gemfiles/rails_4.2_sprockets_3.gemfile
-  - gemfiles/rails_4.2_sprockets_4.gemfile
-  - gemfiles/rails_5.gemfile
   - gemfiles/rails_5_no_sprockets.gemfile
   - gemfiles/rails_5_sprockets_4.gemfile
 
@@ -35,7 +39,7 @@ matrix:
     - rvm: 2.1
       gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
     - rvm: 2.1
-      gemfile: gemfiles/rails_5.gemfile
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_5_no_sprockets.gemfile
     - rvm: 2.1
@@ -49,14 +53,20 @@ matrix:
     - rvm: jruby-9.0.1.0
       gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
     - rvm: jruby-9.0.1.0
-      gemfile: gemfiles/rails_5_mini_racer.gemfile
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker.gemfile
 
   allow_failures:
     - rvm: jruby-9.0.1.0
 
 before_install:
+  - nvm install 7.8.0 && nvm use 7.8.0
   - mkdir travis-phantomjs
   - wget https://rmosolgo.github.io/assets/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
   - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
   - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
   - phantomjs --version
+  # Repo for Yarn
+  - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
+  - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+  - sudo apt-get update -qq
+  - sudo apt-get install -y -qq yarn

Appraisals

@@ -43,14 +43,25 @@ appraise "rails-4.2-sprockets_4" do
   gem 'rails', '~> 4.2.1'
   gem "sprockets", "~> 4.0.x"
   gem "turbolinks", "~> 2.5.0"
+  gem "webpacker", github: "rails/webpacker"
+  # This ExecJS backend provides stateful context
+  # which the default nodejs backend does not
+  gem "mini_racer"
 end
 
-appraise "rails-5" do
+appraise "rails-5_no_sprockets_webpacker" do
   gem 'rails', '~> 5.0.0'
-  gem "turbolinks", "~> 5.0.0"
+  gem "webpacker", github: "rails/webpacker"
+  # This ExecJS backend provides stateful context
+  # which the default nodejs backend does not
+  gem "therubyracer"
 end
 
 appraise "rails-5-no_sprockets" do
+  # Appraisal adds `turbolinks` to this gemfile because it is
+  # present in `./Gemfile`.
+  # But it causes this gemfile to break, so it must be removed
+  # from `./gemfiles/rails_5_no_sprockets.gemfile` manually.
   gem 'rails', '~> 5.0.0'
 end
 

CHANGELOG.md

@@ -8,6 +8,35 @@
 
 #### Bug Fixes
 
+## 2.0.0 (April 13, 2017)
+
+#### Breaking Changes
+
+- Server rendering loads `server_rendering.js` by default #471 . Upgrade by adding a new file which requires the previous defaults:
+
+  ```js
+  // app/assets/javascripts/server_rendering.js
+  // = require react-server
+  // = require components
+  ```
+
+
+#### New Features
+
+- Webpacker support:
+  - `react_component` can find components via `require.context` + `ReactRailsUJS.useContext` #678
+  - Server rendering detects Webpacker and uses packs #683, #687
+  - `ReactRailsUJS` is available from `npm` with `yarn add react_ujs` or `npm install react_ujs` #678
+- `per_request_react_rails_prerenderer` Allows you to check out a renderer for the _whole request_ instead of once-per-`react_component` #559
+
+#### Bug Fixes
+
+- Improved watching of server-rendering JS files #687
+- Fix console replay:
+  - Put the `<script>` tag outside the React.js container to avoid React warnings #691
+  - Clear console history between renders #692
+- Use better Turbolinks events #690
+
 ## 1.11.0 (April 4, 2017)
 
 #### New Features

Gemfile

@@ -1,3 +1,5 @@
 source 'http://rubygems.org'
 
 gemspec
+# This is an optional dev-dependency, required whenever sprockets is required
+gem "turbolinks"