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

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

@@ -1,2 +1,8 @@
-declare const _default: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/platform-shared/shared").BuiltInRuntimePluginHooks & import("@shuvi/platform-shared/shared").CustomRuntimePluginHooks, void>;
+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/esm/shuvi-app/react/redox-react/runtime.js

@@ -11,6 +11,8 @@ 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 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/filesystem-routes/index.d.ts

@@ -13,7 +13,7 @@ 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/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
 };

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

@@ -50,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* () {
+    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 +71,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 +86,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 +97,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 +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',
@@ -109,7 +118,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,7 +131,7 @@ const plugin = (0, service_1.createPlugin)({
                     baseDir: paths.routesDir
                 });
             }),
-            dependencies: [paths.routesDir]
+            dependencies: [rawRoutes]
         });
         const loadersFile = defineFile({
             name: 'loaders.js',
@@ -167,6 +176,7 @@ const plugin = (0, service_1.createPlugin)({
             dependencies: [loadersFile]
         });
         return [
+            rawRoutes,
             pageRoutesFile,
             apiRoutesFile,
             middlewareRoutesFile,

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 windows === '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)('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[]>;

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

@@ -1,32 +1,4 @@
-export { buildHtml } from './main/buildHtml';
+import { IPlatformContext, ResolvedPlugin } from '@shuvi/service/lib/core';
+export { buildHtml } from './html-render/lib/buildHtml';
 export { getMiddlewares, getMiddlewaresBeforeDevMiddlewares } from './middlewares';
-export { getPlugin as getMainPlugin } from './main';
-export declare const featurePlugins: (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> | {
-    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>;
-})[];
+export declare const getPlugins: (platformContext: IPlatformContext) => ResolvedPlugin[];

package/lib/node/features/index.js

@@ -3,23 +3,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.featurePlugins = exports.getMainPlugin = exports.getMiddlewaresBeforeDevMiddlewares = exports.getMiddlewares = exports.buildHtml = void 0;
+exports.getPlugins = exports.getMiddlewaresBeforeDevMiddlewares = exports.getMiddlewares = exports.buildHtml = void 0;
 const on_demand_compile_page_1 = __importDefault(require("./on-demand-compile-page"));
-const html_render_1 = __importDefault(require("./html-render"));
+const html_render_1 = require("./html-render");
 const custom_server_1 = __importDefault(require("./custom-server"));
 const model_1 = __importDefault(require("./model"));
 const filesystem_routes_1 = __importDefault(require("./filesystem-routes"));
-var buildHtml_1 = require("./main/buildHtml");
+const webpack_watch_wait_for_file_builder_1 = __importDefault(require("./webpack-watch-wait-for-file-builder"));
+var buildHtml_1 = require("./html-render/lib/buildHtml");
 Object.defineProperty(exports, "buildHtml", { enumerable: true, get: function () { return buildHtml_1.buildHtml; } });
 var middlewares_1 = require("./middlewares");
 Object.defineProperty(exports, "getMiddlewares", { enumerable: true, get: function () { return middlewares_1.getMiddlewares; } });
 Object.defineProperty(exports, "getMiddlewaresBeforeDevMiddlewares", { enumerable: true, get: function () { return middlewares_1.getMiddlewaresBeforeDevMiddlewares; } });
-var main_1 = require("./main");
-Object.defineProperty(exports, "getMainPlugin", { enumerable: true, get: function () { return main_1.getPlugin; } });
-exports.featurePlugins = [
+const getPlugins = (platformContext) => [
+    (0, html_render_1.getPlugin)(platformContext),
     on_demand_compile_page_1.default,
     filesystem_routes_1.default,
-    html_render_1.default,
     custom_server_1.default,
-    model_1.default
+    model_1.default,
+    webpack_watch_wait_for_file_builder_1.default
 ];
+exports.getPlugins = getPlugins;

package/lib/node/features/model/index.d.ts

@@ -9,7 +9,7 @@ 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/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
     runtime: {

package/lib/node/features/model/runtime.d.ts

@@ -4,10 +4,5 @@ export declare type InitRedox = (params: {
     initialState: any;
     ctx: IAppContext;
 }) => IStoreManager;
-declare module '@shuvi/runtime' {
-    interface CustomAppContext {
-        storeManager?: 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/features/model/runtime.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const redox_1 = require("@shuvi/redox");
 const shared_1 = require("@shuvi/platform-shared/shared");
-let currentStoreManager;
+let currentStore;
 const isServer = typeof window === 'undefined';
 // for client, singleton mode
 // for server, return new store
@@ -21,27 +21,21 @@ const initStore = ({ initialState, ctx }) => {
         return createStoreInstance();
     }
     // for client is singleton, just init once
-    if (currentStoreManager) {
-        return currentStoreManager;
+    if (!currentStore) {
+        currentStore = createStoreInstance();
     }
-    currentStoreManager = createStoreInstance();
-    return currentStoreManager;
+    return currentStore;
 };
 exports.default = (0, shared_1.createRuntimePlugin)({
     appContext: ctx => {
-        if (!ctx.storeManager) {
-            let initialState = {};
-            if (!isServer) {
-                initialState = (0, shared_1.getPageData)('redox');
-            }
-            if (ctx.pageData && ctx.pageData.redox) {
-                initialState = ctx.pageData.redox;
-            }
-            ctx.storeManager = initStore({
-                ctx,
-                initialState
-            });
+        let initialState = {};
+        if (!isServer) {
+            initialState = (0, shared_1.getPageData)('shuviInitialState', {});
         }
+        ctx.store = initStore({
+            ctx,
+            initialState
+        });
         return ctx;
     }
 });

package/lib/node/features/model/server.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const service_1 = require("@shuvi/service");
 exports.default = (0, service_1.createServerPlugin)({
     getPageData: appContext => {
-        const { storeManager } = appContext;
-        delete appContext.storeManager;
+        const { store } = appContext;
         return {
-            redox: storeManager === null || storeManager === void 0 ? void 0 : storeManager.getState()
+            shuviInitialState: store.getState()
         };
     }
 });

package/lib/node/features/model/shuvi-app.d.ts

@@ -1,6 +1,6 @@
 import type { IStoreManager } from '@shuvi/redox';
 declare module '@shuvi/runtime' {
     interface CustomAppContext {
-        storeManager?: IStoreManager;
+        store: IStoreManager;
     }
 }