Skip to content

Prep for 2.6.1 #1015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Dec 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
*.gem
Gemfile.lock
*.log
test/*/tmp
test/*/public/packs
gemfiles/*.lock
*.swp
/vendor/react
**/node_modules
Expand Down
42 changes: 11 additions & 31 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,57 +7,37 @@ cache:
bundler: true
yarn: true
rvm:
- 2.6.2
- 2.5.3
- 2.3.8
- 2.7.0
- 2.6.5
- 2.5.7
- jruby-9.1.9.0

gemfile:
# These have webpacker:
- gemfiles/rails_4.2_sprockets_4.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
- gemfiles/rails_5.2_no_sprockets.gemfile
- gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile
- gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile
# These don't have webpacker:
- gemfiles/rails_4.2_sprockets_2.gemfile
- gemfiles/rails_4.2_sprockets_3.gemfile
- gemfiles/rails_5_no_sprockets.gemfile
- gemfiles/rails_5.1_sprockets_4.gemfile
- gemfiles/rails_5.2_sprockets_3.gemfile
- gemfiles/rails_5.2_sprockets_4.gemfile

matrix:
fast_finish: true
exclude:
# Oldest rails does not run on ruby 2.6
- rvm: 2.6.2
gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
- rvm: 2.6.2
gemfile: gemfiles/rails_4.2_sprockets_3.gemfile
- rvm: 2.6.2
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
- rvm: 2.5.3
- rvm: 2.3.8
- rvm: 2.6.5
- rvm: 2.5.7
- rvm: jruby-9.1.9.0

include:
# Oldest rails does not run on ruby 2.6
- rvm: 2.5.3
gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
- rvm: 2.5.3
gemfile: gemfiles/rails_4.2_sprockets_3.gemfile
- rvm: 2.5.3
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
# Newest gemfiles for universal testing
- rvm: 2.5.3
- rvm: 2.6.5
gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile
- rvm: 2.5.3
- rvm: 2.6.5
gemfile: gemfiles/rails_5.2_sprockets_4.gemfile
- rvm: 2.3.8
- rvm: 2.5.7
gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile
- rvm: 2.3.8
- rvm: 2.5.7
gemfile: gemfiles/rails_5.2_sprockets_4.gemfile
- rvm: jruby-9.1.9.0
gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile
Expand Down
79 changes: 12 additions & 67 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,92 +1,37 @@
appraise 'rails-5.2-sprockets_4' do
gem 'rails', '~> 5.2.0'
gem 'rails', '~> 5.2.x'
gem 'sprockets', '~> 4.0.x'
gem 'turbolinks', '~> 5'
end

appraise 'rails-5.2_no_sprockets_webpacker_3' do
gem 'rails', '~> 5.2.0'
gem 'webpacker', '~> 3.0'
gem 'mini_racer', :platforms => :mri
gem 'therubyrhino', :platforms => :jruby
end

appraise 'rails-5.2_no_sprockets_webpacker_4' do
gem 'rails', '~> 5.2.0'
gem 'webpacker', '~> 4.0'
appraise 'rails-5.2-sprockets_3' do
gem 'rails', '~> 5.2.x'
gem 'sprockets', '~> 3.5'
gem 'turbolinks', '~> 5'
gem 'mini_racer', :platforms => :mri
gem 'therubyrhino', :platforms => :jruby
end

appraise 'rails-5.1-sprockets_4' do
gem 'rails', '~> 5.1.0'
gem 'sprockets', '~> 4.0.x'
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_3' do
gem 'rails', '~> 5.0.0'
appraise 'rails-5.2_no_sprockets_webpacker_3' do
gem 'rails', '~> 5.2.x'
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_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 'mini_racer', :platforms => :mri
gem 'therubyrhino', :platforms => :jruby
end

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 'mini_racer', :platforms => :mri
gem 'therubyrhino', :platforms => :jruby
end

appraise 'rails-5_no_sprockets_webpacker_1_1' do
gem 'rails', '~> 5.0.0'
gem 'webpacker', '~> 1.1.0'
# This ExecJS backend provides stateful context
# which the default nodejs backend does not
appraise 'rails-5.2_no_sprockets_webpacker_4' do
gem 'rails', '~> 5.2.x'
gem 'webpacker', '~> 4.0'
gem 'mini_racer', :platforms => :mri
gem 'therubyrhino', :platforms => :jruby
end

appraise 'rails-5-no_sprockets' do
appraise 'rails-5.2-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-4.2-sprockets_4' do
gem 'rails', '~> 4.2.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
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'
gem 'rails', '~> 5.2.x'
end
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,26 @@

#### Bug Fixes

## 2.6.1

#### Breaking Changes

#### New Features

- React 16.9.0
- Sprockets users get React_UJS 2.6.1

#### Deprecation

- Removed tests for Rails 3, 4, 5.0
- Removed tests for Sprockets 2
- Removed tests for Webpacker 1.1, 2

#### Bug Fixes

- React_UJS 2.6.1 still complies with ES5 #1027 #1026 #1016
- Support RubyGems pattern for Alpha releases when detecting sprockets version #1047

## 2.6.0

#### Breaking Changes
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

🎉 Thanks for taking the time to contribute! 🎉

With 2 Million+ downloads of the react-rails Gem and another 100k+ downloads of react_ujs on NPM, you're helping the biggest React + Rails community!
With 5 Million+ downloads of the react-rails Gem and another 2 Million+ downloads of react_ujs on NPM, you're helping the biggest React + Rails community!

What follows is a set of guidelines for contributing to React-Rails, inside the [react-js Organization](https://github.com/reactjs), part of the wider [React Community](https://reactcommunity.org/)

Expand Down
Loading