@shuvi/platform-web 1.0.0-rc.3 → 1.0.0-rc.6

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").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<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");
@@ -50,9 +24,18 @@ const plugin = (0, service_1.createPlugin)({
     setup: ({ addHooks }) => {
         addHooks({ addRoutes: hooks_1.addRoutes, addMiddlewareRoutes: hooks_1.addMiddlewareRoutes });
     },
-    addRuntimeFile: ({ defineFile }, context) => __awaiter(void 0, void 0, void 0, function* () {
+    addRuntimeFile: ({ defineFile, getContent }, context) => __awaiter(void 0, void 0, void 0, function* () {
         const { config: { routes: pageRoutes, middlewareRoutes, apiRoutes, conventionRoutes }, paths, pluginRunner, phase } = context;
         const isBuildPhase = phase === 'PHASE_PRODUCTION_BUILD';
+        const rawRoutes = defineFile({
+            name: 'virtual-raw-routes.js',
+            virtual: true,
+            content: () => __awaiter(void 0, void 0, void 0, function* () {
+                const rawRoutes = yield (0, node_1.getRawRoutesFromDir)(paths.routesDir, conventionRoutes.exclude);
+                return rawRoutes;
+            }),
+            dependencies: [paths.routesDir]
+        });
         const pageRoutesFile = defineFile({
             name: 'routes.js',
             content: () => __awaiter(void 0, void 0, void 0, function* () {
@@ -62,7 +45,7 @@ const plugin = (0, service_1.createPlugin)({
                     routes = pageRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getPageRoutes)(paths.routesDir, conventionRoutes.exclude);
+                    const { routes: _routes, warnings } = yield (0, node_1.getPageRoutes)(getContent(rawRoutes), conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning.msg);
@@ -77,7 +60,7 @@ const plugin = (0, service_1.createPlugin)({
                 (0, page_1.setRoutes)(normalizedRoutes);
                 return (0, page_1.generateRoutesContent)(normalizedRoutes);
             }),
-            dependencies: [paths.routesDir]
+            dependencies: [rawRoutes]
         });
         const apiRoutesFile = defineFile({
             name: 'apiRoutes.js',
@@ -88,7 +71,7 @@ const plugin = (0, service_1.createPlugin)({
                     routes = apiRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getApiRoutes)(paths.routesDir, conventionRoutes.exclude);
+                    const { routes: _routes, warnings } = yield (0, node_1.getApiRoutes)(getContent(rawRoutes), conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning);
@@ -98,7 +81,7 @@ const plugin = (0, service_1.createPlugin)({
                 }
                 return (0, api_1.generateRoutesContent)(routes, paths.routesDir);
             }),
-            dependencies: [paths.routesDir]
+            dependencies: [rawRoutes]
         });
         const middlewareRoutesFile = defineFile({
             name: 'middlewareRoutes.js',
@@ -109,7 +92,7 @@ const plugin = (0, service_1.createPlugin)({
                     routes = middlewareRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getMiddlewareRoutes)(paths.routesDir, conventionRoutes.exclude);
+                    const { routes: _routes, warnings } = yield (0, node_1.getMiddlewareRoutes)(getContent(rawRoutes), conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning);
@@ -122,10 +105,10 @@ const plugin = (0, service_1.createPlugin)({
                     baseDir: paths.routesDir
                 });
             }),
-            dependencies: [paths.routesDir]
+            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 = {};
@@ -148,29 +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.d.ts

@@ -1,8 +1,8 @@
 import { IPageRouteConfig, IPageRouteConfigWithId } from '@shuvi/platform-shared/shared';
 export { IPageRouteConfig };
 /**
- * returns JSON string of IRawPageRouteRecord
+ * returns JSON string of IPageRouteConfigWithId
  */
-export declare function serializeRoutes(routes: IPageRouteConfigWithId[]): string;
+export declare function serializeRoutes(routes: IPageRouteConfigWithId[], isServer: boolean): string;
 export declare function normalizeRoutes(routes: IPageRouteConfig[], componentDir: string, parentPath?: string): IPageRouteConfigWithId[];
 export declare const generateRoutesContent: (routes: IPageRouteConfigWithId[]) => string;

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

@@ -10,18 +10,23 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRoutesContent = exports.normalizeRoutes = exports.serializeRoutes = void 0;
 const crypto_1 = require("crypto");
+const querystring_1 = __importDefault(require("querystring"));
 const constants_1 = require("@shuvi/shared/lib/constants");
 const file_1 = require("@shuvi/utils/lib/file");
 function genRouteId(filepath) {
     return (0, crypto_1.createHash)('md4').update(filepath).digest('hex').substr(0, 4);
 }
+const KEEP_SYMBOL = querystring_1.default.stringify({ keep: ['default'] });
 /**
- * returns JSON string of IRawPageRouteRecord
+ * returns JSON string of IPageRouteConfigWithId
  */
-function serializeRoutes(routes) {
+function serializeRoutes(routes, isServer) {
     let res = '';
     for (let index = 0; index < routes.length; index++) {
         const _a = routes[index], { children: childRoutes } = _a, route = __rest(_a, ["children"]);
@@ -33,16 +38,18 @@ function serializeRoutes(routes) {
             if (key === 'component') {
                 const { component } = route;
                 const componentSource = component;
-                const componentSourceWithAffix = `${componentSource}?${constants_1.ROUTE_RESOURCE_QUERYSTRING}`;
+                const componentRequest = `${componentSource}?${constants_1.ROUTE_RESOURCE_QUERYSTRING}&${KEEP_SYMBOL}`;
                 // `webpackExports` works with production and optimization.minimize, check compiled dist
-                strRoute +=
-                    `__componentSourceWithAffix__: "${componentSourceWithAffix}",
-__componentSource__: "${componentSource}",
+                if (isServer) {
+                    strRoute += `__componentRawRequest__: "${componentRequest}",\n`;
+                    strRoute += `__componentSource__: "${componentSource}",\n`;
+                }
+                strRoute += `
 __import__: () => import(
   /* webpackChunkName: "page-${id}" */
   /* webpackExports: "default" */
-  "${componentSourceWithAffix}"),
-__resolveWeak__: () => [require.resolveWeak("${componentSourceWithAffix}")]`.trim();
+  "${componentRequest}"),
+__resolveWeak__: () => [require.resolveWeak("${componentRequest}")]`.trim();
             }
             else {
                 strRoute += `${key}: ${JSON.stringify(route[key])}`;
@@ -50,7 +57,7 @@ __resolveWeak__: () => [require.resolveWeak("${componentSourceWithAffix}")]`.tri
             strRoute += `,\n`;
         }
         if (childRoutes && childRoutes.length > 0) {
-            strRoute += `children: ${serializeRoutes(childRoutes)},\n`;
+            strRoute += `children: ${serializeRoutes(childRoutes, isServer)},\n`;
         }
         res += `{${strRoute}},\n`;
     }
@@ -77,7 +84,18 @@ function normalizeRoutes(routes, componentDir, parentPath = '') {
 }
 exports.normalizeRoutes = normalizeRoutes;
 const generateRoutesContent = (routes) => {
-    const serialized = serializeRoutes(routes);
-    return `export default ${serialized}`;
+    const serverRoutes = serializeRoutes(routes, true);
+    const clientRoutes = serializeRoutes(routes, false);
+    return `
+let routes;
+
+if (typeof window === 'undefined') {
+  routes = ${serverRoutes}
+} else {
+  routes = ${clientRoutes}
+}
+
+export default routes
+`;
 };
 exports.generateRoutesContent = generateRoutesContent;

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

@@ -1,19 +1,4 @@
+import { IPlatformContext, ResolvedPlugin } from '@shuvi/service/lib/core';
 export { getPageMiddleware, IHtmlDocument, ITemplateData, IViewServer, IViewClient } from './lib';
-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").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<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>;
-    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/service/lib/server/pluginTypes").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
-    types: string;
-};
-export default _default;
+/** This plugin uses `platformContext` so that it is set to a plugin getter */
+export declare const getPlugin: (platformContext: IPlatformContext) => ResolvedPlugin;

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

@@ -1,28 +1,99 @@
 "use strict";
+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());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageMiddleware = void 0;
+exports.getPlugin = exports.getPageMiddleware = void 0;
 const service_1 = require("@shuvi/service");
+const constants_1 = require("@shuvi/shared/lib/constants");
+const config_1 = require("@shuvi/toolpack/lib/webpack/config");
 const paths_1 = require("../../paths");
+const middlewares_1 = require("../middlewares");
+const generateResource_1 = __importDefault(require("./lib/generateResource"));
+const buildHtml_1 = require("./lib/buildHtml");
 const server_1 = __importDefault(require("./server"));
+function getServerEntry() {
+    return {
+        [service_1.BUILD_SERVER_FILE_SERVER]: [(0, paths_1.resolvePkgFile)('esm/shuvi-app/entry/server')]
+    };
+}
 var lib_1 = require("./lib");
 Object.defineProperty(exports, "getPageMiddleware", { enumerable: true, get: function () { return lib_1.getPageMiddleware; } });
-const core = (0, service_1.createPlugin)({
-    addRuntimeFile: ({ defineFile }, context) => {
-        const { config: { router: { history } } } = context;
-        const routerConfigFile = defineFile({
-            name: 'routerConfig.js',
-            content: () => {
-                return `export const historyMode = "${history}";`;
+/** This plugin uses `platformContext` so that it is set to a plugin getter */
+const getPlugin = (platformContext) => {
+    const core = (0, service_1.createPlugin)({
+        configWebpack: (chain, { name }) => {
+            if (name === constants_1.BUNDLER_DEFAULT_TARGET) {
+                chain.merge({
+                    entry: {
+                        [service_1.BUILD_CLIENT_RUNTIME_POLYFILL]: ['@shuvi/app/core/polyfill'],
+                        [service_1.BUILD_CLIENT_RUNTIME_MAIN]: [
+                            (0, paths_1.resolvePkgFile)('esm/shuvi-app/entry/client')
+                        ]
+                    }
+                });
+            }
+            return chain;
+        },
+        addExtraTarget: ({ createConfig }, context) => {
+            const serverWebpackHelpers = (0, config_1.webpackHelpers)();
+            const serverChain = createConfig({
+                name: constants_1.BUNDLER_TARGET_SERVER,
+                node: true,
+                entry: getServerEntry(),
+                outputDir: service_1.BUILD_SERVER_DIR,
+                webpackHelpers: serverWebpackHelpers
+            });
+            return {
+                name: constants_1.BUNDLER_TARGET_SERVER,
+                chain: serverChain
+            };
+        },
+        addRuntimeFile: ({ defineFile }, context) => {
+            const { config: { router: { history } } } = context;
+            const routerConfigFile = defineFile({
+                name: 'routerConfig.js',
+                content: () => {
+                    return `export const historyMode = "${history}";`;
+                }
+            });
+            return [routerConfigFile];
+        },
+        addRuntimeService: () => [
+            {
+                source: (0, paths_1.resolvePkgFile)('esm/shuvi-app/shuvi-runtime-index'),
+                exported: '*'
+            },
+            {
+                source: (0, paths_1.resolvePkgFile)('lib/node/shuvi-runtime-server'),
+                filepath: 'server.ts',
+                exported: '*'
             }
-        });
-        return [routerConfigFile];
-    }
-});
-exports.default = {
-    core,
-    server: server_1.default,
-    types: (0, paths_1.resolvePkgFile)('lib/node/features/html-render/shuvi-app.d.ts')
+        ],
+        addResource: context => (0, generateResource_1.default)(context),
+        afterBuild: (context) => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, buildHtml_1.buildHtml)({
+                context,
+                serverPlugins: platformContext.serverPlugins,
+                getMiddlewares: middlewares_1.getMiddlewares,
+                pathname: '/',
+                filename: 'index.html'
+            });
+        })
+    });
+    return {
+        core,
+        server: server_1.default,
+        types: (0, paths_1.resolvePkgFile)('lib/node/features/html-render/shuvi-app.d.ts')
+    };
 };
+exports.getPlugin = getPlugin;

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

@@ -1,3 +1,3 @@
 import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
-import { IRouteRecord } from '@shuvi/router';
-export default function generateFilesByRoutId(assetMap: IManifest, routes: IRouteRecord[]): Record<string, string[]>;
+import { IPageRouteRecord } from '@shuvi/platform-shared/shared';
+export default function generateFilesByRoutId(assetMap: IManifest, routes: IPageRouteRecord[]): Record<string, string[]>;

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function generateFilesByRoutId(assetMap, routes) {
     let filesByRoutId = {};
     const loadable = assetMap.loadble;
-    routes.forEach(({ id, __componentSourceWithAffix__ }) => {
-        if (id && __componentSourceWithAffix__) {
-            filesByRoutId[id] = loadable[__componentSourceWithAffix__].files;
+    routes.forEach(({ id, __componentRawRequest__ }) => {
+        if (__componentRawRequest__) {
+            filesByRoutId[id] = loadable[__componentRawRequest__].files;
         }
     });
     return filesByRoutId;

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