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

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({ req, app }: IRenderViewOptions): IHtmlDocument;
 }

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

@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpaRenderer = void 0;
 const base_1 = require("./base");
 class SpaRenderer extends base_1.BaseRenderer {
-    renderDocument({ app }) {
-        const assets = this._getMainAssetTags();
-        const serverPluginContext = this._serverPluginContext;
+    renderDocument({ req, app }) {
+        const assets = this._getMainAssetTags(req);
         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, isDev }: IRenderViewOptions): Promise<import("@shuvi/platform-shared/shared").Response | IHtmlDocument>;
 }

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

@@ -17,12 +17,11 @@ const resources_1 = require("@shuvi/service/lib/resources");
 const base_1 = require("./base");
 const htmlTag_1 = require("./htmlTag");
 class SsrRenderer extends base_1.BaseRenderer {
-    renderDocument({ app, req }) {
+    renderDocument({ app, req, isDev }) {
         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;
             if (!router) {
                 throw new Error('router is null');
             }
@@ -30,18 +29,18 @@ class SsrRenderer extends base_1.BaseRenderer {
                 app,
                 req,
                 manifest: resources_1.clientManifest,
-                getAssetPublicUrl
+                isDev
             });
             if ((0, shared_1.isResponse)(result)) {
                 return result;
             }
-            const mainAssetsTags = this._getMainAssetTags();
+            const mainAssetsTags = this._getMainAssetTags(req);
             const pageDataList = yield serverPluginContext.serverPluginRunner.getPageData(context);
             const pageData = pageDataList.reduce((acc, data) => {
                 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,23 @@
-import { IApplication, IRequest } from '@shuvi/platform-shared/shared';
+import { IApplication, Response } from '@shuvi/platform-shared/shared';
+import { ShuviRequest, IServerPluginContext } from '@shuvi/service';
 import { IHtmlAttrs, IHtmlTag, IClientRendererOptions, IServerRendererOptions, IViewClient, IViewServer, IRenderAppServerResult } from '../../../../../shared';
-import { IServerPluginContext } from '@shuvi/service';
 export { IHtmlAttrs, IHtmlTag, IApplication };
 export interface IRendererConstructorOptions {
     serverPluginContext: IServerPluginContext;
 }
-export declare type IRenderDocumentOptions = {
+export declare type IRenderViewOptions = {
     app: IApplication;
-    req: IRequest;
+    req: ShuviRequest;
+    ssr: boolean;
+    isDev: 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/html-render/server.d.ts

@@ -1,2 +1,2 @@
-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>;
+declare const _default: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").ServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
 export default _default;

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

@@ -1,17 +1,5 @@
 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>;
+    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
     runtime: {
         plugin: string;
     };

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

@@ -1,13 +1,8 @@
-import { IStoreManager } from '@shuvi/redox';
+import { RedoxStore } from '@shuvi/redox';
 import { IAppContext } from '@shuvi/platform-shared/shared';
 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>;
+}) => RedoxStore;
+declare const _default: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/platform-shared/shared").RuntimePluginHooks, 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,23 @@ 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;
     }
+}, {
+    name: 'model'
 });

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';
+import type { RedoxStore } from '@shuvi/redox';
 declare module '@shuvi/runtime' {
     interface CustomAppContext {
-        storeManager?: IStoreManager;
+        store: RedoxStore;
     }
 }

package/lib/node/features/on-demand-compile-page/index.d.ts

@@ -1,15 +1,5 @@
-declare const _default: 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>;
+declare const _default: {
+    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
+};
 export default _default;
 export { default as OnDemandRouteManager } from './onDemandRouteManager';

package/lib/node/features/on-demand-compile-page/index.js

@@ -10,7 +10,7 @@ const module_replace_plugin_1 = __importDefault(require("@shuvi/toolpack/lib/web
 const require_cache_hot_reloader_plugin_1 = __importDefault(require("@shuvi/toolpack/lib/webpack/plugins/require-cache-hot-reloader-plugin"));
 const constants_1 = require("@shuvi/shared/lib/constants");
 const dumbRouteComponent = require.resolve('./emptyComponent');
-exports.default = (0, service_1.createPlugin)({
+const plugin = (0, service_1.createPlugin)({
     configWebpack(config, _, ctx) {
         if (ctx.mode === 'development') {
             config.plugin('private/module-replace-plugin').use(module_replace_plugin_1.default, [
@@ -32,5 +32,8 @@ exports.default = (0, service_1.createPlugin)({
         return config;
     }
 });
+exports.default = {
+    core: plugin
+};
 var onDemandRouteManager_1 = require("./onDemandRouteManager");
 Object.defineProperty(exports, "OnDemandRouteManager", { enumerable: true, get: function () { return __importDefault(onDemandRouteManager_1).default; } });

package/lib/node/features/on-demand-compile-page/onDemandRouteManager.d.ts

@@ -1,11 +1,11 @@
-import { IRequestHandlerWithNext, IServerPluginContext } from '@shuvi/service';
+import { ShuviRequestHandler, IServerPluginContext } from '@shuvi/service';
 import { DevMiddleware } from '@shuvi/service/lib/server/middlewares/dev';
 export default class OnDemandRouteManager {
     devMiddleware: DevMiddleware | null;
     _serverPluginContext: IServerPluginContext;
     constructor(serverPluginContext: IServerPluginContext);
-    getServerMiddleware(): IRequestHandlerWithNext;
-    ensureRoutesMiddleware(): IRequestHandlerWithNext;
+    getServerMiddleware(): ShuviRequestHandler;
+    ensureRoutesMiddleware(): ShuviRequestHandler;
     ensureRoutes(pathname: string): Promise<void>;
     private _activateModules;
 }

package/lib/node/features/on-demand-compile-page/onDemandRouteManager.js

@@ -13,10 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const router_1 = require("@shuvi/router");
-const constants_1 = require("@shuvi/shared/lib/constants");
 const resources_1 = require("@shuvi/service/lib/resources");
 const module_replace_plugin_1 = __importDefault(require("@shuvi/toolpack/lib/webpack/plugins/module-replace-plugin"));
-const index_1 = require("../filesystem-routes/index");
 function acceptsHtml(header, { htmlAcceptHeaders = ['text/html', '*/*'] } = {}) {
     for (var i = 0; i < htmlAcceptHeaders.length; i++) {
         if (header.indexOf(htmlAcceptHeaders[i]) !== -1) {
@@ -79,9 +77,9 @@ class OnDemandRouteManager {
     }
     ensureRoutes(pathname) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchedRoutes = (0, router_1.matchRoutes)((0, index_1.getRoutes)(), pathname) || [];
+            const matchedRoutes = (0, router_1.matchRoutes)(resources_1.server.pageRoutes, pathname) || [];
             const modulesToActivate = matchedRoutes
-                .map(({ route: { component } }) => component ? `${component}?${constants_1.ROUTE_RESOURCE_QUERYSTRING}` : '')
+                .map(({ route: { __componentRawRequest__ } }) => __componentRawRequest__)
                 .filter(Boolean);
             return this._activateModules(modulesToActivate);
         });

package/lib/node/index.js

@@ -13,7 +13,6 @@ const node_1 = require("@shuvi/platform-shared/node");
 const features_1 = require("./features");
 const paths_1 = require("./paths");
 const platform = ({ framework = 'react' } = {}) => (platformContext) => __awaiter(void 0, void 0, void 0, function* () {
-    const mainPlugin = (0, features_1.getMainPlugin)(platformContext);
     const platformFramework = require(`./targets/${framework}`).default;
     const platformFrameworkContent = yield platformFramework();
     const platformModule = platformFrameworkContent.platformModule;
@@ -26,8 +25,7 @@ const platform = ({ framework = 'react' } = {}) => (platformContext) => __awaite
         ],
         plugins: [
             ...node_1.SharedPlugins,
-            mainPlugin,
-            ...features_1.featurePlugins,
+            ...(0, features_1.getPlugins)(platformContext),
             ...platformFrameworkContent.plugins
         ],
         getPresetRuntimeFiles,

package/lib/node/paths.js

@@ -26,8 +26,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePkgFile = exports.resolveLib = exports.resolveDep = void 0;
 const path = __importStar(require("path"));
 const PACKAGE_DIR = path.resolve(__dirname, '..', '..');
-// export const resolveToModulePath = (...paths: string[]) =>
-//   `@shuvi/platform-web/${paths.join('/')}`;
 const resolveDep = (module) => require.resolve(module);
 exports.resolveDep = resolveDep;
 const resolveLib = (module) => path.dirname((0, exports.resolveDep)(path.join(module, 'package.json')));

package/lib/node/shuvi-runtime-server.d.ts

@@ -0,0 +1,18 @@
+import { IServerModule as _IServerModule } from '../shared/index';
+import { extendedHooks } from './features/html-render/serverHooks';
+declare type Head<T extends any[]> = T extends [...infer Head, any] ? Head : never;
+declare type RemoveLast<T extends (...args: any) => any> = (...args: Head<Parameters<T>>) => ReturnType<T>;
+declare global {
+    namespace ShuviService {
+        interface CustomServerPluginHooks {
+            getPageData: typeof extendedHooks.getPageData;
+            handlePageRequest: typeof extendedHooks.handlePageRequest;
+            modifyHtml: typeof extendedHooks.modifyHtml;
+        }
+    }
+}
+declare type ServerModule = Required<_IServerModule>;
+export declare type GetPageDataFunction = RemoveLast<ServerModule['getPageData']>;
+export declare type HandlePageRequestFunction = RemoveLast<ServerModule['handlePageRequest']>;
+export declare type ModifyHtmlFunction = RemoveLast<ServerModule['modifyHtml']>;
+export {};

package/lib/node/shuvi-runtime-server.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/node/shuvi-type-extensions-node.d.ts

@@ -1,13 +1,14 @@
 import '@shuvi/platform-shared/shuvi-type-extensions-node';
+import { IPageRouteRecord } from '@shuvi/platform-shared/shared';
 import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
 import { IMiddlewareRoutes, CreateAppServer, IApiRoutes, IServerModule, PlatformWebCustomConfig } from '../shared/index';
 import { IViewServer } from './features/html-render/index';
 import { addRoutes, addMiddlewareRoutes } from './features/filesystem-routes/hooks';
-import { extendedHooks } from './features/html-render/serverHooks';
 export {};
 declare module '@shuvi/service/lib/resources' {
     const server: {
         server: IServerModule;
+        pageRoutes: IPageRouteRecord[];
         apiRoutes: IApiRoutes;
         middlewareRoutes: IMiddlewareRoutes;
         application: {
@@ -33,10 +34,5 @@ declare global {
             addRoutes: typeof addRoutes;
             addMiddlewareRoutes: typeof addMiddlewareRoutes;
         }
-        interface CustomServerPluginHooks {
-            getPageData: typeof extendedHooks.getPageData;
-            handlePageRequest: typeof extendedHooks.handlePageRequest;
-            modifyHtml: typeof extendedHooks.modifyHtml;
-        }
     }
 }

package/lib/node/targets/react/bundler/index.d.ts

@@ -1,16 +1,4 @@
 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>;
+    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
 };
 export default _default;

package/lib/node/targets/react/bundler/index.js

@@ -64,6 +64,11 @@ const configWebpack = (config, { name, webpack }, context) => {
         resolveLocal('react', 'jsx-runtime')
     ]);
     // @ts-ignore
+    config.resolve.alias.set('react/jsx-dev-runtime$', [
+        resolveUser('react/jsx-dev-runtime'),
+        resolveLocal('react', 'jsx-dev-runtime')
+    ]);
+    // @ts-ignore
     config.resolve.alias.set('react-dom$', [
         resolveUser('react-dom'),
         resolveLocal('react-dom')