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

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import * as React from 'react';
 import { SHUVI_ERROR } from '@shuvi/shared/lib/constants';
 import { Router } from '@shuvi/router-react';
+import { getServerError } from '@shuvi/error-overlay';
 import AppContainer from '../AppContainer';
 import { HeadManager, HeadManagerContext } from '../head';
 import Loadable from '../loadable';
@@ -20,8 +21,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, error: appError } = app;
+            let { ssr, dynamicIds } = appData;
             // For e2e test
             if (window.__SHUVI) {
                 window.__SHUVI.router = router;
@@ -29,6 +30,26 @@ export class ReactClientView {
             else {
                 window.__SHUVI = { router };
             }
+            if (process.env.NODE_ENV === 'development') {
+                if (appError && appError.source === 'server') {
+                    setTimeout(() => {
+                        var _a;
+                        let error;
+                        try {
+                            // Generate a new error object. We `throw` it because some browsers
+                            // will set the `stack` when thrown, and we want to ensure ours is
+                            // not overridden when we re-throw it below.
+                            throw new Error(appError.message);
+                        }
+                        catch (e) {
+                            error = e;
+                        }
+                        error.name = (_a = appError.name) !== null && _a !== void 0 ? _a : '';
+                        error.stack = appError.stack;
+                        throw getServerError(error);
+                    });
+                }
+            }
             const TypedAppComponent = AppComponent;
             if (ssr) {
                 yield Loadable.preloadReady(dynamicIds);
@@ -39,13 +60,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,32 +9,31 @@ 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 chalk from '@shuvi/utils/lib/chalk';
 import Loadable, { LoadableContext } from '../loadable';
 import AppContainer from '../AppContainer';
 import { Head } from '../head';
+import { serializeServerError } from '../../helper/serializeServerError';
 export class ReactServerView {
     constructor() {
-        this.renderApp = ({ app, manifest, getAssetPublicUrl }) => __awaiter(this, void 0, void 0, function* () {
+        this.renderApp = ({ req, app, manifest, isDev }) => __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 htmlContent = undefined;
             let head;
             const RootApp = (<Router static router={router}>
         <AppContainer app={app}>
@@ -46,8 +45,14 @@ export class ReactServerView {
             try {
                 htmlContent = renderToString(RootApp);
             }
+            catch (error) {
+                if (isDev) {
+                    console.error(chalk.red('error') + ' - ' + error.stack);
+                }
+                setAppError(serializeServerError(error, isDev));
+                htmlContent = renderToString(RootApp); // Consistency on both server and client side
+            }
             finally {
-                loaderManager.clearAllData();
                 head = Head.rewind() || [];
             }
             const { loadble } = manifest;
@@ -72,7 +77,7 @@ export class ReactServerView {
                         tagName: 'link',
                         attrs: {
                             rel: 'preload',
-                            href: getAssetPublicUrl(file),
+                            href: req.getAssetUrl(file),
                             as: 'script'
                         }
                     });
@@ -82,19 +87,17 @@ export class ReactServerView {
                         tagName: 'link',
                         attrs: {
                             rel: 'stylesheet',
-                            href: getAssetPublicUrl(file)
+                            href: req.getAssetUrl(file)
                         }
                     });
                 }
             }
             const appData = {
-                dynamicIds: [...dynamicImportIdSet],
-                loadersData
+                dynamicIds: [...dynamicImportIdSet]
             };
             if (dynamicImportIdSet.size) {
                 appData.dynamicIds = Array.from(dynamicImportIdSet);
             }
-            appData.appState = storeManager.getState();
             return {
                 appData,
                 content: htmlContent,

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

@@ -1,4 +1,4 @@
-import { IRequestHandlerWithNext } from '@shuvi/service';
+import { ShuviRequestHandler } from '@shuvi/service';
 import { IApiRequestHandler } from '../shared';
-export declare type MiddlewareHandler = IRequestHandlerWithNext;
-export declare type APIHandler = IApiRequestHandler;
+export declare type ShuviMiddlewareHandler = ShuviRequestHandler;
+export declare type ShuviApiHandler = IApiRequestHandler;

package/lib/node/features/custom-server/index.d.ts

@@ -1,4 +1,4 @@
 declare const _default: {
-    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/service/lib/server/pluginTypes").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
+    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").ServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
 };
 export default _default;

package/lib/node/features/custom-server/server.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/service/lib/server/pluginTypes").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
+declare const _default: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").ServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
 export default _default;

package/lib/node/features/filesystem-routes/api/apiRouteHandler.d.ts

@@ -1,14 +1,14 @@
 /// <reference types="node" />
 import { IncomingMessage } from 'http';
-import { IResponse, IRequest } from '@shuvi/service';
+import { ShuviRequest, ShuviResponse } from '@shuvi/service';
 import { IApiRequestHandler, IApiResponse } from '../../../../shared';
 export { IApiRequestHandler };
-export declare function apiRouteHandler(req: IRequest, res: IResponse, resolver: IApiRequestHandler, apiRoutesConfig: any): Promise<void>;
+export declare function apiRouteHandler(req: ShuviRequest, res: ShuviResponse, resolver: IApiRequestHandler, apiRoutesConfig: any): Promise<void>;
 /**
  * Parse incoming message like `json` or `urlencoded`
  * @param req request object
  */
-export declare function parseBody(req: IRequest, limit: string | number): Promise<any>;
+export declare function parseBody(req: ShuviRequest, limit: string | number): Promise<any>;
 /**
  * Parse cookies from `req` header
  * @param req request object
@@ -21,27 +21,27 @@ export declare function getCookieParser(req: IncomingMessage): {
  * @param res ServerResponse object
  * @param statusCode `HTTP` status code of response
  */
-export declare function sendStatusCode<IRes extends IApiResponse>(res: IResponse, statusCode: number): IRes;
+export declare function sendStatusCode<IRes extends IApiResponse>(res: ShuviResponse, statusCode: number): IRes;
 /**
  *
  * @param res response object
  * @param [statusOrUrl] `HTTP` status code of redirect
  * @param url URL of redirect
  */
-export declare function redirect<IRes extends IApiResponse>(res: IResponse, statusOrUrl: string | number, url?: string): IRes;
+export declare function redirect<IRes extends IApiResponse>(res: ShuviResponse, statusOrUrl: string | number, url?: string): IRes;
 /**
  * Send `any` body to response
  * @param req request object
  * @param res response object
  * @param body of response
  */
-export declare function sendData(req: IRequest, res: IResponse, body: any): void;
+export declare function sendData(req: ShuviRequest, res: ShuviResponse, body: any): void;
 /**
  * Send `JSON` object
  * @param res response object
  * @param jsonBody of data
  */
-export declare function sendJson(req: IRequest, res: IResponse, jsonBody: any): void;
+export declare function sendJson(req: ShuviRequest, res: ShuviResponse, jsonBody: any): void;
 /**
  * Custom error class
  */

package/lib/node/features/filesystem-routes/api/apiRouteHandler.js

@@ -42,11 +42,7 @@ function apiRouteHandler(req, res, resolver, apiRoutesConfig) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const { bodyParser } = apiRoutesConfig || {};
-            const { pathname, query, params } = req;
             const apiReq = {
-                pathname,
-                query,
-                params,
                 // Parsing of cookies
                 cookies: getCookieParser(req)
             };

package/lib/node/features/filesystem-routes/api/middleware.d.ts

@@ -1,2 +1,2 @@
-import { IServerPluginContext, IRequestHandlerWithNext } from '@shuvi/service';
-export declare function middleware(_ctx: IServerPluginContext): IRequestHandlerWithNext;
+import { IServerPluginContext, ShuviRequestHandler } from '@shuvi/service';
+export declare function middleware(_ctx: IServerPluginContext): ShuviRequestHandler;

package/lib/node/features/filesystem-routes/index.d.ts

@@ -3,18 +3,6 @@ import { middleware as getMiddlewareMiddleware } from './middleware';
 import { IApiRequestHandler, middleware as getApiMiddleware } from './api';
 export { IApiRequestHandler, getRoutes, getMiddlewareMiddleware, getApiMiddleware };
 declare const _default: {
-    core: import("@shuvi/platform-shared/shared").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>;
+    core: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
 };
 export default _default;

package/lib/node/features/filesystem-routes/index.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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) {
@@ -33,9 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getApiMiddleware = exports.getMiddlewareMiddleware = exports.getRoutes = void 0;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const build_loaders_1 = require("@shuvi/toolpack/lib/utils/build-loaders");
 const service_1 = require("@shuvi/service");
 const node_1 = require("@shuvi/platform-shared/node");
 const lib_1 = require("../html-render/lib");
@@ -133,8 +107,8 @@ const plugin = (0, service_1.createPlugin)({
             }),
             dependencies: [rawRoutes]
         });
-        const loadersFile = defineFile({
-            name: 'loaders.js',
+        const pageLoadersFile = defineFile({
+            name: 'page-loaders.js',
             content: () => __awaiter(void 0, void 0, void 0, function* () {
                 const routes = (0, page_1.getRoutes)();
                 const loaders = {};
@@ -157,30 +131,18 @@ const plugin = (0, service_1.createPlugin)({
                 let exports = '';
                 Object.entries(loaders).forEach((loader, index) => {
                     const [id, component] = loader;
-                    imports += `import { loader as loader_${index} } from '${component}'\n`;
+                    imports += `import { loader as loader_${index} } from '${component}?keep=loader'\n`;
                     exports += `'${id}': loader_${index},\n`;
                 });
                 return `${imports}  export default {\n  ${exports}\n}`;
             }),
             dependencies: [pageRoutesFile]
         });
-        const loadersFileName = path.join(context.paths.appDir, 'files', 'loaders.js');
-        const pageLoadersFile = defineFile({
-            name: 'page-loaders.js',
-            content: () => __awaiter(void 0, void 0, void 0, function* () {
-                if (fs.existsSync(loadersFileName)) {
-                    return yield (0, build_loaders_1.buildToString)(loadersFileName);
-                }
-                return '';
-            }),
-            dependencies: [loadersFile]
-        });
         return [
             rawRoutes,
             pageRoutesFile,
             apiRoutesFile,
             middlewareRoutesFile,
-            loadersFile,
             pageLoadersFile
         ];
     })

package/lib/node/features/filesystem-routes/middleware/middleware.d.ts

@@ -1,2 +1,2 @@
-import { IServerPluginContext, IRequestHandlerWithNext } from '@shuvi/service';
-export declare function middleware(_api: IServerPluginContext): IRequestHandlerWithNext;
+import { IServerPluginContext, ShuviRequestHandler } from '@shuvi/service';
+export declare function middleware(_api: IServerPluginContext): ShuviRequestHandler;

package/lib/node/features/filesystem-routes/page/routes.js

@@ -89,7 +89,7 @@ const generateRoutesContent = (routes) => {
     return `
 let routes;
 
-if (typeof windows === 'undefined') {
+if (typeof window === 'undefined') {
   routes = ${serverRoutes}
 } else {
   routes = ${clientRoutes}

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/getPageMiddleware.d.ts

@@ -1,2 +1,2 @@
-import { IRequestHandlerWithNext, IServerPluginContext } from '@shuvi/service';
-export declare function getPageMiddleware(api: IServerPluginContext): IRequestHandlerWithNext;
+import { ShuviRequestHandler, IServerPluginContext } from '@shuvi/service';
+export declare function getPageMiddleware(api: IServerPluginContext): ShuviRequestHandler;

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.d.ts

@@ -1,6 +1,6 @@
-import { IRequest, IServerPluginContext } from '@shuvi/service';
+import { ShuviRequest, IServerPluginContext } from '@shuvi/service';
 import { Response } from '@shuvi/platform-shared/shared';
 export declare function renderToHTML({ req, serverPluginContext }: {
-    req: IRequest;
+    req: ShuviRequest;
     serverPluginContext: IServerPluginContext;
 }): Promise<Response>;

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;
@@ -50,27 +19,17 @@ function renderToHTML({ req, serverPluginContext }) {
         const { application } = resources_1.server;
         const app = application.createApp({
             req,
-            ssr: serverPluginContext.config.ssr
+            ssr: serverPluginContext.config.ssr,
+            isDev: serverPluginContext.mode === 'development'
         });
         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,
+                isDev: serverPluginContext.mode === 'development'
             });
-            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,14 +1,14 @@
-import { IAppData, Response } from '@shuvi/platform-shared/shared';
-import { IServerPluginContext } from '@shuvi/service';
-import { IHtmlDocument, IHtmlTag, IApplication } from './types';
-import { IRendererConstructorOptions, IRenderDocumentOptions } from './types';
+import { IAppData } from '@shuvi/platform-shared/shared';
+import { ShuviRequest, IServerPluginContext } from '@shuvi/service';
+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;
-    protected _getMainAssetTags(): {
+    abstract renderDocument({ app, req }: IRenderViewOptions): IRenderDocumentResult;
+    protected _getMainAssetTags(req: ShuviRequest): {
         styles: IHtmlTag<any>[];
         scripts: IHtmlTag<any>[];
     };

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

@@ -14,24 +14,24 @@ class BaseRenderer {
     constructor({ serverPluginContext }) {
         this._serverPluginContext = serverPluginContext;
     }
-    _getMainAssetTags() {
+    _getMainAssetTags(req) {
         const styles = [];
         const scripts = [];
         const entrypoints = resources_1.clientManifest.entries[service_1.BUILD_CLIENT_RUNTIME_MAIN];
         const polyfill = resources_1.clientManifest.bundles[service_1.BUILD_CLIENT_RUNTIME_POLYFILL];
         scripts.push((0, htmlTag_1.tag)('script', {
-            src: this._serverPluginContext.getAssetPublicUrl(polyfill)
+            src: req.getAssetUrl(polyfill)
         }));
         entrypoints.js.forEach((asset) => {
             scripts.push((0, htmlTag_1.tag)('script', {
-                src: this._serverPluginContext.getAssetPublicUrl(asset)
+                src: req.getAssetUrl(asset)
             }));
         });
         if (entrypoints.css) {
             entrypoints.css.forEach((asset) => {
                 styles.push((0, htmlTag_1.tag)('link', {
                     rel: 'stylesheet',
-                    href: this._serverPluginContext.getAssetPublicUrl(asset)
+                    href: req.getAssetUrl(asset)
                 }));
             });
         }
@@ -60,7 +60,7 @@ class BaseRenderer {
     }
     _getInlineAppData(app, appData) {
         const routes = app.router.routes || [];
-        const data = JSON.stringify(Object.assign(Object.assign({}, appData), { filesByRoutId: (0, generateFilesByRoutId_1.default)(resources_1.clientManifest, routes), publicPath: this._serverPluginContext.getAssetPublicUrl() }));
+        const data = JSON.stringify(Object.assign(Object.assign({}, appData), { filesByRoutId: (0, generateFilesByRoutId_1.default)(resources_1.clientManifest, routes), publicPath: this._serverPluginContext.assetPublicPath }));
         return (0, htmlTag_1.tag)('script', {
             id: constants_1.CLIENT_APPDATA_ID,
             type: 'application/json'

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;
 }