Skip to content

Commit 2689a46

Browse files
[dep] upgrades: ROR, Shakapacker, Node, Ruby, misc gem upgrades (#593)
* dep: upgrade node * dep: upgrade ruby, misc gem upgrades * dep: upgrade shakapacker to v8, ROR to 14.0.3 * fix: ffi gem failing in ci * fix: net-pop gem dependency issue * dep: remove unneeded net-* gems from gemfile * dep: upgrade to node v22, remove unneeded incompatible deps * chore: doc update * fix: update node_version in dockerfile
1 parent acfe281 commit 2689a46

File tree

11 files changed

+247
-1116
lines changed

11 files changed

+247
-1116
lines changed

Diff for: .controlplane/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
2-
ARG RUBY_VERSION=3.1.2
2+
ARG RUBY_VERSION=3.3.3
33
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
44

55
# Install packages needed to build gems and node modules
@@ -8,7 +8,7 @@ RUN apt-get update -qq && \
88

99
# Install JavaScript dependencies
1010
# Make sure NODE_VERSION matches the node version in .nvmrc and package.json
11-
ARG NODE_VERSION=18.13.0
11+
ARG NODE_VERSION=22.3.0
1212
ARG YARN_VERSION=1.22.19
1313
ENV PATH=/usr/local/node/bin:$PATH
1414
RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \

Diff for: .github/workflows/js_test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
node: [18.x]
17-
ruby: [3.1.2]
16+
node: [22.x]
17+
ruby: [3.3.3]
1818

1919
env:
2020
RAILS_ENV: test

Diff for: .github/workflows/lint_test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
node: [18.x]
17-
ruby: [3.1.2]
16+
node: [22.x]
17+
ruby: [3.3.3]
1818

1919
env:
2020
RAILS_ENV: test

Diff for: .github/workflows/rspec_test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
node: [18.x]
17-
ruby: [3.1.2]
16+
node: [22.x]
17+
ruby: [3.3.3]
1818

1919
services:
2020
postgres:

Diff for: .nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18.13.0
1+
v22.3.0

Diff for: .ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.2
1+
3.3.3

Diff for: Gemfile

+7-8
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
source "https://rubygems.org"
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

6-
ruby "3.1.2"
6+
ruby "3.3.3"
77

8-
gem "react_on_rails", "14.0.0"
9-
gem "shakapacker", "7.2.1"
8+
gem "react_on_rails", "14.0.3"
9+
gem "shakapacker", "8.0.0"
1010

1111
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
1212
gem "listen"
@@ -45,11 +45,10 @@ gem "autoprefixer-rails"
4545

4646
gem "awesome_print"
4747

48-
# FIXME: quick fix for rails6, not needed since rails 7.0.1
49-
# https://github.com/rails/rails/pull/44083
50-
gem "net-imap", require: false
51-
gem "net-pop", require: false
52-
gem "net-smtp", require: false
48+
# Needed until Ruby 3.3.4 is released https://github.com/ruby/ruby/pull/11006
49+
# Related issue: https://github.com/ruby/net-pop/issues/26
50+
# TODO: When Ruby 3.3.4 is released, upgrade Ruby and remove this line
51+
gem "net-pop", github: "ruby/net-pop"
5352

5453
gem "redcarpet"
5554

0 commit comments

Comments
 (0)