feat(projects): by default, the error boundary is placed on the root …

…path
Ohh-889 · Aug 8, 2024 · e11d19d · e11d19d
1 parent 991b1c0
commit e11d19d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/route-core/dts.ts b/src/route-core/dts.ts
@@ -197,7 +197,7 @@ declare module "@elegant-router/types" {
     ? Omit<ElegantConstRoute, 'children'> & {
         name: K;
         path: RouteMap[K];
-        component: \`${LAYOUT_PREFIX}\${RouteLayout}$${VIEW_PREFIX}\${K}\`| \`${VIEW_PREFIX}\${LastLevelRouteKey}\`;
+        component: \`${LAYOUT_PREFIX}\${RouteLayout}$${VIEW_PREFIX}\${K}\`| \`${VIEW_PREFIX}\${LastLevelRouteKey}\`|\`${LAYOUT_PREFIX}\${RouteLayout}\`;
         children?:ElegantConstRoute[] ;
         layout?:${layoutType}
       }
@@ -257,7 +257,7 @@ declare module "@elegant-router/types" {
     ? Omit<ElegantConstRoute, 'children'> & {
         name: K;
         path: RouteMap[K];
-        component?: \`${VIEW_PREFIX}\${LastLevelRouteKey}\`| \`${VIEW_PREFIX}\${LastLevelRouteKey}\`;
+        component?: \`${VIEW_PREFIX}\${LastLevelRouteKey}\`;
         layout?:${layoutType}
       }
     : never;

diff --git a/src/route-core/transform.ts b/src/route-core/transform.ts
@@ -35,7 +35,7 @@ import type { FunctionComponent } from "react";
 import type { ElegantConstRoute } from '@ohh-889/react-auto-route';
 import type { RouteMap, RouteKey, RoutePath } from '@elegant-router/types';
 import { redirect } from 'react-router-dom'
-import ErrorBoundary  from '@/pages/_builtin/error' 
+import ErrorBoundary  from '../../../ErrorBoundary.tsx'
 
 
 type CustomRouteObject = Omit<RouteObject, 'Component'|'index'> & {
@@ -177,7 +177,7 @@ export function transformElegantRouteToReactRoute(
            const data= (await views[viewName]()).Component as FunctionComponent
             return {
             element: data(props) ,
-             ErrorBoundary
+            ErrorBoundary: null
             }
           }
         } else {