Skip to content

Commit b321bfe

Browse files
committed
update rails & shakapacker
1 parent b68ab00 commit b321bfe

11 files changed

+383
-263
lines changed

Appraisals

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
appraise 'rails-5.2-sprockets_4' do
2-
gem 'rails', '~> 5.2.x'
1+
appraise 'sprockets_4' do
2+
gem 'rails', '~> 7.0.x'
33
gem 'sprockets', '~> 4.0.x'
44
gem 'turbolinks', '~> 5'
55
gem 'mini_racer', :platforms => :mri
66
end
77

8-
appraise 'rails-5.2-sprockets_3' do
9-
gem 'rails', '~> 5.2.x'
8+
appraise 'sprockets_3' do
9+
gem 'rails', '~> 7.0.x'
1010
gem 'sprockets', '~> 3.5'
1111
gem 'turbolinks', '~> 5'
1212
gem 'mini_racer', :platforms => :mri
1313
end
1414

15-
appraise 'rails-5.2_no_sprockets_shakapacker' do
16-
gem 'rails', '~> 5.2.x'
17-
gem 'shakapacker', '~> 6.4.x'
15+
appraise 'no_sprockets_shakapacker' do
16+
gem 'rails', '~> 7.0.x'
17+
gem 'shakapacker', '6.6.0'
1818
end
1919

20-
appraise 'rails-5.2-no_sprockets' do
20+
appraise 'no_sprockets' do
2121
# Appraisal adds `turbolinks` to this gemfile because it is
2222
# present in `./Gemfile`.
2323
# But it causes this gemfile to break, so it must be removed
2424
# from `./gemfiles/rails_5_no_sprockets.gemfile` manually.
25-
gem 'rails', '~> 5.2.x'
25+
gem 'rails', '~> 7.0.x'
2626
end

gemfiles/rails_5.2_no_sprockets.gemfile renamed to gemfiles/no_sprockets.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source "http://rubygems.org"
44

5-
gem "rails", "~> 5.2.x"
5+
gem "rails", "~> 7.0.x"
66

77
gemspec path: "../"

gemfiles/rails_5.2_no_sprockets.gemfile.lock renamed to gemfiles/no_sprockets.gemfile.lock

