Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prod push 2-1-2025 #15

Merged
merged 4 commits into from
Feb 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- name: 📥 Download deps
uses: bahmutov/npm-install@v1
Expand All @@ -46,7 +46,7 @@ jobs:
- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- name: 📥 Download deps
uses: bahmutov/npm-install@v1
Expand All @@ -67,7 +67,7 @@ jobs:
- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- name: 📥 Download deps
uses: bahmutov/npm-install@v1
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- name: 📥 Download deps
uses: bahmutov/npm-install@v1
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ node_modules

# Easy way to create temporary files/folders that won't accidentally be added to git
*.local.*

# generated files
/app/components/ui/icons

# react router v7 generated types
.react-router
5 changes: 3 additions & 2 deletions app/components/error-boundary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ import {
useRouteError,
} from '@remix-run/react'
import { captureRemixErrorBoundaryError } from '@sentry/remix'
import { type ReactElement } from 'react'
import { getErrorMessage } from '#app/utils/misc.tsx'

type StatusHandler = (info: {
error: ErrorResponse
params: Record<string, string | undefined>
}) => JSX.Element | null
}) => ReactElement | null

export function GeneralErrorBoundary({
defaultStatusHandler = ({ error }) => (
Expand All @@ -23,7 +24,7 @@ export function GeneralErrorBoundary({
}: {
defaultStatusHandler?: StatusHandler
statusHandlers?: Record<number, StatusHandler>
unexpectedErrorHandler?: (error: unknown) => JSX.Element | null
unexpectedErrorHandler?: (error: unknown) => ReactElement | null
}) {
const error = useRouteError()
captureRemixErrorBoundaryError(error)
Expand Down
2 changes: 1 addition & 1 deletion app/components/forms.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export function CheckboxField({
errors,
className,
}: {
labelProps: JSX.IntrinsicElements['label']
labelProps: React.ComponentProps<'label'>
buttonProps: CheckboxProps & {
name: string
form: string
Expand Down
4 changes: 4 additions & 0 deletions app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import SiteFooter from '#app/components/site-footer.js'
import { useToast } from '#app/components/toaster.tsx'
import { Button } from '#app/components/ui/button.tsx'
import {
SheetDescription,
SheetTitle,
SheetTrigger,
SheetClose,
SheetContent,
Expand Down Expand Up @@ -226,6 +228,8 @@ function App() {
className="flex flex-col bg-gray-950 p-6 text-gray-50"
side="left"
>
<SheetTitle className='hidden sr-only'>site nav menu</SheetTitle>
<SheetDescription className='hidden sr-only'>site nav menu open</SheetDescription>
<div className="mb-6 flex items-center justify-between">
<div className="flex items-center justify-center">
<Link to="/" className="group grid leading-snug">
Expand Down
2 changes: 1 addition & 1 deletion other/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is moved to the root directory before building the image

# base node image
FROM node:20-bookworm-slim as base
FROM node:22-bookworm-slim as base

# set for base and all layer that inherit from it
ENV NODE_ENV production
Expand Down
Loading