Skip to content

Commit 8c97326

Browse files
committed
Update dependencies, Ruby & Inertia defaults
1 parent 9d95d7f commit 8c97326

9 files changed

Lines changed: 453 additions & 449 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
bundler-cache: true
6464

6565
- name: Prepare RuboCop cache
66-
uses: actions/cache@v4
66+
uses: actions/cache@v5
6767
env:
6868
DEPENDENCIES_HASH: ${{ hashFiles('.ruby-version', '**/.rubocop.yml', '**/.rubocop_todo.yml', 'Gemfile.lock') }}
6969
with:
@@ -115,7 +115,7 @@ jobs:
115115
run: bin/rails db:test:prepare spec
116116

117117
- name: Keep screenshots from failed system tests
118-
uses: actions/upload-artifact@v5
118+
uses: actions/upload-artifact@v6
119119
if: failure()
120120
with:
121121
name: screenshots

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-3.4.5
1+
ruby-3.4.8

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html
99

1010
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
11-
ARG RUBY_VERSION=3.4.5
11+
ARG RUBY_VERSION=3.4.8
1212
FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base
1313

1414
# Rails app lives here

Dockerfile-ssr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html
99

1010
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
11-
ARG RUBY_VERSION=3.4.5
11+
ARG RUBY_VERSION=3.4.8
1212
FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base
1313

1414
# Rails app lives here

Gemfile.lock

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ GEM
8282
base64 (0.3.0)
8383
bcrypt (3.1.20)
8484
bcrypt_pbkdf (1.1.2)
85-
bigdecimal (3.3.1)
85+
bigdecimal (4.0.1)
8686
bindex (0.8.1)
8787
bootsnap (1.19.0)
8888
msgpack (~> 1.2)
@@ -107,10 +107,10 @@ GEM
107107
ruby2_keywords
108108
childprocess (5.1.0)
109109
logger (~> 1.5)
110-
concurrent-ruby (1.3.5)
110+
concurrent-ruby (1.3.6)
111111
connection_pool (3.0.2)
112112
crass (1.0.6)
113-
date (3.5.0)
113+
date (3.5.1)
114114
debug (1.11.0)
115115
irb (~> 1.10)
116116
reline (>= 0.3.8)
@@ -119,7 +119,7 @@ GEM
119119
drb (2.2.3)
120120
dry-cli (1.3.0)
121121
ed25519 (1.4.0)
122-
erb (6.0.0)
122+
erb (6.0.1)
123123
erubi (1.13.1)
124124
et-orbi (1.4.0)
125125
tzinfo
@@ -135,10 +135,10 @@ GEM
135135
activesupport (>= 6.1)
136136
i18n (1.14.7)
137137
concurrent-ruby (~> 1.0)
138-
inertia_rails (3.14.0)
138+
inertia_rails (3.15.0)
139139
railties (>= 6)
140-
io-console (0.8.1)
141-
irb (1.15.3)
140+
io-console (0.8.2)
141+
irb (1.16.0)
142142
pp (>= 0.6.0)
143143
rdoc (>= 4.0.0)
144144
reline (>= 0.4.2)
@@ -148,8 +148,8 @@ GEM
148148
js-routes (2.3.5)
149149
railties (>= 5)
150150
sorbet-runtime
151-
json (2.17.1)
152-
kamal (2.9.0)
151+
json (2.18.0)
152+
kamal (2.10.1)
153153
activesupport (>= 7.0)
154154
base64 (~> 0.2)
155155
bcrypt_pbkdf (~> 1.0)
@@ -169,7 +169,7 @@ GEM
169169
launchy (>= 2.2, < 4)
170170
lint_roller (1.1.0)
171171
logger (1.7.0)
172-
loofah (2.24.1)
172+
loofah (2.25.0)
173173
crass (~> 1.0.2)
174174
nokogiri (>= 1.12.0)
175175
mail (2.9.0)
@@ -181,10 +181,10 @@ GEM
181181
marcel (1.1.0)
182182
matrix (0.4.3)
183183
mini_mime (1.1.5)
184-
minitest (5.26.2)
184+
minitest (5.27.0)
185185
msgpack (1.8.0)
186186
mutex_m (0.3.0)
187-
net-imap (0.5.12)
187+
net-imap (0.6.2)
188188
date
189189
net-protocol
190190
net-pop (0.1.2)
@@ -226,7 +226,7 @@ GEM
226226
actionpack (>= 7.0.0)
227227
activesupport (>= 7.0.0)
228228
rack
229-
psych (5.2.6)
229+
psych (5.3.1)
230230
date
231231
stringio
232232
public_suffix (7.0.0)
@@ -301,15 +301,15 @@ GEM
301301
rspec-mocks (~> 3.13)
302302
rspec-support (~> 3.13)
303303
rspec-support (3.13.6)
304-
rubocop (1.81.7)
304+
rubocop (1.82.0)
305305
json (~> 2.3)
306306
language_server-protocol (~> 3.17.0.2)
307307
lint_roller (~> 1.1.0)
308308
parallel (~> 1.10)
309309
parser (>= 3.3.0.2)
310310
rainbow (>= 2.2.2, < 4.0)
311311
regexp_parser (>= 2.9.3, < 3.0)
312-
rubocop-ast (>= 1.47.1, < 2.0)
312+
rubocop-ast (>= 1.48.0, < 2.0)
313313
ruby-progressbar (~> 1.7)
314314
unicode-display_width (>= 2.4.0, < 4.0)
315315
rubocop-ast (1.48.0)
@@ -355,28 +355,28 @@ GEM
355355
fugit (~> 1.11)
356356
railties (>= 7.1)
357357
thor (>= 1.3.1)
358-
sorbet-runtime (0.6.12825)
358+
sorbet-runtime (0.6.12854)
359359
sqlite3 (2.8.1-aarch64-linux-gnu)
360360
sqlite3 (2.8.1-aarch64-linux-musl)
361361
sqlite3 (2.8.1-arm-linux-gnu)
362362
sqlite3 (2.8.1-arm-linux-musl)
363363
sqlite3 (2.8.1-arm64-darwin)
364364
sqlite3 (2.8.1-x86_64-linux-gnu)
365365
sqlite3 (2.8.1-x86_64-linux-musl)
366-
sshkit (1.24.0)
366+
sshkit (1.25.0)
367367
base64
368368
logger
369369
net-scp (>= 1.1.2)
370370
net-sftp (>= 2.1.2)
371371
net-ssh (>= 2.8.0)
372372
ostruct
373-
stringio (3.1.9)
373+
stringio (3.2.0)
374374
thor (1.4.0)
375-
thruster (0.1.16)
376-
thruster (0.1.16-aarch64-linux)
377-
thruster (0.1.16-arm64-darwin)
378-
thruster (0.1.16-x86_64-linux)
379-
timeout (0.5.0)
375+
thruster (0.1.17)
376+
thruster (0.1.17-aarch64-linux)
377+
thruster (0.1.17-arm64-darwin)
378+
thruster (0.1.17-x86_64-linux)
379+
timeout (0.6.0)
380380
tsort (0.2.0)
381381
tzinfo (2.0.6)
382382
concurrent-ruby (~> 1.0)
@@ -406,7 +406,7 @@ GEM
406406
websocket-extensions (0.1.5)
407407
xpath (3.2.0)
408408
nokogiri (~> 1.8)
409-
zeitwerk (2.7.3)
409+
zeitwerk (2.7.4)
410410

