Skip to content

Commit 27fcb08

Browse files
authored
Upgrade from Webpacker 3 to Shakapacker 7 and React-Rails 3 (#1)
* Upgrade webpacker to version 4.0.0 * Update files and js packages to match Webpacker 4 req * Add nvmrc * Upgrade Webpacker to v5.0.0 * Update files and js packages to match Webpacker req * Upgrade Webpacker to v5.4.4 * Update files and js packages to match Webpacker req * Upgrade Webpacker to 6.0.0.rc.6 * Update packages and set react-rails to 2.6.2 * Update files based on Webpacker version * Change Webpacker to Shakapacker 6.0.0 * Install peer dependencies * Rename binstubs from webpack to webpacker * Update js files and config to match Shakapacker * Upgrade Shakapcaker to 6.6.0 * Upgrade to react-rails 2.7.1 * Update js files related to webpack config * Install babel plugin * Update bundler * Upgrade Shakapacker to version 7.0.2 * Update spelling and formatting based on SP7 * Upgrade to React-Rails 3.0.0.rc.0 * Clean up duplicates and outdated code * Remove redundant comment * Add newline at the end of all webpack config files * Remove .nvmrc * Update RR to 3.1.x
1 parent 1d3f1c1 commit 27fcb08

30 files changed

+3937
-6194
lines changed

.babelrc

Lines changed: 0 additions & 26 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
/node_modules
2121
/yarn-error.log
22+
yarn-debug.log*
23+
.yarn-integrity
2224

2325
.byebug_history
2426
/public/packs

.postcssrc.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

Gemfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ git_source(:github) do |repo_name|
55
"https://github.com/#{repo_name}.git"
66
end
77

8-
98
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
10-
gem 'rails', '~> 5.1.4'
9+
gem "rails", "~> 5.2"
1110
# Use sqlite3 as the database for Active Record
1211
gem 'sqlite3'
1312
# Use Puma as the app server
@@ -16,8 +15,8 @@ gem 'puma', '~> 4.3'
1615
gem 'sass-rails', '~> 5.0'
1716
# Use Uglifier as compressor for JavaScript assets
1817
gem 'uglifier', '>= 1.3.0'
19-
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
20-
gem 'webpacker'
18+
# Transpile app-like JavaScript. Read more: https://github.com/shakacode/shakapacker
19+
gem 'shakapacker', '7.0.2'
2120
# See https://github.com/rails/execjs#readme for more supported runtimes
2221
# gem 'therubyracer', platforms: :ruby
2322

@@ -51,4 +50,4 @@ end
5150

5251
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
5352
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
54-
gem "react-rails"
53+
gem "react-rails", '~> 3.1.0'

Gemfile.lock

Lines changed: 128 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,186 +1,209 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.1.6)
5-
actionpack (= 5.1.6)
4+
actioncable (5.2.8.1)
5+
actionpack (= 5.2.8.1)
66
nio4r (~> 2.0)
7-
websocket-driver (~> 0.6.1)
8-
actionmailer (5.1.6)
9-
actionpack (= 5.1.6)
10-
actionview (= 5.1.6)
11-
activejob (= 5.1.6)
7+
websocket-driver (>= 0.6.1)
8+
actionmailer (5.2.8.1)
9+
actionpack (= 5.2.8.1)
10+
actionview (= 5.2.8.1)
11+
activejob (= 5.2.8.1)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.1.6)
15-
actionview (= 5.1.6)
16-
activesupport (= 5.1.6)
17-
rack (~> 2.0)
14+
actionpack (5.2.8.1)
15+
actionview (= 5.2.8.1)
16+
activesupport (= 5.2.8.1)
17+
rack (~> 2.0, >= 2.0.8)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.1.6)
22-
activesupport (= 5.1.6)
21+
actionview (5.2.8.1)
22+
activesupport (= 5.2.8.1)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.1.6)
28-
activesupport (= 5.1.6)
27+
activejob (5.2.8.1)
28+
activesupport (= 5.2.8.1)
2929
globalid (>= 0.3.6)
30-
activemodel (5.1.6)
31-
activesupport (= 5.1.6)
32-
activerecord (5.1.6)
33-
activemodel (= 5.1.6)
34-
activesupport (= 5.1.6)
35-
arel (~> 8.0)
36-
activesupport (5.1.6)
30+
activemodel (5.2.8.1)
31+
activesupport (= 5.2.8.1)
32+
activerecord (5.2.8.1)
33+
activemodel (= 5.2.8.1)
34+
activesupport (= 5.2.8.1)
35+
arel (>= 9.0)
36+
activestorage (5.2.8.1)
37+
actionpack (= 5.2.8.1)
38+
activerecord (= 5.2.8.1)
39+
marcel (~> 1.0.0)
40+
activesupport (5.2.8.1)
3741
concurrent-ruby (~> 1.0, >= 1.0.2)
3842
i18n (>= 0.7, < 2)
3943
minitest (~> 5.1)
4044
tzinfo (~> 1.1)
41-
addressable (2.8.0)
42-
public_suffix (>= 2.0.2, < 5.0)
43-
arel (8.0.0)
45+
addressable (2.8.4)
46+
public_suffix (>= 2.0.2, < 6.0)
47+
arel (9.0.0)
4448
babel-source (5.8.35)
4549
babel-transpiler (0.7.0)
4650
babel-source (>= 4.0, < 6)
4751
execjs (~> 2.0)
48-
bindex (0.5.0)
49-
builder (3.2.3)
50-
byebug (10.0.2)
52+
bindex (0.8.1)
53+
builder (3.2.4)
54+
byebug (11.1.3)
5155
capybara (2.18.0)
5256
addressable
5357
mini_mime (>= 0.1.3)
5458
nokogiri (>= 1.3.3)
5559
rack (>= 1.0.0)
5660
rack-test (>= 0.5.4)
5761
xpath (>= 2.0, < 4.0)
58-
childprocess (0.9.0)
59-
ffi (~> 1.0, >= 1.0.11)
6062
coffee-rails (4.2.2)
6163
coffee-script (>= 2.2.0)
6264
railties (>= 4.0.0)
6365
coffee-script (2.4.1)
6466
coffee-script-source
6567
execjs
6668
coffee-script-source (1.12.2)
67-
concurrent-ruby (1.1.5)
68-
connection_pool (2.2.2)
69-
crass (1.0.5)
70-
erubi (1.8.0)
71-
execjs (2.7.0)
72-
ffi (1.9.25)
73-
globalid (0.4.1)
74-
activesupport (>= 4.2.0)
75-
i18n (1.6.0)
69+
concurrent-ruby (1.2.2)
70+
connection_pool (2.4.1)
71+
crass (1.0.6)
72+
date (3.3.3)
73+
erubi (1.12.0)
74+
execjs (2.8.1)
75+
ffi (1.15.5)
76+
globalid (1.1.0)
77+
activesupport (>= 5.0)
78+
i18n (1.12.0)
7679
concurrent-ruby (~> 1.0)
77-
jbuilder (2.7.0)
78-
activesupport (>= 4.2.0)
79-
multi_json (>= 1.2)
80+
jbuilder (2.11.5)
81+
actionview (>= 5.0.0)
82+
activesupport (>= 5.0.0)
8083
listen (3.1.5)
8184
rb-fsevent (~> 0.9, >= 0.9.4)
8285
rb-inotify (~> 0.9, >= 0.9.7)
8386
ruby_dep (~> 1.2)
84-
loofah (2.3.1)
87+
loofah (2.20.0)
8588
crass (~> 1.0.2)
8689
nokogiri (>= 1.5.9)
87-
mail (2.7.1)
90+
mail (2.8.1)
8891
mini_mime (>= 0.1.1)
89-
method_source (0.9.2)
90-
mini_mime (1.0.1)
91-
mini_portile2 (2.7.1)
92-
minitest (5.11.3)
93-
multi_json (1.13.1)
94-
nio4r (2.5.8)
95-
nokogiri (1.13.1)
96-
mini_portile2 (~> 2.7.0)
92+
net-imap
93+
net-pop
94+
net-smtp
95+
marcel (1.0.2)
96+
method_source (1.0.0)
97+
mini_mime (1.1.2)
98+
mini_portile2 (2.8.1)
99+
minitest (5.18.0)
100+
net-imap (0.3.4)
101+
date
102+
net-protocol
103+
net-pop (0.1.2)
104+
net-protocol
105+
net-protocol (0.2.1)
106+
timeout
107+
net-smtp (0.3.3)
108+
net-protocol
109+
nio4r (2.5.9)
110+
nokogiri (1.14.3)
111+
mini_portile2 (~> 2.8.0)
97112
racc (~> 1.4)
98-
public_suffix (4.0.6)
99-
puma (4.3.11)
113+
public_suffix (5.0.1)
114+
puma (4.3.12)
100115
nio4r (~> 2.0)
101-
racc (1.6.0)
102-
rack (2.2.3)
103-
rack-proxy (0.6.5)
116+
racc (1.6.2)
117+
rack (2.2.6.4)
118+
rack-proxy (0.7.6)
104119
rack
105-
rack-test (1.1.0)
106-
rack (>= 1.0, < 3)
107-
rails (5.1.6)
108-
actioncable (= 5.1.6)
109-
actionmailer (= 5.1.6)
110-
actionpack (= 5.1.6)
111-
actionview (= 5.1.6)
112-
activejob (= 5.1.6)
113-
activemodel (= 5.1.6)
114-
activerecord (= 5.1.6)
115-
activesupport (= 5.1.6)
120+
rack-test (2.1.0)
121+
rack (>= 1.3)
122+
rails (5.2.8.1)
123+
actioncable (= 5.2.8.1)
124+
actionmailer (= 5.2.8.1)
125+
actionpack (= 5.2.8.1)
126+
actionview (= 5.2.8.1)
127+
activejob (= 5.2.8.1)
128+
activemodel (= 5.2.8.1)
129+
activerecord (= 5.2.8.1)
130+
activestorage (= 5.2.8.1)
131+
activesupport (= 5.2.8.1)
116132
bundler (>= 1.3.0)
117-
railties (= 5.1.6)
133+
railties (= 5.2.8.1)
118134
sprockets-rails (>= 2.0.0)
119135
rails-dom-testing (2.0.3)
120136
activesupport (>= 4.2.0)
121137
nokogiri (>= 1.6)
122-
rails-html-sanitizer (1.0.4)
123-
loofah (~> 2.2, >= 2.2.2)
124-
railties (5.1.6)
125-
actionpack (= 5.1.6)
126-
activesupport (= 5.1.6)
138+
rails-html-sanitizer (1.5.0)
139+
loofah (~> 2.19, >= 2.19.1)
140+
railties (5.2.8.1)
141+
actionpack (= 5.2.8.1)
142+
activesupport (= 5.2.8.1)
127143
method_source
128144
rake (>= 0.8.7)
129-
thor (>= 0.18.1, < 2.0)
130-
rake (13.0.1)
131-
rb-fsevent (0.10.3)
132-
rb-inotify (0.9.10)
133-
ffi (>= 0.5.0, < 2)
134-
react-rails (2.5.0)
145+
thor (>= 0.19.0, < 2.0)
146+
rake (13.0.6)
147+
rb-fsevent (0.11.2)
148+
rb-inotify (0.10.1)
149+
ffi (~> 1.0)
150+
react-rails (3.1.1)
135151
babel-transpiler (>= 0.7.0)
136152
connection_pool
137153
execjs
138154
railties (>= 3.2)
139155
tilt
156+
rexml (3.2.5)
140157
ruby_dep (1.5.0)
141-
rubyzip (1.3.0)
142-
sass (3.6.0)
158+
rubyzip (2.3.2)
159+
sass (3.7.4)
143160
sass-listen (~> 4.0.0)
144161
sass-listen (4.0.0)
145162
rb-fsevent (~> 0.9, >= 0.9.4)
146163
rb-inotify (~> 0.9, >= 0.9.7)
147-
sass-rails (5.0.7)
148-
railties (>= 4.0.0, < 6)
164+
sass-rails (5.1.0)
165+
railties (>= 5.2.0)
149166
sass (~> 3.1)
150167
sprockets (>= 2.8, < 4.0)
151168
sprockets-rails (>= 2.0, < 4.0)
152169
tilt (>= 1.1, < 3)
153-
selenium-webdriver (3.141.0)
154-
childprocess (~> 0.5)
155-
rubyzip (~> 1.2, >= 1.2.2)
170+
selenium-webdriver (4.9.0)
171+
rexml (~> 3.2, >= 3.2.5)
172+
rubyzip (>= 1.2.2, < 3.0)
173+
websocket (~> 1.0)
174+
semantic_range (3.0.0)
175+
shakapacker (7.0.2)
176+
activesupport (>= 5.2)
177+
rack-proxy (>= 0.6.1)
178+
railties (>= 5.2)
179+
semantic_range (>= 2.3.0)
156180
sprockets (3.7.2)
157181
concurrent-ruby (~> 1.0)
158182
rack (> 1, < 3)
159-
sprockets-rails (3.2.1)
160-
actionpack (>= 4.0)
161-
activesupport (>= 4.0)
183+
sprockets-rails (3.4.2)
184+
actionpack (>= 5.2)
185+
activesupport (>= 5.2)
162186
sprockets (>= 3.0.0)
163-
sqlite3 (1.3.13)
164-
thor (0.20.3)
187+
sqlite3 (1.6.2)
188+
mini_portile2 (~> 2.8.0)
189+
thor (1.2.1)
165190
thread_safe (0.3.6)
166-
tilt (2.0.9)
167-
turbolinks (5.2.0)
191+
tilt (2.1.0)
192+
timeout (0.3.2)
193+
turbolinks (5.2.1)
168194
turbolinks-source (~> 5.2)
169195
turbolinks-source (5.2.0)
170-
tzinfo (1.2.5)
196+
tzinfo (1.2.11)
171197
thread_safe (~> 0.1)
172-
uglifier (4.1.19)
198+
uglifier (4.2.0)
173199
execjs (>= 0.3.0, < 3)
174200
web-console (3.7.0)
175201
actionview (>= 5.0)
176202
activemodel (>= 5.0)
177203
bindex (>= 0.4.0)
178204
railties (>= 5.0)
179-
webpacker (3.5.5)
180-
activesupport (>= 4.2)
181-
rack-proxy (>= 0.6.1)
182-
railties (>= 4.2)
183-
websocket-driver (0.6.5)
205+
websocket (1.2.9)
206+
websocket-driver (0.7.5)
184207
websocket-extensions (>= 0.1.0)
185208
websocket-extensions (0.1.5)
186209
xpath (3.2.0)
@@ -196,16 +219,16 @@ DEPENDENCIES
196219
jbuilder (~> 2.5)
197220
listen (>= 3.0.5, < 3.2)
198221
puma (~> 4.3)
199-
rails (~> 5.1.4)
200-
react-rails
222+
rails (~> 5.2)
223+
react-rails (~> 3.1.0)
201224
sass-rails (~> 5.0)
202225
selenium-webdriver
226+
shakapacker (= 7.0.2)
203227
sqlite3
204228
turbolinks (~> 5)
205229
tzinfo-data
206230
uglifier (>= 1.3.0)
207231
web-console (>= 3.3.0)
208-
webpacker
209232

210233
BUNDLED WITH
211-
1.16.6
234+
2.4.17

app/javascript/components/.keep

Whitespace-only changes.

0 commit comments

Comments
 (0)