Skip to content

Commit

Permalink
Update dependencies for June 2021 (#663)
Browse files Browse the repository at this point in the history
* Gemfile[.lock]: Update Rails to 5.2.6

Also update its dependency Nokogiri to 1.11.7

* Gemfile.lock: Update Puma to 5.3.2

* yarn.lock: Update browserslist to 4.16.6

* yarn.lock: Update dns-packet to 1.3.4

* deps: Resolve chokidar to 3.x (3.4.2)

* yarn.lock: Update glob-parent to 5.1.2

* yarn.lock: Update hosted-git-info to 2.8.9

* yarn.lock: Update lodash to 4.17.21

* yarn.lock: Update postcss to 7.0.36

* yarn.lock: Update @rails/webpacker to 5.4.0

* yarn.lock: Update ua-parser-js to 0.7.28

* yarn.lock: Update url-parse to 1.5.1

* yarn.lock: Update ws to 6.2.2

* Gemfile.lock: Update rdoc to 6.3.1

* deps: Update [@rails/]webpacker to 5.4.0

Also ran `rails webpacker:install` in the Docker container.

This ensures the packages in `package[-lock].json` and
`Gemfile[.lock]` are in sync with the `webpacker` Ruby gem.

Had to review (and decline) certain conflicting file updates.

* Gemfile.lock: Update addressable to 2.8.0
  • Loading branch information
DeeDeeG authored Jul 13, 2021
1 parent dff81a3 commit 803d002
Show file tree
Hide file tree
Showing 4 changed files with 1,164 additions and 1,808 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
ruby '2.7.3'

gem 'rails', '5.2.5'
gem 'rails', '5.2.6'

gem 'activeadmin', '~> 2.1'
gem 'bootsnap', require: false
Expand Down
96 changes: 48 additions & 48 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.5)
actionpack (= 5.2.5)
actioncable (5.2.6)
actionpack (= 5.2.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.5)
actionpack (= 5.2.5)
actionview (= 5.2.5)
activejob (= 5.2.5)
actionmailer (5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.5)
actionview (= 5.2.5)
activesupport (= 5.2.5)
actionpack (5.2.6)
actionview (= 5.2.6)
activesupport (= 5.2.6)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.5)
activesupport (= 5.2.5)
actionview (5.2.6)
activesupport (= 5.2.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -35,25 +35,25 @@ GEM
ransack (~> 2.1, >= 2.1.1)
sassc-rails (~> 2.1)
sprockets (>= 3.0, < 4.1)
activejob (5.2.5)
activesupport (= 5.2.5)
activejob (5.2.6)
activesupport (= 5.2.6)
globalid (>= 0.3.6)
activemodel (5.2.5)
activesupport (= 5.2.5)
activerecord (5.2.5)
activemodel (= 5.2.5)
activesupport (= 5.2.5)
activemodel (5.2.6)
activesupport (= 5.2.6)
activerecord (5.2.6)
activemodel (= 5.2.6)
activesupport (= 5.2.6)
arel (>= 9.0)
activestorage (5.2.5)
actionpack (= 5.2.5)
activerecord (= 5.2.5)
activestorage (5.2.6)
actionpack (= 5.2.6)
activerecord (= 5.2.6)
marcel (~> 1.0.0)
activesupport (5.2.5)
activesupport (5.2.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
arbre (1.2.1)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -93,7 +93,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.8)
concurrent-ruby (1.1.9)
countries (3.0.1)
i18n_data (~> 0.10.0)
sixarm_ruby_unaccent (~> 1.1)
Expand Down Expand Up @@ -211,7 +211,7 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.9.1)
loofah (2.10.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -222,15 +222,15 @@ GEM
marcel (1.0.1)
method_source (1.0.0)
mini_mime (1.1.0)
mini_portile2 (2.5.1)
mini_portile2 (2.5.3)
minitest (5.14.4)
msgpack (1.3.3)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
mustermann-grape (1.0.1)
mustermann (>= 1.0.0)
nio4r (2.5.7)
nokogiri (1.11.3)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
orm_adapter (0.5.0)
Expand All @@ -251,7 +251,7 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
puma (5.2.2)
puma (5.3.2)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3)
Expand All @@ -261,31 +261,31 @@ GEM
rack (>= 2.0.0)
rack-jsonp (1.3.1)
rack
rack-proxy (0.6.5)
rack-proxy (0.7.0)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.5)
actioncable (= 5.2.5)
actionmailer (= 5.2.5)
actionpack (= 5.2.5)
actionview (= 5.2.5)
activejob (= 5.2.5)
activemodel (= 5.2.5)
activerecord (= 5.2.5)
activestorage (= 5.2.5)
activesupport (= 5.2.5)
rails (5.2.6)
actioncable (= 5.2.6)
actionmailer (= 5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
activemodel (= 5.2.6)
activerecord (= 5.2.6)
activestorage (= 5.2.6)
activesupport (= 5.2.6)
bundler (>= 1.3.0)
railties (= 5.2.5)
railties (= 5.2.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.5)
actionpack (= 5.2.5)
activesupport (= 5.2.5)
railties (5.2.6)
actionpack (= 5.2.6)
activesupport (= 5.2.6)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
Expand All @@ -300,7 +300,7 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.2.1)
rdoc (6.3.1)
regexp_parser (1.7.0)
responders (3.0.0)
actionpack (>= 5.0)
Expand Down Expand Up @@ -353,7 +353,7 @@ GEM
tilt
sdoc (1.1.0)
rdoc (>= 5.0)
semantic_range (2.3.0)
semantic_range (3.0.0)
simple_form (5.0.2)
actionpack (>= 5.0)
activemodel (>= 5.0)
Expand Down Expand Up @@ -391,12 +391,12 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webpacker (5.2.1)
webpacker (5.4.0)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
websocket-driver (0.7.3)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
Expand Down Expand Up @@ -439,7 +439,7 @@ DEPENDENCIES
puma
rack-cors
rack-jsonp
rails (= 5.2.5)
rails (= 5.2.6)
rakismet
rspec-rails
rubocop
Expand Down
10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
{
"dependencies": {
"@rails/ujs": "^6.0.2",
"@rails/webpacker": "^5.2.1",
"@rails/webpacker": "5.4.0",
"bootstrap": "^4.1.1",
"jquery": "^3.3.1",
"jquery-ujs": "^1.2.2",
"popper.js": "^1.14.3",
"rails-erb-loader": "^5.5.2",
"swagger-ui": "^3.19.2",
"webpack": "^4.46.0",
"webpack-cli": "^3.3.12",
"yarn": ">=1.0.2"
},
"devDependencies": {
"webpack-dev-server": "^3.11.0"
"webpack-dev-server": "^3.11.2"
},
"resolutions": {
"node-fetch": "^2.6.1"
"node-fetch": "^2.6.1",
"**/watchpack-chokidar2/chokidar": "^3.4.1",
"webpack-dev-server/chokidar": "^3.4.1"
},
"engines": {
"yarn": ">=1.0.2"
Expand Down
Loading

0 comments on commit 803d002

Please sign in to comment.