Skip to content

Commit

Permalink
Update dependencies for mid March 2023 (#678)
Browse files Browse the repository at this point in the history
* ruby: Upgrade from v3.1.2 to v3.2.1

* Gemfile[.lock]: Update Rails from 6.1.7 to 6.1.7.2

  And update Rails' dependencies.


* Gemfile.lock: Update loofah, nokogiri, and racc

  loofah		2.19.0 --> 2.19.1
  nokogiri	1.13.8 --> 1.14.2
  racc		1.6.0  --> 1.6.2


* Gemfile.lock: Update rails-html-sanitizer

  rails-html-sanitizer 1.4.3 --> 1.5.0


* Gemfile.lock: Update globalid and dependencies

  globalid		1.0.0  --> 1.1.0
  concurrent-ruby	1.1.10 --> 1.2.2
  minitest		5.16.3 --> 5.18.0
  tzinfo		2.0.5  --> 2.0.6
  zeitwerk		2.6.1  --> 2.6.7


* Gemfile.lock: Update rack from 2.2.4 to 2.2.6.3

* yarn.lock: Update loader-utils

  loader-utils 1.4.0 --> 1.4.2
  loader-utils 2.0.0 --> 2.0.4


* yarn.lock: Update json5

  json5 1.0.1 --> 1.0.2
  json5 2.1.3 --> 2.2.3


* yarn.lock: Update qs 6.10.2 to 6.11.1

* yarn.lock: Update express and dependencies

  express		4.17.1 --> 4.18.2
  accepts		+ 1.3.8
  body-parser		1.19.0 --> 1.20.1
  bytes			3.1.0  --> 3.1.2
  content-disposition	0.5.3  --> 0.5.4
  cookie		0.4.0  --> 0.5.0
  depd			+ 2.0.0
  destroy		1.0.4  --> 1.2.0
  finalhandler		1.1.2  --> 1.2.0
  forwarded		0.1.2  --> 0.2.0
  http-errors		1.7.2  --> 2.0.0
  http-errors		- 1.7.3
  mime-db		+ 1.52.0
  mime-types		+ 2.1.35
  ms			2.1.1  --> 2.1.3
  negotiator		+ 0.6.3
  on-finished		2.3.0  --> 2.4.1
  proxy-addr		2.0.6  --> 2.0.7
  qs			6.7.0  --> 6.11.0
  raw-body		2.4.0  --> 2.5.1
  send			0.17.1 --> 0.18.0
  serve-static		1.14.1 --> 1.15.0
  setprototypeof	1.1.1  --> 1.2.0
  statuses		+ 2.0.1
  toidentifier		1.0.0  --> 1.0.1


* yarn.lock: Update minimatch from 3.0.4 to 3.1.2

* yarn.lock: Update @braintree/sanitize-url

  @braintree/sanitize-url 6.0.0 --> 6.0.2


* yarn.lock: Update fast-json-patch

  fast-json-patch 3.1.0 --> 3.1.1


* yarn.lock: Update decode-uri-component

  decode-uri-component 0.2.0 --> 0.2.2


* Dockerfile: Check integrity of phantomjs

* .env: Set COMPOSE_HTTP_TIMEOUT to 6 minutes

  This sets the time docker-compose will wait for certain steps that
  happen to involve (internal) HTTP requests, but which may time out due
  to any other slowness on the machine, especially slow disk access.

  (docker-compose frequently times out for me unless I set this timeout
  variable properly to be much longer than the default of 60 s. So...)

  Set the timeout to be *much, much longer*,
  so it no-longer times out in any realistic situation.

  Makes development that much more pleasant for those contributing
  on slow hardware (especially those with spinning metal hard drives).


* yarn.lock: Dedupe some dependencies

* yarn.lock: Dedupe mime-db package

* Dockerfile: Delete yarn cache after install

  Results in a smaller final image on disk


* Gemfile.lock: Update webpacker from 5.4.3 to 5.4.4

* webpacker: Run bundle exec rails webpacker:install

* deps: Remove ansi-html-community resolution

  This indirect dependency was updated exactly the same way in the
  latest webpack-dev-server's dependencies, so we don't have to manually
  resolve/override the dependency anymore in our package.json.


* yarn.lock: Dedupe babel and sub-dependencies

* yarn.lock: Dedupe all other dependencies

* package.json: Pin node to 16.x

  We can't use NodeJS 18 until we work through this issue:
  github[dot]com/webpack[slash]webpack/issues/14532

  There was a default hashing algorithm for webpack (md4) that is now
  considered quite old/obsolete/flawed. It was removed from OpenSSL 3.0.
  OpenSSL 3.0 is the version of OpenSSL used in NodeJS 17 and up.

  In order to use an LTS version of Node that will receive long-term
  support over the next months, but not hit this issue where webpack
  errors out due to the md4 hash algorithm not being available in Node
  17+, we need to stay on NodeJS 16.x for the time being.

  NOTE: NodeJS 16.x will be EOL on  the 11th of September 2023, matching
  the EOL date for OpenSSL 1.1.1.

  See:
  https://nodejs.org/en/blog/announcements/nodejs16-eol/
  https://github.com/nodejs/release#release-schedule

  So this workaround only buys us time until September of this year!!

  The "proper" fix for this would be updating to webpack 5 and webpacker
  6.x (which was never given a final release, but got as far as a
  release candidate), or move to something that is actively supported,
  like the alternatives discussed here:
  https://world.hey.com/dhh/rails-7-will-have-three-great-answers-to-javascript-in-2021-8d68191b
  https://rubyonrails.org/2021/12/6/Rails-7-0-rc-1-released


* Gemfile.lock: Update "rack" from 2.2.6.3 to 2.2.7

* Gemfile.lock: Update "nokogiri", 1.14.2 -> 1.14.3

* Gemfile[.lock]: Update "rails", 6.1.7.2 to 6.1.7.3

  Also update its direct and indirect dependencies.


* ruby: Upgrade from v3.2.1 to v3.2.2

* Revert "webpacker: Run bundle exec rails webpacker:install"

  This reverts commit 21c08d2.


* yarn.lock: Update webpack-dev-server to 3.11.3

  Bumps indirect dependency ansi-html 0.0.7 to ansi-html-community 0.0.8
  • Loading branch information
DeeDeeG authored May 4, 2023
1 parent b77d752 commit c3b5c55
Show file tree
Hide file tree
Showing 8 changed files with 286 additions and 272 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ DEVISE_SECRET_KEY=3f4915489bd10fdbacb4f22dbf772a4be6e2d2d1616a1af7913f0f6645784d
RAILS_SECRET_KEY=4944cf251e3dbf309ed71ebcd8990a1479d793011cd4011761e3fbea9ecc59edefd0cb49a0ed9b5c0261ab0dda841962bb7dd28fd3f99579bfa2beec26329961
RECAPTCHA_SITE_KEY=6Le_W5gUAAAAAJFOELNu2LkSR2E6sXYIVZrMe6V0
RECAPTCHA_SECRET_KEY=6Le_W5gUAAAAABZpnGQtfVaQdfluuLrf8wihooeo
COMPOSE_HTTP_TIMEOUT=360
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.2.2
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1.2-slim
FROM ruby:3.2.2-slim

# Add basic binaries
RUN apt-get update \
Expand All @@ -8,6 +8,8 @@ RUN apt-get update \

# Download, extract and install PhantomJS from archive hosted at bitbucket
RUN curl -L https://github.com/Medium/phantomjs/releases/download/v2.1.1/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O \
# Check the file's integrity against its known sha1sum
&& test "`sha1sum phantomjs-2.1.1-linux-x86_64.tar.bz2`" = "f8afc8a24eec34c2badccc93812879a3d6f2caf3 phantomjs-2.1.1-linux-x86_64.tar.bz2" || (echo "PhantomJS tarball SHA1sum did not match!" && exit 1) \
# Extract and clean up the PhantomJS archive
&& tar xf phantomjs-2.1.1-linux-x86_64.tar.bz2 && rm phantomjs-2.1.1-linux-x86_64.tar.bz2 \
# Install PhantomJS binary to /usr/local/bin
Expand Down Expand Up @@ -46,4 +48,4 @@ RUN bundle install

# Install Node.js packages with Yarn
COPY package.json yarn.lock /refugerestrooms/
RUN yarn install --pure-lockfile
RUN yarn install --pure-lockfile && yarn cache clean
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
ruby '3.1.2'
ruby '3.2.2'

gem 'rails', '6.1.7'
gem 'rails', '6.1.7.3'

gem 'activeadmin', '~> 2.1'
gem 'bootsnap', require: false
Expand Down
155 changes: 79 additions & 76 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7)
actionpack (= 6.1.7)
activesupport (= 6.1.7)
actioncable (6.1.7.3)
actionpack (= 6.1.7.3)
activesupport (= 6.1.7.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7)
actionpack (= 6.1.7)
activejob (= 6.1.7)
activerecord (= 6.1.7)
activestorage (= 6.1.7)
activesupport (= 6.1.7)
actionmailbox (6.1.7.3)
actionpack (= 6.1.7.3)
activejob (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
mail (>= 2.7.1)
actionmailer (6.1.7)
actionpack (= 6.1.7)
actionview (= 6.1.7)
activejob (= 6.1.7)
activesupport (= 6.1.7)
actionmailer (6.1.7.3)
actionpack (= 6.1.7.3)
actionview (= 6.1.7.3)
activejob (= 6.1.7.3)
activesupport (= 6.1.7.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7)
actionview (= 6.1.7)
activesupport (= 6.1.7)
actionpack (6.1.7.3)
actionview (= 6.1.7.3)
activesupport (= 6.1.7.3)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7)
actionpack (= 6.1.7)
activerecord (= 6.1.7)
activestorage (= 6.1.7)
activesupport (= 6.1.7)
actiontext (6.1.7.3)
actionpack (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
nokogiri (>= 1.8.5)
actionview (6.1.7)
activesupport (= 6.1.7)
actionview (6.1.7.3)
activesupport (= 6.1.7.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -48,22 +48,22 @@ GEM
kaminari (~> 1.0, >= 1.2.1)
railties (>= 6.1, < 7.1)
ransack (>= 2.1.1, < 4)
activejob (6.1.7)
activesupport (= 6.1.7)
activejob (6.1.7.3)
activesupport (= 6.1.7.3)
globalid (>= 0.3.6)
activemodel (6.1.7)
activesupport (= 6.1.7)
activerecord (6.1.7)
activemodel (= 6.1.7)
activesupport (= 6.1.7)
activestorage (6.1.7)
actionpack (= 6.1.7)
activejob (= 6.1.7)
activerecord (= 6.1.7)
activesupport (= 6.1.7)
activemodel (6.1.7.3)
activesupport (= 6.1.7.3)
activerecord (6.1.7.3)
activemodel (= 6.1.7.3)
activesupport (= 6.1.7.3)
activestorage (6.1.7.3)
actionpack (= 6.1.7.3)
activejob (= 6.1.7.3)
activerecord (= 6.1.7.3)
activesupport (= 6.1.7.3)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7)
activesupport (6.1.7.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -110,7 +110,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.2)
countries (5.1.2)
sixarm_ruby_unaccent (~> 1.1)
country_select (8.0.0)
Expand Down Expand Up @@ -148,7 +148,7 @@ GEM
dry-core (~> 0.5, >= 0.5)
dry-inflector (~> 0.1, >= 0.1.2)
dry-logic (~> 1.0, >= 1.0.2)
erubi (1.11.0)
erubi (1.12.0)
execjs (2.8.1)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
Expand All @@ -160,7 +160,7 @@ GEM
actionpack (>= 5.2.0)
formtastic_i18n (0.7.0)
geocoder (1.6.7)
globalid (1.0.0)
globalid (1.1.0)
activesupport (>= 5.0)
grape (1.6.2)
activesupport
Expand All @@ -184,7 +184,7 @@ GEM
hashdiff (1.0.1)
high_voltage (3.0.0)
http_accept_language (2.1.1)
i18n (1.12.0)
i18n (1.13.0)
concurrent-ruby (~> 1.0)
i18n-debug (1.2.0)
i18n (< 2)
Expand Down Expand Up @@ -217,19 +217,22 @@ GEM
kaminari-grape (1.0.1)
grape
kaminari-core (~> 1.0)
loofah (2.19.0)
loofah (2.20.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
mail_form (1.9.0)
actionmailer (>= 5.2)
activemodel (>= 5.2)
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.2)
minitest (5.16.3)
minitest (5.18.0)
msgpack (1.6.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
Expand All @@ -246,10 +249,10 @@ GEM
digest
net-protocol
timeout
nio4r (2.5.8)
nokogiri (1.13.8-x86_64-darwin)
nio4r (2.5.9)
nokogiri (1.14.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.8-x86_64-linux)
nokogiri (1.14.3-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.22.1)
Expand All @@ -271,41 +274,41 @@ GEM
public_suffix (5.0.0)
puma (5.6.5)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.4)
racc (1.6.2)
rack (2.2.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-jsonp (1.3.1)
rack
rack-proxy (0.7.4)
rack-proxy (0.7.6)
rack
rack-test (2.0.2)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7)
actioncable (= 6.1.7)
actionmailbox (= 6.1.7)
actionmailer (= 6.1.7)
actionpack (= 6.1.7)
actiontext (= 6.1.7)
actionview (= 6.1.7)
activejob (= 6.1.7)
activemodel (= 6.1.7)
activerecord (= 6.1.7)
activestorage (= 6.1.7)
activesupport (= 6.1.7)
rails (6.1.7.3)
actioncable (= 6.1.7.3)
actionmailbox (= 6.1.7.3)
actionmailer (= 6.1.7.3)
actionpack (= 6.1.7.3)
actiontext (= 6.1.7.3)
actionview (= 6.1.7.3)
activejob (= 6.1.7.3)
activemodel (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
bundler (>= 1.15.0)
railties (= 6.1.7)
railties (= 6.1.7.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
railties (6.1.7)
actionpack (= 6.1.7)
activesupport (= 6.1.7)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (6.1.7.3)
actionpack (= 6.1.7.3)
activesupport (= 6.1.7.3)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -371,7 +374,7 @@ GEM
sdoc (2.4.0)
rdoc (>= 5.0)
semantic_range (3.0.0)
simple_form (5.1.0)
simple_form (5.2.0)
actionpack (>= 5.2)
activemodel (>= 5.2)
simplecov (0.17.1)
Expand All @@ -395,7 +398,7 @@ GEM
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (2.0.5)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
Expand All @@ -406,7 +409,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webpacker (5.4.3)
webpacker (5.4.4)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
Expand All @@ -416,7 +419,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.1)
zeitwerk (2.6.8)

PLATFORMS
x86_64-darwin-21
Expand Down Expand Up @@ -457,7 +460,7 @@ DEPENDENCIES
puma
rack-cors
rack-jsonp
rails (= 6.1.7)
rails (= 6.1.7.3)
rakismet
rspec-rails
rubocop
Expand All @@ -475,7 +478,7 @@ DEPENDENCIES
webpacker (~> 5)

RUBY VERSION
ruby 3.1.2p20
ruby 3.2.2p53

BUNDLED WITH
2.3.7
2.4.10
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Please also read our [Code of Conduct](https://github.com/RefugeRestrooms/refuge

## Tech

* Ruby Version - ruby-3.1.2
* Ruby Version - ruby-3.2.2
* Ruby on Rails
* RSpec
* Javascript
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"node-fetch": "^2.6.1",
"**/watchpack-chokidar2/chokidar": "^3.4.1",
"webpack-dev-server/chokidar": "^3.4.1",
"webpack-dev-server/**/ansi-html": "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41",
"webpack-dev-server/**/ansi-regex": "^5.0.1",
"@rails/webpacker/**/ansi-regex": "^5.0.1",
"@rails/webpacker/**/nth-check": "^2.0.1",
"swagger-ui/**/@braintree/sanitize-url": "^6.0.0"
},
"engines": {
"yarn": ">=1.0.2"
"yarn": ">=1.0.2",
"node": "16.x"
}
}
Loading

0 comments on commit c3b5c55

Please sign in to comment.