@shuvi/platform-web 1.0.0-rc.2 → 1.0.0-rc.20

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) {
@@ -31,14 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.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");
+const constants_1 = require("@shuvi/shared/lib/constants");
+const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
 const hooks_1 = require("./hooks");
 const page_1 = require("./page");
 Object.defineProperty(exports, "getRoutes", { enumerable: true, get: function () { return page_1.getRoutes; } });
@@ -46,13 +24,26 @@ const middleware_1 = require("./middleware");
 Object.defineProperty(exports, "getMiddlewareMiddleware", { enumerable: true, get: function () { return middleware_1.middleware; } });
 const api_1 = require("./api");
 Object.defineProperty(exports, "getApiMiddleware", { enumerable: true, get: function () { return api_1.middleware; } });
+let isWarnedAddMiddlewareRoutes = false;
 const plugin = (0, service_1.createPlugin)({
     setup: ({ addHooks }) => {
-        addHooks({ addRoutes: hooks_1.addRoutes, addMiddlewareRoutes: hooks_1.addMiddlewareRoutes });
+        addHooks({ addRoutes: hooks_1.addRoutes, addApiRoutes: hooks_1.addApiRoutes, addMiddlewareRoutes: hooks_1.addMiddlewareRoutes });
     },
-    addRuntimeFile: ({ defineFile }, context) => __awaiter(void 0, void 0, void 0, function* () {
-        const { config: { routes: pageRoutes, middlewareRoutes, apiRoutes, conventionRoutes }, paths, pluginRunner, phase } = context;
+    addRuntimeFile: ({ defineFile, getContent }, context) => __awaiter(void 0, void 0, void 0, function* () {
+        const { config: { routes: pageRoutes, conventionRoutes }, paths, pluginRunner, phase, mode } = 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],
+            watchOptions: {
+                ignoreFileContentUpdate: true
+            }
+        });
         const pageRoutesFile = defineFile({
             name: 'routes.js',
             content: () => __awaiter(void 0, void 0, void 0, function* () {
@@ -62,10 +53,10 @@ 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);
+                            logger_1.default.warn(warning.msg);
                         });
                     }
                     routes = _routes;
@@ -75,57 +66,51 @@ const plugin = (0, service_1.createPlugin)({
                 // user routes come later
                 extraRoutes.concat(routes), paths.routesDir);
                 (0, page_1.setRoutes)(normalizedRoutes);
-                return (0, page_1.generateRoutesContent)(normalizedRoutes);
+                return (0, page_1.generateRoutesContent)(normalizedRoutes, mode === 'development');
             }),
-            dependencies: [paths.routesDir]
+            dependencies: [rawRoutes]
         });
         const apiRoutesFile = defineFile({
             name: 'apiRoutes.js',
             content: () => __awaiter(void 0, void 0, void 0, function* () {
-                let routes;
-                const hasConfigRoutes = Array.isArray(apiRoutes);
-                if (hasConfigRoutes) {
-                    routes = apiRoutes;
-                }
-                else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getApiRoutes)(paths.routesDir, conventionRoutes.exclude);
-                    if (isBuildPhase) {
-                        warnings.forEach(warning => {
-                            console.warn(warning);
-                        });
-                    }
-                    routes = _routes;
+                const { routes: fsRoutes, warnings } = yield (0, node_1.getApiRoutes)(getContent(rawRoutes), conventionRoutes.exclude);
+                if (isBuildPhase) {
+                    warnings.forEach(warning => {
+                        logger_1.default.warn(warning);
+                    });
                 }
-                return (0, api_1.generateRoutesContent)(routes, paths.routesDir);
+                const pluginRoutes = (yield pluginRunner.addApiRoutes()).flat();
+                return (0, api_1.generateRoutesContent)(pluginRoutes.concat(fsRoutes), paths.routesDir);
             }),
-            dependencies: [paths.routesDir]
+            dependencies: [rawRoutes]
         });
         const middlewareRoutesFile = defineFile({
             name: 'middlewareRoutes.js',
             content: () => __awaiter(void 0, void 0, void 0, function* () {
-                let routes;
-                const hasConfigRoutes = Array.isArray(middlewareRoutes);
-                if (hasConfigRoutes) {
-                    routes = middlewareRoutes;
-                }
-                else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getMiddlewareRoutes)(paths.routesDir, conventionRoutes.exclude);
-                    if (isBuildPhase) {
-                        warnings.forEach(warning => {
-                            console.warn(warning);
-                        });
-                    }
-                    routes = _routes;
+                // Remove the 'middleware' file convention first, and deal with it in a future major update.
+                // const { routes: _routes, warnings } = await getMiddlewareRoutes(
+                //   getContent(rawRoutes),
+                //   conventionRoutes.exclude
+                // );
+                // if (isBuildPhase) {
+                //   warnings.forEach(warning => {
+                //     logger.warn(warning);
+                //   });
+                // }
+                // let fsRoutes = _routes;
+                const pluginRoutes = (yield pluginRunner.addMiddlewareRoutes()).flat();
+                if (!isWarnedAddMiddlewareRoutes && pluginRoutes.length > 0) {
+                    logger_1.default.warn('Warning: addMiddlewareRoutes is an experimental feature, we recommend using api routes instead.');
+                    isWarnedAddMiddlewareRoutes = true;
                 }
-                const extraRoutes = (yield pluginRunner.addMiddlewareRoutes()).flat();
-                return (0, middleware_1.generateRoutesContent)(extraRoutes.concat(routes), {
+                return (0, middleware_1.generateRoutesContent)(pluginRoutes, {
                     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 = {};
@@ -133,10 +118,7 @@ const plugin = (0, service_1.createPlugin)({
                     routes.forEach(r => {
                         const { component, id, children } = r;
                         if (component && id) {
-                            const hasLoader = (0, lib_1.ifComponentHasLoader)(component);
-                            if (hasLoader) {
-                                loaders[id] = component;
-                            }
+                            loaders[id] = component;
                         }
                         if (children) {
                             traverseRoutes(children);
@@ -148,29 +130,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}?${constants_1.LOADER_RESOURCE_QUERYSTRING}'\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/middleware/middleware.js

@@ -8,14 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.middleware = void 0;
 const router_1 = require("@shuvi/router");
-const resources_1 = require("@shuvi/service/lib/resources");
+const resources_1 = __importDefault(require("@shuvi/service/lib/resources"));
 function middleware(_api) {
     return function (req, res, next) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { middlewareRoutes = [] } = resources_1.server;
+            const { middlewareRoutes = [] } = resources_1.default.server;
             // match path for get middlewares
             let middlewares = [];
             for (let i = 0; i < middlewareRoutes.length; i++) {

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[], includeMeta: boolean): string;
 export declare function normalizeRoutes(routes: IPageRouteConfig[], componentDir: string, parentPath?: string): IPageRouteConfigWithId[];
-export declare const generateRoutesContent: (routes: IPageRouteConfigWithId[]) => string;
+export declare const generateRoutesContent: (routes: IPageRouteConfigWithId[], isDev: boolean) => string;

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

@@ -19,9 +19,9 @@ function genRouteId(filepath) {
     return (0, crypto_1.createHash)('md4').update(filepath).digest('hex').substr(0, 4);
 }
 /**
- * returns JSON string of IRawPageRouteRecord
+ * returns JSON string of IPageRouteConfigWithId
  */
-function serializeRoutes(routes) {
+function serializeRoutes(routes, includeMeta) {
     let res = '';
     for (let index = 0; index < routes.length; index++) {
         const _a = routes[index], { children: childRoutes } = _a, route = __rest(_a, ["children"]);
@@ -33,16 +33,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}`;
                 // `webpackExports` works with production and optimization.minimize, check compiled dist
-                strRoute +=
-                    `__componentSourceWithAffix__: "${componentSourceWithAffix}",
-__componentSource__: "${componentSource}",
+                if (includeMeta) {
+                    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 +52,7 @@ __resolveWeak__: () => [require.resolveWeak("${componentSourceWithAffix}")]`.tri
             strRoute += `,\n`;
         }
         if (childRoutes && childRoutes.length > 0) {
-            strRoute += `children: ${serializeRoutes(childRoutes)},\n`;
+            strRoute += `children: ${serializeRoutes(childRoutes, includeMeta)},\n`;
         }
         res += `{${strRoute}},\n`;
     }
@@ -76,8 +78,19 @@ function normalizeRoutes(routes, componentDir, parentPath = '') {
     return res;
 }
 exports.normalizeRoutes = normalizeRoutes;
-const generateRoutesContent = (routes) => {
-    const serialized = serializeRoutes(routes);
-    return `export default ${serialized}`;
+const generateRoutesContent = (routes, isDev) => {
+    const serverRoutes = serializeRoutes(routes, true);
+    const clientRoutes = serializeRoutes(routes, isDev);
+    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,5 @@
+import { ResolvedPlugin } from '@shuvi/service';
+import { IPlatformContext } 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,141 @@
 "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 config_1 = require("@shuvi/toolpack/lib/webpack/config");
+const copy_file_plugin_1 = require("@shuvi/toolpack/lib/webpack/plugins/copy-file-plugin");
+const shared_1 = require("../../../shared");
 const paths_1 = require("../../paths");
+const version_1 = require("../../version");
+const middlewares_1 = require("../middlewares");
+const generateResource_1 = __importDefault(require("./lib/generateResource"));
+const buildHtml_1 = require("./lib/buildHtml");
+const build_manifest_plugin_1 = __importDefault(require("./lib/webpack/build-manifest-plugin"));
 const server_1 = __importDefault(require("./server"));
+const ENTRY_FLAG = 'shuviEntry';
+function makeEntryRequest(req) {
+    return `${req}?${ENTRY_FLAG}=true`;
+}
+function getClientEntry() {
+    return {
+        [shared_1.BUILD_CLIENT_RUNTIME_MAIN]: [
+            makeEntryRequest((0, paths_1.resolvePkgFile)('esm/shuvi-app/entry/client'))
+        ]
+    };
+}
+function getServerEntry() {
+    return {
+        [shared_1.BUILD_SERVER_FILE_SERVER]: [
+            makeEntryRequest((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, mode }) => {
+            const isDev = mode === 'development';
+            const pkgVersion = (0, version_1.getVersion)();
+            const isServer = name === shared_1.BUNDLER_TARGET_SERVER;
+            const isClient = name === shared_1.BUNDLER_TARGET_CLIENT;
+            if (isClient) {
+                chain.merge({
+                    entry: getClientEntry()
+                });
+                chain.optimization.runtimeChunk({ name: shared_1.BUILD_CLIENT_RUNTIME_WEBPACK });
+                chain.plugin('polyfills').use(copy_file_plugin_1.CopyFilePlugin, [
+                    {
+                        filePath: (0, paths_1.resolvePkgFile)('polyfills/polyfills.js'),
+                        cacheKey: pkgVersion,
+                        name: shared_1.BUILD_CLIENT_RUNTIME_POLYFILLS,
+                        info: {
+                            [shared_1.BUILD_CLIENT_RUNTIME_POLYFILLS_SYMBOL]: 1,
+                            // This file is already minified
+                            minimized: true
+                        }
+                    }
+                ]);
+                chain.plugin('private/build-manifest').use(build_manifest_plugin_1.default, [
+                    {
+                        filename: shared_1.CLIENT_BUILD_MANIFEST_PATH,
+                        modules: true,
+                        chunkRequest: isDev
+                    }
+                ]);
+            }
+            else if (isServer) {
+                chain.plugin('private/build-manifest').use(build_manifest_plugin_1.default, [
+                    {
+                        filename: shared_1.SERVER_BUILD_MANIFEST_PATH,
+                        modules: false,
+                        chunkRequest: isDev
+                    }
+                ]);
+            }
+            return chain;
+        },
+        addExtraTarget: ({ createConfig }, context) => {
+            const serverWebpackHelpers = (0, config_1.webpackHelpers)();
+            const serverChain = createConfig({
+                name: shared_1.BUNDLER_TARGET_SERVER,
+                node: true,
+                entry: getServerEntry(),
+                outputDir: shared_1.SERVER_OUTPUT_DIR,
+                webpackHelpers: serverWebpackHelpers
+            });
+            return {
+                name: shared_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)('lib/node/shuvi-runtime-server'),
+                filepath: 'server.ts',
+                exported: '*'
+            }
+        ],
+        addResource: context => (0, generateResource_1.default)(context),
+        afterBuild: (context) => __awaiter(void 0, void 0, void 0, function* () {
+            if (context.config.ssr === false) {
+                yield (0, buildHtml_1.buildHtml)({
+                    context,
+                    serverPlugins: platformContext.serverPlugins,
+                    getMiddlewares: middlewares_1.getMiddlewares,
+                    pathname: '/',
+                    filename: 'index.html'
+                });
             }
-        });
-        return [routerConfigFile];
-    }
-});
-exports.default = {
-    core,
-    server: server_1.default,
-    types: (0, paths_1.resolvePkgFile)('lib/node/features/html-render/shuvi-app.d.ts')
+        })
+    });
+    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/{main → html-render/lib}/buildHtml.js

@@ -38,6 +38,7 @@ const fse = __importStar(require("fs-extra"));
 const node_mocks_http_1 = require("node-mocks-http");
 const path = __importStar(require("path"));
 const service_1 = require("@shuvi/service");
+const shared_1 = require("../../../../shared");
 const buildHtml = ({ context, serverPlugins, getMiddlewares, pathname, filename }) => __awaiter(void 0, void 0, void 0, function* () {
     return new Promise(resolve => {
         const request = (0, node_mocks_http_1.createRequest)({
@@ -48,7 +49,7 @@ const buildHtml = ({ context, serverPlugins, getMiddlewares, pathname, filename
         });
         response.on('end', () => {
             const html = response._getBuffer();
-            fse.writeFileSync(path.resolve(context.paths.buildDir, service_1.BUILD_DEFAULT_DIR, filename), html);
+            fse.writeFileSync(path.resolve(context.paths.buildDir, shared_1.CLIENT_OUTPUT_DIR, filename), html);
             resolve();
         });
         (0, service_1.createShuviServer)({

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';
+import { IManifest } from '../../../../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/{main → html-render/lib}/generateResource.js

@@ -25,30 +25,34 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __importStar(require("path"));
 const fse = __importStar(require("fs-extra"));
-const service_1 = require("@shuvi/service");
 const file_utils_1 = require("@shuvi/service/lib/project/file-utils");
+const shared_1 = require("../../../../shared");
 const generateResources = (context) => {
-    const { resolveUserFile } = context;
+    const { resolveUserFile, paths } = context;
+    const resourcesDir = path.dirname(paths.resourcesFile);
     const { buildDir } = context.paths;
-    const clientManifestRequest = (0, file_utils_1.urlToRequest)(path.join(buildDir, service_1.BUILD_DEFAULT_DIR, service_1.CLIENT_BUILD_MANIFEST_PATH));
-    const serverManifestRequest = (0, file_utils_1.urlToRequest)(path.join(buildDir, service_1.BUILD_SERVER_DIR, service_1.SERVER_BUILD_MANIFEST_PATH));
-    const serverModuleDir = path.join(buildDir, service_1.BUILD_SERVER_DIR);
+    const clientManifestRequest = (0, file_utils_1.urlToRequest)(path.relative(resourcesDir, path.join(buildDir, shared_1.CLIENT_OUTPUT_DIR, shared_1.CLIENT_BUILD_MANIFEST_PATH)));
+    const serverManifestRequest = (0, file_utils_1.urlToRequest)(path.relative(resourcesDir, path.join(buildDir, shared_1.SERVER_OUTPUT_DIR, shared_1.SERVER_BUILD_MANIFEST_PATH)));
+    const serverModuleDir = path.relative(resourcesDir, path.join(buildDir, shared_1.SERVER_OUTPUT_DIR));
     const result = [];
     result.push(['clientManifest', clientManifestRequest]);
     result.push(['serverManifest', serverManifestRequest]);
     result.push([
         `server = function() {
     const path = require('path');
-    const relativeModulePath = require('${serverManifestRequest}')['bundles']['${service_1.BUILD_SERVER_FILE_SERVER}'];
+    const relativeModulePath = require('${serverManifestRequest}')['bundles']['${shared_1.BUILD_SERVER_FILE_SERVER}'];
     const modulePath = require.resolve(path.join("${serverModuleDir}", relativeModulePath));
     return require(modulePath)
   }`,
         undefined
     ]);
     const customDoc = resolveUserFile('document.ejs');
-    let documentPath = require.resolve('@shuvi/platform-shared/template/document.ejs');
+    let documentPath;
     if (fse.existsSync(customDoc)) {
-        documentPath = customDoc;
+        documentPath = path.relative(process.cwd(), customDoc);
+    }
+    else {
+        documentPath = path.relative(process.cwd(), require.resolve('@shuvi/platform-shared/template/document.ejs'));
     }
     result.push([`documentPath = "${documentPath}"`, undefined]);
     return result;

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): Promise<ShuviRequestHandler>;