mirror of
https://github.com/Sonny93/my-links.git
synced 2025-12-08 22:53:25 +00:00
fix: issue when missing exporter layout
This commit is contained in:
@@ -20,9 +20,11 @@ createInertiaApp({
|
|||||||
import.meta.glob('../pages/**/*.tsx')
|
import.meta.glob('../pages/**/*.tsx')
|
||||||
);
|
);
|
||||||
|
|
||||||
currentPage.default.layout =
|
if (currentPage?.default) {
|
||||||
currentPage.default.layout ||
|
currentPage.default.layout =
|
||||||
((p: any) => <DefaultLayout children={p} />);
|
currentPage.default.layout ||
|
||||||
|
((p: any) => <DefaultLayout children={p} />);
|
||||||
|
}
|
||||||
|
|
||||||
return currentPage;
|
return currentPage;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -9,9 +9,13 @@ export default function render(page: any) {
|
|||||||
resolve: (name) => {
|
resolve: (name) => {
|
||||||
const pages = import.meta.glob('../pages/**/*.tsx', { eager: true });
|
const pages = import.meta.glob('../pages/**/*.tsx', { eager: true });
|
||||||
let pageComponent: any = pages[`../pages/${name}.tsx`];
|
let pageComponent: any = pages[`../pages/${name}.tsx`];
|
||||||
pageComponent.default.layout =
|
|
||||||
pageComponent?.default?.layout ||
|
if (pageComponent?.default) {
|
||||||
((pageChildren: any) => <DefaultLayout children={pageChildren} />);
|
pageComponent.default.layout =
|
||||||
|
pageComponent.default.layout ||
|
||||||
|
((pageChildren: any) => <DefaultLayout children={pageChildren} />);
|
||||||
|
}
|
||||||
|
|
||||||
return pageComponent;
|
return pageComponent;
|
||||||
},
|
},
|
||||||
setup: ({ App, props }) => <App {...props} />,
|
setup: ({ App, props }) => <App {...props} />,
|
||||||
|
|||||||
Reference in New Issue
Block a user