Skip to content

Commit aef6076

Browse files
inertia-rails-generator-sync[bot]inertia-rails-generator-sync[bot]
authored
Sync with generator manual-30012838223 (#320)
1 parent 00a9c73 commit aef6076

29 files changed

Lines changed: 1417 additions & 1067 deletions

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Set up Node.js
3535
uses: actions/setup-node@v6
3636
with:
37-
node-version: 22
37+
node-version-file: .node-version
3838
cache: npm
3939

4040
- name: Install JS dependencies
@@ -93,7 +93,7 @@ jobs:
9393
- name: Set up Node.js
9494
uses: actions/setup-node@v6
9595
with:
96-
node-version: 22
96+
node-version-file: .node-version
9797
cache: npm
9898

9999
- name: Install JS dependencies

‎.node-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
22.23.1

‎.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
build
22
coverage
3+
app/javascript/components/ui
34
app/javascript/routes

‎Gemfile.lock‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ GEM
107107
capybara (>= 3.0)
108108
childprocess (5.1.0)
109109
logger (~> 1.5)
110-
concurrent-ruby (1.3.7)
110+
concurrent-ruby (1.3.8)
111111
connection_pool (3.0.2)
112112
crass (1.0.7)
113113
date (3.5.1)
@@ -118,18 +118,18 @@ GEM
118118
dotenv (3.2.0)
119119
drb (2.2.3)
120120
ed25519 (1.4.0)
121-
erb (6.0.4)
121+
erb (6.0.6)
122122
erubi (1.13.1)
123123
et-orbi (1.4.0)
124124
tzinfo
125-
fugit (1.12.3)
125+
fugit (1.13.0)
126126
et-orbi (~> 1.4)
127127
raabro (~> 1.4)
128128
globalid (1.4.0)
129129
activesupport (>= 6.1)
130130
i18n (1.15.2)
131131
concurrent-ruby (~> 1.0)
132-
inertia_rails (3.21.2)
132+
inertia_rails (3.22.0)
133133
railties (>= 6)
134134
io-console (0.8.2)
135135
irb (1.18.0)
@@ -140,7 +140,7 @@ GEM
140140
jbuilder (2.15.1)
141141
actionview (>= 7.0.0)
142142
activesupport (>= 7.0.0)
143-
json (2.20.0)
143+
json (2.21.1)
144144
kamal (2.12.0)
145145
activesupport (>= 7.0)
146146
base64 (~> 0.2)
@@ -161,7 +161,7 @@ GEM
161161
launchy (>= 2.2, < 4)
162162
lint_roller (1.1.0)
163163
logger (1.7.0)
164-
loofah (2.25.1)
164+
loofah (2.25.2)
165165
crass (~> 1.0.2)
166166
nokogiri (>= 1.12.0)
167167
mail (2.9.1)
@@ -208,7 +208,7 @@ GEM
208208
racc (~> 1.4)
209209
ostruct (0.6.3)
210210
parallel (2.1.0)
211-
parser (3.3.11.1)
211+
parser (3.3.12.0)
212212
ast (~> 2.4.1)
213213
racc
214214
pp (0.6.4)
@@ -222,7 +222,7 @@ GEM
222222
public_suffix (7.0.5)
223223
puma (8.0.2)
224224
nio4r (~> 2.0)
225-
raabro (1.4.0)
225+
raabro (1.5.0)
226226
racc (1.8.1)
227227
rack (3.2.6)
228228
rack-session (2.1.2)
@@ -250,8 +250,8 @@ GEM
250250
activesupport (>= 5.0.0)
251251
minitest
252252
nokogiri (>= 1.6)
253-
rails-html-sanitizer (1.7.0)
254-
loofah (~> 2.25)
253+
rails-html-sanitizer (1.7.1)
254+
loofah (~> 2.25, >= 2.25.2)
255255
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
256256
rails_vite (0.2.3)
257257
railties (>= 7.0)
@@ -296,7 +296,7 @@ GEM
296296
rspec-mocks (>= 3.13.0, < 5.0.0)
297297
rspec-support (>= 3.13.0, < 5.0.0)
298298
rspec-support (3.13.7)
299-
rubocop (1.88.1)
299+
rubocop (1.88.2)
300300
json (~> 2.3)
301301
language_server-protocol (~> 3.17.0.2)
302302
lint_roller (~> 1.1.0)
@@ -314,7 +314,7 @@ GEM
314314
lint_roller (~> 1.1)
315315
rubocop (>= 1.75.0, < 2.0)
316316
rubocop-ast (>= 1.47.1, < 2.0)
317-
rubocop-rails (2.35.5)
317+
rubocop-rails (2.36.0)
318318
activesupport (>= 4.2.0)
319319
lint_roller (~> 1.1)
320320
rack (>= 1.1)
@@ -327,13 +327,13 @@ GEM
327327
ruby-progressbar (1.13.0)
328328
rubyzip (3.4.1)
329329
securerandom (0.4.1)
330-
selenium-webdriver (4.45.0)
330+
selenium-webdriver (4.46.0)
331331
base64 (~> 0.2)
332332
logger (~> 1.4)
333333
rexml (~> 3.2, >= 3.2.5)
334334
rubyzip (>= 1.2.2, < 4.0)
335335
websocket (~> 1.0)
336-
solid_cable (4.0.0)
336+
solid_cable (4.0.2)
337337
actioncable (>= 7.2)
338338
activejob (>= 7.2)
339339
activerecord (>= 7.2)
@@ -342,7 +342,7 @@ GEM
342342
activejob (>= 7.2)
343343
activerecord (>= 7.2)
344344
railties (>= 7.2)
345-
solid_queue (1.4.0)
345+
solid_queue (1.5.0)
346346
activejob (>= 7.1)
347347
activerecord (>= 7.1)
348348
concurrent-ruby (>= 1.3.1)
@@ -364,10 +364,10 @@ GEM
364364
net-ssh (>= 2.8.0)
365365
ostruct
366366
thor (1.5.0)
367-
thruster (0.1.22)
368-
thruster (0.1.22-aarch64-linux)
369-
thruster (0.1.22-arm64-darwin)
370-
thruster (0.1.22-x86_64-linux)
367+
thruster (0.1.23)
368+
thruster (0.1.23-aarch64-linux)
369+
thruster (0.1.23-arm64-darwin)
370+
thruster (0.1.23-x86_64-linux)
371371
timeout (0.6.1)
372372
tsort (0.2.0)
373373
typelizer (0.13.1)

‎app/javascript/components/ui/alert.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const alertVariants = cva(
1616
defaultVariants: {
1717
variant: "default",
1818
},
19-
},
19+
}
2020
)
2121

