adjust err handling

payloadcms · Oct 7, 2024 · 633aaa7 · 633aaa7
1 parent 860b6cf
commit 633aaa7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/examples/custom-components/src/app/(payload)/layout.tsx b/examples/custom-components/src/app/(payload)/layout.tsx
@@ -1,6 +1,6 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import configPromise from '@payload-config'
+import config from '@payload-config'
 import '@payloadcms/next/css'
 import { RootLayout } from '@payloadcms/next/layouts'
 import React from 'react'
@@ -13,7 +13,7 @@ type Args = {
 }
 
 const Layout = ({ children }: Args) => (
-  <RootLayout config={configPromise} importMap={importMap}>
+  <RootLayout config={config} importMap={importMap}>
     {children}
   </RootLayout>
 )

diff --git a/examples/multi-tenant-single-domain/src/app/(payload)/layout.tsx b/examples/multi-tenant-single-domain/src/app/(payload)/layout.tsx
@@ -1,6 +1,6 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import configPromise from '@payload-config'
+import config from '@payload-config'
 import '@payloadcms/next/css'
 import { RootLayout } from '@payloadcms/next/layouts'
 import React from 'react'
@@ -13,7 +13,7 @@ type Args = {
 }
 
 const Layout = ({ children }: Args) => (
-  <RootLayout config={configPromise} importMap={importMap}>
+  <RootLayout config={config} importMap={importMap}>
     {children}
   </RootLayout>
 )

diff --git a/packages/ui/src/providers/ServerFunctions/index.tsx b/packages/ui/src/providers/ServerFunctions/index.tsx
@@ -46,14 +46,12 @@ export const ServerFunctionsProvider: React.FC<{
             args: rest,
           })) as ReturnType<typeof buildFormState> // TODO: infer this type when `strictNullChecks` is enabled
 
-          if (signal?.aborted) {
-            throw new Error('Request was aborted, ignoring result')
+          if (!signal?.aborted) {
+            return result
           }
-
-          return result
         }
-      } catch (error) {
-        console.error(error) // eslint-disable-line no-console
+      } catch (_err) {
+        // swallow error
       }
 
       return { state: args.formState }

diff --git a/templates/_template/src/app/(payload)/layout.tsx b/templates/_template/src/app/(payload)/layout.tsx
@@ -1,7 +1,5 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import type { ServerFunctionClient } from 'payload'
-
 import config from '@payload-config'
 import '@payloadcms/next/css'
 import { RootLayout } from '@payloadcms/next/layouts'