411411
PLATFORMS
412412
aarch64-linux

app/frontend/entrypoints/inertia.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ResolvedComponent } from "@inertiajs/react"
22
import { createInertiaApp } from "@inertiajs/react"
3-
import { type ReactNode, StrictMode } from "react"
3+
import { StrictMode } from "react"
44
import { createRoot } from "react-dom/client"
55

66
import { initializeTheme } from "@/hooks/use-appearance"
@@ -30,9 +30,7 @@ void createInertiaApp({
3030
// and use the following line.
3131
// see https://inertia-rails.dev/guide/pages#default-layouts
3232
//
33-
page.default.layout ??= (page: ReactNode) => (
34-
<PersistentLayout>{page}</PersistentLayout>
35-
)
33+
page.default.layout ??= [PersistentLayout]
3634

3735
return page
3836
},
@@ -52,9 +50,10 @@ void createInertiaApp({
5250

5351
defaults: {
5452
form: {
55-
forceIndicesArrayFormatInFormData: true,
53+
forceIndicesArrayFormatInFormData: false,
5654
},
5755
future: {
56+
useScriptElementForInitialPage: true,
5857
useDataInertiaHeadAttribute: true,
5958
useDialogForErrorModal: true,
6059
preserveEqualProps: true,

config/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ builder:
107107
#
108108
# # Pass arguments and secrets to the Docker build process
109109
# args:
110-
# RUBY_VERSION: ruby-3.4.5
110+
# RUBY_VERSION: ruby-3.4.8
111111
# secrets:
112112
# - GITHUB_TOKEN
113113
# - RAILS_MASTER_KEY

config/initializers/inertia_rails.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
InertiaRails.configure do |config|
44
config.version = ViteRuby.digest
5-
config.encrypt_history = true
5+
config.encrypt_history = Rails.env.production?
66
config.always_include_errors_hash = true
7+
config.use_script_element_for_initial_page = true
78

89
config.parent_controller = "::InertiaController"
910
end

0 commit comments

Comments
 (0)