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

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
 export { getPageMiddleware } from './getPageMiddleware';
-export { renderToHTML } from './renderToHTML';
 export * from './renderer';
 export * from './pageLoader';

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

@@ -14,10 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderToHTML = exports.getPageMiddleware = void 0;
+exports.getPageMiddleware = void 0;
 var getPageMiddleware_1 = require("./getPageMiddleware");
 Object.defineProperty(exports, "getPageMiddleware", { enumerable: true, get: function () { return getPageMiddleware_1.getPageMiddleware; } });
-var renderToHTML_1 = require("./renderToHTML");
-Object.defineProperty(exports, "renderToHTML", { enumerable: true, get: function () { return renderToHTML_1.renderToHTML; } });
 __exportStar(require("./renderer"), exports);
 __exportStar(require("./pageLoader"), exports);

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

@@ -11,38 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderToHTML = void 0;
 const resources_1 = require("@shuvi/service/lib/resources");
-const shared_1 = require("@shuvi/platform-shared/shared");
 const renderer_1 = require("./renderer");
-const htmlTag_1 = require("./renderer/htmlTag");
-function addEssentialTagsIfMissing(document) {
-    let hasMetaCharset = false;
-    let hasMetaViewport = false;
-    for (const { tagName, attrs } of document.headTags) {
-        if (hasMetaCharset && hasMetaViewport) {
-            break;
-        }
-        if (tagName === 'meta') {
-            if (attrs.charset) {
-                hasMetaCharset = true;
-            }
-            else if (attrs.name === 'viewport') {
-                hasMetaViewport = true;
-            }
-        }
-    }
-    if (!hasMetaCharset) {
-        document.headTags.unshift((0, htmlTag_1.tag)('meta', {
-            charset: 'utf-8'
-        }));
-    }
-    if (!hasMetaViewport) {
-        document.headTags.unshift((0, htmlTag_1.tag)('meta', {
-            name: 'viewport',
-            content: 'width=device-width,minimum-scale=1,initial-scale=1'
-        }));
-    }
-    return document;
-}
 function renderToHTML({ req, serverPluginContext }) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
