@umijs/renderer-react 4.0.0-rc.20 → 4.0.0-rc.23

package/dist/appContext.d.ts

@@ -1,4 +1,16 @@
 import React from 'react';
-export declare const AppContext: React.Context<any>;
-export declare function useAppData(): any;
+import { IClientRoute, ILoaderData, IRouteComponents, IRoutesById } from './types';
+interface IAppCentextType {
+    routes: IRoutesById;
+    routeComponents: IRouteComponents;
+    clientRoutes: IClientRoute[];
+    pluginManager: any;
+    rootElement?: HTMLElement;
+    basename?: string;
+    clientLoaderData: ILoaderData;
+    preloadRoute: (to: string) => void;
+}
+export declare const AppContext: React.Context<IAppCentextType>;
+export declare function useAppData(): IAppCentextType;
 export declare function useClientLoaderData(): any;
+export {};

package/dist/appContext.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useRouteData } from './routeContext';
-export const AppContext = React.createContext(null);
+export const AppContext = React.createContext({});
 export function useAppData() {
     return React.useContext(AppContext);
 }

package/dist/browser.js

@@ -75,6 +75,7 @@ export function renderClient(opts) {
             // @ts-ignore
             (route) => route.route.id)) || []).filter(Boolean);
             matchedRouteIds.forEach((id) => {
+                var _a;
                 // preload
                 // @ts-ignore
                 const manifest = window.__umi_manifest__;
@@ -102,7 +103,8 @@ export function renderClient(opts) {
                     }
                 }
                 // client loader
-                const clientLoader = opts.routes[id].clientLoader;
+                // onPatchClientRoutes 添加的 route 在 opts.routes 里是不存在的
+                const clientLoader = (_a = opts.routes[id]) === null || _a === void 0 ? void 0 : _a.clientLoader;
                 if (clientLoader && !clientLoaderData[id]) {
                     clientLoader().then((data) => {
                         setClientLoaderData((d) => ({ ...d, [id]: data }));

package/dist/link.js

@@ -4,5 +4,5 @@ import { useAppData } from './appContext';
 export function LinkWithPrefetch(props) {
     const appData = useAppData();
     const to = typeof props.to === 'string' ? props.to : props.to.pathname;
-    return (React.createElement(Link, { onMouseEnter: () => props.prefetch && appData.preloadRoute(to), ...props }, props.children));
+    return (React.createElement(Link, { onMouseEnter: () => props.prefetch && to && appData.preloadRoute(to), ...props }, props.children));
 }

package/dist/routeContext.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
+import { IRoute } from './types';
 export interface IRouteContextType {
-    route: any;
+    route: IRoute;
 }
 export declare const RouteContext: React.Context<IRouteContextType | undefined>;
 export declare function useRouteData(): IRouteContextType;

package/dist/routes.d.ts

@@ -1,27 +1,8 @@
 import React from 'react';
-import { IRoute, IRoutesById } from './types';
+import { IClientRoute, IRoutesById } from './types';
 export declare function createClientRoutes(opts: {
     routesById: IRoutesById;
     routeComponents: Record<string, any>;
     parentId?: string;
     loadingComponent?: React.ReactNode;
-}): {
-    parentId?: string | undefined;
-    clientLoader?: (() => Promise<any>) | undefined;
-    id: string;
-    path: string | undefined;
-    index: boolean | undefined;
-    element: JSX.Element;
-}[];
-export declare function createClientRoute(opts: {
-    route: IRoute;
-    routeComponent: any;
-    loadingComponent?: React.ReactNode;
-}): {
-    parentId?: string | undefined;
-    clientLoader?: (() => Promise<any>) | undefined;
-    id: string;
-    path: string | undefined;
-    index: boolean | undefined;
-    element: JSX.Element;
-};
+}): IClientRoute[];

package/dist/routes.js

@@ -20,23 +20,18 @@ export function createClientRoutes(opts) {
             loadingComponent: opts.loadingComponent,
         });
         if (children.length > 0) {
-            // @ts-ignore
             route.children = children;
             // TODO: remove me
             // compatible with @ant-design/pro-layout
-            // @ts-ignore
             route.routes = children;
         }
         return route;
     });
 }
-export function createClientRoute(opts) {
+function createClientRoute(opts) {
     const { route } = opts;
-    const { id, path, index, redirect, ...props } = route;
+    const { redirect, ...props } = route;
     return {
-        id: id,
-        path: path,
-        index: index,
         element: redirect ? (React.createElement(Navigate, { to: redirect })) : (React.createElement(RouteContext.Provider, { value: {
                 route: opts.route,
             } },

package/dist/types.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface IRoute {
     id: string;
     path?: string;
@@ -6,6 +7,16 @@ export interface IRoute {
     redirect?: string;
     clientLoader?: () => Promise<any>;
 }
+export interface IClientRoute {
+    id: string;
+    element: React.ReactNode;
+    children?: IClientRoute[];
+    routes?: IClientRoute[];
+    path?: string;
+    index?: boolean;
+    parentId?: string;
+    clientLoader?: () => Promise<any>;
+}
 export interface IRoutesById {
     [id: string]: IRoute;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.0-rc.20",
+  "version": "4.0.0-rc.23",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",