From 1f1b9dc31f236efbd34fab65a120094a3482d757 Mon Sep 17 00:00:00 2001 From: atridadl Date: Mon, 27 Nov 2023 11:49:46 -0700 Subject: [PATCH 1/2] 404 error boundary fixes --- app/components/FourOhFour.tsx | 12 ++++++++---- app/routes/room.$roomId.tsx | 6 ++++-- app/routes/sign-in.$.tsx | 7 +------ app/routes/sign-up.$.tsx | 7 +------ 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app/components/FourOhFour.tsx b/app/components/FourOhFour.tsx index 310534c..ae2c593 100644 --- a/app/components/FourOhFour.tsx +++ b/app/components/FourOhFour.tsx @@ -1,12 +1,16 @@ -import { Link } from "@remix-run/react"; +import { Link, isRouteErrorResponse, useRouteError } from "@remix-run/react"; export default function FourOhFour() { + const error = useRouteError(); + let message = + "Oops! This room does not appear to exist, or may have been deleted! 😢"; + if (isRouteErrorResponse(error)) { + message = error.statusText; + } return (

4️⃣0️⃣4️⃣

-

- Oops! This room does not appear to exist, or may have been deleted! 😢 -

+

{message}

If you believe you reached this page in error, please file an issue{" "} { if (!room) { throw new Response(null, { status: 404, - statusText: "Not Found", + statusText: + "Oops! This room does not appear to exist, or may have been deleted! 😢", }); } @@ -61,7 +62,8 @@ export const loader: LoaderFunction = async (args) => { if (isShit) { throw new Response(null, { status: 404, - statusText: "Not Found", + statusText: + "Wowee zowee! This wasn't supposed to happen! Maybe try refreshing the page... 🤔🧐", }); } diff --git a/app/routes/sign-in.$.tsx b/app/routes/sign-in.$.tsx index 0421a36..8d2dc4b 100644 --- a/app/routes/sign-in.$.tsx +++ b/app/routes/sign-in.$.tsx @@ -1,10 +1,5 @@ import { SignIn } from "@clerk/remix"; export default function SignInPage() { - return ( -
-

Sign In route

- -
- ); + return ; } diff --git a/app/routes/sign-up.$.tsx b/app/routes/sign-up.$.tsx index 9a9d777..fc9baa0 100644 --- a/app/routes/sign-up.$.tsx +++ b/app/routes/sign-up.$.tsx @@ -1,10 +1,5 @@ import { SignUp } from "@clerk/remix"; export default function SignUpPage() { - return ( -
-

Sign Up route

- -
- ); + return ; } From 9108693608837650c5fee78ac3d420e4ceb36b8d Mon Sep 17 00:00:00 2001 From: atridadl Date: Mon, 27 Nov 2023 11:50:16 -0700 Subject: [PATCH 2/2] Deps --- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2e60693..f06870e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sprintpadawan", - "version": "4.0.2", + "version": "4.0.3", "private": true, "sideEffects": false, "type": "module", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 964c6ab..de5cc04 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1916,7 +1916,7 @@ packages: tar-fs: 2.1.1 tsconfig-paths: 4.2.0 typescript: 5.3.2 - undici: 5.28.0 + undici: 5.28.1 ws: 7.5.9 transitivePeerDependencies: - '@types/node' @@ -5957,7 +5957,7 @@ packages: glob-to-regexp: 0.4.1 source-map-support: 0.5.21 stoppable: 1.1.0 - undici: 5.28.0 + undici: 5.28.1 workerd: 1.20231030.0 ws: 8.14.2 youch: 3.3.3 @@ -7875,8 +7875,8 @@ packages: /undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - /undici@5.28.0: - resolution: {integrity: sha512-gM12DkXhlAc5+/TPe60iy9P6ETgVfqTuRJ6aQ4w8RYu0MqKuXhaq3/b86GfzDQnNA3NUO6aUNdvevrKH59D0Nw==} + /undici@5.28.1: + resolution: {integrity: sha512-xcIIvj1LOQH9zAL54iWFkuDEaIVEjLrru7qRpa3GrEEHk6OBhb/LycuUY2m7VCcTuDeLziXCxobQVyKExyGeIA==} engines: {node: '>=14.0'} dependencies: '@fastify/busboy': 2.1.0