Merge branch 'master' of https://github.com/reactjs/react-rails

Author: ViXP

.gitignore

@@ -1,8 +1,8 @@
 *.gem
 Gemfile.lock
 *.log
-test/dummy/tmp
-test/dummy/public/packs
+test/*/tmp
+test/*/public/packs
 gemfiles/*.lock
 *.swp
 /vendor/react

.rubocop.yml

@@ -0,0 +1,10 @@
+AllCops:
+  TargetRubyVersion: 2.1
+  DisplayCopNames: true
+  Exclude:
+    - test/dummy_sprockets/**/*
+    - test/dummy_webpacker1/**/*
+    - test/dummy_webpacker2/**/*
+    - test/dummy_webpacker3/**/*
+    - node_modules/**/*
+    - react_ujs/**/*

.travis.yml

@@ -1,18 +1,23 @@
 language: ruby
 sudo: required
 dist: trusty
+addons:
+  chrome: stable
 cache:
   bundler: true
   yarn: true
 rvm:
   - 2.3.0
   - 2.1
-  - jruby-9.0.1.0
+  - jruby-9.1.9.0
 
 gemfile:
   # These have webpacker:
   - gemfiles/rails_4.2_sprockets_4.gemfile
-  - gemfiles/rails_5_no_sprockets_webpacker.gemfile
+  - gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
+  - gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
+  - gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
+  - gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
   # These don't have webpacker:
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.5.gemfile
@@ -29,42 +34,50 @@ matrix:
     - rvm: 2.1
       gemfile: gemfiles/rails_3.2.gemfile
     - rvm: 2.1
-      gemfile: rails_4.0.5.gemfile
+      gemfile: gemfiles/rails_4.0.5.gemfile
     - rvm: 2.1
-      gemfile: rails_4.0_with_therubyracer.gemfile
+      gemfile: gemfiles/rails_4.0_with_therubyracer.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_4.2_sprockets_3.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
     - rvm: 2.1
-      gemfile: gemfiles/rails_5_no_sprockets_webpacker.gemfile
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_5_no_sprockets.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_5.1_sprockets_4.gemfile
-    - rvm: jruby-9.0.1.0
+    - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: jruby-9.0.1.0
+    - rvm: jruby-9.1.9.0
       gemfile: rails_4.0_with_therubyracer.gemfile
-    - rvm: jruby-9.0.1.0
+    - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: jruby-9.0.1.0
+    - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
-    - rvm: jruby-9.0.1.0
-      gemfile: gemfiles/rails_5_no_sprockets_webpacker.gemfile
+    - rvm: jruby-9.1.9.0
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
+    - rvm: jruby-9.1.9.0
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
+    - rvm: jruby-9.1.9.0
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
+    - rvm: jruby-9.1.9.0
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
+    - rvm: jruby-9.1.9.0
+      gemfile: gemfiles/rails_5_no_sprockets.gemfile
 
   allow_failures:
-    - rvm: jruby-9.0.1.0
+    - rvm: jruby-9.1.9.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

Appraisals

@@ -1,72 +1,101 @@
-appraise "rails-3.2" do
+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
+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"
+  gem 'turbolinks'
 end
 
-appraise "rails-4.0-with-therubyracer" do
+appraise 'rails-4.0-with-therubyracer' do
   gem 'rails', '~> 4.0.13'
-  gem 'therubyracer', '0.12.0', :platform => :mri
-  gem "turbolinks"
+  gem 'therubyracer', '0.12.0', :platforms => :mri
+  gem 'turbolinks'
 end
 
-appraise "rails-4.1" do
+appraise 'rails-4.1' do
   gem 'rails', '~> 4.1.10'
   # Just to make sure we support old Turbolinks:
-  gem "turbolinks", "~> 2.3.0"
+  gem 'turbolinks', '~> 2.3.0'
 end
 
-appraise "rails-4.2-sprockets_2" do
+appraise 'rails-4.2-sprockets_2' do
   gem 'rails', '~> 4.2.1'
-  gem "sprockets", "~> 2.12"
-  gem "turbolinks"
+  gem 'sprockets', '~> 2.12'
+  gem 'turbolinks'
 end
 
-appraise "rails-4.2-sprockets_3" do
+appraise 'rails-4.2-sprockets_3' do
   gem 'rails', '~> 4.2.1'
-  gem "sprockets", "~> 3.5"
-  gem "turbolinks", "~> 2.5.0"
+  gem 'sprockets', '~> 3.5'
+  gem 'turbolinks', '~> 2.5.0'
 end
 
-appraise "rails-4.2-sprockets_4" do
+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"
+  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"
+  gem 'mini_racer', :platforms => :mri
 end
 
-appraise "rails-5_no_sprockets_webpacker" do
+# 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
   gem 'rails', '~> 5.0.0'
-  gem "webpacker", github: "rails/webpacker"
+  gem 'webpacker', '~> 1.1.0'
   # This ExecJS backend provides stateful context
   # which the default nodejs backend does not
-  gem "therubyracer"
+  gem 'therubyracer', :platforms => :mri
+  gem 'therubyrhino', :platforms => :jruby
 end
 
