@umijs/renderer-react 4.0.0-canary.20220615.2 → 4.0.0-canary.20220628.1

package/dist/appContext.d.ts

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

package/dist/appContext.js

@@ -4,8 +4,13 @@ export const AppContext = React.createContext({});
 export function useAppData() {
     return React.useContext(AppContext);
 }
+export function useServerLoaderData() {
+    const route = useRouteData();
+    const appData = useAppData();
+    return { data: appData.serverLoaderData[route.route.id] };
+}
 export function useClientLoaderData() {
     const route = useRouteData();
     const appData = useAppData();
-    return appData.clientLoaderData[route.route.id];
+    return { data: appData.clientLoaderData[route.route.id] };
 }

package/dist/browser.d.ts

@@ -1,6 +1,7 @@
 import { History } from 'history';
 import React from 'react';
 import { IRouteComponents, IRoutesById } from './types';
+export declare function Routes(): React.ReactElement<any, string | React.JSXElementConstructor<any>> | null;
 export declare function renderClient(opts: {
     publicPath?: string;
     runtimePublicPath?: boolean;
@@ -11,4 +12,5 @@ export declare function renderClient(opts: {
     basename?: string;
     loadingComponent?: React.ReactNode;
     history: History;
+    hydrate?: boolean;
 }): void;

package/dist/browser.js

@@ -29,7 +29,7 @@ function BrowserRoutes(props) {
     }, [history, props.routes, props.clientRoutes]);
     return (React.createElement(Router, { navigator: history, location: state.location, basename: props.basename }, props.children));
 }
