From d39ac8909b0a7b063dfb310b8d3cb1e86e676e1e Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Sat, 15 Sep 2018 12:13:44 +0100 Subject: [PATCH 01/12] :white_check_mark: Adding Webpacker-4-prerelease to tests --- Appraisals | 6 ++++++ gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile | 9 +++++++++ 2 files changed, 15 insertions(+) create mode 100644 gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile diff --git a/Appraisals b/Appraisals index 08d2b4194..2dcbda77e 100644 --- a/Appraisals +++ b/Appraisals @@ -4,6 +4,12 @@ appraise 'rails-5.2-sprockets_4' do gem 'turbolinks', '~> 5' end +appraise 'rails-5.2_no_sprockets_webpacker_4' do + gem 'rails', '~> 5.2.0' + gem 'webpacker', '4.0.0.pre.pre.2' + gem 'mini_racer', :platforms => :mri +end + appraise 'rails-5.1-sprockets_4' do gem 'rails', '~> 5.1.0' gem 'sprockets', '~> 4.0.x' diff --git a/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile new file mode 100644 index 000000000..8dd0acb16 --- /dev/null +++ b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "rails", "~> 5.2.0" +gem "webpacker", "4.0.0.pre.pre.2" +gem "mini_racer", platforms: :mri + +gemspec path: "../" From c07588943b38afd2c47dd019d13a0c9ca1549cd3 Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Sat, 15 Sep 2018 14:50:35 +0100 Subject: [PATCH 02/12] :white_check_mark: Adding Rails 5.2, webpacker 3, 4.pre to travis --- .travis.yml | 3 +++ Appraisals | 6 ++++++ gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile | 9 +++++++++ 3 files changed, 18 insertions(+) create mode 100644 gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile diff --git a/.travis.yml b/.travis.yml index 1e62aceb2..333fa3b33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ 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_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 @@ -45,6 +47,7 @@ matrix: allow_failures: - rvm: jruby-9.1.9.0 + - gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile before_install: # Repo for Yarn diff --git a/Appraisals b/Appraisals index 2dcbda77e..50528e93b 100644 --- a/Appraisals +++ b/Appraisals @@ -4,6 +4,12 @@ appraise 'rails-5.2-sprockets_4' do gem 'turbolinks', '~> 5' end +appraise 'rails-5.2_no_sprockets_webpacker_3' do + gem 'rails', '~> 5.2.0' + gem 'webpacker', '4.0.0.pre.pre.2' + gem 'mini_racer', :platforms => :mri +end + appraise 'rails-5.2_no_sprockets_webpacker_4' do gem 'rails', '~> 5.2.0' gem 'webpacker', '4.0.0.pre.pre.2' diff --git a/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile b/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile new file mode 100644 index 000000000..8dd0acb16 --- /dev/null +++ b/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "rails", "~> 5.2.0" +gem "webpacker", "4.0.0.pre.pre.2" +gem "mini_racer", platforms: :mri + +gemspec path: "../" From b230e6f2d92c7ce1e30d9be3fe617297e006be7e Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Sat, 15 Sep 2018 19:21:58 +0100 Subject: [PATCH 03/12] :white_check_mark: Correcting appraisal --- Appraisals | 4 +++- gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile | 3 ++- gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Appraisals b/Appraisals index 50528e93b..a89de4452 100644 --- a/Appraisals +++ b/Appraisals @@ -6,14 +6,16 @@ end appraise 'rails-5.2_no_sprockets_webpacker_3' do gem 'rails', '~> 5.2.0' - gem 'webpacker', '4.0.0.pre.pre.2' + 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.0.pre.pre.2' gem 'mini_racer', :platforms => :mri + gem 'therubyrhino', :platforms => :jruby end appraise 'rails-5.1-sprockets_4' do diff --git a/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile b/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile index 8dd0acb16..c900cfa59 100644 --- a/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile +++ b/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile @@ -3,7 +3,8 @@ source "http://rubygems.org" gem "rails", "~> 5.2.0" -gem "webpacker", "4.0.0.pre.pre.2" +gem "webpacker", "~> 3.0" gem "mini_racer", platforms: :mri +gem "therubyrhino", platforms: :jruby gemspec path: "../" diff --git a/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile index 8dd0acb16..99f2fb24f 100644 --- a/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile +++ b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile @@ -5,5 +5,6 @@ source "http://rubygems.org" gem "rails", "~> 5.2.0" gem "webpacker", "4.0.0.pre.pre.2" gem "mini_racer", platforms: :mri +gem "therubyrhino", platforms: :jruby gemspec path: "../" From 27338075fae1119c90a2968afad0df4d6833c02d Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Thu, 4 Oct 2018 09:44:46 +0100 Subject: [PATCH 04/12] Update to webpacker 4.0.0.pre.3 --- Appraisals | 2 +- gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Appraisals b/Appraisals index a89de4452..3f7d9abc1 100644 --- a/Appraisals +++ b/Appraisals @@ -13,7 +13,7 @@ end appraise 'rails-5.2_no_sprockets_webpacker_4' do gem 'rails', '~> 5.2.0' - gem 'webpacker', '4.0.0.pre.pre.2' + gem 'webpacker', '4.0.0.pre.3' gem 'mini_racer', :platforms => :mri gem 'therubyrhino', :platforms => :jruby end diff --git a/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile index 99f2fb24f..7a344fb61 100644 --- a/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile +++ b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile @@ -3,7 +3,7 @@ source "http://rubygems.org" gem "rails", "~> 5.2.0" -gem "webpacker", "4.0.0.pre.pre.2" +gem "webpacker", "4.0.0.pre.3" gem "mini_racer", platforms: :mri gem "therubyrhino", platforms: :jruby From 071504301d25b4a500d449a316d8e2d2408ca6d9 Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Thu, 3 Jan 2019 13:23:33 +0000 Subject: [PATCH 05/12] Update Webpacker to 4.0.0.rc.2 --- Appraisals | 2 +- gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile | 2 +- package.json | 3 +++ yarn.lock | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Appraisals b/Appraisals index 3f7d9abc1..f30750ac7 100644 --- a/Appraisals +++ b/Appraisals @@ -13,7 +13,7 @@ end appraise 'rails-5.2_no_sprockets_webpacker_4' do gem 'rails', '~> 5.2.0' - gem 'webpacker', '4.0.0.pre.3' + gem 'webpacker', '4.0.0.rc.2' gem 'mini_racer', :platforms => :mri gem 'therubyrhino', :platforms => :jruby end diff --git a/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile index 7a344fb61..0aa189589 100644 --- a/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile +++ b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile @@ -3,7 +3,7 @@ source "http://rubygems.org" gem "rails", "~> 5.2.0" -gem "webpacker", "4.0.0.pre.3" +gem "webpacker", "4.0.0.rc.2" gem "mini_racer", platforms: :mri gem "therubyrhino", platforms: :jruby diff --git a/package.json b/package.json index bb9edc52c..bcf271364 100644 --- a/package.json +++ b/package.json @@ -12,5 +12,8 @@ }, "devDependencies": { "webpack": "^2.3.3" + }, + "dependencies": { + "react_ujs": "^2.4.4" } } diff --git a/yarn.lock b/yarn.lock index eb4f971d8..95e119fc4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1314,6 +1314,11 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +react_ujs@^2.4.4: + version "2.4.4" + resolved "https://registry.yarnpkg.com/react_ujs/-/react_ujs-2.4.4.tgz#49bac535d24024a96b0a35d7514d18188aea42bc" + integrity sha512-RON6mgV+I3s6KkmvxTQi+WGuoLbhZ+TzRat06EE/RHFvzU+Na1Eom6XnesQeOP7WCrTZGOdcZEPP0P7QrJrHfg== + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" From f2508b21bf236af7b77d50bf311c2d745719d562 Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Sat, 30 Mar 2019 21:29:40 +0000 Subject: [PATCH 06/12] :white_check_mark: Update Webpacker to 4.0.x --- Appraisals | 2 +- gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Appraisals b/Appraisals index f30750ac7..e25bed5fa 100644 --- a/Appraisals +++ b/Appraisals @@ -13,7 +13,7 @@ end appraise 'rails-5.2_no_sprockets_webpacker_4' do gem 'rails', '~> 5.2.0' - gem 'webpacker', '4.0.0.rc.2' + gem 'webpacker', '~> 4.0' gem 'mini_racer', :platforms => :mri gem 'therubyrhino', :platforms => :jruby end diff --git a/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile index 0aa189589..acb280389 100644 --- a/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile +++ b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile @@ -3,7 +3,7 @@ source "http://rubygems.org" gem "rails", "~> 5.2.0" -gem "webpacker", "4.0.0.rc.2" +gem "webpacker", "~> 4.0" gem "mini_racer", platforms: :mri gem "therubyrhino", platforms: :jruby From 3444afff36be7663b2961eed766ad31e84f962a6 Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Sat, 30 Mar 2019 21:33:16 +0000 Subject: [PATCH 07/12] :white_check_mark: Upgrade rubies. Add 2.6 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 333fa3b33..0d7638bc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,9 @@ cache: bundler: true yarn: true rvm: - - 2.5.1 - - 2.3.7 + - 2.6.2 + - 2.5.5 + - 2.3.8 - jruby-9.1.9.0 gemfile: From 69305e568a82f4bed7979503c132b7c1efe2db92 Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Sat, 30 Mar 2019 21:53:18 +0000 Subject: [PATCH 08/12] :white_check_mark: Update chromedriver-helper to webdriver [ci skip] --- .travis.yml | 3 +-- react-rails.gemspec | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d7638bc4..b41723c65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,5 +57,4 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -y -qq yarn - gem update --system - - gem install chromedriver-helper - - chromedriver-update + - gem install webdrivers diff --git a/react-rails.gemspec b/react-rails.gemspec index e9cb028c9..738dbd69b 100644 --- a/react-rails.gemspec +++ b/react-rails.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'guard-minitest' s.add_development_dependency 'jbuilder' s.add_development_dependency 'listen', '~> 3.0.0' # support Ruby 2.1 - s.add_development_dependency 'chromedriver-helper' + s.add_development_dependency 'webdrivers' s.add_development_dependency 'capybara' s.add_development_dependency 'selenium-webdriver' s.add_development_dependency 'test-unit', '~> 2.5' From 35e4522a631872fe3b8d30b778e411b13d051b51 Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Sun, 31 Mar 2019 18:05:07 +0100 Subject: [PATCH 09/12] :bug: Restrict bundler to < 2 for tests on Rails 4.2 to run --- react-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-rails.gemspec b/react-rails.gemspec index 738dbd69b..dbd008388 100644 --- a/react-rails.gemspec +++ b/react-rails.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.email = ['paul@oshannessy.com', 'rmosolgo@gmail.com', 'neonmd@hotmail.co.uk', 'info@ttanimichi.com'] s.add_development_dependency 'appraisal' - s.add_development_dependency 'bundler', '>= 1.2.2' + s.add_development_dependency 'bundler', '>= 1.2.2', '< 2.0' s.add_development_dependency 'codeclimate-test-reporter' s.add_development_dependency 'coffee-rails' s.add_development_dependency 'es5-shim-rails', '>= 2.0.5' From 835b0f19f8d6555a4b1e10673fdd9874ca923dd3 Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Sun, 31 Mar 2019 18:28:58 +0100 Subject: [PATCH 10/12] Revert ":white_check_mark: Update chromedriver-helper to webdriver" This reverts commit 69305e568a82f4bed7979503c132b7c1efe2db92. --- .travis.yml | 3 ++- react-rails.gemspec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b41723c65..0d7638bc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,4 +57,5 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -y -qq yarn - gem update --system - - gem install webdrivers + - gem install chromedriver-helper + - chromedriver-update diff --git a/react-rails.gemspec b/react-rails.gemspec index dbd008388..b2242c96d 100644 --- a/react-rails.gemspec +++ b/react-rails.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'guard-minitest' s.add_development_dependency 'jbuilder' s.add_development_dependency 'listen', '~> 3.0.0' # support Ruby 2.1 - s.add_development_dependency 'webdrivers' + s.add_development_dependency 'chromedriver-helper' s.add_development_dependency 'capybara' s.add_development_dependency 'selenium-webdriver' s.add_development_dependency 'test-unit', '~> 2.5' From 289275df91dee006c2ff1165b52d0449348fdba1 Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Sun, 31 Mar 2019 19:06:45 +0100 Subject: [PATCH 11/12] :green_heart: Fix Travis matrix for modern rubies --- .travis.yml | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d7638bc4..e22c704a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ cache: yarn: true rvm: - 2.6.2 - - 2.5.5 + - 2.5.3 - 2.3.8 - jruby-9.1.9.0 @@ -31,24 +31,40 @@ gemfile: matrix: fast_finish: true exclude: - - # all except 5.1_sprockets_4, 5.1_webpacker_3, 4.2_sprockets_3 - - rvm: jruby-9.1.9.0 + # Oldest rails does not run on ruby 2.6 + - rvm: 2.6.2 gemfile: gemfiles/rails_4.2_sprockets_4.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 + - 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: jruby-9.1.9.0 - gemfile: gemfiles/rails_5_no_sprockets.gemfile + + 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 + gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile + - rvm: 2.5.3 + gemfile: gemfiles/rails_5.2_sprockets_4.gemfile + - rvm: 2.3.8 + gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile + - rvm: 2.3.8 + gemfile: gemfiles/rails_5.2_sprockets_4.gemfile allow_failures: - rvm: jruby-9.1.9.0 - - gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile + gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile + - rvm: jruby-9.1.9.0 + gemfile: gemfiles/rails_5.2_sprockets_4.gemfile before_install: # Repo for Yarn From 48de0976527d20c26389f2951cdfbb5ff2b87364 Mon Sep 17 00:00:00 2001 From: Greg Myers Date: Sun, 31 Mar 2019 19:08:41 +0100 Subject: [PATCH 12/12] :green_heart: Include Jruby for allowed failure. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index e22c704a0..aca4d5896 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,6 +59,10 @@ matrix: gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile - rvm: 2.3.8 gemfile: gemfiles/rails_5.2_sprockets_4.gemfile + - rvm: jruby-9.1.9.0 + gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile + - rvm: jruby-9.1.9.0 + gemfile: gemfiles/rails_5.2_sprockets_4.gemfile allow_failures: - rvm: jruby-9.1.9.0