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

package/esm/shared/configTypes.d.ts

@@ -0,0 +1,14 @@
+import { IRouterHistoryMode, IPageRouteConfig, IMiddlewareRouteConfig, IApiRouteConfig } from '@shuvi/platform-shared/shared';
+export interface IRouterConfig {
+    history: IRouterHistoryMode | 'auto';
+}
+export interface PlatformWebCustomConfig {
+    ssr: boolean;
+    router: IRouterConfig;
+    routes?: IPageRouteConfig[];
+    middlewareRoutes?: IMiddlewareRouteConfig[];
+    apiRoutes?: IApiRouteConfig[];
+    conventionRoutes: {
+        exclude?: string[];
+    };
+}

package/esm/shared/configTypes.js

@@ -0,0 +1 @@
+export {};

package/esm/shared/index.d.ts

@@ -1,4 +1,5 @@
 export * from './appTypes';
+export * from './configTypes';
 export * from './renderTypes';
 export * from './routeTypes';
 export * from './serverTypes';

package/esm/shared/index.js

@@ -1,4 +1,5 @@
 export * from './appTypes';
+export * from './configTypes';
 export * from './renderTypes';
 export * from './routeTypes';
 export * from './serverTypes';

package/esm/shared/routeTypes.d.ts

@@ -24,7 +24,7 @@ export declare type IApiRes<T = any> = {
 export declare type IApiResponse<T = any> = IResponse & IApiRes<T>;
 export declare type IApiRequestHandler<T = any> = (req: IApiRequest, res: IApiResponse<T>) => void | Promise<void>;
 export interface IApiConfig {
-    apiConfig?: {
+    api?: {
         bodyParser?: {
             sizeLimit: number | string;
         } | boolean;

package/esm/shuvi-app/dev/webpackHotDevClient.js

@@ -5,7 +5,8 @@ export default (options = {}) => {
     if (devClient) {
         return devClient;
     }
-    devClient = connect(Object.assign(Object.assign({}, options), { launchEditorEndpoint: DEV_HOT_LAUNCH_EDITOR_ENDPOINT, path: DEV_HOT_MIDDLEWARE_PATH }));
+    devClient = connect(Object.assign(Object.assign({}, options), { launchEditorEndpoint: DEV_HOT_LAUNCH_EDITOR_ENDPOINT, path: DEV_HOT_MIDDLEWARE_PATH, location,
+        WebSocket }));
     devClient.subscribeToHmrEvent((event) => {
         // if (obj.action === "reloadPage") {
         //   return window.location.reload();

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

@@ -1,5 +1,5 @@
 import * as application from '../../app/server';
-import * as server from '@shuvi/app/files/user/server';
+import * as server from '@shuvi/app/user/server';
 import { default as apiRoutes } from '@shuvi/app/files/apiRoutes';
 import { default as middlewareRoutes } from '@shuvi/app/files/middlewareRoutes';
 export { server, application, apiRoutes, middlewareRoutes };

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

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

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

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

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

@@ -1,2 +1,2 @@
-declare const _default: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/platform-shared/shared").BuiltInRuntimePluginHooks & import("@shuvi/runtime").CustomRuntimePluginHooks, void>;
+declare const _default: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/platform-shared/shared").BuiltInRuntimePluginHooks & import("@shuvi/platform-shared/shared").CustomRuntimePluginHooks, void>;
 export default _default;

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

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,11 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const shared_1 = require("@shuvi/platform-shared/shared");
-const RedoxWrapper_1 = require("./RedoxWrapper");
-exports.default = (0, shared_1.createRuntimePlugin)({
+import { createRuntimePlugin } from '@shuvi/platform-shared/shared';
+import { RedoxWrapper } from './RedoxWrapper';
+export default createRuntimePlugin({
     appComponent: (App, appContext) => __awaiter(void 0, void 0, void 0, function* () {
-        return (0, RedoxWrapper_1.RedoxWrapper)(App, appContext);
+        return RedoxWrapper(App, appContext);
     })
 });

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

@@ -1,16 +1,4 @@
 declare const _default: {
-    core: import("@shuvi/hook").IPluginInstance<{
-        afterInit: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBuild: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterDestroy: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBundlerDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerDoneExtra, void, void>;
-        afterBundlerTargetDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerTargetDoneExtra, void, void>;
-        configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<import("@shuvi/service/lib/core/lifecycleTypes").WebpackChainType, import("@shuvi/service/lib/core/lifecycleTypes").ConfigWebpackAssistant>;
-        addExtraTarget: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").ExtraTargetAssistant, void, import("@shuvi/service/lib/core/lifecycleTypes").TargetChain>;
-        addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
-        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
-        addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/runtime").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
+    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/service/lib/server/pluginTypes").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
 };
 export default _default;

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

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

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

@@ -1,2 +1,2 @@
-declare const _default: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/runtime").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
+declare const _default: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/service/lib/server/pluginTypes").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
 export default _default;

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

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

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

@@ -1,2 +1,2 @@
 import { IServerPluginContext, IRequestHandlerWithNext } from '@shuvi/service';
-export declare function middleware(ctx: IServerPluginContext): IRequestHandlerWithNext;
+export declare function middleware(_ctx: IServerPluginContext): IRequestHandlerWithNext;

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

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

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

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

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

@@ -3,7 +3,8 @@ import { middleware as getMiddlewareMiddleware } from './middleware';
 import { IApiRequestHandler, middleware as getApiMiddleware } from './api';
 export { IApiRequestHandler, getRoutes, getMiddlewareMiddleware, getApiMiddleware };
 declare const _default: {
-    core: import("@shuvi/hook").IPluginInstance<{
+    core: import("@shuvi/platform-shared/shared").IPluginInstance<{
+        extendConfig: import("@shuvi/hook").SyncWaterfallHook<import("@shuvi/service").Config, void>;
         afterInit: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
         afterBuild: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
         afterDestroy: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
@@ -14,7 +15,6 @@ declare const _default: {
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
         addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    types: string;
+    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
 };
 export default _default;

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

@@ -38,7 +38,6 @@ const path = __importStar(require("path"));
 const build_loaders_1 = require("@shuvi/toolpack/lib/utils/build-loaders");
 const service_1 = require("@shuvi/service");
 const node_1 = require("@shuvi/platform-shared/node");
-const paths_1 = require("../../paths");
 const lib_1 = require("../html-render/lib");
 const hooks_1 = require("./hooks");
 const page_1 = require("./page");
@@ -52,7 +51,7 @@ const plugin = (0, service_1.createPlugin)({
         addHooks({ addRoutes: hooks_1.addRoutes, addMiddlewareRoutes: hooks_1.addMiddlewareRoutes });
     },
     addRuntimeFile: ({ defineFile }, context) => __awaiter(void 0, void 0, void 0, function* () {
-        const { config: { routes: pageRoutes, middlewareRoutes, apiRoutes }, paths, pluginRunner, phase } = context;
+        const { config: { routes: pageRoutes, middlewareRoutes, apiRoutes, conventionRoutes }, paths, pluginRunner, phase } = context;
         const isBuildPhase = phase === 'PHASE_PRODUCTION_BUILD';
         const pageRoutesFile = defineFile({
             name: 'routes.js',
@@ -63,7 +62,7 @@ const plugin = (0, service_1.createPlugin)({
                     routes = pageRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getPageRoutes)(paths.routesDir);
+                    const { routes: _routes, warnings } = yield (0, node_1.getPageRoutes)(paths.routesDir, conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning.msg);
@@ -83,13 +82,13 @@ const plugin = (0, service_1.createPlugin)({
         const apiRoutesFile = defineFile({
             name: 'apiRoutes.js',
             content: () => __awaiter(void 0, void 0, void 0, function* () {
-                let routes = [];
+                let routes;
                 const hasConfigRoutes = Array.isArray(apiRoutes);
                 if (hasConfigRoutes) {
                     routes = apiRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getApiRoutes)(paths.routesDir);
+                    const { routes: _routes, warnings } = yield (0, node_1.getApiRoutes)(paths.routesDir, conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning);
@@ -110,7 +109,7 @@ const plugin = (0, service_1.createPlugin)({
                     routes = middlewareRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getMiddlewareRoutes)(paths.routesDir);
+                    const { routes: _routes, warnings } = yield (0, node_1.getMiddlewareRoutes)(paths.routesDir, conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning);
@@ -177,6 +176,5 @@ const plugin = (0, service_1.createPlugin)({
     })
 });
 exports.default = {
-    core: plugin,
-    types: (0, paths_1.resolvePkgFile)('lib/node/features/filesystem-routes/shuvi-app.d.ts')
+    core: plugin
 };

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

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

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

@@ -1,8 +1,8 @@
-import { IUserRouteConfig, IRouteConfig } from '@shuvi/service';
-export { IUserRouteConfig };
+import { IPageRouteConfig, IPageRouteConfigWithId } from '@shuvi/platform-shared/shared';
+export { IPageRouteConfig };
 /**
  * returns JSON string of IRawPageRouteRecord
  */
-export declare function serializeRoutes(routes: IRouteConfig[]): string;
-export declare function normalizeRoutes(routes: (IUserRouteConfig | IUserRouteConfig)[], componentDir: string, parentPath?: string): IRouteConfig[];
-export declare const generateRoutesContent: (routes: IRouteConfig[]) => string;
+export declare function serializeRoutes(routes: IPageRouteConfigWithId[]): string;
+export declare function normalizeRoutes(routes: IPageRouteConfig[], componentDir: string, parentPath?: string): IPageRouteConfigWithId[];
+export declare const generateRoutesContent: (routes: IPageRouteConfigWithId[]) => string;

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

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

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

@@ -1,6 +1,7 @@
 export { getPageMiddleware, IHtmlDocument, ITemplateData, IViewServer, IViewClient } from './lib';
 declare const _default: {
     core: import("@shuvi/hook").IPluginInstance<{
+        extendConfig: import("@shuvi/hook").SyncWaterfallHook<import("@shuvi/service").Config, void>;
         afterInit: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
         afterBuild: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
         afterDestroy: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
@@ -11,8 +12,8 @@ declare const _default: {
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
         addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/runtime").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
+    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/service/lib/server/pluginTypes").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
     types: string;
 };
 export default _default;

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

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
 import { IAppContext } from '@shuvi/platform-shared/shared';
 import { IHtmlDocument } from '../html-render';

package/lib/node/features/html-render/shuvi-app.d.ts

@@ -1,11 +1,6 @@
-import { extendedHooks } from './serverHooks';
+export {};
 declare module '@shuvi/runtime' {
     interface CustomAppContext {
         pageData?: any;
     }
-    interface CustomServerPluginHooks {
-        getPageData: typeof extendedHooks.getPageData;
-        handlePageRequest: typeof extendedHooks.handlePageRequest;
-        modifyHtml: typeof extendedHooks.modifyHtml;
-    }
 }

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

@@ -2,6 +2,7 @@ export { buildHtml } from './main/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>;
@@ -12,8 +13,9 @@ export declare const featurePlugins: (import("@shuvi/hook").IPluginInstance<{
     addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
     addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
     addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-} & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext> | {
+} & 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>;
@@ -24,20 +26,7 @@ export declare const featurePlugins: (import("@shuvi/hook").IPluginInstance<{
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
         addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    types: string;
+    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
 } | {
-    core: import("@shuvi/hook").IPluginInstance<{
-        afterInit: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBuild: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterDestroy: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBundlerDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerDoneExtra, void, void>;
-        afterBundlerTargetDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerTargetDoneExtra, void, void>;
-        configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<import("@shuvi/service/lib/core/lifecycleTypes").WebpackChainType, import("@shuvi/service/lib/core/lifecycleTypes").ConfigWebpackAssistant>;
-        addExtraTarget: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").ExtraTargetAssistant, void, import("@shuvi/service/lib/core/lifecycleTypes").TargetChain>;
-        addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
-        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
-        addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/runtime").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
+    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/service/lib/server/pluginTypes").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
 })[];

package/lib/node/features/main/generateResource.js

@@ -26,24 +26,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = __importStar(require("path"));
 const fse = __importStar(require("fs-extra"));
 const service_1 = require("@shuvi/service");
+const file_utils_1 = require("@shuvi/service/lib/project/file-utils");
 const generateResources = (context) => {
     const { resolveUserFile } = context;
     const { buildDir } = context.paths;
-    const serverManifestPath = path.join(buildDir, service_1.BUILD_SERVER_DIR, service_1.SERVER_BUILD_MANIFEST_PATH);
+    const clientManifestRequest = (0, file_utils_1.urlToRequest)(path.join(buildDir, service_1.BUILD_DEFAULT_DIR, service_1.CLIENT_BUILD_MANIFEST_PATH));
+    const serverManifestRequest = (0, file_utils_1.urlToRequest)(path.join(buildDir, service_1.BUILD_SERVER_DIR, service_1.SERVER_BUILD_MANIFEST_PATH));
+    const serverModuleDir = path.join(buildDir, service_1.BUILD_SERVER_DIR);
     const result = [];
-    result.push([
-        'clientManifest',
-        path.join(buildDir, service_1.BUILD_DEFAULT_DIR, service_1.CLIENT_BUILD_MANIFEST_PATH)
-    ]);
-    result.push(['serverManifest', serverManifestPath]);
+    result.push(['clientManifest', clientManifestRequest]);
+    result.push(['serverManifest', serverManifestRequest]);
     result.push([
         `server = function() {
-    var path = require('path');
-    return require(path.join(
-      '${buildDir}',
-      '${service_1.BUILD_SERVER_DIR}',
-      require('${serverManifestPath}')['bundles']['${service_1.BUILD_SERVER_FILE_SERVER}']
-    ))
+    const path = require('path');
+    const relativeModulePath = require('${serverManifestRequest}')['bundles']['${service_1.BUILD_SERVER_FILE_SERVER}'];
+    const modulePath = require.resolve(path.join("${serverModuleDir}", relativeModulePath));
+    return require(modulePath)
   }`,
         undefined
     ]);

package/lib/node/features/middlewares.d.ts

@@ -1,4 +1,4 @@
 import { IServerPluginContext, IServerMiddleware } from '@shuvi/service';
 import { DevMiddleware } from '@shuvi/service/lib/server/middlewares/dev/devMiddleware';
 export declare const getMiddlewares: (context: IServerPluginContext) => IServerMiddleware[];
-export declare const getMiddlewaresBeforeDevMiddlewares: (devMiddleware: DevMiddleware, context: IServerPluginContext) => IServerMiddleware;
+export declare const getMiddlewaresBeforeDevMiddlewares: (devMiddleware: DevMiddleware, context: IServerPluginContext) => IServerMiddleware[];

package/lib/node/features/middlewares.js

@@ -4,10 +4,8 @@ exports.getMiddlewaresBeforeDevMiddlewares = exports.getMiddlewares = void 0;
 const on_demand_compile_page_1 = require("./on-demand-compile-page");
 const filesystem_routes_1 = require("./filesystem-routes");
 const html_render_1 = require("./html-render");
-let onDemandRouteManager;
 const getMiddlewares = (context) => {
     return [
-        onDemandRouteManager && onDemandRouteManager.ensureRoutesMiddleware(),
         (0, filesystem_routes_1.getMiddlewareMiddleware)(context),
         (0, filesystem_routes_1.getApiMiddleware)(context),
         (0, html_render_1.getPageMiddleware)(context)
@@ -15,8 +13,11 @@ const getMiddlewares = (context) => {
 };
 exports.getMiddlewares = getMiddlewares;
 const getMiddlewaresBeforeDevMiddlewares = (devMiddleware, context) => {
-    onDemandRouteManager = new on_demand_compile_page_1.OnDemandRouteManager(context);
+    const onDemandRouteManager = new on_demand_compile_page_1.OnDemandRouteManager(context);
     onDemandRouteManager.devMiddleware = devMiddleware;
-    return onDemandRouteManager.getServerMiddleware();
+    return [
+        onDemandRouteManager.getServerMiddleware(),
+        onDemandRouteManager.ensureRoutesMiddleware() // check page request
+    ];
 };
 exports.getMiddlewaresBeforeDevMiddlewares = getMiddlewaresBeforeDevMiddlewares;

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

@@ -1,5 +1,6 @@
 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>;
@@ -10,7 +11,7 @@ declare const _default: {
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
         addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
     runtime: {
         plugin: string;
     };

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

@@ -4,5 +4,10 @@ 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

@@ -22,7 +22,7 @@ const initStore = ({ initialState, ctx }) => {
     }
     // for client is singleton, just init once
     if (currentStoreManager) {
-        return createStoreInstance();
+        return currentStoreManager;
     }
     currentStoreManager = createStoreInstance();
     return currentStoreManager;

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

@@ -1,4 +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>;
@@ -9,6 +10,6 @@ declare const _default: import("@shuvi/hook").IPluginInstance<{
     addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
     addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
     addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-} & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+} & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
 export default _default;
 export { default as OnDemandRouteManager } from './onDemandRouteManager';

package/lib/node/index.d.ts

@@ -1,4 +1,6 @@
 import { IPlatform } from '@shuvi/service';
-import './shuvi-node-extensions';
-declare const platform: IPlatform;
+export { PlatformWebCustomConfig } from '../shared/configTypes';
+declare const platform: ({ framework }?: {
+    framework?: string | undefined;
+}) => IPlatform;
 export default platform;

package/lib/node/index.js

@@ -11,9 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_1 = require("@shuvi/platform-shared/node");
 const features_1 = require("./features");
-require("./shuvi-node-extensions");
 const paths_1 = require("./paths");
-const platform = ({ framework = 'react' } = {}, platformContext) => __awaiter(void 0, void 0, void 0, function* () {
+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();

package/lib/node/paths.js

@@ -1,16 +1,36 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePkgFile = exports.resolveLib = exports.resolveDep = void 0;
-const path_1 = __importDefault(require("path"));
-const PACKAGE_DIR = path_1.default.resolve(__dirname, '..', '..');
+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_1.default.dirname((0, exports.resolveDep)(path_1.default.join(module, 'package.json')));
+const resolveLib = (module) => path.dirname((0, exports.resolveDep)(path.join(module, 'package.json')));
 exports.resolveLib = resolveLib;
-const resolvePkgFile = (...paths) => path_1.default.join(PACKAGE_DIR, ...paths);
+const resolvePkgFile = (...paths) => path.join(PACKAGE_DIR, ...paths);
 exports.resolvePkgFile = resolvePkgFile;

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

@@ -0,0 +1,42 @@
+import '@shuvi/platform-shared/shuvi-type-extensions-node';
+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;
+        apiRoutes: IApiRoutes;
+        middlewareRoutes: IMiddlewareRoutes;
+        application: {
+            createApp: CreateAppServer;
+        };
+        view: IViewServer;
+    };
+    const documentPath: string;
+    const clientManifest: IManifest;
+    const serverManifest: IManifest;
+}
+declare global {
+    namespace ShuviService {
+        interface CustomConfig {
+            ssr: PlatformWebCustomConfig['ssr'];
+            router: PlatformWebCustomConfig['router'];
+            routes?: PlatformWebCustomConfig['routes'];
+            middlewareRoutes?: PlatformWebCustomConfig['middlewareRoutes'];
+            apiRoutes?: PlatformWebCustomConfig['apiRoutes'];
+            conventionRoutes: PlatformWebCustomConfig['conventionRoutes'];
+        }
+        interface CustomCorePluginHooks {
+            addRoutes: typeof addRoutes;
+            addMiddlewareRoutes: typeof addMiddlewareRoutes;
+        }
+        interface CustomServerPluginHooks {
+            getPageData: typeof extendedHooks.getPageData;
+            handlePageRequest: typeof extendedHooks.handlePageRequest;
+            modifyHtml: typeof extendedHooks.modifyHtml;
+        }
+    }
+}

package/lib/node/{shuvi-node-extensions.js → shuvi-type-extensions-node.js}

@@ -1,2 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+require("@shuvi/platform-shared/shuvi-type-extensions-node");

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

@@ -1,5 +1,6 @@
 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>;
@@ -10,6 +11,6 @@ declare const _default: {
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
         addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
 };
 export default _default;

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

@@ -1,5 +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>;
@@ -10,8 +11,9 @@ declare const platformWebReact: () => {
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
         addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext> | {
+    } & 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>;
@@ -22,7 +24,7 @@ declare const platformWebReact: () => {
             addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
             addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
             addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-        } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+        } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
     })[];
     platformModule: string;
     polyfills: string[];

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

@@ -1,5 +1,6 @@
 export declare const RedoxReactPlugin: {
     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>;
@@ -10,7 +11,7 @@ export declare const RedoxReactPlugin: {
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
         addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
     runtime: {
         plugin: string;
     };

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

@@ -28,7 +28,7 @@ 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, '../../../../../lib/node/targets/react/redox-react/runtime'));
+const runtimePath = require.resolve(path.join(__dirname, '../../../../../esm/shuvi-app/react/redox-react/runtime'));
 const core = (0, service_1.createPlugin)({
     addRuntimeService: () => [
         {

package/lib/shared/configTypes.d.ts

@@ -0,0 +1,14 @@
+import { IRouterHistoryMode, IPageRouteConfig, IMiddlewareRouteConfig, IApiRouteConfig } from '@shuvi/platform-shared/shared';
+export interface IRouterConfig {
+    history: IRouterHistoryMode | 'auto';
+}
+export interface PlatformWebCustomConfig {
+    ssr: boolean;
+    router: IRouterConfig;
+    routes?: IPageRouteConfig[];
+    middlewareRoutes?: IMiddlewareRouteConfig[];
+    apiRoutes?: IApiRouteConfig[];
+    conventionRoutes: {
+        exclude?: string[];
+    };
+}

package/lib/shared/index.d.ts

@@ -1,4 +1,5 @@
 export * from './appTypes';
+export * from './configTypes';
 export * from './renderTypes';
 export * from './routeTypes';
 export * from './serverTypes';

package/lib/shared/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./appTypes"), exports);
+__exportStar(require("./configTypes"), exports);
 __exportStar(require("./renderTypes"), exports);
 __exportStar(require("./routeTypes"), exports);
 __exportStar(require("./serverTypes"), exports);

package/lib/shared/routeTypes.d.ts

@@ -24,7 +24,7 @@ export declare type IApiRes<T = any> = {
 export declare type IApiResponse<T = any> = IResponse & IApiRes<T>;
 export declare type IApiRequestHandler<T = any> = (req: IApiRequest, res: IApiResponse<T>) => void | Promise<void>;
 export interface IApiConfig {
-    apiConfig?: {
+    api?: {
         bodyParser?: {
             sizeLimit: number | string;
         } | boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -14,8 +14,8 @@
   "files": [
     "lib",
     "esm",
-    "types",
-    "shuvi-app-extensions.d.ts"
+    "shuvi-type-extensions-node.d.ts",
+    "shuvi-type-extensions-runtime.d.ts"
   ],
   "exports": {
     ".": {
@@ -42,24 +42,37 @@
         "./esm/shuvi-app/*.jsx"
       ]
     },
-    "./shuvi-app-extensions.d.ts": "./shuvi-app-extensions.d.ts"
+    "./shuvi-type-extensions-node": {
+      "types": "./shuvi-type-extensions-node.d.js",
+      "default": "./shuvi-type-extensions-node.js"
+    },
+    "./shuvi-type-extensions-runtime": "./shuvi-type-extensions-runtime.d.ts"
+  },
+  "scripts": {
+    "dev": "run-p watch:*",
+    "watch:esm": "tsc -p tsconfig.build.browser.json -w",
+    "watch:cjs": "tsc -p tsconfig.build.node.json -w",
+    "prebuild": "rimraf lib esm types",
+    "build": "run-p build:*",
+    "build:esm": "tsc -p tsconfig.build.browser.json",
+    "build:cjs": "tsc -p tsconfig.build.node.json"
   },
   "engines": {
     "node": ">= 12.0.0"
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/hook": "1.0.0-rc.1",
-    "@shuvi/platform-shared": "1.0.0-rc.1",
+    "@shuvi/hook": "1.0.0-rc.2",
+    "@shuvi/platform-shared": "1.0.0-rc.2",
     "@shuvi/redox": "0.0.3",
     "@shuvi/redox-react": "0.0.3",
-    "@shuvi/router": "1.0.0-rc.1",
-    "@shuvi/router-react": "1.0.0-rc.1",
-    "@shuvi/runtime": "1.0.0-rc.1",
-    "@shuvi/service": "1.0.0-rc.1",
-    "@shuvi/shared": "1.0.0-rc.1",
-    "@shuvi/toolpack": "1.0.0-rc.1",
-    "@shuvi/utils": "1.0.0-rc.1",
+    "@shuvi/router": "1.0.0-rc.2",
+    "@shuvi/router-react": "1.0.0-rc.2",
+    "@shuvi/runtime": "1.0.0-rc.2",
+    "@shuvi/service": "1.0.0-rc.2",
+    "@shuvi/shared": "1.0.0-rc.2",
+    "@shuvi/toolpack": "1.0.0-rc.2",
+    "@shuvi/utils": "1.0.0-rc.2",
     "content-type": "1.0.4",
     "cookie": "0.4.1",
     "ejs": "3.1.5",
@@ -72,22 +85,19 @@
     "react-refresh": "0.12.0",
     "use-sync-external-store": "1.1.0"
   },
+  "peerDependencies": {
+    "@shuvi/service": "1.0.0-rc.2"
+  },
   "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": "^10.0.2",
+    "@testing-library/react": "^13.2.0",
     "@types/content-type": "^1.1.5",
     "@types/cookie": "^0.4.1",
     "@types/ejs": "^3.1.0",
     "@types/raw-body": "^2.3.0",
     "webpack": "5.73.0"
-  },
-  "scripts": {
-    "dev": "run-p watch:*",
-    "watch:esm": "tsc -p tsconfig.build.browser.json -w",
-    "watch:cjs": "tsc -p tsconfig.build.node.json -w",
-    "prebuild": "rimraf lib esm types",
-    "build": "run-p build:*",
-    "build:esm": "tsc -p tsconfig.build.browser.json",
-    "build:cjs": "tsc -p tsconfig.build.node.json"
   }
-}
+}

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

@@ -0,0 +1,2 @@
+// ts has bug with package.exports, so we use a module to proxy the real module
+import './lib/node/shuvi-type-extensions-node';

package/{shuvi-app-extensions.d.ts → shuvi-type-extensions-runtime.d.ts}

@@ -1,4 +1,4 @@
-/// <reference types="@shuvi/platform-shared/shuvi-app-extensions.d.ts" />
+/// <reference types="@shuvi/platform-shared/shuvi-type-extensions-runtime" />
 
 declare module '@shuvi/app/files/routes' {
   import { IRawPageRouteRecord } from '@shuvi/platform-shared/shared';
@@ -7,13 +7,11 @@ declare module '@shuvi/app/files/routes' {
 }
 
 declare module '@shuvi/app/files/routerConfig' {
-  import { ILoaderOptions } from '@shuvi/platform-shared/shared/loader';
   export const historyMode: 'browser' | 'hash';
 }
 
 declare module '@shuvi/app/files/page-loaders' {
-  import { IRouteLoaderContext } from '@shuvi/platform-shared/shared';
-  import { Loader } from '@shuvi/platform-shared/shared';
+  import { IRouteLoaderContext, Loader } from '@shuvi/platform-shared/shared';
 
   const loaders: Record<string, Loader>;
   export default loaders;
@@ -21,16 +19,18 @@ declare module '@shuvi/app/files/page-loaders' {
 
 declare module '@shuvi/app/files/apiRoutes' {
   import { IApiRoutes } from '@shuvi/platform-web/shared';
+
   declare const apiRoutes: IApiRoutes[];
   export default apiRoutes;
 }
 
 declare module '@shuvi/app/files/middlewareRoutes' {
   import { IMiddlewareRoutes } from '@shuvi/platform-web/shared';
+
   declare const middlewareRoutes: IMiddlewareRoutes[];
   export default middlewareRoutes;
 }
 
-declare module '@shuvi/app/files/user/server' {
+declare module '@shuvi/app/user/server' {
   export {};
 }

package/lib/node/features/filesystem-routes/shuvi-app.d.ts

@@ -1,7 +0,0 @@
-import { addRoutes, addMiddlewareRoutes } from './hooks';
-declare module '@shuvi/runtime' {
-    interface CustomCorePluginHooks {
-        addRoutes: typeof addRoutes;
-        addMiddlewareRoutes: typeof addMiddlewareRoutes;
-    }
-}

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

@@ -1,17 +0,0 @@
-import { CreateAppServer, IServerModule, IApiRoutes, IMiddlewareRoutes } from '../shared';
-import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
-import { IViewServer } from './features/html-render';
-declare module '@shuvi/service/lib/resources' {
-    const server: {
-        server: IServerModule;
-        apiRoutes: IApiRoutes;
-        middlewareRoutes: IMiddlewareRoutes;
-        application: {
-            createApp: CreateAppServer;
-        };
-        view: IViewServer;
-    };
-    const documentPath: string;
-    const clientManifest: IManifest;
-    const serverManifest: IManifest;
-}

package/lib/node/targets/react/redox-react/RedoxWrapper.js

@@ -1,37 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedoxWrapper = void 0;
-const React = __importStar(require("react"));
-const redox_react_1 = require("@shuvi/redox-react");
-const RedoxWrapper = (App, appContext) => {
-    function RedoxAppWrapper(appProps) {
-        return (React.createElement(redox_react_1.RedoxRoot, { storeManager: appContext.storeManager },
-            React.createElement(App, Object.assign({}, appProps))));
-    }
-    RedoxAppWrapper.displayName = 'RedoxAppWrapper';
-    return RedoxAppWrapper;
-};
-exports.RedoxWrapper = RedoxWrapper;