2222
function Alert({
@@ -40,7 +40,7 @@ function AlertTitle({ className, ...props }: React.ComponentProps<"div">) {
4040
data-slot="alert-title"
4141
className={cn(
4242
"col-start-2 line-clamp-1 min-h-4 font-medium tracking-tight",
43-
className,
43+
className
4444
)}
4545
{...props}
4646
/>
@@ -55,8 +55,8 @@ function AlertDescription({
5555
<div
5656
data-slot="alert-description"
5757
className={cn(
58-
"text-muted-foreground col-start-2 grid justify-items-start gap-1 text-sm [&_p]:leading-relaxed",
59-
className,
58+
"col-start-2 grid justify-items-start gap-1 text-sm text-muted-foreground [&_p]:leading-relaxed",
59+
className
6060
)}
6161
{...props}
6262
/>

‎app/javascript/components/ui/avatar.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function Avatar({
1616
data-size={size}
1717
className={cn(
1818
"group/avatar relative flex size-8 shrink-0 overflow-hidden rounded-full select-none data-[size=lg]:size-10 data-[size=sm]:size-6",
19-
className,
19+
className
2020
)}
2121
{...props}
2222
/>
@@ -44,8 +44,8 @@ function AvatarFallback({
4444
<AvatarPrimitive.Fallback
4545
data-slot="avatar-fallback"
4646
className={cn(
47-
"bg-muted text-muted-foreground flex size-full items-center justify-center rounded-full text-sm group-data-[size=sm]/avatar:text-xs",
48-
className,
47+
"flex size-full items-center justify-center rounded-full bg-muted text-sm text-muted-foreground group-data-[size=sm]/avatar:text-xs",
48+
className
4949
)}
5050
{...props}
5151
/>
@@ -57,11 +57,11 @@ function AvatarBadge({ className, ...props }: React.ComponentProps<"span">) {
5757
<span
5858
data-slot="avatar-badge"
5959
className={cn(
60-
"bg-primary text-primary-foreground ring-background absolute right-0 bottom-0 z-10 inline-flex items-center justify-center rounded-full ring-2 select-none",
60+
"absolute right-0 bottom-0 z-10 inline-flex items-center justify-center rounded-full bg-primary text-primary-foreground ring-2 ring-background select-none",
6161
"group-data-[size=sm]/avatar:size-2 group-data-[size=sm]/avatar:[&>svg]:hidden",
6262
"group-data-[size=default]/avatar:size-2.5 group-data-[size=default]/avatar:[&>svg]:size-2",
6363
"group-data-[size=lg]/avatar:size-3 group-data-[size=lg]/avatar:[&>svg]:size-2",
64-
className,
64+
className
6565
)}
6666
{...props}
6767
/>
@@ -73,8 +73,8 @@ function AvatarGroup({ className, ...props }: React.ComponentProps<"div">) {
7373
<div
7474
data-slot="avatar-group"
7575
className={cn(
76-
"group/avatar-group *:data-[slot=avatar]:ring-background flex -space-x-2 *:data-[slot=avatar]:ring-2",
77-
className,
76+
"group/avatar-group flex -space-x-2 *:data-[slot=avatar]:ring-2 *:data-[slot=avatar]:ring-background",
77+
className
7878
)}
7979
{...props}
8080
/>
@@ -89,8 +89,8 @@ function AvatarGroupCount({
8989
<div
9090
data-slot="avatar-group-count"
9191
className={cn(
92-
"bg-muted text-muted-foreground ring-background relative flex size-8 shrink-0 items-center justify-center rounded-full text-sm ring-2 group-has-data-[size=lg]/avatar-group:size-10 group-has-data-[size=sm]/avatar-group:size-6 [&>svg]:size-4 group-has-data-[size=lg]/avatar-group:[&>svg]:size-5 group-has-data-[size=sm]/avatar-group:[&>svg]:size-3",
93-
className,
92+
"relative flex size-8 shrink-0 items-center justify-center rounded-full bg-muted text-sm text-muted-foreground ring-2 ring-background group-has-data-[size=lg]/avatar-group:size-10 group-has-data-[size=sm]/avatar-group:size-6 [&>svg]:size-4 group-has-data-[size=lg]/avatar-group:[&>svg]:size-5 group-has-data-[size=sm]/avatar-group:[&>svg]:size-3",
93+
className
9494
)}
9595
{...props}
9696
/>

‎app/javascript/components/ui/badge.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const badgeVariants = cva(
2323
defaultVariants: {
2424
variant: "default",
2525
},
26-
},
26+
}
2727
)
2828

2929
function Badge({

‎app/javascript/components/ui/breadcrumb.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ function BreadcrumbList({ className, ...props }: React.ComponentProps<"ol">) {
1313
<ol
1414
data-slot="breadcrumb-list"
1515
className={cn(
16-
"text-muted-foreground flex flex-wrap items-center gap-1.5 text-sm break-words sm:gap-2.5",
17-
className,
16+
"flex flex-wrap items-center gap-1.5 text-sm break-words text-muted-foreground sm:gap-2.5",
17+
className
1818
)}
1919
{...props}
2020
/>
@@ -43,7 +43,7 @@ function BreadcrumbLink({
4343
return (
4444
<Comp
4545
data-slot="breadcrumb-link"
46-
className={cn("hover:text-foreground transition-colors", className)}
46+
className={cn("transition-colors hover:text-foreground", className)}
4747
{...props}
4848
/>
4949
)
@@ -56,7 +56,7 @@ function BreadcrumbPage({ className, ...props }: React.ComponentProps<"span">) {
5656
role="link"
5757
aria-disabled="true"
5858
aria-current="page"
59-
className={cn("text-foreground font-normal", className)}
59+
className={cn("font-normal text-foreground", className)}
6060
{...props}
6161
/>
6262
)

‎app/javascript/components/ui/button.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const buttonVariants = cva(
3535
variant: "default",
3636
size: "default",
3737
},
38-
},
38+
}
3939
)
4040

4141
function Button({

‎app/javascript/components/ui/card.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ function Card({ className, ...props }: React.ComponentProps<"div">) {
77
<div
88
data-slot="card"
99
className={cn(
10-
"bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm",
11-
className,
10+
"flex flex-col gap-6 rounded-xl border bg-card py-6 text-card-foreground shadow-sm",
11+
className
1212
)}
1313
{...props}
1414
/>
@@ -21,7 +21,7 @@ function CardHeader({ className, ...props }: React.ComponentProps<"div">) {
2121
data-slot="card-header"
2222
className={cn(
2323
"@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-2 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6",
24-
className,
24+
className
2525
)}
2626
{...props}
2727
/>
@@ -42,7 +42,7 @@ function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
4242
return (
4343
<div
4444
data-slot="card-description"
45-
className={cn("text-muted-foreground text-sm", className)}
45+
className={cn("text-sm text-muted-foreground", className)}
4646
{...props}
4747
/>
4848
)
@@ -54,7 +54,7 @@ function CardAction({ className, ...props }: React.ComponentProps<"div">) {
5454
data-slot="card-action"
5555
className={cn(
5656
"col-start-2 row-span-2 row-start-1 self-start justify-self-end",
57-
className,
57+
className
5858
)}
5959
{...props}
6060
/>

0 commit comments

Comments
 (0)