@shuvi/platform-shared 1.0.0-rc.5 → 1.0.0-rc.8

package/esm/shared/application.d.ts

@@ -1,5 +1,5 @@
 import { IRouter, IPageRouteRecord } from './routerTypes';
-import { IStoreManager, IApplication, IAppContext, IApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
+import { RedoxStore, IApplication, IAppContext, IApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
 export declare class Application {
     private _router;
     private _appComponent;
@@ -11,7 +11,7 @@ export declare class Application {
     constructor(options: IApplicationOptions);
     get router(): IRouter<IPageRouteRecord>;
     get context(): IAppContext;
-    get pluginManager(): import("@shuvi/hook").HookManager<import("./lifecycle").BuiltInRuntimePluginHooks, void, import("@shuvi/runtime").CustomRuntimePluginHooks>;
+    get pluginManager(): import("@shuvi/hook").HookManager<import("./runtimPlugin").RuntimePluginHooks, void>;
     get appComponent(): any;
     get error(): IError | undefined;
     setError(err: IError): void;
@@ -19,7 +19,7 @@ export declare class Application {
     getLoadersData(): Record<string, any>;
     setLoadersData(datas: Record<string, any>): void;
     init(): Promise<void>;
-    get store(): IStoreManager;
+    get store(): RedoxStore;
     updateComponents({ AppComponent }?: IRerenderConfig): Promise<void>;
     dispose(): Promise<void>;
     private _initPlugin;

package/esm/shared/application.js

@@ -7,8 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getManager } from './lifecycle';
-import { initPlugins } from './lifecycle';
+import { getManager } from './runtimPlugin';
+import { initPlugins } from './runtimPlugin';
 import { redox } from '@shuvi/redox';
 import { errorModel } from './models/error';
 import { loaderModel } from './models/loader';
@@ -17,8 +17,8 @@ export class Application {
         this._router = options.router;
         this._context = {};
         this._store = redox({ initialState: options.initialState });
-        this._error = this._store.get(errorModel);
-        this._loader = this._store.get(loaderModel);
+        this._error = this._store.getModel(errorModel);
+        this._loader = this._store.getModel(loaderModel);
         this._appComponent = options.AppComponent;
         this._pluginManager = getManager();
         initPlugins(this._pluginManager, options.plugins || []);

package/esm/shared/applicationTypes.d.ts

@@ -1,22 +1,21 @@
-/// <reference types="node" />
-import type { IncomingMessage } from 'http';
-import { IStoreManager } from '@shuvi/redox';
+import { RedoxStore } from '@shuvi/redox';
 import { CustomAppContext } from '@shuvi/runtime';
 import { IRouter, IPageRouteRecord } from './routerTypes';
-import { IPluginList } from './lifecycle';
-export declare type IRequest = IncomingMessage & {
-    [x: string]: any;
-};
+import { IPluginList } from './runtimPlugin';
 export interface IAppContext extends CustomAppContext {
     [x: string]: unknown;
 }
 export declare type IRerenderConfig = {
     AppComponent?: any;
 };
-export type { IStoreManager };
+export type { RedoxStore };
+export declare type ErrorSource = 'server';
 export interface IError {
     code?: number;
     message?: string;
+    stack?: string;
+    name?: string;
+    source?: ErrorSource;
 }
 export interface IErrorState {
     error?: IError;
@@ -28,7 +27,7 @@ export interface IApplication {
     readonly context: IAppContext;
     readonly router: IRouter<IPageRouteRecord>;
     readonly appComponent: any;
-    readonly store: IStoreManager;
+    readonly store: RedoxStore;
     readonly error: IError | undefined;
     setError(err: IError): void;
     clearError(): void;

package/esm/shared/index.d.ts

@@ -8,4 +8,4 @@ export { loaderModel } from './models/loader';
 export * from './applicationTypes';
 export type { Application } from './application';
 export type { IRuntimeConfig } from './runtimeConfigTypes';
-export { IAppModule, IPluginInstance, BuiltInRuntimePluginHooks, CustomRuntimePluginHooks, RuntimePluginHooks, createRuntimePlugin, RuntimePluginInstance } from './lifecycle';
+export { IAppModule, IPluginInstance, BuiltInRuntimePluginHooks, CustomRuntimePluginHooks, RuntimePluginHooks, createRuntimePlugin, createRuntimePluginBefore, createRuntimePluginAfter, RuntimePluginInstance } from './runtimPlugin';

package/esm/shared/index.js

@@ -6,6 +6,4 @@ export * from './loader';
 export { errorModel } from './models/error';
 export { loaderModel } from './models/loader';
 export * from './applicationTypes';
-export { 
-// fix createRuntimePlugin is not portable end
-createRuntimePlugin } from './lifecycle';
+export { createRuntimePlugin, createRuntimePluginBefore, createRuntimePluginAfter } from './runtimPlugin';

package/esm/shared/loader/loader.d.ts

@@ -5,5 +5,5 @@ interface Result<T> {
     result?: T;
 }
 export declare function runInParallerAndBail<T>(fns: Array<() => Promise<T> | T>): Promise<Result<T>[]>;
-export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, { isServer, query, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
+export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, { query, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
 export {};

package/esm/shared/loader/loader.js

@@ -68,7 +68,7 @@ function errorHelper(msg, statusCode = 500) {
     invariant(statusCode >= 400 && statusCode < 600, 'status code should be 4xx and 5xx');
     throw response(msg, { status: statusCode });
 }
-export function runLoaders(matches, loadersByRouteId, { isServer, query, req, getAppContext }) {
+export function runLoaders(matches, loadersByRouteId, { query, req, getAppContext }) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!matches.length) {
             return [];
@@ -78,7 +78,7 @@ export function runLoaders(matches, loadersByRouteId, { isServer, query, req, ge
             const loaderFn = loadersByRouteId[match.route.id];
             let res;
             try {
-                const value = yield loaderFn(Object.assign({ isServer, pathname: match.pathname, params: match.params, query: query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
+                const value = yield loaderFn(Object.assign({ pathname: match.pathname, params: match.params, query: query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
                 if (value) {
                     res = createJson(value);
                 }

package/esm/shared/loader/types.d.ts

@@ -1,9 +1,9 @@
+import type { ShuviRequest } from '@shuvi/service';
 import { IURLQuery, IURLParams } from '../routerTypes';
-import { IAppContext, IRequest } from '../applicationTypes';
+import { IAppContext } from '../applicationTypes';
 import { Response } from '../response';
 export interface LoaderContextOptions {
-    isServer: boolean;
-    req?: IRequest;
+    req?: ShuviRequest;
     query: IURLQuery;
     getAppContext: () => IAppContext;
 }
@@ -17,10 +17,6 @@ export interface ErrorFunction {
  * route component getInitialProps params `context`
  */
 export interface IRouteLoaderContext {
-    /**
-     * is running on server, if server is true, client will be false
-     */
-    isServer: boolean;
     /**
      * current url path
      */
@@ -62,7 +58,7 @@ export interface IRouteLoaderContext {
     /**
      * server only
      */
-    req?: IRequest;
+    req?: ShuviRequest;
     /**
      * Application context object, which is accessiable during the entire lifecycle of application
      */

package/esm/shared/models/error.d.ts

@@ -1,5 +1,5 @@
 import { IErrorState, IError } from '../applicationTypes';
-export declare const errorModel: import("@shuvi/redox").Model<"error", IErrorState, {}, {
+export declare const errorModel: import("@shuvi/redox/esm/core/defineModel").DefineModel<"error", IErrorState, {
     setError(_state: IErrorState, error?: IError): {
         error: IError | undefined;
     };
@@ -9,5 +9,5 @@ export declare const errorModel: import("@shuvi/redox").Model<"error", IErrorSta
 }, {
     errorObject(): IError | undefined;
     hasError(): boolean;
-}>;
+}, {}>;
 export declare type ErrorModel = typeof errorModel;

package/esm/shared/models/loader.d.ts

@@ -1,13 +1,13 @@
 export interface LoaderState {
     dataByRouteId: Record<string, any>;
 }
-export declare const loaderModel: import("@shuvi/redox").Model<"loader", LoaderState, {}, {
+export declare const loaderModel: import("@shuvi/redox/esm/core/defineModel").DefineModel<"loader", LoaderState, {
     setDatas(state: LoaderState, newData: Record<string, any>): {
         dataByRouteId: {
             [x: string]: any;
         };
     };
-}, import("@shuvi/redox").RedoxActions, {
+}, import("@shuvi/redox/esm/core/defineModel").ActionOptions, {
     getAllData(): Record<string, any>;
-}>;
+}, {}>;
 export declare type LoaderModel = typeof loaderModel;

package/esm/shared/routerTypes.d.ts

@@ -7,6 +7,8 @@ export interface IPageRouteRecord extends IRouteRecord {
     path: string;
     component?: any;
     children?: IPageRouteRecord[];
+    __import__?: () => Promise<any>;
+    __resolveWeak__?: () => string[];
     __componentSource__?: string;
     __componentRawRequest__?: string;
     [x: string]: any;

package/esm/shared/{lifecycle.d.ts → runtimPlugin.d.ts}

@@ -14,10 +14,8 @@ export interface BuiltInRuntimePluginHooks extends HookMap {
 }
 export interface RuntimePluginHooks extends BuiltInRuntimePluginHooks, CustomRuntimePluginHooks {
 }
-export declare const getManager: () => import("@shuvi/hook").HookManager<BuiltInRuntimePluginHooks, void, CustomRuntimePluginHooks>;
-export declare const createRuntimePlugin: (pluginHandlers: Partial<import("@shuvi/hook").IPluginHandlersFullMap<BuiltInRuntimePluginHooks & CustomRuntimePluginHooks, void>> & {
-    setup?: import("@shuvi/hook").Setup<CustomRuntimePluginHooks> | undefined;
-}, options?: import("@shuvi/hook").PluginOptions | undefined) => IPluginInstance<BuiltInRuntimePluginHooks & CustomRuntimePluginHooks, void>;
+export declare const getManager: () => import("@shuvi/hook").HookManager<RuntimePluginHooks, void>;
+export declare const createRuntimePluginBefore: import("@shuvi/shared/lib/plugins").PluginFunc<RuntimePluginHooks, void>, createRuntimePlugin: import("@shuvi/shared/lib/plugins").PluginFunc<RuntimePluginHooks, void>, createRuntimePluginAfter: import("@shuvi/shared/lib/plugins").PluginFunc<RuntimePluginHooks, void>;
 export type { IPluginInstance, CustomRuntimePluginHooks };
 export declare type PluginManager = ReturnType<typeof getManager>;
 export declare type RuntimePluginInstance = IPluginInstance<RuntimePluginHooks, void>;

package/esm/shared/{lifecycle.js → runtimPlugin.js}

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { createAsyncParallelHook, createAsyncSeriesWaterfallHook, createHookManager, isPluginInstance } from '@shuvi/hook';
+import { createPluginCreator } from '@shuvi/shared/lib/plugins';
 const init = createAsyncParallelHook();
 const appContext = createAsyncSeriesWaterfallHook();
 const appComponent = createAsyncSeriesWaterfallHook();
@@ -19,7 +20,7 @@ const builtinRuntimePluginHooks = {
     dispose
 };
 export const getManager = () => createHookManager(builtinRuntimePluginHooks, false);
-export const { createPlugin: createRuntimePlugin } = getManager();
+export const { createPluginBefore: createRuntimePluginBefore, createPlugin: createRuntimePlugin, createPluginAfter: createRuntimePluginAfter } = createPluginCreator(getManager());
 export const initPlugins = (pluginManager, plugins) => __awaiter(void 0, void 0, void 0, function* () {
     // clear plugin at development mode every time
     if (process.env.NODE_ENV === 'development') {

package/esm/shuvi-app/shuvi-runtime-app.d.ts

@@ -5,7 +5,7 @@
  *  import {} from '@shuvi/runtime/app'
  *
  */
-import { IAppModule as _IAppModule } from '../shared/lifecycle';
+import { IAppModule as _IAppModule } from '../shared/runtimPlugin';
 declare type AppModule = Required<_IAppModule>;
 export declare type InitFunction = AppModule['init'];
 export declare type AppComponentFunction = AppModule['appComponent'];

package/esm/shuvi-app/shuvi-runtime-index.d.ts

@@ -5,6 +5,6 @@
  *  import {} from '@shuvi/runtime'
  *
  */
-export { createRuntimePlugin } from '../shared/lifecycle';
+export { createRuntimePlugin } from '../shared/runtimPlugin';
 export { getPageData } from '../shared/helper/getPageData';
 export type { Loader } from '../shared/loader';

package/esm/shuvi-app/shuvi-runtime-index.js

@@ -5,5 +5,5 @@
  *  import {} from '@shuvi/runtime'
  *
  */
-export { createRuntimePlugin } from '../shared/lifecycle';
+export { createRuntimePlugin } from '../shared/runtimPlugin';
 export { getPageData } from '../shared/helper/getPageData';

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

@@ -1,16 +1,4 @@
 export * from './runtimeFiles';
 export declare const SharedPlugins: {
-    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>;
 }[];

package/lib/node/platform/plugins/main/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/route/helpers.js

@@ -20,38 +20,17 @@ const invariant_1 = __importDefault(require("@shuvi/utils/lib/invariant"));
 const router_1 = require("../../shared/router");
 const supportFileTypes = ['page', 'layout', 'middleware', 'api'];
 const allowReadFilExtList = ['ts', 'js', 'tsx', 'jsx'];
-const dynamicMatchAllRegex = /\[\[(.+?)\]\]/g;
-const dynamicMatchPartRegex = /\[(.+?)\]/g;
+const dynamicMatchAllRegex = /\$$/;
+const dynamicMatchPartRegex = /\$/g;
 function parseDynamicPath(normalizedRoute) {
-    (0, invariant_1.default)(!checkSpecialRegexChars(normalizedRoute), 'filePath should not be special regex chars: |\\{}()^$+*?');
+    (0, invariant_1.default)(!checkSpecialRegexChars(normalizedRoute), 'filePath should not be special regex chars: |\\{}()^:+*?');
     return normalizedRoute
-        .split('/')
-        .map(segment => {
-        let result = '';
-        result = segment.replace(dynamicMatchAllRegex, function (matchString, ...matchArr) {
-            return parseMatchRepeat(matchArr[0], true);
-        });
-        result = result.replace(dynamicMatchPartRegex, function (matchString, ...matchArr) {
-            return parseMatchRepeat(matchArr[0], false);
-        });
-        return `${result}`;
-    })
-        .join('/');
+        .replace(dynamicMatchAllRegex, '*')
+        .replace(dynamicMatchPartRegex, ':');
 }
 exports.parseDynamicPath = parseDynamicPath;
-function parseMatchRepeat(param, optional) {
-    const repeat = param.startsWith('...');
-    if (repeat) {
-        param = param.slice(3);
-    }
-    return repeat
-        ? optional
-            ? `:${param}*`
-            : `:${param}+`
-        : `:${param}${optional ? '?' : ''}`;
-}
 function checkSpecialRegexChars(string) {
-    return /[|\\{}()^$+*?]/g.test(string);
+    return /[|\\{}()^:+*?]/g.test(string);
 }
 function normalizeRoutePath(rawPath) {
     let routePath = rawPath

package/lib/shared/application.d.ts

@@ -1,5 +1,5 @@
 import { IRouter, IPageRouteRecord } from './routerTypes';
-import { IStoreManager, IApplication, IAppContext, IApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
+import { RedoxStore, IApplication, IAppContext, IApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
 export declare class Application {
     private _router;
     private _appComponent;
@@ -11,7 +11,7 @@ export declare class Application {
     constructor(options: IApplicationOptions);
     get router(): IRouter<IPageRouteRecord>;
     get context(): IAppContext;
-    get pluginManager(): import("@shuvi/hook").HookManager<import("./lifecycle").BuiltInRuntimePluginHooks, void, import("@shuvi/runtime").CustomRuntimePluginHooks>;
+    get pluginManager(): import("@shuvi/hook").HookManager<import("./runtimPlugin").RuntimePluginHooks, void>;
     get appComponent(): any;
     get error(): IError | undefined;
     setError(err: IError): void;
@@ -19,7 +19,7 @@ export declare class Application {
     getLoadersData(): Record<string, any>;
     setLoadersData(datas: Record<string, any>): void;
     init(): Promise<void>;
-    get store(): IStoreManager;
+    get store(): RedoxStore;
     updateComponents({ AppComponent }?: IRerenderConfig): Promise<void>;
     dispose(): Promise<void>;
     private _initPlugin;

package/lib/shared/application.js

@@ -10,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Application = void 0;
-const lifecycle_1 = require("./lifecycle");
-const lifecycle_2 = require("./lifecycle");
+const runtimPlugin_1 = require("./runtimPlugin");
+const runtimPlugin_2 = require("./runtimPlugin");
 const redox_1 = require("@shuvi/redox");
 const error_1 = require("./models/error");
 const loader_1 = require("./models/loader");
@@ -20,11 +20,11 @@ class Application {
         this._router = options.router;
         this._context = {};
         this._store = (0, redox_1.redox)({ initialState: options.initialState });
-        this._error = this._store.get(error_1.errorModel);
-        this._loader = this._store.get(loader_1.loaderModel);
+        this._error = this._store.getModel(error_1.errorModel);
+        this._loader = this._store.getModel(loader_1.loaderModel);
         this._appComponent = options.AppComponent;
-        this._pluginManager = (0, lifecycle_1.getManager)();
-        (0, lifecycle_2.initPlugins)(this._pluginManager, options.plugins || []);
+        this._pluginManager = (0, runtimPlugin_1.getManager)();
+        (0, runtimPlugin_2.initPlugins)(this._pluginManager, options.plugins || []);
     }
     get router() {
         return this._router;

package/lib/shared/applicationTypes.d.ts

@@ -1,22 +1,21 @@
-/// <reference types="node" />
-import type { IncomingMessage } from 'http';
-import { IStoreManager } from '@shuvi/redox';
+import { RedoxStore } from '@shuvi/redox';
 import { CustomAppContext } from '@shuvi/runtime';
 import { IRouter, IPageRouteRecord } from './routerTypes';
-import { IPluginList } from './lifecycle';
-export declare type IRequest = IncomingMessage & {
-    [x: string]: any;
-};
+import { IPluginList } from './runtimPlugin';
 export interface IAppContext extends CustomAppContext {
     [x: string]: unknown;
 }
 export declare type IRerenderConfig = {
     AppComponent?: any;
 };
-export type { IStoreManager };
+export type { RedoxStore };
+export declare type ErrorSource = 'server';
 export interface IError {
     code?: number;
     message?: string;
+    stack?: string;
+    name?: string;
+    source?: ErrorSource;
 }
 export interface IErrorState {
     error?: IError;
@@ -28,7 +27,7 @@ export interface IApplication {
     readonly context: IAppContext;
     readonly router: IRouter<IPageRouteRecord>;
     readonly appComponent: any;
-    readonly store: IStoreManager;
+    readonly store: RedoxStore;
     readonly error: IError | undefined;
     setError(err: IError): void;
     clearError(): void;

package/lib/shared/index.d.ts

@@ -8,4 +8,4 @@ export { loaderModel } from './models/loader';
 export * from './applicationTypes';
 export type { Application } from './application';
 export type { IRuntimeConfig } from './runtimeConfigTypes';
-export { IAppModule, IPluginInstance, BuiltInRuntimePluginHooks, CustomRuntimePluginHooks, RuntimePluginHooks, createRuntimePlugin, RuntimePluginInstance } from './lifecycle';
+export { IAppModule, IPluginInstance, BuiltInRuntimePluginHooks, CustomRuntimePluginHooks, RuntimePluginHooks, createRuntimePlugin, createRuntimePluginBefore, createRuntimePluginAfter, RuntimePluginInstance } from './runtimPlugin';

package/lib/shared/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRuntimePlugin = exports.loaderModel = exports.errorModel = void 0;
+exports.createRuntimePluginAfter = exports.createRuntimePluginBefore = exports.createRuntimePlugin = exports.loaderModel = exports.errorModel = void 0;
 __exportStar(require("./helper"), exports);
 __exportStar(require("./routerTypes"), exports);
 __exportStar(require("./router"), exports);
@@ -25,6 +25,7 @@ Object.defineProperty(exports, "errorModel", { enumerable: true, get: function (
 var loader_1 = require("./models/loader");
 Object.defineProperty(exports, "loaderModel", { enumerable: true, get: function () { return loader_1.loaderModel; } });
 __exportStar(require("./applicationTypes"), exports);
-var lifecycle_1 = require("./lifecycle");
-// fix createRuntimePlugin is not portable end
-Object.defineProperty(exports, "createRuntimePlugin", { enumerable: true, get: function () { return lifecycle_1.createRuntimePlugin; } });
+var runtimPlugin_1 = require("./runtimPlugin");
+Object.defineProperty(exports, "createRuntimePlugin", { enumerable: true, get: function () { return runtimPlugin_1.createRuntimePlugin; } });
+Object.defineProperty(exports, "createRuntimePluginBefore", { enumerable: true, get: function () { return runtimPlugin_1.createRuntimePluginBefore; } });
+Object.defineProperty(exports, "createRuntimePluginAfter", { enumerable: true, get: function () { return runtimPlugin_1.createRuntimePluginAfter; } });

package/lib/shared/loader/loader.d.ts

@@ -5,5 +5,5 @@ interface Result<T> {
     result?: T;
 }
 export declare function runInParallerAndBail<T>(fns: Array<() => Promise<T> | T>): Promise<Result<T>[]>;
-export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, { isServer, query, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
+export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, { query, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
 export {};

package/lib/shared/loader/loader.js

@@ -75,7 +75,7 @@ function errorHelper(msg, statusCode = 500) {
     (0, invariant_1.default)(statusCode >= 400 && statusCode < 600, 'status code should be 4xx and 5xx');
     throw (0, response_1.response)(msg, { status: statusCode });
 }
-function runLoaders(matches, loadersByRouteId, { isServer, query, req, getAppContext }) {
+function runLoaders(matches, loadersByRouteId, { query, req, getAppContext }) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!matches.length) {
             return [];
@@ -85,7 +85,7 @@ function runLoaders(matches, loadersByRouteId, { isServer, query, req, getAppCon
             const loaderFn = loadersByRouteId[match.route.id];
             let res;
             try {
-                const value = yield loaderFn(Object.assign({ isServer, pathname: match.pathname, params: match.params, query: query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
+                const value = yield loaderFn(Object.assign({ pathname: match.pathname, params: match.params, query: query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
                 if (value) {
                     res = (0, response_1.json)(value);
                 }

package/lib/shared/loader/types.d.ts

@@ -1,9 +1,9 @@
+import type { ShuviRequest } from '@shuvi/service';
 import { IURLQuery, IURLParams } from '../routerTypes';
-import { IAppContext, IRequest } from '../applicationTypes';
+import { IAppContext } from '../applicationTypes';
 import { Response } from '../response';
 export interface LoaderContextOptions {
-    isServer: boolean;
-    req?: IRequest;
+    req?: ShuviRequest;
     query: IURLQuery;
     getAppContext: () => IAppContext;
 }
@@ -17,10 +17,6 @@ export interface ErrorFunction {
  * route component getInitialProps params `context`
  */
 export interface IRouteLoaderContext {
-    /**
-     * is running on server, if server is true, client will be false
-     */
-    isServer: boolean;
     /**
      * current url path
      */
@@ -62,7 +58,7 @@ export interface IRouteLoaderContext {
     /**
      * server only
      */
-    req?: IRequest;
+    req?: ShuviRequest;
     /**
      * Application context object, which is accessiable during the entire lifecycle of application
      */

package/lib/shared/models/error.d.ts

@@ -1,5 +1,5 @@
 import { IErrorState, IError } from '../applicationTypes';
-export declare const errorModel: import("@shuvi/redox").Model<"error", IErrorState, {}, {
+export declare const errorModel: import("@shuvi/redox/esm/core/defineModel").DefineModel<"error", IErrorState, {
     setError(_state: IErrorState, error?: IError): {
         error: IError | undefined;
     };
@@ -9,5 +9,5 @@ export declare const errorModel: import("@shuvi/redox").Model<"error", IErrorSta
 }, {
     errorObject(): IError | undefined;
     hasError(): boolean;
-}>;
+}, {}>;
 export declare type ErrorModel = typeof errorModel;

package/lib/shared/models/loader.d.ts

@@ -1,13 +1,13 @@
 export interface LoaderState {
     dataByRouteId: Record<string, any>;
 }
-export declare const loaderModel: import("@shuvi/redox").Model<"loader", LoaderState, {}, {
+export declare const loaderModel: import("@shuvi/redox/esm/core/defineModel").DefineModel<"loader", LoaderState, {
     setDatas(state: LoaderState, newData: Record<string, any>): {
         dataByRouteId: {
             [x: string]: any;
         };
     };
-}, import("@shuvi/redox").RedoxActions, {
+}, import("@shuvi/redox/esm/core/defineModel").ActionOptions, {
     getAllData(): Record<string, any>;
-}>;
+}, {}>;
 export declare type LoaderModel = typeof loaderModel;

package/lib/shared/routerTypes.d.ts

@@ -7,6 +7,8 @@ export interface IPageRouteRecord extends IRouteRecord {
     path: string;
     component?: any;
     children?: IPageRouteRecord[];
+    __import__?: () => Promise<any>;
+    __resolveWeak__?: () => string[];
     __componentSource__?: string;
     __componentRawRequest__?: string;
     [x: string]: any;

package/lib/shared/{lifecycle.d.ts → runtimPlugin.d.ts}

@@ -14,10 +14,8 @@ export interface BuiltInRuntimePluginHooks extends HookMap {
 }
 export interface RuntimePluginHooks extends BuiltInRuntimePluginHooks, CustomRuntimePluginHooks {
 }
-export declare const getManager: () => import("@shuvi/hook").HookManager<BuiltInRuntimePluginHooks, void, CustomRuntimePluginHooks>;
-export declare const createRuntimePlugin: (pluginHandlers: Partial<import("@shuvi/hook").IPluginHandlersFullMap<BuiltInRuntimePluginHooks & CustomRuntimePluginHooks, void>> & {
-    setup?: import("@shuvi/hook").Setup<CustomRuntimePluginHooks> | undefined;
-}, options?: import("@shuvi/hook").PluginOptions | undefined) => IPluginInstance<BuiltInRuntimePluginHooks & CustomRuntimePluginHooks, void>;
+export declare const getManager: () => import("@shuvi/hook").HookManager<RuntimePluginHooks, void>;
+export declare const createRuntimePluginBefore: import("@shuvi/shared/lib/plugins").PluginFunc<RuntimePluginHooks, void>, createRuntimePlugin: import("@shuvi/shared/lib/plugins").PluginFunc<RuntimePluginHooks, void>, createRuntimePluginAfter: import("@shuvi/shared/lib/plugins").PluginFunc<RuntimePluginHooks, void>;
 export type { IPluginInstance, CustomRuntimePluginHooks };
 export declare type PluginManager = ReturnType<typeof getManager>;
 export declare type RuntimePluginInstance = IPluginInstance<RuntimePluginHooks, void>;

package/lib/shared/{lifecycle.js → runtimPlugin.js}

@@ -8,9 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initPlugins = exports.createRuntimePlugin = exports.getManager = void 0;
+exports.initPlugins = exports.createRuntimePluginAfter = exports.createRuntimePlugin = exports.createRuntimePluginBefore = exports.getManager = void 0;
 const hook_1 = require("@shuvi/hook");
+const plugins_1 = require("@shuvi/shared/lib/plugins");
 const init = (0, hook_1.createAsyncParallelHook)();
 const appContext = (0, hook_1.createAsyncSeriesWaterfallHook)();
 const appComponent = (0, hook_1.createAsyncSeriesWaterfallHook)();
@@ -23,7 +25,7 @@ const builtinRuntimePluginHooks = {
 };
 const getManager = () => (0, hook_1.createHookManager)(builtinRuntimePluginHooks, false);
 exports.getManager = getManager;
-exports.createRuntimePlugin = (0, exports.getManager)().createPlugin;
+_a = (0, plugins_1.createPluginCreator)((0, exports.getManager)()), exports.createRuntimePluginBefore = _a.createPluginBefore, exports.createRuntimePlugin = _a.createPlugin, exports.createRuntimePluginAfter = _a.createPluginAfter;
 const initPlugins = (pluginManager, plugins) => __awaiter(void 0, void 0, void 0, function* () {
     // clear plugin at development mode every time
     if (process.env.NODE_ENV === 'development') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-shared",
-  "version": "1.0.0-rc.5",
+  "version": "1.0.0-rc.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -82,18 +82,18 @@
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@shuvi/hook": "1.0.0-rc.5",
-    "@shuvi/redox": "0.0.3",
-    "@shuvi/router": "1.0.0-rc.5",
-    "@shuvi/runtime": "1.0.0-rc.5",
-    "@shuvi/service": "1.0.0-rc.5",
-    "@shuvi/shared": "1.0.0-rc.5",
-    "@shuvi/toolpack": "1.0.0-rc.5",
-    "@shuvi/utils": "1.0.0-rc.5",
+    "@shuvi/hook": "1.0.0-rc.8",
+    "@shuvi/redox": "0.0.6",
+    "@shuvi/router": "1.0.0-rc.8",
+    "@shuvi/runtime": "1.0.0-rc.8",
+    "@shuvi/service": "1.0.0-rc.8",
+    "@shuvi/shared": "1.0.0-rc.8",
+    "@shuvi/toolpack": "1.0.0-rc.8",
+    "@shuvi/utils": "1.0.0-rc.8",
     "redux": "4.1.2"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.0-rc.5"
+    "@shuvi/service": "1.0.0-rc.8"
   },
   "devDependencies": {
     "@types/minimatch": "3.0.5"