Skip to content

Commit 76db7f9

Browse files
authored
Merge pull request #15 from lsbyerley/dev
prod push 2-1-2025
2 parents f699fe1 + 01b1974 commit 76db7f9

File tree

8 files changed

+3313
-3376
lines changed

8 files changed

+3313
-3376
lines changed

.github/workflows/deploy.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: ⎔ Setup node
2626
uses: actions/setup-node@v4
2727
with:
28-
node-version: 20
28+
node-version: 22
2929

3030
- name: 📥 Download deps
3131
uses: bahmutov/npm-install@v1
@@ -46,7 +46,7 @@ jobs:
4646
- name: ⎔ Setup node
4747
uses: actions/setup-node@v4
4848
with:
49-
node-version: 20
49+
node-version: 22
5050

5151
- name: 📥 Download deps
5252
uses: bahmutov/npm-install@v1
@@ -67,7 +67,7 @@ jobs:
6767
- name: ⎔ Setup node
6868
uses: actions/setup-node@v4
6969
with:
70-
node-version: 20
70+
node-version: 22
7171

7272
- name: 📥 Download deps
7373
uses: bahmutov/npm-install@v1
@@ -95,7 +95,7 @@ jobs:
9595
- name: ⎔ Setup node
9696
uses: actions/setup-node@v4
9797
with:
98-
node-version: 20
98+
node-version: 22
9999

100100
- name: 📥 Download deps
101101
uses: bahmutov/npm-install@v1

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,9 @@ node_modules
2020

2121
# Easy way to create temporary files/folders that won't accidentally be added to git
2222
*.local.*
23+
24+
# generated files
25+
/app/components/ui/icons
26+
27+
# react router v7 generated types
28+
.react-router

app/components/error-boundary.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ import {
55
useRouteError,
66
} from '@remix-run/react'
77
import { captureRemixErrorBoundaryError } from '@sentry/remix'
8+
import { type ReactElement } from 'react'
89
import { getErrorMessage } from '#app/utils/misc.tsx'
910

1011
type StatusHandler = (info: {
1112
error: ErrorResponse
1213
params: Record<string, string | undefined>
13-
}) => JSX.Element | null
14+
}) => ReactElement | null
1415

1516
export function GeneralErrorBoundary({
1617
defaultStatusHandler = ({ error }) => (
@@ -23,7 +24,7 @@ export function GeneralErrorBoundary({
2324
}: {
2425
defaultStatusHandler?: StatusHandler
2526
statusHandlers?: Record<number, StatusHandler>
26-
unexpectedErrorHandler?: (error: unknown) => JSX.Element | null
27+
unexpectedErrorHandler?: (error: unknown) => ReactElement | null
2728
}) {
2829
const error = useRouteError()
2930
captureRemixErrorBoundaryError(error)

app/components/forms.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export function CheckboxField({
144144
errors,
145145
className,
146146
}: {
147-
labelProps: JSX.IntrinsicElements['label']
147+
labelProps: React.ComponentProps<'label'>
148148
buttonProps: CheckboxProps & {
149149
name: string
150150
form: string

app/root.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import SiteFooter from '#app/components/site-footer.js'
2424
import { useToast } from '#app/components/toaster.tsx'
2525
import { Button } from '#app/components/ui/button.tsx'
2626
import {
27+
SheetDescription,
28+
SheetTitle,
2729
SheetTrigger,
2830
SheetClose,
2931
SheetContent,
@@ -226,6 +228,8 @@ function App() {
226228
className="flex flex-col bg-gray-950 p-6 text-gray-50"
227229
side="left"
228230
>
231+
<SheetTitle className='hidden sr-only'>site nav menu</SheetTitle>
232+
<SheetDescription className='hidden sr-only'>site nav menu open</SheetDescription>
229233
<div className="mb-6 flex items-center justify-between">
230234
<div className="flex items-center justify-center">
231235
<Link to="/" className="group grid leading-snug">

other/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is moved to the root directory before building the image
22

33
# base node image
4-
FROM node:20-bookworm-slim as base
4+
FROM node:22-bookworm-slim as base
55

66
# set for base and all layer that inherit from it
77
ENV NODE_ENV production

0 commit comments

Comments
 (0)