remove useLoaderData from errorElement

Shopify · May 25, 2024 · 0e50fd8 · 0e50fd8
1 parent dff8e41
commit 0e50fd8
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/templates/skeleton/app/root.tsx b/templates/skeleton/app/root.tsx
@@ -110,16 +110,15 @@ export default function App() {
 
 export function ErrorBoundary() {
   const error = useRouteError();
-  const rootData = useLoaderData<typeof loader>();
   const nonce = useNonce();
   let errorMessage = 'Unknown error';
   let errorStatus = 500;
 
   if (isRouteErrorResponse(error)) {
-    errorMessage = error?.data?.message ?? error.data;
+    errorMessage = error?.data?.message ?? error.data ?? errorMessage;
     errorStatus = error.status;
   } else if (error instanceof Error) {
-    errorMessage = error.message;
+    errorMessage = error.message ?? errorMessage;
   }
 
   return (
@@ -131,17 +130,15 @@ export function ErrorBoundary() {
         <Links />
       </head>
       <body>
-        <Layout {...rootData}>
-          <div className="route-error">
-            <h1>Oops</h1>
-            <h2>{errorStatus}</h2>
-            {errorMessage && (
-              <fieldset>
-                <pre>{errorMessage}</pre>
-              </fieldset>
-            )}
-          </div>
-        </Layout>
+        <div className="route-error">
+          <h1>Oops</h1>
+          <h2>{errorStatus}</h2>
+          {errorMessage && (
+            <fieldset>
+              <pre>{errorMessage}</pre>
+            </fieldset>
+          )}
+        </div>
         <ScrollRestoration nonce={nonce} />
         <Scripts nonce={nonce} />
       </body>