Skip to content

Commit

Permalink
Merge pull request #2887 from DFE-Digital/various-dependency-updates-…
Browse files Browse the repository at this point in the history
…jun-6

Various dependency updates
  • Loading branch information
plisovin authored Jun 15, 2023
2 parents 3c308b4 + 226fc1a commit 8cc6755
Show file tree
Hide file tree
Showing 4 changed files with 298 additions and 150 deletions.
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,22 @@ updates:
directory: /
schedule:
interval: monthly
ignore:
# TODO: Remove this ignore config once moved to a Redis v6.2+ instance in AKS.
# The version is currently pinned to <7. We're unable to upgrade sidekiq as it requires out Redis service
# instance to be 6.2+ https://github.com/sidekiq/sidekiq/blob/main/docs/7.0-Upgrade.md#version-support.
# Our current Redis service instance is 5.0.6. This will be upgraded when we migrate from GOVuk PaaS to AKS.
- dependency-name: "sidekiq"
update-types: ["version-update:semver-major"]

# TODO: Remove this ignore config once moved to a Redis v6.2+ instance in AKS.
# The version is currently pinned to <5 by sidekiq (version 6.5.8).
# It seems this pin is removed by later sidekiq versions, but we're unable to upgrade sidekiq as it requires out
# Redis service instance to be 6.2+ https://github.com/sidekiq/sidekiq/blob/main/docs/7.0-Upgrade.md#version-support.
# Our current Redis service instance is 5.0.6. This will be upgraded when we migrate from GOVuk PaaS to AKS.
- dependency-name: "redis"
update-types: ["version-update:semver-major"]


- package-ecosystem: npm
directory: /
Expand Down
22 changes: 10 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ GEM
addressable (2.8.2)
public_suffix (>= 2.0.2, < 6.0)
aes_key_wrap (1.1.0)
amazing_print (1.4.0)
amazing_print (1.5.0)
anyway_config (2.4.0)
ruby-next-core (>= 0.14.0)
ast (2.4.2)
Expand All @@ -139,7 +139,7 @@ GEM
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
capybara (3.38.0)
capybara (3.39.2)
addressable
matrix
mini_mime (>= 0.1.3)
Expand All @@ -151,7 +151,6 @@ GEM
capybara-screenshot (1.0.26)
capybara (>= 1.0, < 4)
launchy
childprocess (4.1.0)
choice (0.2.0)
coderay (1.1.3)
concurrent-ruby (1.2.2)
Expand Down Expand Up @@ -291,7 +290,7 @@ GEM
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
govuk_design_system_formbuilder (3.1.2)
govuk_design_system_formbuilder (3.3.0)
actionview (>= 6.1)
activemodel (>= 6.1)
activesupport (>= 6.1)
Expand Down Expand Up @@ -539,8 +538,7 @@ GEM
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
selenium-webdriver (4.5.0)
childprocess (>= 0.5, < 5.0)
selenium-webdriver (4.9.1)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand All @@ -562,10 +560,10 @@ GEM
semantic_range (>= 2.3.0)
shoulda-matchers (5.1.0)
activesupport (>= 5.2.0)
sidekiq (6.5.8)
connection_pool (>= 2.2.5, < 3)
sidekiq (6.5.5)
connection_pool (>= 2.2.2)
rack (~> 2.0)
redis (>= 4.5.0, < 5)
redis (>= 4.5.0)
sidekiq-cron (1.10.0)
fugit (~> 1.8)
globalid (>= 1.0.1)
Expand Down Expand Up @@ -623,7 +621,7 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.7.0)
webrick (1.8.1)
websocket (1.2.9)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
Expand Down Expand Up @@ -672,7 +670,7 @@ DEPENDENCIES
breasal
bullet
byebug
capybara (>= 3.38.0)
capybara (>= 3.39.1)
capybara-screenshot
connection_pool
cucumber-rails (>= 2.4.0)
Expand Down Expand Up @@ -741,7 +739,7 @@ DEPENDENCIES
yabeda-sidekiq

RUBY VERSION
ruby 3.1.0p0
ruby 3.1.3p185

BUNDLED WITH
2.3.10
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "school_experience",
"private": true,
"dependencies": {
"@babel/core": "^7.21.4",
"@babel/plugin-transform-runtime": "^7.21.4",
"@babel/core": "^7.22.1",
"@babel/plugin-transform-runtime": "^7.22.4",
"@babel/preset-env": "^7.20.2",
"@babel/runtime": "^7.21.5",
"@babel/runtime": "^7.22.3",
"@googlemaps/js-api-loader": "^1.15.1",
"@stimulus/polyfills": "^2.0.0",
"accessible-autocomplete": "^2.0.4",
Expand All @@ -20,14 +20,14 @@
"govuk-frontend": "^4.0.1",
"js-cookie": "^3.0.5",
"json5": "2.2.3",
"mini-css-extract-plugin": "^2.7.5",
"mini-css-extract-plugin": "^2.7.6",
"postcss-preset-env": "^6.7.1",
"sass": "^1.59.3",
"sass-loader": "^13.2.2",
"shakapacker": "6.6.0",
"stimulus": "^3.2.1",
"style-loader": "^3.3.2",
"terser-webpack-plugin": "^5.3.6",
"terser-webpack-plugin": "^5.3.9",
"webpack": "^5.69.1",
"webpack-assets-manifest": "^5.1.0",
"webpack-cli": "^4.10.0",
Expand Down
Loading

0 comments on commit 8cc6755

Please sign in to comment.