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

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.js

@@ -9,7 +9,6 @@ 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"));
-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");
@@ -20,7 +19,6 @@ const getPlugins = (platformContext) => [
     on_demand_compile_page_1.default,
     filesystem_routes_1.default,
     custom_server_1.default,
-    model_1.default,
-    webpack_watch_wait_for_file_builder_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").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>;
+    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,8 +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 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

@@ -38,4 +38,6 @@ exports.default = (0, shared_1.createRuntimePlugin)({
         });
         return ctx;
     }
+}, {
+    name: 'model'
 });

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 {
-        store: IStoreManager;
+        store: RedoxStore;
     }
 }

package/lib/node/features/on-demand-compile-page/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").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>;
+    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/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/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

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

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

@@ -1,30 +1,6 @@
 declare const platformWebReact: () => {
-    plugins: (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").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> | {
-        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").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>;
+    plugins: (import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext> | {
+        core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
     })[];
     platformModule: string;
     polyfills: string[];

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const service_1 = require("@shuvi/service");
 const bundler_1 = __importDefault(require("./bundler"));
-const redox_react_1 = require("./redox-react");
+const model_1 = require("./model");
 const paths_1 = require("../../paths");
 const webReactMainPlugin = (0, service_1.createPlugin)({
     addRuntimeService: () => [
@@ -17,7 +17,7 @@ const webReactMainPlugin = (0, service_1.createPlugin)({
 });
 const platformWebReact = () => {
     return {
-        plugins: [webReactMainPlugin, bundler_1.default, redox_react_1.RedoxReactPlugin],
+        plugins: [webReactMainPlugin, bundler_1.default, model_1.ModelReactPlugin],
         platformModule: (0, paths_1.resolvePkgFile)('esm/shuvi-app/react/index'),
         polyfills: [
             (0, paths_1.resolveDep)('react-app-polyfill/ie11'),

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

@@ -0,0 +1,6 @@
+export declare const ModelReactPlugin: {
+    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
+    runtime: {
+        plugin: string;
+    };
+};

package/lib/node/targets/react/{redox-react → model}/index.js

@@ -23,13 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedoxReactPlugin = void 0;
+exports.ModelReactPlugin = void 0;
 const path = __importStar(require("path"));
 const service_1 = require("@shuvi/service");
 const paths_1 = require("../../../paths");
-// todo: optimize this
-const runtimePath = require.resolve(path.join(__dirname, '../../../../../esm/shuvi-app/react/redox-react/runtime'));
-const core = (0, service_1.createPlugin)({
+const core = (0, service_1.createPluginAfter)({
     addRuntimeService: () => [
         {
             source: path.dirname(require.resolve('@shuvi/redox-react/package.json')),
@@ -41,10 +39,13 @@ const core = (0, service_1.createPlugin)({
         config.resolve.alias.set('@shuvi/redox', (0, paths_1.resolveLib)('@shuvi/redox'));
         return config;
     }
+}, {
+    name: 'model-react'
 });
-exports.RedoxReactPlugin = {
+exports.ModelReactPlugin = {
     core,
     runtime: {
-        plugin: runtimePath
+        // this need
+        plugin: (0, paths_1.resolvePkgFile)('esm/shuvi-app/react/model/runtime')
     }
 };

package/lib/shared/appTypes.d.ts

@@ -1,9 +1,11 @@
-import { IRequest, IPageRouteRecord, IAppData, IAppState } from '@shuvi/platform-shared/shared';
+import { IPageRouteRecord, IAppData, IAppState } from '@shuvi/platform-shared/shared';
 import { Application } from '@shuvi/platform-shared/shuvi-app/application';
+import type { ShuviRequest } from '@shuvi/service';
 export interface CreateAppServer {
     (options: {
-        req: IRequest;
+        req: ShuviRequest;
         ssr: boolean;
+        isDev: boolean;
     }): Application;
 }
 export interface CreateAppClient {

package/lib/shared/renderTypes.d.ts

@@ -1,10 +1,10 @@
 import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
-import { Response, IApplication, IRequest, IAppData } from '@shuvi/platform-shared/shared';
-export declare type IRenderDocumentOptions = {
+import type { ShuviRequest } from '@shuvi/service';
+import { Response, IApplication, IAppData } from '@shuvi/platform-shared/shared';
+export declare type IRenderViewOptions = {
     app: IApplication;
-    req?: IRequest;
 };
-export interface IRenderOptions extends IRenderDocumentOptions {
+export interface IRenderOptions extends IRenderViewOptions {
 }
 export interface IView<RenderOption extends IRenderOptions = any, RenderResult = void> {
     renderApp(options: RenderOption): RenderResult;
@@ -35,8 +35,9 @@ export interface IClientRendererOptions<ExtraAppData = {}> extends IRenderOption
     appData: IAppData<ExtraAppData>;
 }
 export interface IServerRendererOptions extends IRenderOptions {
+    req: ShuviRequest;
     manifest: IManifest;
-    getAssetPublicUrl(path: string): string;
+    isDev?: boolean;
 }
 export interface IViewClient<ExtraAppData = {}> extends IView<IClientRendererOptions<ExtraAppData>> {
 }

package/lib/shared/routeTypes.d.ts

@@ -1,10 +1,5 @@
-import { IURLParams, IURLQuery } from '@shuvi/platform-shared/shared';
-import { IRequestHandlerWithNext } from '@shuvi/service';
-import { IResponse, IRequest } from '@shuvi/service';
+import { ShuviRequest, ShuviResponse, ShuviRequestHandler } from '@shuvi/service';
 export interface IApiReq {
-    pathname: string;
-    query: IURLQuery;
-    params: IURLParams;
     cookies: {
         [key: string]: string;
     };
@@ -12,7 +7,7 @@ export interface IApiReq {
         [key: string]: any;
     };
 }
-export declare type IApiRequest = IRequest & IApiReq;
+export declare type IApiRequest = ShuviRequest & IApiReq;
 export declare type Send<T> = (body: T) => void;
 export declare type IApiRes<T = any> = {
     send: Send<T>;
@@ -21,7 +16,7 @@ export declare type IApiRes<T = any> = {
     redirect(url: string): IApiRes<T>;
     redirect(status: number, url: string): IApiRes<T>;
 };
-export declare type IApiResponse<T = any> = IResponse & IApiRes<T>;
+export declare type IApiResponse<T = any> = ShuviResponse & IApiRes<T>;
 export declare type IApiRequestHandler<T = any> = (req: IApiRequest, res: IApiResponse<T>) => void | Promise<void>;
 export interface IApiConfig {
     api?: {
@@ -35,7 +30,7 @@ export interface IApiHandler {
     config?: IApiConfig;
 }
 export interface IMiddlewareConfig {
-    default: IRequestHandlerWithNext;
+    default: ShuviRequestHandler;
 }
 export declare type IApiRoutes = {
     path: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -65,17 +65,18 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/hook": "1.0.0-rc.4",
-    "@shuvi/platform-shared": "1.0.0-rc.4",
-    "@shuvi/redox": "0.0.3",
-    "@shuvi/redox-react": "0.0.3",
-    "@shuvi/router": "1.0.0-rc.4",
-    "@shuvi/router-react": "1.0.0-rc.4",
-    "@shuvi/runtime": "1.0.0-rc.4",
-    "@shuvi/service": "1.0.0-rc.4",
-    "@shuvi/shared": "1.0.0-rc.4",
-    "@shuvi/toolpack": "1.0.0-rc.4",
-    "@shuvi/utils": "1.0.0-rc.4",
+    "@shuvi/hook": "1.0.0-rc.7",
+    "@shuvi/platform-shared": "1.0.0-rc.7",
+    "@shuvi/redox": "0.0.6",
+    "@shuvi/redox-react": "0.0.6",
+    "@shuvi/router": "1.0.0-rc.7",
+    "@shuvi/router-react": "1.0.0-rc.7",
+    "@shuvi/runtime": "1.0.0-rc.7",
+    "@shuvi/service": "1.0.0-rc.7",
+    "@shuvi/shared": "1.0.0-rc.7",
+    "@shuvi/toolpack": "1.0.0-rc.7",
+    "@shuvi/utils": "1.0.0-rc.7",
+    "@shuvi/error-overlay": "1.0.0-rc.7",
     "content-type": "1.0.4",
     "cookie": "0.4.1",
     "ejs": "3.1.5",
@@ -91,13 +92,12 @@
     "use-sync-external-store": "1.1.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.0-rc.4"
+    "@shuvi/service": "1.0.0-rc.7"
   },
   "devDependencies": {
     "@types/react": "18.0.9",
     "@types/react-dom": "18.0.6",
     "@types/react-test-renderer": "18.0.0",
-    "@shuvi/redox": "0.0.3",
     "@testing-library/react": "^13.2.0",
     "@types/content-type": "^1.1.5",
     "@types/cookie": "^0.4.1",