@@ -54,23 +23,11 @@ function renderToHTML({ req, serverPluginContext }) {
         });
         try {
             yield app.init();
-            const publicApp = app.getPublicAPI();
-            let doc = yield renderer.renderDocument({
-                app: publicApp,
-                req
+            result = yield renderer.renderView({
+                req,
+                app: app.getPublicAPI(),
+                ssr: serverPluginContext.config.ssr
             });
-            if ((0, shared_1.isResponse)(doc)) {
-                result = doc;
-            }
-            else {
-                addEssentialTagsIfMissing(doc);
-                yield serverPluginContext.serverPluginRunner.modifyHtml(doc, app.context);
-                const htmlStr = renderer.renderDocumentToString(doc);
-                const appError = app.error.getError;
-                result = (0, shared_1.text)(htmlStr, {
-                    status: appError && typeof appError.code !== 'undefined' ? appError.code : 200
-                });
-            }
         }
         finally {
             yield app.dispose();

package/lib/node/features/html-render/lib/renderer/base.d.ts

@@ -1,13 +1,13 @@
-import { IAppData, Response } from '@shuvi/platform-shared/shared';
+import { IAppData } from '@shuvi/platform-shared/shared';
 import { IServerPluginContext } from '@shuvi/service';
-import { IHtmlDocument, IHtmlTag, IApplication } from './types';
-import { IRendererConstructorOptions, IRenderDocumentOptions } from './types';
+import { IHtmlTag, IApplication } from './types';
+import { IRendererConstructorOptions, IRenderViewOptions, IRenderDocumentResult } from './types';
 export declare type AppData = Omit<IAppData, 'filesByRoutId' | 'publicPath'>;
 export declare abstract class BaseRenderer {
     protected _serverPluginContext: IServerPluginContext;
     protected _app?: IApplication;
     constructor({ serverPluginContext }: IRendererConstructorOptions);
-    abstract renderDocument({ app, req }: IRenderDocumentOptions): Promise<IHtmlDocument | Response> | IHtmlDocument | Response;
+    abstract renderDocument({ app, req }: IRenderViewOptions): IRenderDocumentResult;
     protected _getMainAssetTags(): {
         styles: IHtmlTag<any>[];
         scripts: IHtmlTag<any>[];

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

@@ -1,5 +1,5 @@
-import { IRendererConstructorOptions, IRenderDocumentOptions } from './types';
-import { IHtmlDocument } from './types';
+import { Response } from '@shuvi/platform-shared/shared';
+import { IRendererConstructorOptions, IRenderViewOptions } from './types';
 export * from './types';
 export interface ITemplateData {
     [x: string]: any;
@@ -10,6 +10,7 @@ export declare class Renderer {
     private _ssrRenderer;
     private _spaRenderer;
     constructor(options: IRendererConstructorOptions);
-    renderDocument(options: IRenderDocumentOptions): import("@shuvi/platform-shared/shared").Response | IHtmlDocument | Promise<import("@shuvi/platform-shared/shared").Response | IHtmlDocument>;
-    renderDocumentToString(document: IHtmlDocument, templateData?: ITemplateData): string;
+    renderView(options: IRenderViewOptions): Promise<Response>;
+    private _renderDocument;
+    private _renderDocumentToString;
 }

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

@@ -13,14 +13,54 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Renderer = void 0;
 const resources_1 = require("@shuvi/service/lib/resources");
+const shared_1 = require("@shuvi/platform-shared/shared");
 const htmlTag_1 = require("./htmlTag");
 const viewTemplate_1 = require("../viewTemplate");
 const spa_1 = require("./spa");
 const ssr_1 = require("./ssr");
+const htmlTag_2 = require("./htmlTag");
 __exportStar(require("./types"), exports);
+function addEssentialTagsIfMissing(document) {
+    let hasMetaCharset = false;
+    let hasMetaViewport = false;
+    for (const { tagName, attrs } of document.headTags) {
+        if (hasMetaCharset && hasMetaViewport) {
+            break;
+        }
+        if (tagName === 'meta') {
+            if (attrs.charset) {
+                hasMetaCharset = true;
+            }
+            else if (attrs.name === 'viewport') {
+                hasMetaViewport = true;
+            }
+        }
+    }
+    if (!hasMetaCharset) {
+        document.headTags.unshift((0, htmlTag_2.tag)('meta', {
+            charset: 'utf-8'
+        }));
+    }
+    if (!hasMetaViewport) {
+        document.headTags.unshift((0, htmlTag_2.tag)('meta', {
+            name: 'viewport',
+            content: 'width=device-width,minimum-scale=1,initial-scale=1'
+        }));
+    }
+    return document;
+}
 class Renderer {
     constructor(options) {
         this._serverPluginContext = options.serverPluginContext;
@@ -28,13 +68,36 @@ class Renderer {
         this._ssrRenderer = new ssr_1.SsrRenderer(options);
         this._spaRenderer = new spa_1.SpaRenderer(options);
     }
-    renderDocument(options) {
-        if (this._serverPluginContext.config.ssr) {
-            return this._ssrRenderer.renderDocument(options);
-        }
-        return this._spaRenderer.renderDocument(options);
+    renderView(options) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            let result;
+            const { app } = options;
+            const doc = yield this._renderDocument(options);
+            if ((0, shared_1.isResponse)(doc)) {
+                result = doc;
+            }
+            else {
+                addEssentialTagsIfMissing(doc);
+                yield this._serverPluginContext.serverPluginRunner.modifyHtml(doc, app.context);
+                const htmlStr = this._renderDocumentToString(doc);
+                result = (0, shared_1.text)(htmlStr, {
+                    status: (_b = (_a = app.error) === null || _a === void 0 ? void 0 : _a.code) !== null && _b !== void 0 ? _b : 200
+                });
+            }
+            return result;
+        });
+    }
+    _renderDocument(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // todo: fallback to spa
+            if (options.ssr) {
+                return yield this._ssrRenderer.renderDocument(options);
+            }
+            return yield this._spaRenderer.renderDocument(options);
+        });
     }
-    renderDocumentToString(document, templateData = {}) {
+    _renderDocumentToString(document, templateData = {}) {
         const htmlAttrs = (0, htmlTag_1.stringifyAttrs)(document.htmlAttrs);
         const head = document.headTags.map(tag => (0, htmlTag_1.stringifyTag)(tag)).join('');
         const main = document.mainTags.map(tag => (0, htmlTag_1.stringifyTag)(tag)).join('');

package/lib/node/features/html-render/lib/renderer/spa.d.ts

@@ -1,5 +1,5 @@
 import { BaseRenderer } from './base';
-import { IRenderDocumentOptions, IHtmlDocument } from './types';
+import { IRenderViewOptions, IHtmlDocument } from './types';
 export declare class SpaRenderer extends BaseRenderer {
-    renderDocument({ app }: IRenderDocumentOptions): IHtmlDocument;
+    renderDocument({ app }: IRenderViewOptions): IHtmlDocument;
 }

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

@@ -5,11 +5,9 @@ const base_1 = require("./base");
 class SpaRenderer extends base_1.BaseRenderer {
     renderDocument({ app }) {
         const assets = this._getMainAssetTags();
-        const serverPluginContext = this._serverPluginContext;
         const appData = {
-            pageData: {},
-            ssr: serverPluginContext.config.ssr,
-            loadersData: {}
+            ssr: false,
+            pageData: {}
         };
         const document = {
             htmlAttrs: {},

package/lib/node/features/html-render/lib/renderer/ssr.d.ts

@@ -1,5 +1,5 @@
 import { BaseRenderer } from './base';
-import { IHtmlDocument, IRenderDocumentOptions } from './types';
+import { IHtmlDocument, IRenderViewOptions } from './types';
 export declare class SsrRenderer extends BaseRenderer {
-    renderDocument({ app, req }: IRenderDocumentOptions): Promise<import("@shuvi/platform-shared/shared").Response | IHtmlDocument>;
+    renderDocument({ app, req }: IRenderViewOptions): Promise<import("@shuvi/platform-shared/shared").Response | IHtmlDocument>;
 }

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

@@ -19,7 +19,7 @@ const htmlTag_1 = require("./htmlTag");
 class SsrRenderer extends base_1.BaseRenderer {
     renderDocument({ app, req }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { router, context } = app;
+            const { store, router, context } = app;
             const serverPluginContext = this._serverPluginContext;
             const { view } = resources_1.server;
             const { getAssetPublicUrl } = serverPluginContext;
@@ -41,7 +41,7 @@ class SsrRenderer extends base_1.BaseRenderer {
                 Object.assign(acc, data);
                 return acc;
             }, {});
-            const appData = Object.assign(Object.assign({}, result.appData), { pageData, ssr: serverPluginContext.config.ssr });
+            const appData = Object.assign(Object.assign({}, result.appData), { ssr: true, appState: store.getState(), pageData });
             appData.runtimeConfig = (0, shuvi_singleton_runtimeConfig_1.getPublicRuntimeConfig)() || {};
             const document = {
                 htmlAttrs: Object.assign({}, result.htmlAttrs),

package/lib/node/features/html-render/lib/renderer/types.d.ts

@@ -1,20 +1,22 @@
-import { IApplication, IRequest } from '@shuvi/platform-shared/shared';
-import { IHtmlAttrs, IHtmlTag, IClientRendererOptions, IServerRendererOptions, IViewClient, IViewServer, IRenderAppServerResult } from '../../../../../shared';
+import { IApplication, IRequest, Response } from '@shuvi/platform-shared/shared';
 import { IServerPluginContext } from '@shuvi/service';
+import { IHtmlAttrs, IHtmlTag, IClientRendererOptions, IServerRendererOptions, IViewClient, IViewServer, IRenderAppServerResult } from '../../../../../shared';
 export { IHtmlAttrs, IHtmlTag, IApplication };
 export interface IRendererConstructorOptions {
     serverPluginContext: IServerPluginContext;
 }
-export declare type IRenderDocumentOptions = {
+export declare type IRenderViewOptions = {
     app: IApplication;
     req: IRequest;
+    ssr: boolean;
 };
+export declare type IRenderDocumentResult = Promise<IHtmlDocument | Response> | IHtmlDocument | Response;
 export interface IHtmlDocument {
     htmlAttrs: IHtmlAttrs;
     headTags: IHtmlTag<'meta' | 'link' | 'style' | 'script' | 'noscript' | 'title'>[];
     mainTags: IHtmlTag[];
     scriptTags: IHtmlTag<'script'>[];
 }
-export interface IRenderOptions extends IRenderDocumentOptions {
+export interface IRenderOptions extends IRenderViewOptions {
 }
 export { IRenderAppServerResult, IClientRendererOptions, IServerRendererOptions, IViewClient, IViewServer };

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,22 @@ 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");
+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
 ];
+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;
     }
 }