Skip to content

Commit fb053f4

Browse files
jamesmartinjamesmartin
authored
Merge pull request #24 from tagliala/rails7-shakapacker
Add Rails 7.2 / Shakapacker 8 test app
2 parents 59180dc + 96bb6e5 commit fb053f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+4668
-6419
lines changed

‎.browserslistrc

-1
This file was deleted.

‎.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.3
1+
3.3.4

‎Gemfile

+2-7
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@ source 'https://rubygems.org'
22

33

44
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
5-
gem 'rails', '6.1.7.3'
5+
gem 'rails', '7.2.0'
66

7-
gem 'webpacker', '~> 4.0'
8-
9-
# We need Rails 6 (because Webpacker - oh how I wish we could drop support for
10-
# this train wreck.) but psych 4 is broken with Rails 6.1.7.3. The joys of open
11-
# source maintenance.
12-
gem 'psych', '< 4'
7+
gem 'shakapacker', '8.0.1'
138

149
# Use edge Sprockets-rails for testing
1510
#gem 'sprockets-rails', github: 'rails/sprockets-rails'

‎Gemfile.lock

+151-119
Original file line numberDiff line numberDiff line change
@@ -1,168 +1,201 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.1.7.3)
5-
actionpack (= 6.1.7.3)
6-
activesupport (= 6.1.7.3)
4+
actioncable (7.2.0)
5+
actionpack (= 7.2.0)
6+
activesupport (= 7.2.0)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (6.1.7.3)
10-
actionpack (= 6.1.7.3)
11-
activejob (= 6.1.7.3)
12-
activerecord (= 6.1.7.3)
13-
activestorage (= 6.1.7.3)
14-
activesupport (= 6.1.7.3)
15-
mail (>= 2.7.1)
16-
actionmailer (6.1.7.3)
17-
actionpack (= 6.1.7.3)
18-
actionview (= 6.1.7.3)
19-
activejob (= 6.1.7.3)
20-
activesupport (= 6.1.7.3)
21-
mail (~> 2.5, >= 2.5.4)
22-
rails-dom-testing (~> 2.0)
23-
actionpack (6.1.7.3)
24-
actionview (= 6.1.7.3)
25-
activesupport (= 6.1.7.3)
26-
rack (~> 2.0, >= 2.0.9)
9+
zeitwerk (~> 2.6)
10+
actionmailbox (7.2.0)
11+
actionpack (= 7.2.0)
12+
activejob (= 7.2.0)
13+
activerecord (= 7.2.0)
14+
activestorage (= 7.2.0)
15+
activesupport (= 7.2.0)
16+
mail (>= 2.8.0)
17+
actionmailer (7.2.0)
18+
actionpack (= 7.2.0)
19+
actionview (= 7.2.0)
20+
activejob (= 7.2.0)
21+
activesupport (= 7.2.0)
22+
mail (>= 2.8.0)
23+
rails-dom-testing (~> 2.2)
24+
actionpack (7.2.0)
25+
actionview (= 7.2.0)
26+
activesupport (= 7.2.0)
27+
nokogiri (>= 1.8.5)
28+
racc
29+
rack (>= 2.2.4, < 3.2)
30+
rack-session (>= 1.0.1)
2731
rack-test (>= 0.6.3)
28-
rails-dom-testing (~> 2.0)
29-
rails-html-sanitizer (~> 1.0, >= 1.2.0)
30-
actiontext (6.1.7.3)
31-
actionpack (= 6.1.7.3)
32-
activerecord (= 6.1.7.3)
33-
activestorage (= 6.1.7.3)
34-
activesupport (= 6.1.7.3)
32+
rails-dom-testing (~> 2.2)
33+
rails-html-sanitizer (~> 1.6)
34+
useragent (~> 0.16)
35+
actiontext (7.2.0)
36+
actionpack (= 7.2.0)
37+
activerecord (= 7.2.0)
38+
activestorage (= 7.2.0)
39+
activesupport (= 7.2.0)
40+
globalid (>= 0.6.0)
3541
nokogiri (>= 1.8.5)
36-
actionview (6.1.7.3)
37-
activesupport (= 6.1.7.3)
42+
actionview (7.2.0)
43+
activesupport (= 7.2.0)
3844
builder (~> 3.1)
39-
erubi (~> 1.4)
40-
rails-dom-testing (~> 2.0)
41-
rails-html-sanitizer (~> 1.1, >= 1.2.0)
42-
activejob (6.1.7.3)
43-
activesupport (= 6.1.7.3)
45+
erubi (~> 1.11)
46+
rails-dom-testing (~> 2.2)
47+
rails-html-sanitizer (~> 1.6)
48+
activejob (7.2.0)
49+
activesupport (= 7.2.0)
4450
globalid (>= 0.3.6)
45-
activemodel (6.1.7.3)
46-
activesupport (= 6.1.7.3)
47-
activerecord (6.1.7.3)
48-
activemodel (= 6.1.7.3)
49-
activesupport (= 6.1.7.3)
50-
activestorage (6.1.7.3)
51-
actionpack (= 6.1.7.3)
52-
activejob (= 6.1.7.3)
53-
activerecord (= 6.1.7.3)
54-
activesupport (= 6.1.7.3)
51+
activemodel (7.2.0)
52+
activesupport (= 7.2.0)
53+
activerecord (7.2.0)
54+
activemodel (= 7.2.0)
55+
activesupport (= 7.2.0)
56+
timeout (>= 0.4.0)
57+
activestorage (7.2.0)
58+
actionpack (= 7.2.0)
59+
activejob (= 7.2.0)
60+
activerecord (= 7.2.0)
61+
activesupport (= 7.2.0)
5562
marcel (~> 1.0)
56-
mini_mime (>= 1.1.0)
57-
activesupport (6.1.7.3)
58-
concurrent-ruby (~> 1.0, >= 1.0.2)
63+
activesupport (7.2.0)
64+
base64
65+
bigdecimal
66+
concurrent-ruby (~> 1.0, >= 1.3.1)
67+
connection_pool (>= 2.2.5)
68+
drb
5969
i18n (>= 1.6, < 2)
70+
logger (>= 1.4.2)
6071
minitest (>= 5.1)
61-
tzinfo (~> 2.0)
62-
zeitwerk (~> 2.3)
63-
builder (3.2.4)
72+
securerandom (>= 0.3)
73+
tzinfo (~> 2.0, >= 2.0.5)
74+
base64 (0.2.0)
75+
bigdecimal (3.1.8)
76+
builder (3.3.0)
6477
coderay (1.1.3)
65-
concurrent-ruby (1.2.2)
78+
concurrent-ruby (1.3.4)
79+
connection_pool (2.4.1)
6680
crass (1.0.6)
67-
date (3.3.3)
68-
erubi (1.12.0)
69-
execjs (2.8.1)
70-
globalid (1.1.0)
71-
activesupport (>= 5.0)
72-
i18n (1.12.0)
81+
date (3.3.4)
82+
drb (2.2.1)
83+
erubi (1.13.0)
84+
execjs (2.9.1)
85+
globalid (1.2.1)
86+
activesupport (>= 6.1)
87+
i18n (1.14.5)
7388
concurrent-ruby (~> 1.0)
74-
inline_svg (1.8.0)
89+
inline_svg (1.9.0)
7590
activesupport (>= 3.0)
7691
nokogiri (>= 1.6)
77-
jbuilder (2.11.5)
92+
io-console (0.7.2)
93+
irb (1.14.0)
94+
rdoc (>= 4.0.0)
95+
reline (>= 0.4.2)
96+
jbuilder (2.12.0)
7897
actionview (>= 5.0.0)
7998
activesupport (>= 5.0.0)
80-
loofah (2.19.1)
99+
logger (1.6.0)
100+
loofah (2.22.0)
81101
crass (~> 1.0.2)
82-
nokogiri (>= 1.5.9)
102+
nokogiri (>= 1.12.0)
83103
mail (2.8.1)
84104
mini_mime (>= 0.1.1)
85105
net-imap
86106
net-pop
87107
net-smtp
88-
marcel (1.0.2)
89-
method_source (1.0.0)
90-
mini_mime (1.1.2)
91-
mini_portile2 (2.8.1)
92-
minitest (5.18.0)
93-
net-imap (0.3.4)
108+
marcel (1.0.4)
109+
method_source (1.1.0)
110+
mini_mime (1.1.5)
111+
mini_portile2 (2.8.7)
112+
minitest (5.25.1)
113+
net-imap (0.4.14)
94114
date
95115
net-protocol
96116
net-pop (0.1.2)
97117
net-protocol
98-
net-protocol (0.2.1)
118+
net-protocol (0.2.2)
99119
timeout
100-
net-smtp (0.3.3)
120+
net-smtp (0.5.0)
101121
net-protocol
102-
nio4r (2.5.8)
103-
nokogiri (1.14.2)
104-
mini_portile2 (~> 2.8.0)
122+
nio4r (2.7.3)
123+
nokogiri (1.16.7)
124+
mini_portile2 (~> 2.8.2)
105125
racc (~> 1.4)
126+
package_json (0.1.0)
106127
pry (0.14.2)
107128
coderay (~> 1.1)
108129
method_source (~> 1.0)
109-
psych (3.3.4)
110-
racc (1.6.2)
111-
rack (2.2.6.4)
112-
rack-proxy (0.7.6)
130+
psych (5.1.2)
131+
stringio
132+
racc (1.8.1)
133+
rack (3.1.7)
134+
rack-proxy (0.7.7)
113135
rack
136+
rack-session (2.0.0)
137+
rack (>= 3.0.0)
114138
rack-test (2.1.0)
115139
rack (>= 1.3)
116-
rails (6.1.7.3)
117-
actioncable (= 6.1.7.3)
118-
actionmailbox (= 6.1.7.3)
119-
actionmailer (= 6.1.7.3)
120-
actionpack (= 6.1.7.3)
121-
actiontext (= 6.1.7.3)
122-
actionview (= 6.1.7.3)
123-
activejob (= 6.1.7.3)
124-
activemodel (= 6.1.7.3)
125-
activerecord (= 6.1.7.3)
126-
activestorage (= 6.1.7.3)
127-
activesupport (= 6.1.7.3)
140+
rackup (2.1.0)
141+
rack (>= 3)
142+
webrick (~> 1.8)
143+
rails (7.2.0)
144+
actioncable (= 7.2.0)
145+
actionmailbox (= 7.2.0)
146+
actionmailer (= 7.2.0)
147+
actionpack (= 7.2.0)
148+
actiontext (= 7.2.0)
149+
actionview (= 7.2.0)
150+
activejob (= 7.2.0)
151+
activemodel (= 7.2.0)
152+
activerecord (= 7.2.0)
153+
activestorage (= 7.2.0)
154+
activesupport (= 7.2.0)
128155
bundler (>= 1.15.0)
129-
railties (= 6.1.7.3)
130-
sprockets-rails (>= 2.0.0)
131-
rails-dom-testing (2.0.3)
132-
activesupport (>= 4.2.0)
156+
railties (= 7.2.0)
157+
rails-dom-testing (2.2.0)
158+
activesupport (>= 5.0.0)
159+
minitest
133160
nokogiri (>= 1.6)
134-
rails-html-sanitizer (1.5.0)
135-
loofah (~> 2.19, >= 2.19.1)
136-
railties (6.1.7.3)
137-
actionpack (= 6.1.7.3)
138-
activesupport (= 6.1.7.3)
139-
method_source
161+
rails-html-sanitizer (1.6.0)
162+
loofah (~> 2.21)
163+
nokogiri (~> 1.14)
164+
railties (7.2.0)
165+
actionpack (= 7.2.0)
166+
activesupport (= 7.2.0)
167+
irb (~> 1.13)
168+
rackup (>= 1.0.0)
140169
rake (>= 12.2)
141-
thor (~> 1.0)
142-
rake (13.0.6)
170+
thor (~> 1.0, >= 1.2.2)
171+
zeitwerk (~> 2.6)
172+
rake (13.2.1)
143173
rb-readline (0.5.5)
144-
sprockets (4.2.0)
145-
concurrent-ruby (~> 1.0)
146-
rack (>= 2.2.4, < 4)
147-
sprockets-rails (3.4.2)
148-
actionpack (>= 5.2)
174+
rdoc (6.7.0)
175+
psych (>= 4.0.0)
176+
reline (0.5.9)
177+
io-console (~> 0.5)
178+
securerandom (0.3.1)
179+
semantic_range (3.0.0)
180+
shakapacker (8.0.1)
149181
activesupport (>= 5.2)
150-
sprockets (>= 3.0.0)
151-
thor (1.2.1)
152-
timeout (0.3.2)
182+
package_json
183+
rack-proxy (>= 0.6.1)
184+
railties (>= 5.2)
185+
semantic_range (>= 2.3.0)
186+
stringio (3.1.1)
187+
thor (1.3.1)
188+
timeout (0.4.1)
153189
tzinfo (2.0.6)
154190
concurrent-ruby (~> 1.0)
155191
uglifier (4.2.0)
156192
execjs (>= 0.3.0, < 3)
157-
webpacker (4.3.0)
158-
activesupport (>= 4.2)
159-
rack-proxy (>= 0.6.1)
160-
railties (>= 4.2)
193+
useragent (0.16.10)
161194
webrick (1.8.1)
162-
websocket-driver (0.7.5)
195+
websocket-driver (0.7.6)
163196
websocket-extensions (>= 0.1.0)
164197
websocket-extensions (0.1.5)
165-
zeitwerk (2.6.7)
198+
zeitwerk (2.6.17)
166199

167200
PLATFORMS
168201
ruby
@@ -171,12 +204,11 @@ DEPENDENCIES
171204
inline_svg
172205
jbuilder
173206
pry
174-
psych (< 4)
175-
rails (= 6.1.7.3)
207+
rails (= 7.2.0)
176208
rb-readline
209+
shakapacker (= 8.0.1)
177210
uglifier
178-
webpacker (~> 4.0)
179211
webrick
180212

181213
BUNDLED WITH
182-
2.1.4
214+
2.5.17

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ A Rails application for testing the
22
[inline_svg](https://github.com/jamesmartin/inline_svg) gem locally.
33

44
* SVGs live in ./app/assets/images/ for most branches
5-
* SVGs live in ./app/webpacker/images/ for any `-webpacker` branches
5+
* SVGs live in ./app/javascript/images/ for any `-shakapacker` branches
66

77
There are long-lived branches for different major Rails versions (to check
88
compatibility):

0 commit comments

Comments
 (0)