Skip to content

Commit d34397f

Browse files
authored
Merge pull request #179 from rootstrap/fix-serialize-javascript
Upgrade rails webpacker
2 parents dca0e3a + 9ad1397 commit d34397f

File tree

4 files changed

+941
-620
lines changed

4 files changed

+941
-620
lines changed

Diff for: Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ gem 'puma', '~> 4.3'
2222
gem 'rack-cors', '~> 1.0', '>= 1.0.6'
2323
gem 'sendgrid', '~> 1.2.4'
2424
gem 'sprockets', '~> 3.7.2'
25-
gem 'webpacker', '~> 4.2'
25+
gem 'webpacker', '~> 4.2', '>= 4.2.2'
2626
# Use Redis adapter to run Action Cable in production
2727
# gem 'redis', '~> 4.0'
2828
# Use Active Model has_secure_password

Diff for: Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ GEM
414414
addressable (>= 2.3.6)
415415
crack (>= 0.3.2)
416416
hashdiff (>= 0.4.0, < 2.0.0)
417-
webpacker (4.2.0)
417+
webpacker (4.2.2)
418418
activesupport (>= 4.2)
419419
rack-proxy (>= 0.6.1)
420420
railties (>= 4.2)
@@ -466,7 +466,7 @@ DEPENDENCIES
466466
tzinfo-data
467467
uglifier (~> 4.2)
468468
webmock (~> 3.7, >= 3.7.6)
469-
webpacker (~> 4.2)
469+
webpacker (~> 4.2, >= 4.2.2)
470470

471471
RUBY VERSION
472472
ruby 2.6.3p62

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"@rails/actioncable": "^6.0.0-alpha",
66
"@rails/activestorage": "^6.0.0-alpha",
77
"@rails/ujs": "^6.0.0-alpha",
8-
"@rails/webpacker": "^4.0.7",
8+
"@rails/webpacker": "^4.2.2",
99
"turbolinks": "^5.2.0"
1010
},
1111
"version": "0.1.0",

0 commit comments

Comments
 (0)