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

package/esm/shuvi-app/entry/client/run.dev.js

@@ -9,11 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 /// <reference lib="dom" />
 import { DEV_STYLE_HIDE_FOUC, DEV_STYLE_PREPARE } from '@shuvi/shared/lib/constants';
-import initWebpackHMR from '../../dev/webpackHotDevClient';
-import { run } from './app';
+import { initHMRAndDevClient } from '../../dev';
+import { run, app } from './app';
 function init() {
     return __awaiter(this, void 0, void 0, function* () {
-        initWebpackHMR();
+        initHMRAndDevClient(app);
         // reduce FOUC caused by style-loader
         const styleReady = new Promise(resolve => {
             (window.requestAnimationFrame || setTimeout)(() => __awaiter(this, void 0, void 0, function* () {
@@ -27,4 +27,4 @@ function init() {
         yield styleReady;
     });
 }
-init().then(run);
+init().then(() => run());

package/esm/shuvi-app/entry/server/index.d.ts

@@ -1,6 +1,7 @@
-import * as application from '../../app/server';
-import * as server from '@shuvi/app/files/user/server';
+import { default as pageRoutes } from '@shuvi/app/files/routes';
 import { default as apiRoutes } from '@shuvi/app/files/apiRoutes';
 import { default as middlewareRoutes } from '@shuvi/app/files/middlewareRoutes';
-export { server, application, apiRoutes, middlewareRoutes };
-export { view } from '@shuvi/app/core/platform';
+import { view } from '@shuvi/app/core/platform';
+import * as server from '@shuvi/app/user/server';
+import * as application from '../../app/server';
+export { pageRoutes, apiRoutes, middlewareRoutes, server, view, application };

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

@@ -1,7 +1,8 @@
 // This is the shuvi server-side main module exports collection
-import * as application from '../../app/server';
-import * as server from '@shuvi/app/files/user/server';
+import { default as pageRoutes } from '@shuvi/app/files/routes';
 import { default as apiRoutes } from '@shuvi/app/files/apiRoutes';
 import { default as middlewareRoutes } from '@shuvi/app/files/middlewareRoutes';
-export { server, application, apiRoutes, middlewareRoutes };
-export { view } from '@shuvi/app/core/platform';
+import { view } from '@shuvi/app/core/platform';
+import * as server from '@shuvi/app/user/server';
+import * as application from '../../app/server';
+export { pageRoutes, apiRoutes, middlewareRoutes, server, view, application };

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

@@ -1,2 +1,2 @@
-import { IPageRouteRecord, IRawPageRouteRecord } from '@shuvi/platform-shared/shared';
-export default function getRoutes(routes: IRawPageRouteRecord[]): IPageRouteRecord[];
+import { IPageRouteRecord } from '@shuvi/platform-shared/shared';
+export default function getRoutes(routes: IPageRouteRecord[]): IPageRouteRecord[];

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

@@ -13,18 +13,17 @@ import { loadRouteComponent } from './loadRouteComponent';
 export default function getRoutes(routes) {
     const getRoutesWithRequire = (routes) => routes.map(x => {
         const originalRoute = Object.assign({}, x);
-        const { __componentSource__, __componentSourceWithAffix__, __import__, __resolveWeak__, children } = originalRoute, rest = __rest(originalRoute, ["__componentSource__", "__componentSourceWithAffix__", "__import__", "__resolveWeak__", "children"]);
+        const { __componentRawRequest__, __import__, __resolveWeak__, children } = originalRoute, rest = __rest(originalRoute, ["__componentRawRequest__", "__import__", "__resolveWeak__", "children"]);
         const route = Object.assign({}, rest);
         if (children) {
             route.children = getRoutesWithRequire(children);
         }
-        if (__componentSourceWithAffix__ && __import__) {
-            route.component = loadRouteComponent(__import__, {
-                webpack: __resolveWeak__,
-                modules: [__componentSourceWithAffix__]
-            });
+        if (__import__) {
+            route.component = loadRouteComponent(__import__, Object.assign({ webpack: __resolveWeak__ }, (__componentRawRequest__ && {
+                modules: [__componentRawRequest__]
+            })));
         }
-        return Object.assign({ __componentSourceWithAffix__, __resolveWeak__ }, route);
+        return Object.assign({ __componentRawRequest__, __resolveWeak__ }, route);
     });
     const routesWithRequire = getRoutesWithRequire(routes || []);
     return routesWithRequire;

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

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

package/{lib/node/targets → esm/shuvi-app}/react/redox-react/runtime.d.ts

@@ -1,2 +1,8 @@
+import { IStoreManager } from '@shuvi/redox';
+declare module '@shuvi/runtime' {
+    interface CustomAppContext {
+        store: IStoreManager;
+    }
+}
 declare const _default: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/platform-shared/shared").BuiltInRuntimePluginHooks & import("@shuvi/runtime").CustomRuntimePluginHooks, void>;
 export default _default;

package/{lib/node/targets → esm/shuvi-app}/react/redox-react/runtime.js

@@ -1,4 +1,3 @@
-"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) {
@@ -8,11 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const shared_1 = require("@shuvi/platform-shared/shared");
-const RedoxWrapper_1 = require("./RedoxWrapper");
-exports.default = (0, shared_1.createRuntimePlugin)({
+import { createRuntimePlugin } from '@shuvi/platform-shared/shared';
+import { RedoxWrapper } from './RedoxWrapper';
+export default createRuntimePlugin({
     appComponent: (App, appContext) => __awaiter(void 0, void 0, void 0, function* () {
-        return (0, RedoxWrapper_1.RedoxWrapper)(App, appContext);
+        return RedoxWrapper(App, {
+            storeManager: appContext.store
+        });
     })
 });

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

@@ -1,2 +1,2 @@
-// exported by @shuvi/runtme
+// exported by @shuvi/runtime
 export {};

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

@@ -1,16 +1,4 @@
 declare const _default: {
-    core: import("@shuvi/hook").IPluginInstance<{
-        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/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/runtime").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
+    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/service/lib/server/pluginTypes").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
 };
 export default _default;

package/lib/node/features/custom-server/index.js

@@ -3,24 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const service_1 = require("@shuvi/service");
-const file_utils_1 = require("@shuvi/service/lib/project/file-utils");
 const server_1 = __importDefault(require("./server"));
-const core = (0, service_1.createPlugin)({
-    addRuntimeFile: ({ defineFile }, context) => {
-        const { paths } = context;
-        const serverCandidates = (0, file_utils_1.getUserCustomFileCandidates)(paths.rootDir, 'server', 'noop');
-        const userServerFile = defineFile({
-            name: 'user/server.js',
-            content: () => {
-                return (0, file_utils_1.getFirstModuleExport)((0, file_utils_1.getAllFiles)(serverCandidates), serverCandidates);
-            },
-            dependencies: serverCandidates
-        });
-        return [userServerFile];
-    }
-});
 exports.default = {
-    core,
     server: server_1.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/runtime").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
+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>;
 export default _default;

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { IncomingMessage } from 'http';
 import { IResponse, IRequest } from '@shuvi/service';
 import { IApiRequestHandler, IApiResponse } from '../../../../shared';

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;
+export declare function middleware(_ctx: IServerPluginContext): IRequestHandlerWithNext;

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

@@ -13,11 +13,10 @@ exports.middleware = void 0;
 const router_1 = require("@shuvi/router");
 const resources_1 = require("@shuvi/service/lib/resources");
 const apiRouteHandler_1 = require("./apiRouteHandler");
-function middleware(ctx) {
+function middleware(_ctx) {
     return function (req, res, next) {
         return __awaiter(this, void 0, void 0, function* () {
             const { apiRoutes } = resources_1.server;
-            const commonApiConfig = ctx.config.apiConfig || {};
             let tempApiModule;
             for (const { path, api } of apiRoutes) {
                 const match = (0, router_1.matchPathname)(path, req.pathname);
@@ -29,9 +28,8 @@ function middleware(ctx) {
             }
             if (tempApiModule) {
                 try {
-                    const { config: { apiConfig = {} } = {}, default: resolver } = tempApiModule;
-                    let overridesConfig = Object.assign(Object.assign({}, commonApiConfig), apiConfig);
-                    yield (0, apiRouteHandler_1.apiRouteHandler)(req, res, resolver, overridesConfig);
+                    const { config, default: resolver } = tempApiModule;
+                    yield (0, apiRouteHandler_1.apiRouteHandler)(req, res, resolver, (config === null || config === void 0 ? void 0 : config.api) || { bodyParser: true });
                 }
                 catch (error) {
                     next(error);

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

@@ -1,3 +1,3 @@
-import { IUserRouteConfig, IMiddlewareRouteConfig } from '@shuvi/service';
-export declare const addRoutes: import("@shuvi/hook").AsyncParallelHook<void, void, IUserRouteConfig[]>;
+import { IPageRouteConfig, IMiddlewareRouteConfig } from '@shuvi/platform-shared/shared';
+export declare const addRoutes: import("@shuvi/hook").AsyncParallelHook<void, void, IPageRouteConfig[]>;
 export declare const addMiddlewareRoutes: import("@shuvi/hook").AsyncParallelHook<void, void, IMiddlewareRouteConfig[]>;

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

@@ -3,7 +3,8 @@ import { middleware as getMiddlewareMiddleware } from './middleware';
 import { IApiRequestHandler, middleware as getApiMiddleware } from './api';
 export { IApiRequestHandler, getRoutes, getMiddlewareMiddleware, getApiMiddleware };
 declare const _default: {
-    core: import("@shuvi/hook").IPluginInstance<{
+    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>;
@@ -12,9 +13,8 @@ declare const _default: {
         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>[]>;
+        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/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    types: string;
+    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
 };
 export default _default;

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

@@ -38,7 +38,6 @@ 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 paths_1 = require("../../paths");
 const lib_1 = require("../html-render/lib");
 const hooks_1 = require("./hooks");
 const page_1 = require("./page");
@@ -51,9 +50,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* () {
-        const { config: { routes: pageRoutes, middlewareRoutes, apiRoutes }, paths, pluginRunner, phase } = context;
+    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* () {
@@ -63,7 +71,7 @@ const plugin = (0, service_1.createPlugin)({
                     routes = pageRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getPageRoutes)(paths.routesDir);
+                    const { routes: _routes, warnings } = yield (0, node_1.getPageRoutes)(getContent(rawRoutes), conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning.msg);
@@ -78,18 +86,18 @@ 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',
             content: () => __awaiter(void 0, void 0, void 0, function* () {
-                let routes = [];
+                let routes;
                 const hasConfigRoutes = Array.isArray(apiRoutes);
                 if (hasConfigRoutes) {
                     routes = apiRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getApiRoutes)(paths.routesDir);
+                    const { routes: _routes, warnings } = yield (0, node_1.getApiRoutes)(getContent(rawRoutes), conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning);
@@ -99,7 +107,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',
@@ -110,7 +118,7 @@ const plugin = (0, service_1.createPlugin)({
                     routes = middlewareRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getMiddlewareRoutes)(paths.routesDir);
+                    const { routes: _routes, warnings } = yield (0, node_1.getMiddlewareRoutes)(getContent(rawRoutes), conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning);
@@ -123,7 +131,7 @@ const plugin = (0, service_1.createPlugin)({
                     baseDir: paths.routesDir
                 });
             }),
-            dependencies: [paths.routesDir]
+            dependencies: [rawRoutes]
         });
         const loadersFile = defineFile({
             name: 'loaders.js',
@@ -168,6 +176,7 @@ const plugin = (0, service_1.createPlugin)({
             dependencies: [loadersFile]
         });
         return [
+            rawRoutes,
             pageRoutesFile,
             apiRoutesFile,
             middlewareRoutesFile,
@@ -177,6 +186,5 @@ const plugin = (0, service_1.createPlugin)({
     })
 });
 exports.default = {
-    core: plugin,
-    types: (0, paths_1.resolvePkgFile)('lib/node/features/filesystem-routes/shuvi-app.d.ts')
+    core: plugin
 };

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

@@ -1,2 +1,2 @@
-export { normalizeRoutes, generateRoutesContent, IUserRouteConfig } from './routes';
+export { normalizeRoutes, generateRoutesContent, IPageRouteConfig } from './routes';
 export * from './store';

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

@@ -1,8 +1,8 @@
-import { IUserRouteConfig, IRouteConfig } from '@shuvi/service';
-export { IUserRouteConfig };
+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: IRouteConfig[]): string;
-export declare function normalizeRoutes(routes: (IUserRouteConfig | IUserRouteConfig)[], componentDir: string, parentPath?: string): IRouteConfig[];
-export declare const generateRoutesContent: (routes: IRouteConfig[]) => 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 windows === 'undefined') {
+  routes = ${serverRoutes}
+} else {
+  routes = ${clientRoutes}
+}
+
+export default routes
+`;
 };
 exports.generateRoutesContent = generateRoutesContent;

package/lib/node/features/filesystem-routes/page/store.d.ts

@@ -1,3 +1,3 @@
-import { IRouteConfig } from '@shuvi/service';
-export declare const setRoutes: (newRoutes: IRouteConfig[]) => void;
-export declare const getRoutes: () => IRouteConfig[];
+import { IPageRouteConfigWithId } from '@shuvi/platform-shared/shared';
+export declare const setRoutes: (newRoutes: IPageRouteConfigWithId[]) => void;
+export declare const getRoutes: () => IPageRouteConfigWithId[];

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

@@ -1,18 +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<{
-        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/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/runtime").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)('esm/shuvi-app/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[]>;