-function Routes() {
+export function Routes() {
     const { clientRoutes } = useAppData();
     return useRoutes(clientRoutes);
 }
@@ -68,10 +68,13 @@ export function renderClient(opts) {
     }
     const Browser = () => {
         const [clientLoaderData, setClientLoaderData] = useState({});
-        const handleRouteChange = useCallback((p) => {
+        const [serverLoaderData, setServerLoaderData] = useState(
+        // @ts-ignore
+        window.__UMI_LOADER_DATA__ || {});
+        const handleRouteChange = useCallback((id, isFirst) => {
             var _a;
             // Patched routes has to id
-            const matchedRouteIds = (((_a = matchRoutes(clientRoutes, p)) === null || _a === void 0 ? void 0 : _a.map(
+            const matchedRouteIds = (((_a = matchRoutes(clientRoutes, id)) === null || _a === void 0 ? void 0 : _a.map(
             // @ts-ignore
             (route) => route.route.id)) || []).filter(Boolean);
             matchedRouteIds.forEach((id) => {
@@ -102,6 +105,19 @@ export function renderClient(opts) {
                         document.head.appendChild(link);
                     }
                 }
+                // server loader
+                if (!isFirst && opts.routes[id].hasServerLoader) {
+                    fetch('/__serverLoader?route=' + id)
+                        .then((d) => d.json())
+                        .then((data) => {
+                        // setServerLoaderData when startTransition because if ssr is enabled,
+                        // the component may being hydrated and setLoaderData will break the hydration
+                        React.startTransition(() => {
+                            setServerLoaderData((d) => ({ ...d, [id]: data }));
+                        });
+                    })
+                        .catch(console.error);
+                }
                 // client loader
                 // onPatchClientRoutes 添加的 route 在 opts.routes 里是不存在的
                 const clientLoader = (_a = opts.routes[id]) === null || _a === void 0 ? void 0 : _a.clientLoader;
@@ -113,7 +129,7 @@ export function renderClient(opts) {
             });
         }, [clientLoaderData]);
         useEffect(() => {
-            handleRouteChange(window.location.pathname);
+            handleRouteChange(window.location.pathname, true);
             return opts.history.listen((e) => {
                 handleRouteChange(e.location.pathname);
             });
@@ -126,14 +142,20 @@ export function renderClient(opts) {
                 rootElement: opts.rootElement,
                 basename,
                 clientLoaderData,
+                serverLoaderData,
                 preloadRoute: handleRouteChange,
             } }, rootContainer));
     };
-    if (ReactDOM.createRoot) {
-        ReactDOM.createRoot(rootElement).render(React.createElement(Browser, null));
+    if (opts.hydrate) {
+        ReactDOM.hydrateRoot(rootElement, React.createElement(Browser, null));
     }
     else {
-        // @ts-ignore
-        ReactDOM.render(React.createElement(Browser, null), rootElement);
+        if (ReactDOM.createRoot) {
+            ReactDOM.createRoot(rootElement).render(React.createElement(Browser, null));
+        }
+        else {
+            // @ts-ignore
+            ReactDOM.render(React.createElement(Browser, null), rootElement);
+        }
     }
 }

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export { createBrowserHistory, createHashHistory, createMemoryHistory, History, } from 'history';
 export { createSearchParams, matchPath, matchRoutes, Navigate, NavLink, Outlet, resolvePath, useLocation, useMatch, useNavigate, useOutlet, useOutletContext, useParams, useResolvedPath, useRoutes, useSearchParams, } from 'react-router-dom';
-export { useAppData, useClientLoaderData } from './appContext';
+export { useAppData, useClientLoaderData, useServerLoaderData, } from './appContext';
 export { renderClient } from './browser';
 export { LinkWithPrefetch as Link } from './link';
 export { useRouteData } from './routeContext';
+export { __useFetcher } from './useFetcher';

package/dist/index.js

@@ -1,6 +1,7 @@
 export { createBrowserHistory, createHashHistory, createMemoryHistory, } from 'history';
 export { createSearchParams, matchPath, matchRoutes, Navigate, NavLink, Outlet, resolvePath, useLocation, useMatch, useNavigate, useOutlet, useOutletContext, useParams, useResolvedPath, useRoutes, useSearchParams, } from 'react-router-dom';
-export { useAppData, useClientLoaderData } from './appContext';
+export { useAppData, useClientLoaderData, useServerLoaderData, } from './appContext';
 export { renderClient } from './browser';
 export { LinkWithPrefetch as Link } from './link';
 export { useRouteData } from './routeContext';
+export { __useFetcher } from './useFetcher';

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 && to && appData.preloadRoute(to), ...props }, props.children));
+    return (React.createElement(Link, { onMouseEnter: () => { var _a; return props.prefetch && to && ((_a = appData.preloadRoute) === null || _a === void 0 ? void 0 : _a.call(appData, to)); }, ...props }, props.children));
 }

package/dist/routes.js

@@ -1,5 +1,4 @@
 // @ts-ignore
-import loadable from '@loadable/component';
 import React from 'react';
 import { Navigate } from 'react-router-dom';
 import { RouteContext } from './routeContext';
@@ -43,8 +42,19 @@ function DefaultLoading() {
     return React.createElement("div", null);
 }
 function RemoteComponent(props) {
-    const Component = loadable(props.loader, {
-        fallback: React.createElement(props.loadingComponent, null),
-    });
-    return React.createElement(Component, null);
+    const useSuspense = true; // !!React.startTransition;
+    if (useSuspense) {
+        const Component = props.loader;
+        return (React.createElement(React.Suspense, { fallback: React.createElement(props.loadingComponent, null) },
+            React.createElement(Component, null)));
+    }
+    else {
+        return null;
+        // // @ts-ignore
+        //     import loadable from '@loadable/component';
+        //     const Component = loadable(props.loader, {
+        //       fallback: <props.loadingComponent />,
+        //     });
+        //     return <Component />;
+    }
 }

package/dist/server.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="react" />
+import { IRouteComponents, IRoutesById } from './types';
+export declare function getClientRootComponent(opts: {
+    routes: IRoutesById;
+    routeComponents: IRouteComponents;
+    pluginManager: any;
+    location: string;
+    loaderData: {
+        [routeKey: string]: any;
+    };
+    manifest: any;
+}): Promise<JSX.Element>;

package/dist/server.js

@@ -0,0 +1,59 @@
+import React from 'react';
+import { StaticRouter } from 'react-router-dom/server';
+import { AppContext } from './appContext';
+import { Routes } from './browser';
+import { createClientRoutes } from './routes';
+// Get the root React component for ReactDOMServer.renderToString
+export async function getClientRootComponent(opts) {
+    const basename = '/';
+    const components = { ...opts.routeComponents };
+    const clientRoutes = createClientRoutes({
+        routesById: opts.routes,
+        routeComponents: components,
+    });
+    let rootContainer = (React.createElement(StaticRouter, { basename: basename, location: opts.location },
+        React.createElement(Routes, null)));
+    for (const key of [
+        // Lowest to the highest priority
+        'innerProvider',
+        'i18nProvider',
+        'accessProvider',
+        'dataflowProvider',
+        'outerProvider',
+        'rootContainer',
+    ]) {
+        rootContainer = opts.pluginManager.applyPlugins({
+            type: 'modify',
+            key: key,
+            initialValue: rootContainer,
+            args: {},
+        });
+    }
+    return (React.createElement(Html, { loaderData: opts.loaderData, manifest: opts.manifest },
+        React.createElement(AppContext.Provider, { value: {
+                routes: opts.routes,
+                routeComponents: opts.routeComponents,
+                clientRoutes,
+                pluginManager: opts.pluginManager,
+                basename,
+                clientLoaderData: {},
+                serverLoaderData: opts.loaderData,
+            } }, rootContainer)));
+}
+function Html({ children, loaderData, manifest }) {
+    // TODO: 处理 head 标签，比如 favicon.ico 的一致性
+    // TODO: root 支持配置
+    return (React.createElement("html", { lang: "en" },
+        React.createElement("head", null,
+            React.createElement("meta", { charSet: "utf-8" }),
+            React.createElement("meta", { name: "viewport", content: "width=device-width, initial-scale=1" }),
+            manifest.assets['umi.css'] && (React.createElement("link", { rel: "stylesheet", href: manifest.assets['umi.css'] }))),
+        React.createElement("body", null,
+            React.createElement("noscript", { dangerouslySetInnerHTML: {
+                    __html: `<b>Enable JavaScript to run this app.</b>`,
+                } }),
+            React.createElement("div", { id: "root" }, children),
+            React.createElement("script", { dangerouslySetInnerHTML: {
+                    __html: `window.__UMI_LOADER_DATA__ = ${JSON.stringify(loaderData)}`,
+                } }))));
+}

package/dist/types.d.ts

@@ -6,6 +6,7 @@ export interface IRoute {
     parentId?: string;
     redirect?: string;
     clientLoader?: () => Promise<any>;
+    hasServerLoader?: boolean;
 }
 export interface IClientRoute {
     id: string;

package/dist/useFetcher.d.ts

@@ -0,0 +1,3 @@
+export declare function __useFetcher(): {
+    load(path?: string): void;
+};

package/dist/useFetcher.js

@@ -0,0 +1,11 @@
+import { useLocation } from 'react-router-dom';
+import { useAppData } from './appContext';
+export function __useFetcher() {
+    const { preloadRoute } = useAppData();
+    const location = useLocation();
+    return {
+        load(path) {
+            preloadRoute(path || location.pathname);
+        },
+    };
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.0-canary.20220615.2",
+  "version": "4.0.0-canary.20220628.1",
   "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",
+  "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
+  "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/umijs/umi-next"
+    "url": "https://github.com/umijs/umi"
   },
   "license": "MIT",
   "sideEffects": false,
@@ -18,7 +18,7 @@
   "scripts": {
     "build": "pnpm tsc",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build -- --watch",
+    "dev": "pnpm build --watch",
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {