diff --git a/inertia/app/app.tsx b/inertia/app/app.tsx index f0e47c8..f1c6044 100644 --- a/inertia/app/app.tsx +++ b/inertia/app/app.tsx @@ -20,9 +20,11 @@ createInertiaApp({ import.meta.glob('../pages/**/*.tsx') ); - currentPage.default.layout = - currentPage.default.layout || - ((p: any) => ); + if (currentPage?.default) { + currentPage.default.layout = + currentPage.default.layout || + ((p: any) => ); + } return currentPage; }, diff --git a/inertia/app/ssr.tsx b/inertia/app/ssr.tsx index 907e5ee..648d92b 100644 --- a/inertia/app/ssr.tsx +++ b/inertia/app/ssr.tsx @@ -9,9 +9,13 @@ export default function render(page: any) { resolve: (name) => { const pages = import.meta.glob('../pages/**/*.tsx', { eager: true }); let pageComponent: any = pages[`../pages/${name}.tsx`]; - pageComponent.default.layout = - pageComponent?.default?.layout || - ((pageChildren: any) => ); + + if (pageComponent?.default) { + pageComponent.default.layout = + pageComponent.default.layout || + ((pageChildren: any) => ); + } + return pageComponent; }, setup: ({ App, props }) => ,