@shuvi/platform-web 1.0.0-rc.4 → 1.0.0-rc.5

package/esm/shared/renderTypes.d.ts

@@ -1,10 +1,10 @@
 import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
 import { Response, IApplication, IRequest, IAppData } from '@shuvi/platform-shared/shared';
-export declare type IRenderDocumentOptions = {
+export declare type IRenderViewOptions = {
     app: IApplication;
     req?: IRequest;
 };
-export interface IRenderOptions extends IRenderDocumentOptions {
+export interface IRenderOptions extends IRenderViewOptions {
 }
 export interface IView<RenderOption extends IRenderOptions = any, RenderResult = void> {
     renderApp(options: RenderOption): RenderResult;

package/esm/shuvi-app/app/client.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { getRoutes } from '@shuvi/app/core/platform';
-import { runPreload, runLoaders, getRouteMatchesWithInvalidLoader, getLoaderManager, isRedirect, isResponse } from '@shuvi/platform-shared/shared';
+import { runPreload, runLoaders, getRouteMatchesWithInvalidLoader, isRedirect, isResponse } from '@shuvi/platform-shared/shared';
 import application, { Application } from '@shuvi/platform-shared/shuvi-app/application';
 import { createRouter, createBrowserHistory, createHashHistory } from '@shuvi/router';
 import pageLoaders from '@shuvi/app/files/page-loaders';
@@ -21,7 +21,7 @@ export const createApp = ({ routes, appData, appComponent }) => {
     if (app) {
         return app;
     }
-    const { loadersData = {}, appState, ssr } = appData;
+    const { appState, ssr } = appData;
     let history;
     if (historyMode === 'hash') {
         history = createHashHistory();
@@ -38,14 +38,14 @@ export const createApp = ({ routes, appData, appComponent }) => {
         AppComponent: appComponent,
         router
     });
+    const loadersData = app.getLoadersData();
     const hasHydrateData = Object.keys(loadersData).length > 0;
-    const loaderManager = getLoaderManager();
     let shouldHydrate = ssr && hasHydrateData;
-    let hasServerError = app.error.hasError;
+    let hasServerError = !!app.error;
     router.beforeResolve((to, from, next) => __awaiter(void 0, void 0, void 0, function* () {
         if (shouldHydrate) {
             shouldHydrate = false;
-            loaderManager.setDatas(loadersData);
+            app.setLoadersData(loadersData);
             return next();
         }
         if (hasServerError) {
@@ -53,7 +53,7 @@ export const createApp = ({ routes, appData, appComponent }) => {
             return next();
         }
         if (!to.matches.length) {
-            app.error.error(SHUVI_ERROR.PAGE_NOT_FOUND);
+            app.setError(SHUVI_ERROR.PAGE_NOT_FOUND);
             next();
             return;
         }
@@ -96,7 +96,7 @@ export const createApp = ({ routes, appData, appComponent }) => {
                     tryResolve();
                 });
             });
-            loaderManager.setDatas(loaderDatas);
+            app.setLoadersData(loaderDatas);
         }
         catch (error) {
             if (isRedirect(error)) {
@@ -104,14 +104,14 @@ export const createApp = ({ routes, appData, appComponent }) => {
                 return;
             }
             if (isResponse(error) && error.status >= 400 && error.status < 600) {
-                app.error.error({
+                app.setError({
                     code: error.status,
                     message: error.data
                 });
                 next();
                 return;
             }
-            app.error.error({
+            app.setError({
                 code: SHUVI_ERROR.APP_ERROR.code,
                 message: error.message || isPreloadError ? 'Preload Error' : 'Loader Error'
             });
@@ -119,7 +119,7 @@ export const createApp = ({ routes, appData, appComponent }) => {
             return;
         }
         next(() => {
-            app.error.clear();
+            app.clearError();
         });
     }));
     return app;

package/esm/shuvi-app/app/server.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import routes from '@shuvi/app/files/routes';
 import { getRoutes, app as AppComponent } from '@shuvi/app/core/platform';
-import { runLoaders, getRouteMatchesWithInvalidLoader, isResponse, isRedirect, getLoaderManager } from '@shuvi/platform-shared/shared';
+import { runLoaders, getRouteMatchesWithInvalidLoader, isResponse, isRedirect } from '@shuvi/platform-shared/shared';
 import pageLoaders from '@shuvi/app/files/page-loaders';
 import application from '@shuvi/platform-shared/shuvi-app/application';
 import { createRouter, createMemoryHistory } from '@shuvi/router';
@@ -24,7 +24,6 @@ export const createApp = options => {
         routes: getRoutes(routes)
     });
     let app;
-    const loaderManager = getLoaderManager();
     if (ssr) {
         router.beforeResolve((to, from, next) => __awaiter(void 0, void 0, void 0, function* () {
             const matches = getRouteMatchesWithInvalidLoader(to, from, pageLoaders);
@@ -35,7 +34,7 @@ export const createApp = options => {
                     query: to.query,
                     getAppContext: () => app.context
                 });
-                loaderManager.setDatas(loaderResult);
+                app.setLoadersData(loaderResult);
             }
             catch (error) {
                 if (isRedirect(error)) {
@@ -43,14 +42,14 @@ export const createApp = options => {
                     return;
                 }
                 if (isResponse(error) && error.status >= 400 && error.status < 600) {
-                    app.error.error({
+                    app.setError({
                         code: error.status,
                         message: error.data
                     });
                     next();
                     return;
                 }
-                app.error.error({
+                app.setError({
                     message: error.message || 'Loader Error'
                 });
                 next();

package/esm/shuvi-app/react/AppContainer.d.ts

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { IApplication } from '@shuvi/platform-shared/shared';
-export default function AppContainer({ children, app }: {
+export default function AppContainer({ app, children }: React.PropsWithChildren<{
     app: IApplication;
-    children: React.ReactElement;
-}): JSX.Element;
+}>): JSX.Element;

package/esm/shuvi-app/react/AppContainer.jsx

@@ -1,10 +1,9 @@
 import * as React from 'react';
 import { errorModel } from '@shuvi/platform-shared/shared';
-import { createContainer } from '@shuvi/redox-react';
 import { AppProvider } from './applicationContext';
 import ErrorPage from './ErrorPage';
 import { ErrorBoundary } from './ErrorBoundary';
-const { Provider, useSharedModel } = createContainer();
+import { Provider, useSharedModel } from './store';
 function ErrorGuard({ children = null }) {
     const [errorState] = useSharedModel(errorModel);
     if (errorState.error !== undefined) {
@@ -12,10 +11,10 @@ function ErrorGuard({ children = null }) {
     }
     return <>{children}</>;
 }
-export default function AppContainer({ children, app }) {
+export default function AppContainer({ app, children }) {
     return (<ErrorBoundary>
       <AppProvider app={app}>
-        <Provider storeManager={app.storeManager}>
+        <Provider storeManager={app.store}>
           <ErrorGuard>{children}</ErrorGuard>
         </Provider>
       </AppProvider>

package/esm/shuvi-app/react/redox-react/RedoxWrapper.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import type { IStoreManager } from '@shuvi/redox';
 export declare const RedoxWrapper: (App: any, appContext: {
-    storeManager: IStoreManager;
+    store: IStoreManager;
 }) => {
-    (appProps: any): JSX.Element;
+    (): JSX.Element;
     displayName: string;
 };

package/esm/shuvi-app/react/redox-react/RedoxWrapper.jsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { RedoxRoot } from '@shuvi/redox-react';
 export const RedoxWrapper = (App, appContext) => {
-    function RedoxAppWrapper(appProps) {
-        return (<RedoxRoot storeManager={appContext.storeManager}>
-        <App {...appProps}/>
+    function RedoxAppWrapper() {
+        return (<RedoxRoot storeManager={appContext.store}>
+        <App />
       </RedoxRoot>);
     }
     RedoxAppWrapper.displayName = 'RedoxAppWrapper';

package/esm/shuvi-app/react/redox-react/runtime.js

@@ -12,7 +12,7 @@ import { RedoxWrapper } from './RedoxWrapper';
 export default createRuntimePlugin({
     appComponent: (App, appContext) => __awaiter(void 0, void 0, void 0, function* () {
         return RedoxWrapper(App, {
-            storeManager: appContext.store
+            store: appContext.store
         });
     })
 });

package/esm/shuvi-app/react/store.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+declare const Provider: (props: import("react").PropsWithChildren<{
+    storeManager?: import("@shuvi/redox").IStoreManager | undefined;
+}>) => JSX.Element, useSharedModel: import("@shuvi/redox-react/esm/types").IUseModel;
+export { Provider, useSharedModel };

package/esm/shuvi-app/react/store.js

@@ -0,0 +1,3 @@
+import { createContainer } from '@shuvi/redox-react';
+const { Provider, useSharedModel } = createContainer();
+export { Provider, useSharedModel };

package/esm/shuvi-app/react/types.d.ts

@@ -1,14 +1,7 @@
-import { IAppState } from '@shuvi/platform-shared/shared';
 import { IHtmlTag, IViewClient, IViewServer } from '../../shared';
 export { IHtmlTag };
 export declare type IReactAppData = {
-    appProps?: Record<string, any>;
-    errorProps?: {
-        notFound: boolean;
-    };
     dynamicIds?: Array<string | number>;
-    appState?: IAppState;
-    loadersData: any;
 };
 export declare type IReactServerView = IViewServer<IReactAppData>;
 export declare type IReactClientView = IViewClient<IReactAppData>;

package/esm/shuvi-app/react/useLoaderData.js

@@ -1,27 +1,18 @@
 import { useMatchedRoute } from '@shuvi/router-react';
-import { getLoaderManager } from '@shuvi/platform-shared/shared';
-import { useRef, useEffect, useReducer } from 'react';
+import { loaderModel } from '@shuvi/platform-shared/shared';
+import { useSharedModel } from './store';
 export const noLoaderMessage = 'Warning: no loader found. Please make sure the page component where `useLoaderData` is called has a `loader` export.';
 export const useLoaderData = () => {
-    var _a;
     const currentMatch = useMatchedRoute();
-    const loaderManager = getLoaderManager();
-    const id = (_a = currentMatch.route) === null || _a === void 0 ? void 0 : _a.id;
-    const data = loaderManager.getData(id);
-    if (data === null) {
+    const id = currentMatch.route.id;
+    const [loader] = useSharedModel(loaderModel, s => {
+        return {
+            hasLoader: Object.prototype.hasOwnProperty.call(s.dataByRouteId, id),
+            data: s.dataByRouteId[id]
+        };
+    }, [id]);
+    if (!loader.hasLoader) {
         throw Error(noLoaderMessage);
     }
-    const dataRef = useRef(data);
-    const [_, forceUpdate] = useReducer(state => state * -1, 1);
-    useEffect(() => {
-        const cancel = loaderManager.subscribe(() => {
-            const newData = loaderManager.getData(id);
-            if (newData !== data) {
-                dataRef.current = newData;
-                forceUpdate();
-            }
-        });
-        return cancel;
-    }, []);
-    return dataRef.current;
+    return loader.data;
 };

package/esm/shuvi-app/react/view/ReactView.client.jsx

@@ -20,8 +20,8 @@ export class ReactClientView {
         this._isInitialRender = true;
         this.renderApp = ({ appContainer, app, appData }) => __awaiter(this, void 0, void 0, function* () {
             const { _isInitialRender: isInitialRender } = this;
-            const { router, appComponent: AppComponent, error } = app;
-            let { ssr, appProps, dynamicIds } = appData;
+            const { router, appComponent: AppComponent, setError: setAppError } = app;
+            let { ssr, dynamicIds } = appData;
             // For e2e test
             if (window.__SHUVI) {
                 window.__SHUVI.router = router;
@@ -39,13 +39,13 @@ export class ReactClientView {
                 const { matches } = router.current;
                 if (!matches.length) {
                     // no handler no matches
-                    error.error(SHUVI_ERROR.PAGE_NOT_FOUND);
+                    setAppError(SHUVI_ERROR.PAGE_NOT_FOUND);
                 }
             }
             const root = (<Router router={router}>
         <AppContainer app={app}>
           <HeadManagerContext.Provider value={headManager.updateHead}>
-            <TypedAppComponent {...appProps}/>
+            <TypedAppComponent />
           </HeadManagerContext.Provider>
         </AppContainer>
       </Router>);

package/esm/shuvi-app/react/view/ReactView.server.jsx

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import * as React from 'react';
 import { renderToString } from 'react-dom/server';
-import { getLoaderManager, redirect } from '@shuvi/platform-shared/shared';
+import { redirect } from '@shuvi/platform-shared/shared';
 import { SHUVI_ERROR } from '@shuvi/shared/lib/constants';
 import { Router } from '@shuvi/router-react';
 import Loadable, { LoadableContext } from '../loadable';
@@ -19,20 +19,17 @@ export class ReactServerView {
     constructor() {
         this.renderApp = ({ app, manifest, getAssetPublicUrl }) => __awaiter(this, void 0, void 0, function* () {
             yield Loadable.preloadAll();
-            const { storeManager, router, error: appError, appComponent: AppComponent } = app;
+            const { router, appComponent: AppComponent, setError: setAppError } = app;
             yield router.ready;
             // todo: move these into renderer
             let { pathname, matches, redirected } = router.current;
             // handler no matches
             if (!matches.length) {
-                appError.error(SHUVI_ERROR.PAGE_NOT_FOUND);
+                setAppError(SHUVI_ERROR.PAGE_NOT_FOUND);
             }
             if (redirected) {
                 return redirect(pathname);
             }
-            // todo: move loader into app, avoid using global module
-            const loaderManager = getLoaderManager();
-            const loadersData = yield loaderManager.getAllData();
             const loadableModules = [];
             let htmlContent;
             let head;
@@ -47,7 +44,6 @@ export class ReactServerView {
                 htmlContent = renderToString(RootApp);
             }
             finally {
-                loaderManager.clearAllData();
                 head = Head.rewind() || [];
             }
             const { loadble } = manifest;
@@ -88,13 +84,11 @@ export class ReactServerView {
                 }
             }
             const appData = {
-                dynamicIds: [...dynamicImportIdSet],
-                loadersData
+                dynamicIds: [...dynamicImportIdSet]
             };
             if (dynamicImportIdSet.size) {
                 appData.dynamicIds = Array.from(dynamicImportIdSet);
             }
-            appData.appState = storeManager.getState();
             return {
                 appData,
                 content: htmlContent,

package/lib/node/features/html-render/index.js

@@ -74,7 +74,7 @@ const getPlugin = (platformContext) => {
                 exported: '*'
             },
             {
-                source: (0, paths_1.resolvePkgFile)('esm/shuvi-app/shuvi-runtime-server'),
+                source: (0, paths_1.resolvePkgFile)('lib/node/shuvi-runtime-server'),
                 filepath: 'server.ts',
                 exported: '*'
             }

package/lib/node/features/html-render/lib/index.d.ts

@@ -1,4 +1,3 @@
 export { getPageMiddleware } from './getPageMiddleware';
-export { renderToHTML } from './renderToHTML';
 export * from './renderer';
 export * from './pageLoader';

package/lib/node/features/html-render/lib/index.js

@@ -14,10 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderToHTML = exports.getPageMiddleware = void 0;
+exports.getPageMiddleware = void 0;
 var getPageMiddleware_1 = require("./getPageMiddleware");
 Object.defineProperty(exports, "getPageMiddleware", { enumerable: true, get: function () { return getPageMiddleware_1.getPageMiddleware; } });
-var renderToHTML_1 = require("./renderToHTML");
-Object.defineProperty(exports, "renderToHTML", { enumerable: true, get: function () { return renderToHTML_1.renderToHTML; } });
 __exportStar(require("./renderer"), exports);
 __exportStar(require("./pageLoader"), exports);

package/lib/node/features/html-render/lib/renderToHTML.js

@@ -11,38 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderToHTML = void 0;
 const resources_1 = require("@shuvi/service/lib/resources");
-const shared_1 = require("@shuvi/platform-shared/shared");
 const renderer_1 = require("./renderer");
-const htmlTag_1 = require("./renderer/htmlTag");
-function addEssentialTagsIfMissing(document) {
-    let hasMetaCharset = false;
-    let hasMetaViewport = false;
-    for (const { tagName, attrs } of document.headTags) {
-        if (hasMetaCharset && hasMetaViewport) {
-            break;
-        }
-        if (tagName === 'meta') {
-            if (attrs.charset) {
-                hasMetaCharset = true;
-            }
-            else if (attrs.name === 'viewport') {
-                hasMetaViewport = true;
-            }
-        }
-    }
-    if (!hasMetaCharset) {
-        document.headTags.unshift((0, htmlTag_1.tag)('meta', {
-            charset: 'utf-8'
-        }));
-    }
-    if (!hasMetaViewport) {
-        document.headTags.unshift((0, htmlTag_1.tag)('meta', {
-            name: 'viewport',
-            content: 'width=device-width,minimum-scale=1,initial-scale=1'
-        }));
-    }
-    return document;
-}
 function renderToHTML({ req, serverPluginContext }) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
@@ -54,23 +23,11 @@ function renderToHTML({ req, serverPluginContext }) {
         });
         try {
             yield app.init();
-            const publicApp = app.getPublicAPI();
-            let doc = yield renderer.renderDocument({
-                app: publicApp,
-                req
+            result = yield renderer.renderView({
+                req,
+                app: app.getPublicAPI(),
+                ssr: serverPluginContext.config.ssr
             });
-            if ((0, shared_1.isResponse)(doc)) {
-                result = doc;
-            }
-            else {
-                addEssentialTagsIfMissing(doc);
-                yield serverPluginContext.serverPluginRunner.modifyHtml(doc, app.context);
-                const htmlStr = renderer.renderDocumentToString(doc);
-                const appError = app.error.getError;
-                result = (0, shared_1.text)(htmlStr, {
-                    status: appError && typeof appError.code !== 'undefined' ? appError.code : 200
-                });
-            }
         }
         finally {
             yield app.dispose();

package/lib/node/features/html-render/lib/renderer/base.d.ts

@@ -1,13 +1,13 @@
-import { IAppData, Response } from '@shuvi/platform-shared/shared';
+import { IAppData } from '@shuvi/platform-shared/shared';
 import { IServerPluginContext } from '@shuvi/service';
-import { IHtmlDocument, IHtmlTag, IApplication } from './types';
-import { IRendererConstructorOptions, IRenderDocumentOptions } from './types';
+import { IHtmlTag, IApplication } from './types';
+import { IRendererConstructorOptions, IRenderViewOptions, IRenderDocumentResult } from './types';
 export declare type AppData = Omit<IAppData, 'filesByRoutId' | 'publicPath'>;
 export declare abstract class BaseRenderer {
     protected _serverPluginContext: IServerPluginContext;
     protected _app?: IApplication;
     constructor({ serverPluginContext }: IRendererConstructorOptions);
-    abstract renderDocument({ app, req }: IRenderDocumentOptions): Promise<IHtmlDocument | Response> | IHtmlDocument | Response;
+    abstract renderDocument({ app, req }: IRenderViewOptions): IRenderDocumentResult;
     protected _getMainAssetTags(): {
         styles: IHtmlTag<any>[];
         scripts: IHtmlTag<any>[];

package/lib/node/features/html-render/lib/renderer/index.d.ts

@@ -1,5 +1,5 @@
-import { IRendererConstructorOptions, IRenderDocumentOptions } from './types';
-import { IHtmlDocument } from './types';
+import { Response } from '@shuvi/platform-shared/shared';
+import { IRendererConstructorOptions, IRenderViewOptions } from './types';
 export * from './types';
 export interface ITemplateData {
     [x: string]: any;
@@ -10,6 +10,7 @@ export declare class Renderer {
     private _ssrRenderer;
     private _spaRenderer;
     constructor(options: IRendererConstructorOptions);
-    renderDocument(options: IRenderDocumentOptions): import("@shuvi/platform-shared/shared").Response | IHtmlDocument | Promise<import("@shuvi/platform-shared/shared").Response | IHtmlDocument>;
-    renderDocumentToString(document: IHtmlDocument, templateData?: ITemplateData): string;
+    renderView(options: IRenderViewOptions): Promise<Response>;
+    private _renderDocument;
+    private _renderDocumentToString;
 }

package/lib/node/features/html-render/lib/renderer/index.js

@@ -13,14 +13,54 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Renderer = void 0;
 const resources_1 = require("@shuvi/service/lib/resources");
+const shared_1 = require("@shuvi/platform-shared/shared");
 const htmlTag_1 = require("./htmlTag");
 const viewTemplate_1 = require("../viewTemplate");
 const spa_1 = require("./spa");
 const ssr_1 = require("./ssr");
+const htmlTag_2 = require("./htmlTag");
 __exportStar(require("./types"), exports);
+function addEssentialTagsIfMissing(document) {
+    let hasMetaCharset = false;
+    let hasMetaViewport = false;
+    for (const { tagName, attrs } of document.headTags) {
+        if (hasMetaCharset && hasMetaViewport) {
+            break;
+        }
+        if (tagName === 'meta') {
+            if (attrs.charset) {
+                hasMetaCharset = true;
+            }
+            else if (attrs.name === 'viewport') {
+                hasMetaViewport = true;
+            }
+        }
+    }
+    if (!hasMetaCharset) {
+        document.headTags.unshift((0, htmlTag_2.tag)('meta', {
+            charset: 'utf-8'
+        }));
+    }
+    if (!hasMetaViewport) {
+        document.headTags.unshift((0, htmlTag_2.tag)('meta', {
+            name: 'viewport',
+            content: 'width=device-width,minimum-scale=1,initial-scale=1'
+        }));
+    }
+    return document;
+}
 class Renderer {
     constructor(options) {
         this._serverPluginContext = options.serverPluginContext;
@@ -28,13 +68,36 @@ class Renderer {
         this._ssrRenderer = new ssr_1.SsrRenderer(options);
         this._spaRenderer = new spa_1.SpaRenderer(options);
     }
-    renderDocument(options) {
-        if (this._serverPluginContext.config.ssr) {
-            return this._ssrRenderer.renderDocument(options);
-        }
-        return this._spaRenderer.renderDocument(options);
+    renderView(options) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            let result;
+            const { app } = options;
+            const doc = yield this._renderDocument(options);
+            if ((0, shared_1.isResponse)(doc)) {
+                result = doc;
+            }
+            else {
+                addEssentialTagsIfMissing(doc);
+                yield this._serverPluginContext.serverPluginRunner.modifyHtml(doc, app.context);
+                const htmlStr = this._renderDocumentToString(doc);
+                result = (0, shared_1.text)(htmlStr, {
+                    status: (_b = (_a = app.error) === null || _a === void 0 ? void 0 : _a.code) !== null && _b !== void 0 ? _b : 200
+                });
+            }
+            return result;
+        });
+    }
+    _renderDocument(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // todo: fallback to spa
+            if (options.ssr) {
+                return yield this._ssrRenderer.renderDocument(options);
+            }
+            return yield this._spaRenderer.renderDocument(options);
+        });
     }
-    renderDocumentToString(document, templateData = {}) {
+    _renderDocumentToString(document, templateData = {}) {
         const htmlAttrs = (0, htmlTag_1.stringifyAttrs)(document.htmlAttrs);
         const head = document.headTags.map(tag => (0, htmlTag_1.stringifyTag)(tag)).join('');
         const main = document.mainTags.map(tag => (0, htmlTag_1.stringifyTag)(tag)).join('');

package/lib/node/features/html-render/lib/renderer/spa.d.ts

@@ -1,5 +1,5 @@
 import { BaseRenderer } from './base';
-import { IRenderDocumentOptions, IHtmlDocument } from './types';
+import { IRenderViewOptions, IHtmlDocument } from './types';
 export declare class SpaRenderer extends BaseRenderer {
-    renderDocument({ app }: IRenderDocumentOptions): IHtmlDocument;
+    renderDocument({ app }: IRenderViewOptions): IHtmlDocument;
 }

package/lib/node/features/html-render/lib/renderer/spa.js

@@ -5,11 +5,9 @@ const base_1 = require("./base");
 class SpaRenderer extends base_1.BaseRenderer {
     renderDocument({ app }) {
         const assets = this._getMainAssetTags();
-        const serverPluginContext = this._serverPluginContext;
         const appData = {
-            pageData: {},
-            ssr: serverPluginContext.config.ssr,
-            loadersData: {}
+            ssr: false,
+            pageData: {}
         };
         const document = {
             htmlAttrs: {},

package/lib/node/features/html-render/lib/renderer/ssr.d.ts

@@ -1,5 +1,5 @@
 import { BaseRenderer } from './base';
-import { IHtmlDocument, IRenderDocumentOptions } from './types';
+import { IHtmlDocument, IRenderViewOptions } from './types';
 export declare class SsrRenderer extends BaseRenderer {
-    renderDocument({ app, req }: IRenderDocumentOptions): Promise<import("@shuvi/platform-shared/shared").Response | IHtmlDocument>;
+    renderDocument({ app, req }: IRenderViewOptions): Promise<import("@shuvi/platform-shared/shared").Response | IHtmlDocument>;
 }

package/lib/node/features/html-render/lib/renderer/ssr.js

@@ -19,7 +19,7 @@ const htmlTag_1 = require("./htmlTag");
 class SsrRenderer extends base_1.BaseRenderer {
     renderDocument({ app, req }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { router, context } = app;
+            const { store, router, context } = app;
             const serverPluginContext = this._serverPluginContext;
             const { view } = resources_1.server;
             const { getAssetPublicUrl } = serverPluginContext;
@@ -41,7 +41,7 @@ class SsrRenderer extends base_1.BaseRenderer {
                 Object.assign(acc, data);
                 return acc;
             }, {});
-            const appData = Object.assign(Object.assign({}, result.appData), { pageData, ssr: serverPluginContext.config.ssr });
+            const appData = Object.assign(Object.assign({}, result.appData), { ssr: true, appState: store.getState(), pageData });
             appData.runtimeConfig = (0, shuvi_singleton_runtimeConfig_1.getPublicRuntimeConfig)() || {};
             const document = {
                 htmlAttrs: Object.assign({}, result.htmlAttrs),

package/lib/node/features/html-render/lib/renderer/types.d.ts

@@ -1,20 +1,22 @@
-import { IApplication, IRequest } from '@shuvi/platform-shared/shared';
-import { IHtmlAttrs, IHtmlTag, IClientRendererOptions, IServerRendererOptions, IViewClient, IViewServer, IRenderAppServerResult } from '../../../../../shared';
+import { IApplication, IRequest, Response } from '@shuvi/platform-shared/shared';
 import { IServerPluginContext } from '@shuvi/service';
+import { IHtmlAttrs, IHtmlTag, IClientRendererOptions, IServerRendererOptions, IViewClient, IViewServer, IRenderAppServerResult } from '../../../../../shared';
 export { IHtmlAttrs, IHtmlTag, IApplication };
 export interface IRendererConstructorOptions {
     serverPluginContext: IServerPluginContext;
 }
-export declare type IRenderDocumentOptions = {
+export declare type IRenderViewOptions = {
     app: IApplication;
     req: IRequest;
+    ssr: boolean;
 };
+export declare type IRenderDocumentResult = Promise<IHtmlDocument | Response> | IHtmlDocument | Response;
 export interface IHtmlDocument {
     htmlAttrs: IHtmlAttrs;
     headTags: IHtmlTag<'meta' | 'link' | 'style' | 'script' | 'noscript' | 'title'>[];
     mainTags: IHtmlTag[];
     scriptTags: IHtmlTag<'script'>[];
 }
-export interface IRenderOptions extends IRenderDocumentOptions {
+export interface IRenderOptions extends IRenderViewOptions {
 }
 export { IRenderAppServerResult, IClientRendererOptions, IServerRendererOptions, IViewClient, IViewServer };

package/lib/node/features/index.js

@@ -9,7 +9,6 @@ const html_render_1 = require("./html-render");
 const custom_server_1 = __importDefault(require("./custom-server"));
 const model_1 = __importDefault(require("./model"));
 const filesystem_routes_1 = __importDefault(require("./filesystem-routes"));
-const webpack_watch_wait_for_file_builder_1 = __importDefault(require("./webpack-watch-wait-for-file-builder"));
 var buildHtml_1 = require("./html-render/lib/buildHtml");
 Object.defineProperty(exports, "buildHtml", { enumerable: true, get: function () { return buildHtml_1.buildHtml; } });
 var middlewares_1 = require("./middlewares");
@@ -20,7 +19,6 @@ const getPlugins = (platformContext) => [
     on_demand_compile_page_1.default,
     filesystem_routes_1.default,
     custom_server_1.default,
-    model_1.default,
-    webpack_watch_wait_for_file_builder_1.default
+    model_1.default
 ];
 exports.getPlugins = getPlugins;

package/lib/node/shuvi-runtime-server.d.ts

@@ -0,0 +1,18 @@
+import { IServerModule as _IServerModule } from '../shared/index';
+import { extendedHooks } from './features/html-render/serverHooks';
+declare type Head<T extends any[]> = T extends [...infer Head, any] ? Head : never;
+declare type RemoveLast<T extends (...args: any) => any> = (...args: Head<Parameters<T>>) => ReturnType<T>;
+declare global {
+    namespace ShuviService {
+        interface CustomServerPluginHooks {
+            getPageData: typeof extendedHooks.getPageData;
+            handlePageRequest: typeof extendedHooks.handlePageRequest;
+            modifyHtml: typeof extendedHooks.modifyHtml;
+        }
+    }
+}
+declare type ServerModule = Required<_IServerModule>;
+export declare type GetPageDataFunction = RemoveLast<ServerModule['getPageData']>;
+export declare type HandlePageRequestFunction = RemoveLast<ServerModule['handlePageRequest']>;
+export declare type ModifyHtmlFunction = RemoveLast<ServerModule['modifyHtml']>;
+export {};

package/lib/node/shuvi-runtime-server.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/node/shuvi-type-extensions-node.d.ts

@@ -4,7 +4,6 @@ import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
 import { IMiddlewareRoutes, CreateAppServer, IApiRoutes, IServerModule, PlatformWebCustomConfig } from '../shared/index';
 import { IViewServer } from './features/html-render/index';
 import { addRoutes, addMiddlewareRoutes } from './features/filesystem-routes/hooks';
-import { extendedHooks } from './features/html-render/serverHooks';
 export {};
 declare module '@shuvi/service/lib/resources' {
     const server: {
@@ -35,10 +34,5 @@ declare global {
             addRoutes: typeof addRoutes;
             addMiddlewareRoutes: typeof addMiddlewareRoutes;
         }
-        interface CustomServerPluginHooks {
-            getPageData: typeof extendedHooks.getPageData;
-            handlePageRequest: typeof extendedHooks.handlePageRequest;
-            modifyHtml: typeof extendedHooks.modifyHtml;
-        }
     }
 }

package/lib/shared/renderTypes.d.ts

@@ -1,10 +1,10 @@
 import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
 import { Response, IApplication, IRequest, IAppData } from '@shuvi/platform-shared/shared';
-export declare type IRenderDocumentOptions = {
+export declare type IRenderViewOptions = {
     app: IApplication;
     req?: IRequest;
 };
-export interface IRenderOptions extends IRenderDocumentOptions {
+export interface IRenderOptions extends IRenderViewOptions {
 }
 export interface IView<RenderOption extends IRenderOptions = any, RenderResult = void> {
     renderApp(options: RenderOption): RenderResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -65,17 +65,17 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/hook": "1.0.0-rc.4",
-    "@shuvi/platform-shared": "1.0.0-rc.4",
+    "@shuvi/hook": "1.0.0-rc.5",
+    "@shuvi/platform-shared": "1.0.0-rc.5",
     "@shuvi/redox": "0.0.3",
     "@shuvi/redox-react": "0.0.3",
-    "@shuvi/router": "1.0.0-rc.4",
-    "@shuvi/router-react": "1.0.0-rc.4",
-    "@shuvi/runtime": "1.0.0-rc.4",
-    "@shuvi/service": "1.0.0-rc.4",
-    "@shuvi/shared": "1.0.0-rc.4",
-    "@shuvi/toolpack": "1.0.0-rc.4",
-    "@shuvi/utils": "1.0.0-rc.4",
+    "@shuvi/router": "1.0.0-rc.5",
+    "@shuvi/router-react": "1.0.0-rc.5",
+    "@shuvi/runtime": "1.0.0-rc.5",
+    "@shuvi/service": "1.0.0-rc.5",
+    "@shuvi/shared": "1.0.0-rc.5",
+    "@shuvi/toolpack": "1.0.0-rc.5",
+    "@shuvi/utils": "1.0.0-rc.5",
     "content-type": "1.0.4",
     "cookie": "0.4.1",
     "ejs": "3.1.5",
@@ -91,7 +91,7 @@
     "use-sync-external-store": "1.1.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.0-rc.4"
+    "@shuvi/service": "1.0.0-rc.5"
   },
   "devDependencies": {
     "@types/react": "18.0.9",

package/esm/shuvi-app/shuvi-runtime-server.d.ts

@@ -1,6 +0,0 @@
-import { IServerModule as _IServerModule } from '../shared';
-declare type ServerModule = Required<_IServerModule>;
-export declare type GetPageDataFunction = ServerModule['getPageData'];
-export declare type HandlePageRequestFunction = ServerModule['handlePageRequest'];
-export declare type ModifyHtmlFunction = ServerModule['modifyHtml'];
-export {};

package/esm/shuvi-app/shuvi-runtime-server.js

@@ -1 +0,0 @@
-export {};

package/lib/node/features/webpack-watch-wait-for-file-builder/index.d.ts

@@ -1,16 +0,0 @@
-declare const _default: {
-    core: import("@shuvi/hook").IPluginInstance<{
-        extendConfig: import("@shuvi/hook").SyncWaterfallHook<import("@shuvi/service").Config, void>;
-        afterInit: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBuild: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterDestroy: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBundlerDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerDoneExtra, void, void>;
-        afterBundlerTargetDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerTargetDoneExtra, void, void>;
-        configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<import("@shuvi/service/lib/core/lifecycleTypes").WebpackChainType, import("@shuvi/service/lib/core/lifecycleTypes").ConfigWebpackAssistant>;
-        addExtraTarget: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").ExtraTargetAssistant, void, import("@shuvi/service/lib/core/lifecycleTypes").TargetChain>;
-        addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
-        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOption<any, any> | import("@shuvi/service/lib/project/index").FileOption<any, any>[]>;
-        addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-};
-export default _default;

package/lib/node/features/webpack-watch-wait-for-file-builder/index.js

@@ -1,25 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const service_1 = require("@shuvi/service");
-const webpack_watch_wait_for_file_builder_plugin_1 = __importDefault(require("./webpack-watch-wait-for-file-builder-plugin"));
-const plugin = (0, service_1.createPlugin)({
-    configWebpack(config, _, ctx) {
-        if (ctx.mode === 'development') {
-            config
-                .plugin('webpack-watch-wait-for-file-builder-plugin')
-                .use(webpack_watch_wait_for_file_builder_plugin_1.default, [
-                {
-                    onBuildStart: ctx.onBuildStart,
-                    onBuildEnd: ctx.onBuildEnd
-                }
-            ]);
-        }
-        return config;
-    }
-});
-exports.default = {
-    core: plugin
-};

package/lib/node/features/webpack-watch-wait-for-file-builder/webpack-watch-wait-for-file-builder-plugin.d.ts

@@ -1,12 +0,0 @@
-import { IPluginContext } from '@shuvi/service';
-import { Compiler, Plugin } from '@shuvi/toolpack/lib/webpack';
-declare type Options = {
-    onBuildStart: IPluginContext['onBuildStart'];
-    onBuildEnd: IPluginContext['onBuildEnd'];
-};
-export default class WebpackWatchWaitForFileBuilderPlugin implements Plugin {
-    options: Options;
-    constructor(options: Options);
-    apply(compiler: Compiler): void;
-}
-export {};

package/lib/node/features/webpack-watch-wait-for-file-builder/webpack-watch-wait-for-file-builder-plugin.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class WebpackWatchWaitForFileBuilderPlugin {
-    constructor(options) {
-        this.options = options;
-    }
-    apply(compiler) {
-        const { onBuildEnd, onBuildStart } = this.options;
-        /**
-         * watching.suspend will pause the real action in the watcher handler but still collecting changed files.
-         * watching.resume will resume its action
-         *
-         * We make sure onBuildStart is faster than webpack's watcher and make it suspend.
-         *
-         * And resume when onBuildEnd.
-         *
-         * In this way, during build of fileBuilder, webpack will not trigger any watchRun event but keep watching changed files.
-         */
-        onBuildStart(() => {
-            compiler.watching.suspend();
-        });
-        onBuildEnd(({ buildStatus }) => {
-            if (buildStatus === 'fulfilled') {
-                setTimeout(() => {
-                    compiler.watching.resume();
-                    // FIXME: timeout for resuming need further investigation
-                }, 100);
-            }
-        });
-    }
-}
-exports.default = WebpackWatchWaitForFileBuilderPlugin;