diff --git a/Appraisals b/Appraisals index afbe6dd1..78543579 100644 --- a/Appraisals +++ b/Appraisals @@ -16,7 +16,7 @@ end appraise 'shakapacker' do gem 'rails', '~> 7.0.x' - gem 'shakapacker', github: 'G-Rath/shakapacker', branch: 'use-package_json' + gem 'shakapacker', '7.2.0.rc.0' end appraise 'base' do diff --git a/gemfiles/base.gemfile.lock b/gemfiles/base.gemfile.lock index 3fd3b920..a21eb747 100644 --- a/gemfiles/base.gemfile.lock +++ b/gemfiles/base.gemfile.lock @@ -174,6 +174,7 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) + package_json (0.1.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -258,6 +259,7 @@ DEPENDENCIES guard-minitest jbuilder listen (~> 3.0.0) + package_json pry-byebug rails (~> 7.0.x) react-rails! diff --git a/gemfiles/shakapacker.gemfile b/gemfiles/shakapacker.gemfile index c699a83c..d2205e1d 100644 --- a/gemfiles/shakapacker.gemfile +++ b/gemfiles/shakapacker.gemfile @@ -3,6 +3,6 @@ source "http://rubygems.org" gem "rails", "~> 7.0.x" -gem "shakapacker", github: "G-Rath/shakapacker", branch: "use-package_json" +gem "shakapacker", "7.2.0.rc.0" gemspec path: "../" diff --git a/gemfiles/shakapacker.gemfile.lock b/gemfiles/shakapacker.gemfile.lock index 2d484e5f..1e83aa42 100644 --- a/gemfiles/shakapacker.gemfile.lock +++ b/gemfiles/shakapacker.gemfile.lock @@ -1,15 +1,3 @@ -GIT - remote: https://github.com/G-Rath/shakapacker.git - revision: 992f156694499f62f35ddd32bb6d53597a78c453 - branch: use-package_json - specs: - shakapacker (7.0.3) - activesupport (>= 5.2) - package_json - rack-proxy (>= 0.6.1) - railties (>= 5.2) - semantic_range (>= 2.3.0) - PATH remote: .. specs: @@ -198,7 +186,7 @@ GEM public_suffix (5.0.1) racc (1.6.2) rack (2.2.7) - rack-proxy (0.7.6) + rack-proxy (0.7.7) rack rack-test (2.1.0) rack (>= 1.3) @@ -240,6 +228,12 @@ GEM rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) semantic_range (3.0.0) + shakapacker (7.2.0.rc.0) + activesupport (>= 5.2) + package_json + rack-proxy (>= 0.6.1) + railties (>= 5.2) + semantic_range (>= 2.3.0) shellany (0.0.1) simplecov (0.13.0) docile (~> 1.1.0) @@ -276,11 +270,12 @@ DEPENDENCIES guard-minitest jbuilder listen (~> 3.0.0) + package_json pry-byebug rails (~> 7.0.x) react-rails! selenium-webdriver - shakapacker! + shakapacker (= 7.2.0.rc.0) test-unit (~> 2.5) BUNDLED WITH diff --git a/gemfiles/sprockets_3.gemfile.lock b/gemfiles/sprockets_3.gemfile.lock index 8e044462..d6c11456 100644 --- a/gemfiles/sprockets_3.gemfile.lock +++ b/gemfiles/sprockets_3.gemfile.lock @@ -178,6 +178,7 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) + package_json (0.1.0) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -270,6 +271,7 @@ DEPENDENCIES jbuilder listen (~> 3.0.0) mini_racer + package_json pry-byebug rails (~> 7.0.x) react-rails! diff --git a/gemfiles/sprockets_4.gemfile.lock b/gemfiles/sprockets_4.gemfile.lock index 81534706..0de2c85b 100644 --- a/gemfiles/sprockets_4.gemfile.lock +++ b/gemfiles/sprockets_4.gemfile.lock @@ -178,6 +178,7 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) + package_json (0.1.0) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -270,6 +271,7 @@ DEPENDENCIES jbuilder listen (~> 3.0.0) mini_racer + package_json pry-byebug rails (~> 7.0.x) react-rails!