Skip to content

Commit 87fc55c

Browse files
justin808justin808
committed
Updated to webpacker v6.beta.7 and React on Rails 12.2.0
1 parent d2836d2 commit 87fc55c

File tree

4 files changed

+95
-95
lines changed

4 files changed

+95
-95
lines changed

‎Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

4-
ruby '2.7.2'
4+
ruby '2.7.3'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
77
gem 'rails', '~> 6.0.3', '>= 6.0.3.1'
@@ -47,8 +47,8 @@ end
4747
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
4848
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
4949

50-
gem "webpacker", "6.0.0.beta.6"
50+
gem "webpacker", "6.0.0.beta.7"
5151

52-
gem "react_on_rails", "12.0.4"
52+
gem "react_on_rails", "12.2.0"
5353

5454
gem 'mini_racer', platforms: :ruby

‎Gemfile.lock

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.0.3.4)
5-
actionpack (= 6.0.3.4)
4+
actioncable (6.0.3.6)
5+
actionpack (= 6.0.3.6)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailbox (6.0.3.4)
9-
actionpack (= 6.0.3.4)
10-
activejob (= 6.0.3.4)
11-
activerecord (= 6.0.3.4)
12-
activestorage (= 6.0.3.4)
13-
activesupport (= 6.0.3.4)
8+
actionmailbox (6.0.3.6)
9+
actionpack (= 6.0.3.6)
10+
activejob (= 6.0.3.6)
11+
activerecord (= 6.0.3.6)
12+
activestorage (= 6.0.3.6)
13+
activesupport (= 6.0.3.6)
1414
mail (>= 2.7.1)
15-
actionmailer (6.0.3.4)
16-
actionpack (= 6.0.3.4)
17-
actionview (= 6.0.3.4)
18-
activejob (= 6.0.3.4)
15+
actionmailer (6.0.3.6)
16+
actionpack (= 6.0.3.6)
17+
actionview (= 6.0.3.6)
18+
activejob (= 6.0.3.6)
1919
mail (~> 2.5, >= 2.5.4)
2020
rails-dom-testing (~> 2.0)
21-
actionpack (6.0.3.4)
22-
actionview (= 6.0.3.4)
23-
activesupport (= 6.0.3.4)
21+
actionpack (6.0.3.6)
22+
actionview (= 6.0.3.6)
23+
activesupport (= 6.0.3.6)
2424
rack (~> 2.0, >= 2.0.8)
2525
rack-test (>= 0.6.3)
2626
rails-dom-testing (~> 2.0)
2727
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28-
actiontext (6.0.3.4)
29-
actionpack (= 6.0.3.4)
30-
activerecord (= 6.0.3.4)
31-
activestorage (= 6.0.3.4)
32-
activesupport (= 6.0.3.4)
28+
actiontext (6.0.3.6)
29+
actionpack (= 6.0.3.6)
30+
activerecord (= 6.0.3.6)
31+
activestorage (= 6.0.3.6)
32+
activesupport (= 6.0.3.6)
3333
nokogiri (>= 1.8.5)
34-
actionview (6.0.3.4)
35-
activesupport (= 6.0.3.4)
34+
actionview (6.0.3.6)
35+
activesupport (= 6.0.3.6)
3636
builder (~> 3.1)
3737
erubi (~> 1.4)
3838
rails-dom-testing (~> 2.0)
3939
rails-html-sanitizer (~> 1.1, >= 1.2.0)
40-
activejob (6.0.3.4)
41-
activesupport (= 6.0.3.4)
40+
activejob (6.0.3.6)
41+
activesupport (= 6.0.3.6)
4242
globalid (>= 0.3.6)
43-
activemodel (6.0.3.4)
44-
activesupport (= 6.0.3.4)
45-
activerecord (6.0.3.4)
46-
activemodel (= 6.0.3.4)
47-
activesupport (= 6.0.3.4)
48-
activestorage (6.0.3.4)
49-
actionpack (= 6.0.3.4)
50-
activejob (= 6.0.3.4)
51-
activerecord (= 6.0.3.4)
52-
marcel (~> 0.3.1)
53-
activesupport (6.0.3.4)
43+
activemodel (6.0.3.6)
44+
activesupport (= 6.0.3.6)
45+
activerecord (6.0.3.6)
46+
activemodel (= 6.0.3.6)
47+
activesupport (= 6.0.3.6)
48+
activestorage (6.0.3.6)
49+
actionpack (= 6.0.3.6)
50+
activejob (= 6.0.3.6)
51+
activerecord (= 6.0.3.6)
52+
marcel (~> 1.0.0)
53+
activesupport (6.0.3.6)
5454
concurrent-ruby (~> 1.0, >= 1.0.2)
5555
i18n (>= 0.7, < 2)
5656
minitest (~> 5.1)
@@ -59,84 +59,84 @@ GEM
5959
addressable (2.7.0)
6060
public_suffix (>= 2.0.2, < 5.0)
6161
bindex (0.8.1)
62-
bootsnap (1.5.1)
62+
bootsnap (1.7.4)
6363
msgpack (~> 1.0)
6464
builder (3.2.4)
6565
byebug (11.1.3)
66-
capybara (3.34.0)
66+
capybara (3.35.3)
6767
addressable
6868
mini_mime (>= 0.1.3)
6969
nokogiri (~> 1.8)
7070
rack (>= 1.6.0)
7171
rack-test (>= 0.6.3)
72-
regexp_parser (~> 1.5)
72+
regexp_parser (>= 1.5, < 3.0)
7373
xpath (~> 3.2)
7474
childprocess (3.0.0)
75-
concurrent-ruby (1.1.7)
76-
connection_pool (2.2.3)
75+
concurrent-ruby (1.1.8)
76+
connection_pool (2.2.5)
7777
crass (1.0.6)
7878
erubi (1.10.0)
7979
execjs (2.7.0)
80-
ffi (1.14.2)
80+
ffi (1.15.0)
8181
globalid (0.4.2)
8282
activesupport (>= 4.2.0)
83-
i18n (1.8.5)
83+
i18n (1.8.10)
8484
concurrent-ruby (~> 1.0)
85-
jbuilder (2.10.1)
85+
jbuilder (2.11.2)
8686
activesupport (>= 5.0.0)
87-
libv8 (8.4.255.0)
88-
listen (3.3.3)
87+
libv8-node (15.14.0.0)
88+
listen (3.5.1)
8989
rb-fsevent (~> 0.10, >= 0.10.3)
9090
rb-inotify (~> 0.9, >= 0.9.10)
91-
loofah (2.8.0)
91+
loofah (2.9.1)
9292
crass (~> 1.0.2)
9393
nokogiri (>= 1.5.9)
9494
mail (2.7.1)
9595
mini_mime (>= 0.1.1)
96-
marcel (0.3.3)
97-
mimemagic (~> 0.3.2)
96+
marcel (1.0.1)
9897
method_source (1.0.0)
99-
mimemagic (0.3.5)
100-
mini_mime (1.0.2)
101-
mini_portile2 (2.4.0)
102-
mini_racer (0.3.1)
103-
libv8 (~> 8.4.255)
104-
minitest (5.14.2)
105-
msgpack (1.3.3)
106-
nio4r (2.5.4)
107-
nokogiri (1.10.10)
108-
mini_portile2 (~> 2.4.0)
98+
mini_mime (1.1.0)
99+
mini_portile2 (2.5.0)
100+
mini_racer (0.4.0)
101+
libv8-node (~> 15.14.0.0)
102+
minitest (5.14.4)
103+
msgpack (1.4.2)
104+
nio4r (2.5.7)
105+
nokogiri (1.11.3)
106+
mini_portile2 (~> 2.5.0)
107+
racc (~> 1.4)
109108
public_suffix (4.0.6)
110109
puma (4.3.7)
111110
nio4r (~> 2.0)
111+
racc (1.5.2)
112112
rack (2.2.3)
113113
rack-proxy (0.6.5)
114114
rack
115115
rack-test (1.1.0)
116116
rack (>= 1.0, < 3)
117-
rails (6.0.3.4)
118-
actioncable (= 6.0.3.4)
119-
actionmailbox (= 6.0.3.4)
120-
actionmailer (= 6.0.3.4)
121-
actionpack (= 6.0.3.4)
122-
actiontext (= 6.0.3.4)
123-
actionview (= 6.0.3.4)
124-
activejob (= 6.0.3.4)
125-
activemodel (= 6.0.3.4)
126-
activerecord (= 6.0.3.4)
127-
activestorage (= 6.0.3.4)
128-
activesupport (= 6.0.3.4)
117+
rails (6.0.3.6)
118+
actioncable (= 6.0.3.6)
119+
actionmailbox (= 6.0.3.6)
120+
actionmailer (= 6.0.3.6)
121+
actionpack (= 6.0.3.6)
122+
actiontext (= 6.0.3.6)
123+
actionview (= 6.0.3.6)
124+
activejob (= 6.0.3.6)
125+
activemodel (= 6.0.3.6)
126+
activerecord (= 6.0.3.6)
127+
activestorage (= 6.0.3.6)
128+
activesupport (= 6.0.3.6)
129129
bundler (>= 1.3.0)
130-
railties (= 6.0.3.4)
130+
railties (= 6.0.3.6)
131131
sprockets-rails (>= 2.0.0)
132132
rails-dom-testing (2.0.3)
133133
activesupport (>= 4.2.0)
134134
nokogiri (>= 1.6)
135135
rails-html-sanitizer (1.3.0)
136136
loofah (~> 2.3)
137-
railties (6.0.3.4)
138-
actionpack (= 6.0.3.4)
139-
activesupport (= 6.0.3.4)
137+
railties (6.0.3.6)
138+
actionpack (= 6.0.3.6)
139+
activesupport (= 6.0.3.6)
140140
method_source
141141
rake (>= 0.8.7)
142142
thor (>= 0.20.3, < 2.0)
@@ -145,14 +145,14 @@ GEM
145145
rb-fsevent (0.10.4)
146146
rb-inotify (0.10.1)
147147
ffi (~> 1.0)
148-
react_on_rails (12.0.4)
148+
react_on_rails (12.2.0)
149149
addressable
150150
connection_pool
151151
execjs (~> 2.5)
152152
rails (>= 3.2)
153153
rainbow (~> 3.0)
154154
webpacker (>= 4.0)
155-
regexp_parser (1.8.2)
155+
regexp_parser (2.1.1)
156156
rubyzip (2.3.0)
157157
selenium-webdriver (3.142.7)
158158
childprocess (>= 0.5, < 4.0)
@@ -170,7 +170,7 @@ GEM
170170
activesupport (>= 4.0)
171171
sprockets (>= 3.0.0)
172172
sqlite3 (1.4.2)
173-
thor (1.0.1)
173+
thor (1.1.0)
174174
thread_safe (0.3.6)
175175
tzinfo (1.2.9)
176176
thread_safe (~> 0.1)
@@ -179,11 +179,11 @@ GEM
179179
activemodel (>= 6.0.0)
180180
bindex (>= 0.4.0)
181181
railties (>= 6.0.0)
182-
webdrivers (4.4.1)
182+
webdrivers (4.6.0)
183183
nokogiri (~> 1.6)
184184
rubyzip (>= 1.3.0)
185185
selenium-webdriver (>= 3.0, < 4.0)
186-
webpacker (6.0.0.beta.6)
186+
webpacker (6.0.0.beta.7)
187187
activesupport (>= 5.2)
188188
rack-proxy (>= 0.6.1)
189189
railties (>= 5.2)
@@ -207,18 +207,18 @@ DEPENDENCIES
207207
mini_racer
208208
puma (~> 4.1)
209209
rails (~> 6.0.3, >= 6.0.3.1)
210-
react_on_rails (= 12.0.4)
210+
react_on_rails (= 12.2.0)
211211
selenium-webdriver
212212
spring
213213
spring-watcher-listen (~> 2.0.0)
214214
sqlite3 (~> 1.4)
215215
tzinfo-data
216216
web-console (>= 3.3.0)
217217
webdrivers
218-
webpacker (= 6.0.0.beta.6)
218+
webpacker (= 6.0.0.beta.7)
219219

220220
RUBY VERSION
221-
ruby 2.7.2p137
221+
ruby 2.7.3p183
222222

223223
BUNDLED WITH
224224
2.2.14

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"prop-types": "^15.7.2",
1010
"react": "^17.0.1",
1111
"react-dom": "^17.0.1",
12-
"react-on-rails": "12.0.3",
12+
"react-on-rails": "12.2.0",
1313
"typescript": "^4.0.5",
1414
"webpack": "^5.11.0",
1515
"webpack-cli": "^4.2.0"

‎yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -981,10 +981,10 @@
981981
"@babel/helper-plugin-utils" "^7.10.4"
982982
"@babel/plugin-transform-typescript" "^7.12.1"
983983

984-
"@babel/runtime-corejs3@^7.9.6":
985-
version "7.11.0"
986-
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.0.tgz#db54a2251206f0f8579b41918acb14488b8dd2c0"
987-
integrity sha512-K0ioacsw8JgzDSPpUiGWokMvLzGvnZPXLrTsJfyHPrFsnp4yoKn+Ap/8NNZgWKZG9o5+qotH8tAa8AXn8gTN5A==
984+
"@babel/runtime-corejs3@^7.12.5":
985+
version "7.13.17"
986+
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz#9baf45f03d4d013f021760b992d6349a9d27deaf"
987+
integrity sha512-RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw==
988988
dependencies:
989989
core-js-pure "^3.0.0"
990990
regenerator-runtime "^0.13.4"
@@ -4053,12 +4053,12 @@ react-is@^16.8.1:
40534053
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
40544054
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
40554055

4056-
react-on-rails@12.0.3:
4057-
version "12.0.3"
4058-
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-12.0.3.tgz#804b0d36effa08f3fbce07d3102f3f05e5b189aa"
4059-
integrity sha512-xk3qous3cgccE7n2849S4U3QipPmWy414zk6OUlMqjCJ+2frPmvyHs5J+xxkQ/6Uu5TJsEYUqcDeEqdlk1nwsQ==
4056+
react-on-rails@12.2.0:
4057+
version "12.2.0"
4058+
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-12.2.0.tgz#289d3752f695be7a9e71c8075a2601029e1ac71e"
4059+
integrity sha512-ev51+38S/CcivIE9PU7kGPkt/ckVaIbZbUKqfXR7BcM5V45vl0NUs1O0tjfT/XVggz7MWV2DA+My2lRjAPIeJA==
40604060
dependencies:
4061-
"@babel/runtime-corejs3" "^7.9.6"
4061+
"@babel/runtime-corejs3" "^7.12.5"
40624062
concurrently "^5.1.0"
40634063

40644064
react-refresh@^0.9.0:

0 commit comments

Comments
 (0)