-appraise "rails-5-no_sprockets" do
+appraise 'rails-5_no_sprockets_webpacker_1_x' do
+  gem 'rails', '~> 5.0.0'
+  gem 'webpacker', '~> 1.2'
+  # This ExecJS backend provides stateful context
+  # which the default nodejs backend does not
+  gem 'therubyracer', :platforms => :mri
+  gem 'therubyrhino', :platforms => :jruby
+end
+
+appraise 'rails-5_no_sprockets_webpacker_2' do
+  gem 'rails', '~> 5.0.0'
+  gem 'webpacker', '~> 2.0'
+  # This ExecJS backend provides stateful context
+  # which the default nodejs backend does not
+  gem 'therubyracer', :platforms => :mri
+  gem 'therubyrhino', :platforms => :jruby
+end
+
+appraise 'rails-5_no_sprockets_webpacker_3' do
+  gem 'rails', '~> 5.0.0'
+  gem 'webpacker', '>= 3.0'
+  # This ExecJS backend provides stateful context
+  # which the default nodejs backend does not
+  gem 'therubyracer', :platforms => :mri
+  gem 'therubyrhino', :platforms => :jruby
+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
 
-appraise "rails-5.1-sprockets_4" do
-  gem "rails", "5.1.0.rc1"
-  gem "sprockets", "~> 4.0.x"
-  gem "turbolinks", "~> 5.0.0"
+appraise 'rails-5.1-sprockets_4' do
+  gem 'rails', '~> 5.1'
+  gem 'sprockets', '~> 4.0.x'
+  gem 'turbolinks', '~> 5.0.0'
 end

CHANGELOG.md

@@ -8,6 +8,17 @@
 
 #### Bug Fixes
 
+## 2.3.0
+
+#### New Features
+
+- Webpacker and Webpack 3 support #777
+- Update to React 15.6.2 #789
+
+#### Deprecation
+
+#### Bug Fixes
+
 ## 2.2.1
 
 #### New Features

Gemfile

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

README.md

@@ -90,7 +90,7 @@ Then restart your development server.
 
 This will:
 
-- add some `//= require`s to `application.js`  
+- add some `//= require`s to `application.js`
 - add a `components/` directory for React components
 - add `server_rendering.js` for [server-side rendering](#server-side-rendering)
 
@@ -108,7 +108,7 @@ window.Post = React.createClass({
 // or, equivalent:
 class Post extends React.Component {
   render() {
-    return <h1>{this.props.title}</h1>    
+    return <h1>{this.props.title}</h1>
   }
 }
 ```
@@ -194,7 +194,7 @@ react_component(component_class_name, props={}, html_options={})
 - `html_options` may include:
   - `tag:` to use an element other than a `div` to embed `data-react-class` and `data-react-props`.
   - `prerender: true` to render the component on the server.
-  - `camelize_props` to [transform a props hash](#camelize_props)
+  - `camelize_props` to [transform a props hash](#camelize-props)
   - `**other` Any other arguments (eg `class:`, `id:`) are passed through to [`content_tag`](http://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-content_tag).
 
 
@@ -475,13 +475,26 @@ You can also specify this option in `react_component`:
 ## Related Projects
 
 - [react\_on\_rails Gem](https://github.com/shakacode/react_on_rails): Integration of React with Rails utilizing Webpack, Babel, React, Redux, React-Router.
-- [Ruby Hyperloop](http://ruby-hyperloop.io/): Use Ruby to build reactive user interfaces with React.
+- [Ruby Hyperloop](http://ruby-hyperloop.org/): Use Ruby to build reactive user interfaces with React.
 - [react-rails-hot-loader](https://github.com/rmosolgo/react-rails-hot-loader) is a simple live-reloader for `react-rails`.
 - [react-rails-benchmark_renderer](https://github.com/pboling/react-rails-benchmark_renderer) adds performance instrumentation to server rendering.
 - [The Free React on Rails Course](https://learnetto.com/users/hrishio/courses/the-free-react-on-rails-5-course) A free video course which teaches the basics of React and how to get started using it in Rails with `react-rails`.
 
 ## Development
 
 - Run tests with `rake test` or `appraisal rake test`
+  - Integration tests run in Headless Chrome which is included in Chrome (59+ linux,OSX | 60+ Windows)
+  - ChromeDriver is included with `chromedriver-helper` gem so no need to manually install that 👍
 - Update React assets with `rake react:update`
 - Update the UJS with `rake ujs:update`
+- Releases:
+  - To release a new RubyGems version:
+    - Increment the version in `lib/react/rails/version.rb`
+    - Add an entry to `VERSIONS.md`
+    - Update the changelog (find recent changes on GitHub by listing commits or showing closed PRs)
+    - Commit changes & push to master
+    - `bundle exec rake release`: pushes a tag to GitHub, builds a `.gem`, and pushes to RubyGems
+  - To release a new NPM version:
+    - Update the version in `react_ujs/package.json`
+    - Commit & push to master
+    - `bundle exec rake ujs:publish` (runs `npm publish`)