Lines changed: 96 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ..
33
specs:
4-
react-rails (2.7.0)
4+
react-rails (2.7.1)
55
babel-transpiler (>= 0.7.0)
66
connection_pool
77
execjs
@@ -11,54 +11,77 @@ PATH
1111
GEM
1212
remote: http://rubygems.org/
1313
specs:
14-
actioncable (5.2.8.1)
15-
actionpack (= 5.2.8.1)
14+
actioncable (7.0.4.3)
15+
actionpack (= 7.0.4.3)
16+
activesupport (= 7.0.4.3)
1617
nio4r (~> 2.0)
1718
websocket-driver (>= 0.6.1)
18-
actionmailer (5.2.8.1)
19-
actionpack (= 5.2.8.1)
20-
actionview (= 5.2.8.1)
21-
activejob (= 5.2.8.1)
19+
actionmailbox (7.0.4.3)
20+
actionpack (= 7.0.4.3)
21+
activejob (= 7.0.4.3)
22+
activerecord (= 7.0.4.3)
23+
activestorage (= 7.0.4.3)
24+
activesupport (= 7.0.4.3)
25+
mail (>= 2.7.1)
26+
net-imap
27+
net-pop
28+
net-smtp
29+
actionmailer (7.0.4.3)
30+
actionpack (= 7.0.4.3)
31+
actionview (= 7.0.4.3)
32+
activejob (= 7.0.4.3)
33+
activesupport (= 7.0.4.3)
2234
mail (~> 2.5, >= 2.5.4)
35+
net-imap
36+
net-pop
37+
net-smtp
2338
rails-dom-testing (~> 2.0)
24-
actionpack (5.2.8.1)
25-
actionview (= 5.2.8.1)
26-
activesupport (= 5.2.8.1)
27-
rack (~> 2.0, >= 2.0.8)
39+
actionpack (7.0.4.3)
40+
actionview (= 7.0.4.3)
41+
activesupport (= 7.0.4.3)
42+
rack (~> 2.0, >= 2.2.0)
2843
rack-test (>= 0.6.3)
2944
rails-dom-testing (~> 2.0)
30-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
31-
actionview (5.2.8.1)
32-
activesupport (= 5.2.8.1)
45+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
46+
actiontext (7.0.4.3)
47+
actionpack (= 7.0.4.3)
48+
activerecord (= 7.0.4.3)
49+
activestorage (= 7.0.4.3)
50+
activesupport (= 7.0.4.3)
51+
globalid (>= 0.6.0)
52+
nokogiri (>= 1.8.5)
53+
actionview (7.0.4.3)
54+
activesupport (= 7.0.4.3)
3355
builder (~> 3.1)
3456
erubi (~> 1.4)
3557
rails-dom-testing (~> 2.0)
36-
rails-html-sanitizer (~> 1.0, >= 1.0.3)
37-
activejob (5.2.8.1)
38-
activesupport (= 5.2.8.1)
58+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
59+
activejob (7.0.4.3)
60+
activesupport (= 7.0.4.3)
3961
globalid (>= 0.3.6)
40-
activemodel (5.2.8.1)
41-
activesupport (= 5.2.8.1)
42-
activerecord (5.2.8.1)
43-
activemodel (= 5.2.8.1)
44-
activesupport (= 5.2.8.1)
45-
arel (>= 9.0)
46-
activestorage (5.2.8.1)
47-
actionpack (= 5.2.8.1)
48-
activerecord (= 5.2.8.1)
49-
marcel (~> 1.0.0)
50-
activesupport (5.2.8.1)
62+
activemodel (7.0.4.3)
63+
activesupport (= 7.0.4.3)
64+
activerecord (7.0.4.3)
65+
activemodel (= 7.0.4.3)
66+
activesupport (= 7.0.4.3)
67+
activestorage (7.0.4.3)
68+
actionpack (= 7.0.4.3)
69+
activejob (= 7.0.4.3)
70+
activerecord (= 7.0.4.3)
71+
activesupport (= 7.0.4.3)
72+
marcel (~> 1.0)
73+
mini_mime (>= 1.1.0)
74+
activesupport (7.0.4.3)
5175
concurrent-ruby (~> 1.0, >= 1.0.2)
52-
i18n (>= 0.7, < 2)
53-
minitest (~> 5.1)
54-
tzinfo (~> 1.1)
76+
i18n (>= 1.6, < 2)
77+
minitest (>= 5.1)
78+
tzinfo (~> 2.0)
5579
addressable (2.7.0)
5680
public_suffix (>= 2.0.2, < 5.0)
5781
appraisal (2.2.0)
5882
bundler
5983
rake
6084
thor (>= 0.14.0)
61-
arel (9.0.0)
6285
babel-source (5.8.35)
6386
babel-transpiler (0.7.0)
6487
babel-source (>= 4.0, < 6)
@@ -87,6 +110,7 @@ GEM
87110
concurrent-ruby (1.1.10)
88111
connection_pool (2.2.2)
89112
crass (1.0.6)
113+
date (3.3.3)
90114
docile (1.1.5)
91115
erubi (1.11.0)
92116
es5-shim-rails (4.0.1)
@@ -96,7 +120,7 @@ GEM
96120
ffi (1.11.3)
97121
formatador (0.2.5)
98122
gem-release (2.2.2)
99-
globalid (0.6.0)
123+
globalid (1.1.0)
100124
activesupport (>= 5.0)
101125
guard (2.16.1)
102126
formatador (>= 0.2.4)
@@ -123,14 +147,26 @@ GEM
123147
crass (~> 1.0.2)
124148
nokogiri (>= 1.5.9)
125149
lumberjack (1.0.13)
126-
mail (2.7.1)
150+
mail (2.8.1)
127151
mini_mime (>= 0.1.1)
152+
net-imap
153+
net-pop
154+
net-smtp
128155
marcel (1.0.2)
129156
method_source (0.9.2)
130157
mini_mime (1.1.2)
131158
minitest (5.16.3)
132159
nenv (0.3.0)
133-
nio4r (2.5.8)
160+
net-imap (0.3.4)
161+
date
162+
net-protocol
163+
net-pop (0.1.2)
164+
net-protocol
165+
net-protocol (0.2.1)
166+
timeout
167+
net-smtp (0.3.3)
168+
net-protocol
169+
nio4r (2.5.9)
134170
nokogiri (1.13.8-x86_64-darwin)
135171
racc (~> 1.4)
136172
notiffany (0.1.3)
@@ -147,30 +183,32 @@ GEM
147183
rack (2.2.4)
148184
rack-test (1.1.0)
149185
rack (>= 1.0, < 3)
150-
rails (5.2.8.1)
151-
actioncable (= 5.2.8.1)
152-
actionmailer (= 5.2.8.1)
153-
actionpack (= 5.2.8.1)
154-
actionview (= 5.2.8.1)
155-
activejob (= 5.2.8.1)
156-
activemodel (= 5.2.8.1)
157-
activerecord (= 5.2.8.1)
158-
activestorage (= 5.2.8.1)
159-
activesupport (= 5.2.8.1)
160-
bundler (>= 1.3.0)
161-
railties (= 5.2.8.1)
162-
sprockets-rails (>= 2.0.0)
186+
rails (7.0.4.3)
187+
actioncable (= 7.0.4.3)
188+
actionmailbox (= 7.0.4.3)
189+
actionmailer (= 7.0.4.3)
190+
actionpack (= 7.0.4.3)
191+
actiontext (= 7.0.4.3)
192+
actionview (= 7.0.4.3)
193+
activejob (= 7.0.4.3)
194+
activemodel (= 7.0.4.3)
195+
activerecord (= 7.0.4.3)
196+
activestorage (= 7.0.4.3)
197+
activesupport (= 7.0.4.3)
198+
bundler (>= 1.15.0)
199+
railties (= 7.0.4.3)
163200
rails-dom-testing (2.0.3)
164201
activesupport (>= 4.2.0)
165202
nokogiri (>= 1.6)
166203
rails-html-sanitizer (1.4.3)
167204
loofah (~> 2.3)
168-
railties (5.2.8.1)
169-
actionpack (= 5.2.8.1)
170-
activesupport (= 5.2.8.1)
205+
railties (7.0.4.3)
206+
actionpack (= 7.0.4.3)
207+
activesupport (= 7.0.4.3)
171208
method_source
172-
rake (>= 0.8.7)
173-
thor (>= 0.19.0, < 2.0)
209+
rake (>= 12.2)
210+
thor (~> 1.0)
211+
zeitwerk (~> 2.5)
174212
rake (13.0.6)
175213
rb-fsevent (0.10.3)
176214
rb-inotify (0.10.1)
@@ -186,19 +224,12 @@ GEM
186224
json (>= 1.8, < 3)
187225
simplecov-html (~> 0.10.0)
188226
simplecov-html (0.10.2)
189-
sprockets (4.1.1)
190-
concurrent-ruby (~> 1.0)
191-
rack (> 1, < 3)
192-
sprockets-rails (3.4.2)
193-
actionpack (>= 5.2)
194-
activesupport (>= 5.2)
195-
sprockets (>= 3.0.0)
196227
test-unit (2.5.5)
197228
thor (1.2.1)
198-
thread_safe (0.3.6)
199229
tilt (2.0.10)
200-
tzinfo (1.2.10)
201-
thread_safe (~> 0.1)
230+
timeout (0.3.2)
231+
tzinfo (2.0.6)
232+
concurrent-ruby (~> 1.0)
202233
webdrivers (4.2.0)
203234
nokogiri (~> 1.6)
204235
rubyzip (>= 1.3.0)
@@ -208,6 +239,7 @@ GEM
208239
websocket-extensions (0.1.5)
209240
xpath (3.2.0)
210241
nokogiri (~> 1.8)
242+
zeitwerk (2.6.7)
211243

212244
PLATFORMS
213245
x86_64-darwin-20
@@ -225,7 +257,7 @@ DEPENDENCIES
225257
jbuilder
226258
listen (~> 3.0.0)
227259
pry-byebug
228-
rails (~> 5.2.x)
260+
rails (~> 7.0.x)
229261
react-rails!
230262
selenium-webdriver
231263
test-unit (~> 2.5)

gemfiles/rails_5.2_no_sprockets_shakapacker.gemfile renamed to gemfiles/no_sprockets_shakapacker.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "http://rubygems.org"
44

5-
gem "rails", "~> 5.2.x"
5+
gem "rails", "~> 7.0.x"
66
gem "shakapacker", "6.6.0"
77

88
gemspec path: "../"

0 commit comments

Comments
 (0)